fox_team
/
Plague-fx
3
2
Fork 2
Code Issues Pull Requests Releases 14 Wiki Activity

Finish adjustment on mutations

This commit is contained in:
Shadow15510 2021-06-03 09:45:24 +02:00
parent 9b20cff6a0
commit 82f9da7cb5
10 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -37,6 +37,7 @@ set(ASSETS_fx
assets-fx/mutations_table/symptoms_1.txt
assets-fx/mutations_table/symptoms_2.txt
assets-fx/mutations_table/symptoms_3.txt
assets-fx/mutations_table/symptoms_4.txt
assets-fx/mutations_table/transmissions_1.txt
assets-fx/mutations_table/transmissions_2.txt
assets-fx/mutations_table/transmissions_3.txt

BIN
Plague.g1a
View File

Binary file not shown.

2
assets-fx/mutations_table/abilities_1.txt
View File

@ -1,4 +1,4 @@
1 | 0 | 0 | 0 | 6 | 0 | 0 | 0
1 | 0 | 0 | 0 | 15 | 0 | 0 | 0
15 | 15 | 0 | 15 | 0 | 0 | 0 | 0
0 | 0 | 0 | 0 | 15 | 0 | 0 | 0
0 | 0 | 0 | 0 | 0 | 0 | 0 | 0

4
assets-fx/mutations_table/symptoms_3.txt
View File

@ -1,4 +1,4 @@
1 | 2 | 5 | 4 | 3 | 0 | 0 | 0
0 | 0 | 14 | 13 | 0 | 0 | 0 | 0
0 | 0 | 8 | 0 | 12 | 0 | 0 | 0
0 | 0 | 15 | 15 | 0 | 0 | 0 | 0
0 | 0 | 8 | 0 | 15 | 0 | 0 | 0
0 | 10 | 7 | 6 | 9 | 11 | 0 | 0

4
assets-fx/mutations_table/symptoms_4.txt Normal file
View File

@ -0,0 +1,4 @@
1 | 2 | 5 | 4 | 3 | 0 | 0 | 0
0 | 0 | 14 | 13 | 0 | 0 | 0 | 0
0 | 0 | 8 | 0 | 12 | 0 | 0 | 0
0 | 10 | 7 | 6 | 9 | 11 | 0 | 0

6
src/core.c
View File

@ -46,7 +46,7 @@ void next_frame(struct game *current_game)
current_game->time += ENGINE_TICK;
current_game->total_time += ENGINE_TICK;
if (current_game->time > LIMIT_TICK)
{
// Reset internal clock
@ -64,9 +64,9 @@ void next_frame(struct game *current_game)
message(msg);
current_game->research = 0;
}
if (!current_game->humans[0])
if (!current_game->humans[1])
{
if (!current_game->humans[1])
if (current_game->humans[0] != 0)
{
const char *msg[5] = {"Vous avez", "perdu.", "", "", ""};
message(msg);

4
src/data.c
View File

@ -13,8 +13,8 @@ const struct mutation symptoms_data[14] =
{10, 10, 0, 10, 0, "LESIONS"},
{30, 20, 20, 20, 30, "HEMORRAGIE"},
{25, 15, 10, 17, 0, "INFECTION"},
{15, 10, 2, 5, 0, "INFLAMMATION"},
{10, 15, 10, 12, 0, "IMMUNITE"},
{15, 10, 10, 5, 0, "INFLAMMATION"},
{10, 15, 20, 12, 0, "IMMUNITE"},
{ 0, 20, 0, 15, 120, "PARANOIA"},
{ 0, 15, 0, 20, 100, "FOLIE"},
{ 0, 30, 30, 30, 250, "ARRET TOTAL"},

3
src/display_engine.c
View File

@ -131,7 +131,8 @@ void display_mutation_buy(const struct cursor c, const int mutation_menu, const
dsubimage(3, 21, &img_mutations, 16 * (mutation_menu - 1), 16 * (id - 1), 15, 15, DIMAGE_NONE);
dprint(47, 25, C_BLACK, mutation_data->name);
dprint(81, 33, C_BLACK, "%d", mutation_data->dna);
if (!current_game->mutations_bought[mutation_menu - 1][id - 1]) dprint(81, 33, C_BLACK, "%d", mutation_data->dna);
else dprint(81, 33, C_BLACK, "ACHETEE");
dprint(81, 41, C_BLACK, "%d (%d)", mutation_data->contagion, mutation_data->contagion - mutation_sel->contagion);
dprint(81, 49, C_BLACK, "%d (%d)", mutation_data->severity, mutation_data->severity - mutation_sel->severity);
dprint(81, 57, C_BLACK, "%d (%d)", mutation_data->lethality, mutation_data->lethality - mutation_sel->lethality);

2
src/main.c
View File

@ -46,7 +46,7 @@ int main(void)
.severity = 0,
.lethality = 0,
.dna = 0,
.dna = 100,
.mutations_count = {0, 0, 0},
.mutations_selected = {0, 0, 0},

8
src/mutation_engine.c
View File

@ -12,6 +12,7 @@ void get_mutation(const struct game *current_game, const int mutation_menu, int
extern struct mutation_table mt_symptoms_1;
extern struct mutation_table mt_symptoms_2;
extern struct mutation_table mt_symptoms_3;
extern struct mutation_table mt_symptoms_4;
// Load abilities
extern struct mutation_table mt_abilities_1;
@ -27,13 +28,14 @@ void get_mutation(const struct game *current_game, const int mutation_menu, int
{
if (current_game->mutations_count[0] < 4) init_mat(8, 4, table, mt_symptoms_1.data);
else if (current_game->mutations_count[0] < 8) init_mat(8, 4, table, mt_symptoms_2.data);
else init_mat(8, 4, table, mt_symptoms_3.data);
else if (current_game->mutations_count[0] < 11) init_mat(8, 4, table, mt_symptoms_3.data);
else init_mat(8, 4, table, mt_symptoms_4.data);
}
if (mutation_menu == 2)
{
if (current_game->mutations_count[1] < 2) init_mat(8, 4, table, mt_abilities_1.data);
else if (current_game->mutations_count[1] < 4) init_mat(8, 4, table, mt_abilities_2.data);
if (current_game->mutations_count[1] < 1) init_mat(8, 4, table, mt_abilities_1.data);
else if (current_game->mutations_count[1] < 3) init_mat(8, 4, table, mt_abilities_2.data);
else init_mat(8, 4, table, mt_abilities_3.data);
}