diff --git a/CMakeLists.txt b/CMakeLists.txt index 77de2f9..0414de7 100644 --- a/CMakeLists.txt +++ b/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/converters.py) +fxconv_declare_converters(assets-fx/converters.py) add_executable(myaddin ${SOURCES} ${ASSETS} ${ASSETS_${FXSDK_PLATFORM}}) diff --git a/Plague.g1a b/Plague.g1a deleted file mode 100644 index f52743d..0000000 Binary files a/Plague.g1a and /dev/null differ diff --git a/Plague.g3a b/Plague.g3a deleted file mode 100644 index 5432905..0000000 Binary files a/Plague.g3a and /dev/null differ diff --git a/assets-cg/icon-sel.png b/assets-cg/icon-sel.png deleted file mode 100644 index 7137b50..0000000 Binary files a/assets-cg/icon-sel.png and /dev/null differ diff --git a/assets-cg/icon-uns.png b/assets-cg/icon-uns.png deleted file mode 100644 index 3c99f62..0000000 Binary files a/assets-cg/icon-uns.png and /dev/null differ diff --git a/assets/bground.png b/assets-fx/bground.png similarity index 100% rename from assets/bground.png rename to assets-fx/bground.png diff --git a/assets/converters.py b/assets-fx/converters.py similarity index 100% rename from assets/converters.py rename to assets-fx/converters.py diff --git a/assets/cursor.png b/assets-fx/cursor.png similarity index 100% rename from assets/cursor.png rename to assets-fx/cursor.png diff --git a/assets/dna.png b/assets-fx/dna.png similarity index 100% rename from assets/dna.png rename to assets-fx/dna.png diff --git a/assets/explosion.png b/assets-fx/explosion.png similarity index 100% rename from assets/explosion.png rename to assets-fx/explosion.png diff --git a/assets/fxconv-metadata.txt b/assets-fx/fxconv-metadata.txt similarity index 100% rename from assets/fxconv-metadata.txt rename to assets-fx/fxconv-metadata.txt diff --git a/assets/mutations.png b/assets-fx/mutations.png similarity index 100% rename from assets/mutations.png rename to assets-fx/mutations.png diff --git a/assets/mutations_table/abilities_1.txt b/assets-fx/mutations_table/abilities_1.txt similarity index 100% rename from assets/mutations_table/abilities_1.txt rename to assets-fx/mutations_table/abilities_1.txt diff --git a/assets/mutations_table/abilities_2.txt b/assets-fx/mutations_table/abilities_2.txt similarity index 100% rename from assets/mutations_table/abilities_2.txt rename to assets-fx/mutations_table/abilities_2.txt diff --git a/assets/mutations_table/abilities_3.txt b/assets-fx/mutations_table/abilities_3.txt similarity index 100% rename from assets/mutations_table/abilities_3.txt rename to assets-fx/mutations_table/abilities_3.txt diff --git a/assets/mutations_table/fxconv-metadata.txt b/assets-fx/mutations_table/fxconv-metadata.txt similarity index 100% rename from assets/mutations_table/fxconv-metadata.txt rename to assets-fx/mutations_table/fxconv-metadata.txt diff --git a/assets/mutations_table/symptoms_1.txt b/assets-fx/mutations_table/symptoms_1.txt similarity index 100% rename from assets/mutations_table/symptoms_1.txt rename to assets-fx/mutations_table/symptoms_1.txt diff --git a/assets/mutations_table/symptoms_2.txt b/assets-fx/mutations_table/symptoms_2.txt similarity index 100% rename from assets/mutations_table/symptoms_2.txt rename to assets-fx/mutations_table/symptoms_2.txt diff --git a/assets/mutations_table/symptoms_3.txt b/assets-fx/mutations_table/symptoms_3.txt similarity index 100% rename from assets/mutations_table/symptoms_3.txt rename to assets-fx/mutations_table/symptoms_3.txt diff --git a/assets/mutations_table/symptoms_4.txt b/assets-fx/mutations_table/symptoms_4.txt similarity index 100% rename from assets/mutations_table/symptoms_4.txt rename to assets-fx/mutations_table/symptoms_4.txt diff --git a/assets/mutations_table/transmissions_1.txt b/assets-fx/mutations_table/transmissions_1.txt similarity index 100% rename from assets/mutations_table/transmissions_1.txt rename to assets-fx/mutations_table/transmissions_1.txt diff --git a/assets/mutations_table/transmissions_2.txt b/assets-fx/mutations_table/transmissions_2.txt similarity index 100% rename from assets/mutations_table/transmissions_2.txt rename to assets-fx/mutations_table/transmissions_2.txt diff --git a/assets/mutations_table/transmissions_3.txt b/assets-fx/mutations_table/transmissions_3.txt similarity index 100% rename from assets/mutations_table/transmissions_3.txt rename to assets-fx/mutations_table/transmissions_3.txt diff --git a/assets/plague.png b/assets-fx/plague.png similarity index 100% rename from assets/plague.png rename to assets-fx/plague.png diff --git a/assets/planes.png b/assets-fx/planes.png similarity index 100% rename from assets/planes.png rename to assets-fx/planes.png diff --git a/assets/title.png b/assets-fx/title.png similarity index 100% rename from assets/title.png rename to assets-fx/title.png diff --git a/assets/__pycache__/converters.cpython-39.pyc b/assets/__pycache__/converters.cpython-39.pyc deleted file mode 100644 index 4b299ca..0000000 Binary files a/assets/__pycache__/converters.cpython-39.pyc and /dev/null differ diff --git a/src/main.c b/src/main.c index 71809ff..2a3a8df 100644 --- a/src/main.c +++ b/src/main.c @@ -1,6 +1,6 @@ /* Project name ......: Plague - Version ...........: 1.3.8 + Version ...........: 1.3.9 Last modification .: 8 June 2021 code and assets provided with licence : @@ -20,7 +20,7 @@ #include "mutation_engine.h" #include "save.h" -const char *VERSION = "1.3.8"; +const char *VERSION = "1.3.9"; // title_screen : display the title screen static void title_screen(void);