diff --git a/Plague.g1a b/Plague.g1a index 42200be..d6987f5 100644 Binary files a/Plague.g1a and b/Plague.g1a differ diff --git a/assets-fx/__pycache__/converters.cpython-39.pyc b/assets-fx/__pycache__/converters.cpython-39.pyc new file mode 100644 index 0000000..b7ecc36 Binary files /dev/null and b/assets-fx/__pycache__/converters.cpython-39.pyc differ diff --git a/assets-fx/converters.py b/assets-fx/converters.py index 91227c7..9984554 100644 --- a/assets-fx/converters.py +++ b/assets-fx/converters.py @@ -3,7 +3,7 @@ import fxconv def convert(input_name, output, params, target): if params["custom-type"] == "mutation-table": - convert_mt(map, input_name, output, params, target) + convert_mt(input_name, output, params, target) return 0 else: return 1 @@ -17,8 +17,8 @@ def convert_mt(input_name, output, params, target): # Encode information into bytes data = bytes() - for i in enumerate(mutation_matrix): - for j in enumerate(i): - mutation += fxconv.u32(int(j)) + for i in mutation_matrix: + for j in i: + data += fxconv.u32(int(j)) fxconv.elf(data, output, "_" + params["name"], **target) diff --git a/assets-fx/mutations_table/abilities_1.txt b/assets-fx/mutations_table/abilities_1.txt index 216307f..52ca2ed 100644 --- a/assets-fx/mutations_table/abilities_1.txt +++ b/assets-fx/mutations_table/abilities_1.txt @@ -1,4 +1,4 @@ 1 | 0 | 0 | 0 | 6 | 0 | 0 | 0 7 | 7 | 0 | 7 | 0 | 0 | 0 | 0 0 | 0 | 0 | 0 | 7 | 0 | 0 | 0 -0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 +0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 \ No newline at end of file diff --git a/src/core.h b/src/core.h index 5e09a34..87a3f51 100644 --- a/src/core.h +++ b/src/core.h @@ -56,15 +56,6 @@ struct plane }; - -// mutation : contain the map of the mutation available -struct mutation_table -{ - // Data of the map - int data[4][8]; -}; - - // get_inputs : detect and manage inputs int get_inputs(const int background, int *mutation_menu); diff --git a/src/display_engine.h b/src/display_engine.h index 6ab6315..ffe944e 100644 --- a/src/display_engine.h +++ b/src/display_engine.h @@ -13,4 +13,12 @@ void display_mutation(const struct game *current_game, const int mutation_menu, // init_mat : copy src into dest void init_mat(int x, int y, int dest[][x], int src[][x]); +// mutation_table : contain the map of the mutation available +struct mutation_table +{ + // Data of the map + int data[4][8]; +}; + + #endif /* _PLAGUE_DISPLAY_ENGINE_H */ \ No newline at end of file