From d85daa92dee56b9c89d755adb6eccda95db4e07a Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Mon, 7 Jun 2021 21:26:52 +0200 Subject: [PATCH] Some adjust with game mecanics --- Plague.g1a | Bin 69252 -> 69236 bytes Plague.g3a | Bin 307696 -> 307680 bytes assets/__pycache__/converters.cpython-39.pyc | Bin 971 -> 968 bytes assets/mutations_table/transmissions_2.txt | 8 ++++---- src/core.c | 2 +- src/data.c | 10 +++++----- src/epidemic_engine.c | 2 +- src/main.c | 6 +++--- src/mutation_engine.c | 3 +-- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index 17598eb209cd8ff2f058070b61025fd9688147ce..b376a8444b49ab09c56c4898c74c72fb424b7e45 100644 GIT binary patch delta 5276 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 diff --git a/assets/__pycache__/converters.cpython-39.pyc b/assets/__pycache__/converters.cpython-39.pyc index 579b499402df1e0fe1f144c6a6ca4fc8da23e0b3..4b299caf610799604fec62400c93147fd2093b62 100644 GIT binary patch delta 31 lcmX@jeuAAlk(ZZ?0SKP`*t3yam66eWvLU0+<^;xUCIEhumans[1]) { - if (current_game->humans[0] || current_game->humans[3] < current_game->humans[2]) message("VOUS AVEZ PERDU."); + if (current_game->humans[3] < 4 * (current_game->humans[0] + current_game->humans[2])) message("VOUS AVEZ PERDU."); else message("VOUS AVEZ GAGNE !"); return 0; } diff --git a/src/data.c b/src/data.c index 89806a2..29a2f05 100644 --- a/src/data.c +++ b/src/data.c @@ -4,7 +4,7 @@ // (contation, severity, lethality, DNA cost, change to cure requirement) const struct mutation symptoms_data[14] = { - {10, 10, 0, 2, 0, "NAUSEE", "DONNE DES NAUSEES"}, + {10, 0, 0, 2, 0, "NAUSEE", "DONNE DES NAUSEES"}, {15, 10, 0, 10, 0, "VOMISSEMENT", "PROVOQUE DES REJETS GASTRIQUES"}, {10, 5, 0, 3, 0, "TOUX", "LA PROJECTION DE PARTICULE AUGMENTE LA CONTAGION"}, {15, 20, 5, 10, 0, "PNEUMONIE", "AFFECTION PULMONAIRE PEU MORTELLE"}, @@ -26,9 +26,9 @@ const struct mutation abilities_data[6] = {15, 0, 0, 10, 0, "FROID", "RESISTANCE AU FROID"}, {15, 0, 0, 15, 0, "CHAUD", "RESISTANCE AU CHAUD"}, { 0, 10, 0, 25, 10, "GENETIQUE", "LE GENOME MUTE, RALENTISSANT LE SEQUENCAGE ADN"}, - {10, 10, 20, 30, 30, "MUTATION+", "LE VIRUS MUTE, BLOQUANT LES CHERCHEURS"}, + {10, 10, 10, 30, 30, "MUTATION+", "LE VIRUS MUTE, BLOQUANT LES CHERCHEURS"}, {30, 10, 0, 30, 0, "ENVIRON", "LE VIRUS RESISTE AUX ENVIRONNEMENTS LES PLUS HOSTILES"}, - { 0, 15, 30, 15, 20, "MEDICAMENT", "RESISTANCES AU MEDICAMENTS"}, + { 0, 15, 30, 15, 20, "MEDICAMENT", "RESISTANCE AU MEDICAMENTS"}, }; @@ -40,11 +40,11 @@ const struct mutation transmissions_data[13] = {40, 15, 0, 30, 0, "AEROSOL", "TRANSMISSION PAR L'AIR ET PAR L'EAU"}, {10, 0, 0, 15, 0, "EAU 1", "TRANSMISSION PAR L'EAU"}, {20, 10, 0, 20, 0, "EAU 2", "TRANSMISSION PAR L'EAU"}, - {20, 0, 5, 12, 0, "ANIMAL 1", "LE VIRUS PEUT PASSER DE L'ANIMAL À L'HOMME"}, + {20, 0, 5, 12, 0, "ANIMAL 1", "LE VIRUS PEUT PASSER DE L'ANIMAL A L'HOMME"}, {40, 10, 0, 25, 0, "ANIMAL 2", "CAPACITE DE TRANSMISSION HOMME-ANIMAL"}, {20, 0, 0, 15, 0, "OISEAU 1", "LES OISEAUX TRANSMETTENT LE VIRUS"}, {40, 10, 0, 25, 0, "OISEAU 2", "LES OISEAUX TRANSMETTENT LE VIRUS"}, - {10, 0, 0, 10, 0, "SANG 1", "LE VIRUS SE TRANSMET PAR LE SANG"}, + {10, 0, 0, 10, 0, "SANG 1", "LE VIRUS SE TRANSMET PAR LE SANG"}, {20, 10, 0, 15, 0, "SANG 2", "LE VIRUS SE TRANSMET PAR LE SANG"}, {40, 15, 0, 25, 0, "SANG 3", "LE VIRUS SE TRANSMET PAR LE SANG"}, }; diff --git a/src/epidemic_engine.c b/src/epidemic_engine.c index 5615b17..abb77b6 100644 --- a/src/epidemic_engine.c +++ b/src/epidemic_engine.c @@ -42,7 +42,7 @@ void epidemic_simulation(struct game *current_game) init_tab(current_game->grid.width * current_game->grid.height, current_grid, current_game->grid.data); int healed_rate = 0; - if (current_game->research == current_game->limit) healed_rate = rand() % 11; + if (current_game->research == current_game->limit) healed_rate = rand() % 6; // Make the epidemic grid evolove for (int i = 0; i < current_game->grid.width; i ++) diff --git a/src/main.c b/src/main.c index 7769062..208cd58 100644 --- a/src/main.c +++ b/src/main.c @@ -1,7 +1,7 @@ /* Project name ......: Plague - Version ...........: 1.3.5 - Last modification .: 6 June 2021 + Version ...........: 1.3.6 + Last modification .: 7 June 2021 code and assets provided with licence : GNU General Public Licence v3.0 @@ -20,7 +20,7 @@ #include "mutation_engine.h" #include "save.h" -const char *VERSION = "1.3.5"; +const char *VERSION = "1.3.6"; // title_screen : display the title screen static void title_screen(void); diff --git a/src/mutation_engine.c b/src/mutation_engine.c index 3c312eb..193af6c 100644 --- a/src/mutation_engine.c +++ b/src/mutation_engine.c @@ -136,6 +136,7 @@ int mutation_buy(struct game *current_game, const struct cursor c, const int mut // Update update_disease(current_game); current_game->priority += ceil((mutation_data->severity + mutation_data->lethality) / 10); + current_game->limit += mutation_data->changement; message("MUTATION ACHETEE"); } else message("ACHAT IMPOSSIBLE"); @@ -168,8 +169,6 @@ void update_disease(struct game *current_game) current_game->severity = symptom->severity + ability->severity + transmission->severity; current_game->lethality = symptom->lethality + ability->lethality + transmission->lethality; - // research parameter - current_game->limit = RESEARCH_LIMIT + symptom->changement + ability->changement + transmission->changement; if (current_game->research > current_game->limit) current_game->research = current_game->limit; }