.gitignore

@@ -1,3 +1,5 @@
 build-fx/*
+build-cg/*
+
 assets-fx/__pycache__/*
-*.g1a
+assets-cg/__pycache__/*

CMakeLists.txt

@@ -21,34 +21,34 @@ set(SOURCES
 
 # Shared assets, fx-9860G-only assets and fx-CG-50-only assets
 set(ASSETS
-
+  assets/plague.png
+  assets/planes.png
+  assets/bground.png
+  assets/mutations.png
+  assets/cursor.png
+  assets/title.png
+  assets/dna.png
+  assets/explosion.png
+  assets/mutations_table/abilities_1.txt
+  assets/mutations_table/abilities_2.txt
+  assets/mutations_table/abilities_3.txt
+  assets/mutations_table/symptoms_1.txt
+  assets/mutations_table/symptoms_2.txt
+  assets/mutations_table/symptoms_3.txt
+  assets/mutations_table/symptoms_4.txt
+  assets/mutations_table/transmissions_1.txt
+  assets/mutations_table/transmissions_2.txt
+  assets/mutations_table/transmissions_3.txt
 )
 set(ASSETS_fx
-  assets-fx/plague.png
-  assets-fx/planes.png
-  assets-fx/bground.png
-  assets-fx/mutations.png
-  assets-fx/cursor.png
-  assets-fx/title.png
-  assets-fx/dna.png
-  assets-fx/explosion.png
-  assets-fx/mutations_table/abilities_1.txt
-  assets-fx/mutations_table/abilities_2.txt
-  assets-fx/mutations_table/abilities_3.txt
-  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
+
 )
 set(ASSETS_cg
   
 )
 
 fxconv_declare_assets(${ASSETS} ${ASSETS_fx} ${ASSETS_cg} WITH_METADATA)
-fxconv_declare_converters(assets-fx/converters.py)
+fxconv_declare_converters(assets/converters.py)
 
 
 add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}})

src/core.c

@@ -108,12 +108,12 @@ int get_inputs(const int background, int *mutation_menu, int *boost)
         else if (background == 6) return 1;
     }
 
-    if (key == KEY_ALPHA || key == KEY_EXIT)
+    if (key == KEY_ALPHA)
     {
         if (background == 5) return 3;
-        if (background == 1 || background == 2) return -1;
         else return 1;
     }
+    if (key == KEY_EXIT && (background == 1 || background == 2)) return -1;
 
     if (background == 3)
     {
@@ -168,5 +168,5 @@ void message(char *msg)
     key_event_t ev = {0};
 
     display_message(msg);
-    while (ev.key != KEY_ALPHA && ev.key != KEY_EXIT) ev = getkey_opt(opt, NULL);
+    while (ev.key != KEY_ALPHA) ev = getkey_opt(opt, NULL);
 }

src/data.c

@@ -6,18 +6,18 @@ const struct mutation symptoms_data[14] =
 {
     {10,  0,  0,  2,  0, "NAUSEE", "DONNE DES NAUSEES"},
     {15, 10,  0, 10,  0, "VOMISSEMENT", "PROVOQUE DES REJETS GASTRIQUES"},
-    {10,  0,  0,  3,  0, "TOUX", "LA PROJECTION DE PARTICULE AUGMENTE LA CONTAGION"},
-    {15, 10,  5, 10,  0, "PNEUMONIE", "AFFECTION PULMONAIRE PEU MORTELLE"},
-    { 0, 20, 20, 15, 10, "TUMEUR", "PEU CONTAGIEUX, MAIS MORTEL"},
-    {15,  0,  5,  4,  0, "PLAIES", "LA PEAU S'ASSECHE ET DEVIENT CASSANTE"},
-    {10,  5, 10, 10,  0, "LESIONS", "BLOQUE LA CICATRISATION"},
-    {30, 10, 20, 20,  5, "HEMORRAGIE", "BLOQUE L'ACTION DES PLAQUETTES"},
-    {25, 10, 10, 17,  0, "INFECTION", "CREER DES FOYERS D'INFECTION DANS LE CORPS"},
+    {10,  5,  0,  3,  0, "TOUX", "LA PROJECTION DE PARTICULE AUGMENTE LA CONTAGION"},
+    {15, 20,  5, 10,  0, "PNEUMONIE", "AFFECTION PULMONAIRE PEU MORTELLE"},
+    { 0, 30, 20, 15, 10, "TUMEUR", "PEU CONTAGIEUX, MAIS MORTEL"},
+    {15, 10,  5,  4,  0, "PLAIES", "LA PEAU S'ASSECHE ET DEVIENT CASSANTE"},
+    {10, 10, 10, 10,  0, "LESIONS", "BLOQUE LA CICATRISATION"},
+    {30, 20, 20, 20,  5, "HEMORRAGIE", "BLOQUE L'ACTION DES PLAQUETTES"},
+    {25, 15, 10, 17,  0, "INFECTION", "CREER DES FOYERS D'INFECTION DANS LE CORPS"},
     {15, 10,  5,  5,  0, "INFLAMMATION", "PROVOQUE DES ROUGEURS ET DEMANGEAISONS"},
     {10, 15, 20, 15,  0, "IMMUNITE", "BLOQUE L'ACTION DU SYSTEME IMMUNITAIRE"},
     { 0, 20,  0, 15,  10, "PARANOIA", "LES CHERCHEURS N'ARRIVENT PLUS A COOPERER ENTRE EUX"},
     { 0, 15, 15, 20,  10, "FOLIE", "PROVOQUE DES CRISES D'HYSTERIES"},
-    { 0, 10, 30, 30,  20, "ARRET TOTAL", "EMPECHE LES ORGANES DE FONCTIONNER"},
+    { 0, 30, 30, 30,  20, "ARRET TOTAL", "EMPECHE LES ORGANES DE FONCTIONNER"},
 };
 
 

src/main.c

@@ -1,7 +1,7 @@
 /*
   Project name ......: Plague
-  Version ...........: 1.3.10
-  Last modification .: 19 January 2022
+  Version ...........: 1.3.7
+  Last modification .: 8 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.10";
+const char *VERSION = "1.3.7";
 
 // title_screen : display the title screen
 static void title_screen(void);
@@ -77,23 +77,6 @@ int main(void)
 
     gint_world_switch(GINT_CALL(read_save, (void *)&current_game));
 
-    if (current_game.total_time == 0)
-    {
-        dclear(C_WHITE);
-
-        dtext(10, 1, C_BLACK, "CONTROLES :");
-        dtext(1, 7, C_BLACK, "[REPLAY]:SELECTIONNER");
-        dtext(1, 14, C_BLACK, "[SHIFT]:VALIDER");
-        dtext(1, 21, C_BLACK, "[ALPHA/EXIT]:REVENIR");
-        dtext(1, 28, C_BLACK, "[VARS]:MUTATIONS");
-        dtext(1, 35, C_BLACK, "[OPTN]:RECHERCHE+ADN");
-        dtext(1, 42, C_BLACK, "[X^2]:STATISTIQUES");
-        dtext(1, 49, C_BLACK, "[->]:MODE RAPIDE");
-        
-        dupdate();
-        getkey();
-    }
-
     int to_save = main_loop(&current_game);
 
     if (to_save) gint_world_switch(GINT_CALL(write_save, (void *)&current_game));

src/mutation_engine.c

@@ -76,7 +76,7 @@ void mutation_select(struct game *current_game, const int mutation_menu)
         if (key) {tick = 1; c.display = 1;}
         
         // Manage input
-        if (key == KEY_ALPHA || key == KEY_EXIT) end = 1;
+        if (key == KEY_ALPHA) end = 1;
         if (key == KEY_SHIFT && table[c.y][c.x] != 15 && table[c.y][c.x] != 0)
         {
             end = mutation_buy(current_game, c, mutation_menu, table);
@@ -115,7 +115,7 @@ int mutation_buy(struct game *current_game, const struct cursor c, const int mut
         if (key == KEY_OPTN)
         {
             display_mutation_description(mutation_data->name, mutation_data->description, mutation_menu, id);
-            while (ev.key != KEY_ALPHA && ev.key != KEY_EXIT) ev = getkey_opt(opt, NULL);
+            while (ev.key != KEY_ALPHA) ev = getkey_opt(opt, NULL);
         }
         if (key == KEY_SHIFT)
         {

src/mutation_engine.h

@@ -5,7 +5,7 @@
 #include "display_engine.h"
 
 // Basic limit research
-#define RESEARCH_LIMIT 200
+#define RESEARCH_LIMIT 300
 
 // mutation_table : contain the map of the mutation available
 struct mutation_table