From 0df11fb8d4a12bdcaf685a420575a720d0689873 Mon Sep 17 00:00:00 2001 From: Shadow15510 Date: Thu, 27 May 2021 18:04:45 +0200 Subject: [PATCH] first try of custom conversion --- Plague.g1a | Bin 41984 -> 43424 bytes .../__pycache__/converters.cpython-39.pyc | Bin 0 -> 913 bytes assets-fx/converters.py | 8 ++++---- assets-fx/mutations_table/abilities_1.txt | 2 +- src/core.h | 9 --------- src/display_engine.h | 8 ++++++++ 6 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 assets-fx/__pycache__/converters.cpython-39.pyc diff --git a/Plague.g1a b/Plague.g1a index 42200be9a633550358f2eefe29fedcc31cc7bc40..d6987f59da0b459496312222db3f522681c284bc 100644 GIT binary patch delta 6694 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 delta 5840 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 BLM8wJ diff --git a/assets-fx/__pycache__/converters.cpython-39.pyc b/assets-fx/__pycache__/converters.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b7ecc362a537e38337ad3b25853d2ac937d12971 GIT binary patch literal 913 zcmZ8f&ubJh6n>dxW~Xbr_S904(vvWU?baWlNGXCn7onh7C~LZt-A z_Yh);NeTxLdole02P9^(kE0ipeTaffjDWoXbHjCWb06&mn!1l*Fm?^kzw_j}1_Oo| z&(J9&5Yv5#85&?Ne{XVUP$^wxU42%HNhhl`*GZ9gH9ty)B$(>bK}2kOP~`80)cs6H z%(j!ftaLx;nXo}oXa@e*oDK5Iy51UEA@hDX*Tn9U>2riPM%=I z`004-H4?|LPbq6I`XWyxn)VxuzUpzc-pqN z(?sb(k(E2kxc-F(ll8yqZEmN#m literal 0 HcmV?d00001 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