From 27ab144ea77df94e0ff15eb042cdfe5075003077 Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Thu, 3 Jun 2021 13:02:08 +0200 Subject: [PATCH] Re-balance DNA gain and research speed --- Plague.g1a | Bin 64656 -> 64768 bytes src/core.c | 7 ++++--- src/mutation_engine.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Plague.g1a b/Plague.g1a index bfc6a57c345865ad9fa8af5a3b5d82dbf32cd6c2..031f2e326960fbb2696eff12f2e9c54bb231736c 100644 GIT binary patch delta 4853 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 delta 4709 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 TQ8&VLe5OwLei #include #include +#include #include "core.h" #include "mutation_engine.h" @@ -53,12 +54,12 @@ void next_frame(struct game *current_game) current_game->time = 0; // Update the game - if (current_game->dna <= 100) current_game->dna += 1; - current_game->research += current_game->priority; + if (current_game->dna <= 100) current_game->dna += 1 + floor(current_game->severity / 25); + if (current_game->research < current_game->limit) current_game->research += current_game->priority; epidemic_simulation(current_game); // Check the end of the game - if (current_game->research > current_game->limit) + if (current_game->research >= current_game->limit) { const char *msg[5] = {"Vous avez", "perdu.", "", "", ""}; message(msg); diff --git a/src/mutation_engine.c b/src/mutation_engine.c index 403257f..1fa3c1d 100644 --- a/src/mutation_engine.c +++ b/src/mutation_engine.c @@ -158,7 +158,7 @@ void update_disease(struct game *current_game) // research parameters current_game->limit = RESEARCH_LIMIT + symptom->changement + ability->changement + transmission->changement; - current_game->priority = floor((current_game->severity + current_game->lethality) / 200); + current_game->priority = floor((current_game->severity + current_game->lethality) / 40); }