diff --git a/Plague.g1a b/Plague.g1a index 17598eb..b376a84 100644 Binary files a/Plague.g1a and b/Plague.g1a differ diff --git a/Plague.g3a b/Plague.g3a index cfdc7ba..1e2d87a 100644 Binary files a/Plague.g3a and b/Plague.g3a differ diff --git a/assets/__pycache__/converters.cpython-39.pyc b/assets/__pycache__/converters.cpython-39.pyc index 579b499..4b299ca 100644 Binary files a/assets/__pycache__/converters.cpython-39.pyc and b/assets/__pycache__/converters.cpython-39.pyc differ diff --git a/assets/mutations_table/transmissions_2.txt b/assets/mutations_table/transmissions_2.txt index 91b216a..e23f587 100644 --- a/assets/mutations_table/transmissions_2.txt +++ b/assets/mutations_table/transmissions_2.txt @@ -1,4 +1,4 @@ -1 | 2 | 15 | 0 | 6 | 5 | 0 | 0 -0 | 0 | 0 | 15 | 0 | 0 | 0 | 11 -9 | 10 | 0 | 0 | 0 | 0 | 0 | 12 -0 | 0 | 0 | 7 | 8 | 0 | 0 | 15 \ No newline at end of file +1 | 2 | 15 | 0 | 15 | 5 | 0 | 0 +0 | 0 | 0 | 15 | 0 | 0 | 0 | 11 +9 | 10 | 0 | 0 | 0 | 0 | 0 | 12 +0 | 0 | 0 | 7 | 8 | 0 | 0 | 15 \ No newline at end of file diff --git a/src/core.c b/src/core.c index 833a1c4..e9df5f6 100644 --- a/src/core.c +++ b/src/core.c @@ -82,7 +82,7 @@ int next_frame(struct game *current_game, int *dna_animation, int *vaccine) if (!current_game->humans[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 bdceb4e..04074e3 100644 --- a/src/mutation_engine.c +++ b/src/mutation_engine.c @@ -137,6 +137,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"); @@ -169,8 +170,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; }