From 7847575a543100bd9ba7a03cf4a7a5c60185fe14 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 4 Jul 2024 21:43:23 +0200 Subject: [PATCH] renamed bladder (spender) to (trapped) bubble in BD engine --- docs/elements/bdx_bladder.txt | 2 - docs/elements/bdx_bladder_spender.txt | 1 - docs/elements/bdx_bubble.txt | 2 + docs/elements/bdx_trapped_bubble.txt | 2 + src/conf_gfx.c | 22 +++++----- src/editor.c | 34 +++++++-------- src/files.c | 8 ++-- src/init.c | 2 +- src/main.c | 60 +++++++++++++-------------- src/main.h | 22 +++++----- src/tools.c | 36 ++++++++-------- 11 files changed, 96 insertions(+), 95 deletions(-) delete mode 100644 docs/elements/bdx_bladder.txt delete mode 100644 docs/elements/bdx_bladder_spender.txt create mode 100644 docs/elements/bdx_bubble.txt create mode 100644 docs/elements/bdx_trapped_bubble.txt diff --git a/docs/elements/bdx_bladder.txt b/docs/elements/bdx_bladder.txt deleted file mode 100644 index d4fc8349..00000000 --- a/docs/elements/bdx_bladder.txt +++ /dev/null @@ -1,2 +0,0 @@ -Bladders can be pushed around easily. They slowly climb up; if they touch a -voodoo doll, they convert into clocks. They can also pass slime. diff --git a/docs/elements/bdx_bladder_spender.txt b/docs/elements/bdx_bladder_spender.txt deleted file mode 100644 index 389a72c7..00000000 --- a/docs/elements/bdx_bladder_spender.txt +++ /dev/null @@ -1 +0,0 @@ -If there is space above it, the bladder spender turns to a bladder. diff --git a/docs/elements/bdx_bubble.txt b/docs/elements/bdx_bubble.txt new file mode 100644 index 00000000..20bab528 --- /dev/null +++ b/docs/elements/bdx_bubble.txt @@ -0,0 +1,2 @@ +Bubbles can be pushed around easily. They slowly move up; if they touch a +voodoo doll, they convert into clocks. They can also pass slime. diff --git a/docs/elements/bdx_trapped_bubble.txt b/docs/elements/bdx_trapped_bubble.txt new file mode 100644 index 00000000..34d8ae89 --- /dev/null +++ b/docs/elements/bdx_trapped_bubble.txt @@ -0,0 +1,2 @@ +If there is space above it, the trapped bubble turns into a bubble that can move +up and that can be pushed by the player. diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 0ead706d..2bc30921 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -867,17 +867,17 @@ struct ConfigInfo image_config[] = { "bdx_nut.falling.EDITOR.xpos", "5" }, { "bdx_nut.falling.EDITOR.ypos", "2" }, - { "bdx_bladder", "RocksBD.png" }, - { "bdx_bladder.xpos", "8" }, - { "bdx_bladder.ypos", "12" }, - { "bdx_bladder.frames", "4" }, - { "bdx_bladder.delay", "4" }, - { "bdx_bladder.anim_mode", "pingpong2" }, - - { "bdx_bladder_spender", "RocksBD.png" }, - { "bdx_bladder_spender.xpos", "11" }, - { "bdx_bladder_spender.ypos", "10" }, - { "bdx_bladder_spender.frames", "1" }, + { "bdx_bubble", "RocksBD.png" }, + { "bdx_bubble.xpos", "8" }, + { "bdx_bubble.ypos", "12" }, + { "bdx_bubble.frames", "4" }, + { "bdx_bubble.delay", "4" }, + { "bdx_bubble.anim_mode", "pingpong2" }, + + { "bdx_trapped_bubble", "RocksBD.png" }, + { "bdx_trapped_bubble.xpos", "11" }, + { "bdx_trapped_bubble.ypos", "10" }, + { "bdx_trapped_bubble.frames", "1" }, { "bdx_creature_switch", "RocksBD.png" }, { "bdx_creature_switch.xpos", "9" }, diff --git a/src/editor.c b/src/editor.c index 539bce3b..d2d020fa 100644 --- a/src/editor.c +++ b/src/editor.c @@ -640,7 +640,7 @@ enum GADGET_ID_BD_ACID_EATS_ELEMENT, GADGET_ID_BD_ACID_TURNS_TO_ELEMENT, GADGET_ID_BD_BITER_EATS_ELEMENT, - GADGET_ID_BD_BLADDER_CONVERTS_BY_ELEMENT, + GADGET_ID_BD_BUBBLE_CONVERTS_BY_ELEMENT, GADGET_ID_BD_NUT_CONTENT, GADGET_ID_BD_EXPANDING_WALL_LOOKS_LIKE, GADGET_ID_BD_SAND_LOOKS_LIKE, @@ -1354,7 +1354,7 @@ enum ED_DRAWING_ID_BD_ACID_EATS_ELEMENT, ED_DRAWING_ID_BD_ACID_TURNS_TO_ELEMENT, ED_DRAWING_ID_BD_BITER_EATS_ELEMENT, - ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT, + ED_DRAWING_ID_BD_BUBBLE_CONVERTS_BY_ELEMENT, ED_DRAWING_ID_BD_NUT_CONTENT, ED_DRAWING_ID_BD_EXPANDING_WALL_LOOKS_LIKE, ED_DRAWING_ID_BD_SAND_LOOKS_LIKE, @@ -5009,11 +5009,11 @@ static struct "Can eat:", NULL, NULL, NULL, "Eats this element when moving" }, { - ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT, + ED_DRAWING_ID_BD_BUBBLE_CONVERTS_BY_ELEMENT, ED_AREA_1X1_SETTINGS_XPOS(0), ED_AREA_1X1_SETTINGS_YPOS(1), ED_AREA_1X1_SETTINGS_XOFF, ED_AREA_1X1_SETTINGS_YOFF, - GADGET_ID_BD_BLADDER_CONVERTS_BY_ELEMENT, GADGET_ID_NONE, - &level.bd_bladder_converts_by_element, 1, 1, + GADGET_ID_BD_BUBBLE_CONVERTS_BY_ELEMENT, GADGET_ID_NONE, + &level.bd_bubble_converts_by_element, 1, 1, "Turns to clock by touching:", NULL, NULL, NULL, "Turns to clock by touching element" }, { @@ -5600,8 +5600,8 @@ static int editor_el_boulderdash_native[] = EL_BDX_EXPANDABLE_STEELWALL_ANY, EL_BDX_CREATURE_SWITCH, - EL_BDX_BLADDER, - EL_BDX_BLADDER_SPENDER, + EL_BDX_BUBBLE, + EL_BDX_TRAPPED_BUBBLE, EL_BDX_REPLICATOR, EL_BDX_REPLICATOR_SWITCH, @@ -5685,15 +5685,15 @@ static int editor_el_boulderdash_effects[] = EL_BDX_EXIT_OPEN, EL_BDX_INVISIBLE_EXIT_OPEN, - EL_BDX_BLADDER_1, - EL_BDX_BLADDER_2, - EL_BDX_BLADDER_3, - EL_BDX_BLADDER_4, + EL_BDX_BUBBLE_1, + EL_BDX_BUBBLE_2, + EL_BDX_BUBBLE_3, + EL_BDX_BUBBLE_4, - EL_BDX_BLADDER_5, - EL_BDX_BLADDER_6, - EL_BDX_BLADDER_7, - EL_BDX_BLADDER_8, + EL_BDX_BUBBLE_5, + EL_BDX_BUBBLE_6, + EL_BDX_BUBBLE_7, + EL_BDX_BUBBLE_8, EL_BDX_SAND_2, EL_BDX_COW_ENCLOSED_1, @@ -12465,9 +12465,9 @@ static void DrawPropertiesConfig(void) { MapDrawingArea(ED_DRAWING_ID_BD_BITER_EATS_ELEMENT); } - else if (properties_element == EL_BDX_BLADDER) + else if (properties_element == EL_BDX_BUBBLE) { - MapDrawingArea(ED_DRAWING_ID_BD_BLADDER_CONVERTS_BY_ELEMENT); + MapDrawingArea(ED_DRAWING_ID_BD_BUBBLE_CONVERTS_BY_ELEMENT); } else if (properties_element == EL_YAMYAM || properties_element == EL_YAMYAM_LEFT || diff --git a/src/files.c b/src/files.c index e078e055..589c34dc 100644 --- a/src/files.c +++ b/src/files.c @@ -935,9 +935,9 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = }, { - EL_BDX_BLADDER, -1, + EL_BDX_BUBBLE, -1, TYPE_ELEMENT, CONF_VALUE_16_BIT(1), - &li.bd_bladder_converts_by_element, EL_BDX_VOODOO_DOLL + &li.bd_bubble_converts_by_element, EL_BDX_VOODOO_DOLL }, { @@ -4387,7 +4387,7 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->biter_delay_frame = level->bd_biter_move_delay; cave->biter_eat = LEVEL_TO_CAVE(level->bd_biter_eats_element); - cave->bladder_converts_by = LEVEL_TO_CAVE(level->bd_bladder_converts_by_element); + cave->bladder_converts_by = LEVEL_TO_CAVE(level->bd_bubble_converts_by_element); cave->expanding_wall_changed = level->bd_change_expanding_wall; @@ -4560,7 +4560,7 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_biter_move_delay = cave->biter_delay_frame; level->bd_biter_eats_element = CAVE_TO_LEVEL(cave->biter_eat); - level->bd_bladder_converts_by_element = CAVE_TO_LEVEL(cave->bladder_converts_by); + level->bd_bubble_converts_by_element = CAVE_TO_LEVEL(cave->bladder_converts_by); level->bd_change_expanding_wall = cave->expanding_wall_changed; diff --git a/src/init.c b/src/init.c index e451d99e..a6666d5d 100644 --- a/src/init.c +++ b/src/init.c @@ -4314,7 +4314,7 @@ void InitElementPropertiesStatic(void) EL_BDX_BITER_UP, EL_BDX_BITER_LEFT, EL_BDX_BITER_DOWN, - EL_BDX_BLADDER, + EL_BDX_BUBBLE, EL_BDX_NUT, EL_EMC_MAGIC_BALL, EL_EMC_ANDROID, diff --git a/src/main.c b/src/main.c index 16bc18f2..0375a9c5 100644 --- a/src/main.c +++ b/src/main.c @@ -6718,14 +6718,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Amoeba 2" }, { - "bdx_bladder", - "bdx_bladder", - "Bladder" + "bdx_bubble", + "bdx_bubble", + "Bubble" }, { - "bdx_bladder_spender", - "bdx_bladder_spender", - "Bladder spender" + "bdx_trapped_bubble", + "bdx_trapped_bubble", + "Trapped bubble" }, { "bdx_creature_switch", @@ -7403,44 +7403,44 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Enclosed cow (7)" }, { - "bdx_bladder_1", - "bdx_bladder", - "Bladder (1)" + "bdx_bubble_1", + "bdx_bubble", + "Bubble (1)" }, { - "bdx_bladder_2", - "bdx_bladder", - "Bladder (2)" + "bdx_bubble_2", + "bdx_bubble", + "Bubble (2)" }, { - "bdx_bladder_3", - "bdx_bladder", - "Bladder (3)" + "bdx_bubble_3", + "bdx_bubble", + "Bubble (3)" }, { - "bdx_bladder_4", - "bdx_bladder", - "Bladder (4)" + "bdx_bubble_4", + "bdx_bubble", + "Bubble (4)" }, { - "bdx_bladder_5", - "bdx_bladder", - "Bladder (5)" + "bdx_bubble_5", + "bdx_bubble", + "Bubble (5)" }, { - "bdx_bladder_6", - "bdx_bladder", - "Bladder (6)" + "bdx_bubble_6", + "bdx_bubble", + "Bubble (6)" }, { - "bdx_bladder_7", - "bdx_bladder", - "Bladder (7)" + "bdx_bubble_7", + "bdx_bubble", + "Bubble (7)" }, { - "bdx_bladder_8", - "bdx_bladder", - "Bladder (8)" + "bdx_bubble_8", + "bdx_bubble", + "Bubble (8)" }, { "bdx_player.growing_1", diff --git a/src/main.h b/src/main.h index cc40d17e..0deb4de8 100644 --- a/src/main.h +++ b/src/main.h @@ -2134,8 +2134,8 @@ #define EL_BDX_NUT 1301 #define EL_BDX_AMOEBA_1 1302 #define EL_BDX_AMOEBA_2 1303 -#define EL_BDX_BLADDER 1304 -#define EL_BDX_BLADDER_SPENDER 1305 +#define EL_BDX_BUBBLE 1304 +#define EL_BDX_TRAPPED_BUBBLE 1305 #define EL_BDX_CREATURE_SWITCH 1306 #define EL_BDX_CREATURE_SWITCH_ACTIVE 1307 #define EL_BDX_BITER_SWITCH_1 1308 @@ -2274,14 +2274,14 @@ #define EL_BDX_COW_ENCLOSED_5 1438 #define EL_BDX_COW_ENCLOSED_6 1439 #define EL_BDX_COW_ENCLOSED_7 1440 -#define EL_BDX_BLADDER_1 1441 -#define EL_BDX_BLADDER_2 1442 -#define EL_BDX_BLADDER_3 1443 -#define EL_BDX_BLADDER_4 1444 -#define EL_BDX_BLADDER_5 1445 -#define EL_BDX_BLADDER_6 1446 -#define EL_BDX_BLADDER_7 1447 -#define EL_BDX_BLADDER_8 1448 +#define EL_BDX_BUBBLE_1 1441 +#define EL_BDX_BUBBLE_2 1442 +#define EL_BDX_BUBBLE_3 1443 +#define EL_BDX_BUBBLE_4 1444 +#define EL_BDX_BUBBLE_5 1445 +#define EL_BDX_BUBBLE_6 1446 +#define EL_BDX_BUBBLE_7 1447 +#define EL_BDX_BUBBLE_8 1448 #define EL_BDX_PLAYER_GROWING_1 1449 #define EL_BDX_PLAYER_GROWING_2 1450 #define EL_BDX_PLAYER_GROWING_3 1451 @@ -3753,7 +3753,7 @@ struct LevelInfo int bd_acid_turns_to_element; // BD acid target element after spreading int bd_biter_move_delay; // BD biter delay between movements (in BD frames) int bd_biter_eats_element; // BD biter eats this game element when moving - int bd_bladder_converts_by_element; // BD bladder converts to clock by touching this element + int bd_bubble_converts_by_element; // BD bubble converts to clock by touching this element boolean bd_change_expanding_wall; // BD expanding wall direction is changed if enabled boolean bd_replicators_active; // BD replicators start in active state if enabled int bd_replicator_create_delay; // BD replicator delay between replications (in BD frames) diff --git a/src/tools.c b/src/tools.c index 17cd794a..09933f1d 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6354,7 +6354,7 @@ bd_object_mapping_list[] = }, { O_BLADDER_SPENDER, TRUE, - EL_BDX_BLADDER_SPENDER, -1, -1 + EL_BDX_TRAPPED_BUBBLE, -1, -1 }, { O_INBOX, TRUE, @@ -6762,71 +6762,71 @@ bd_object_mapping_list[] = }, { O_BLADDER, TRUE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_1, TRUE, - EL_BDX_BLADDER_1, -1, -1 + EL_BDX_BUBBLE_1, -1, -1 }, { O_BLADDER_1, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_2, TRUE, - EL_BDX_BLADDER_2, -1, -1 + EL_BDX_BUBBLE_2, -1, -1 }, { O_BLADDER_2, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_3, TRUE, - EL_BDX_BLADDER_3, -1, -1 + EL_BDX_BUBBLE_3, -1, -1 }, { O_BLADDER_3, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_4, TRUE, - EL_BDX_BLADDER_4, -1, -1 + EL_BDX_BUBBLE_4, -1, -1 }, { O_BLADDER_4, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_5, TRUE, - EL_BDX_BLADDER_5, -1, -1 + EL_BDX_BUBBLE_5, -1, -1 }, { O_BLADDER_5, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_6, TRUE, - EL_BDX_BLADDER_6, -1, -1 + EL_BDX_BUBBLE_6, -1, -1 }, { O_BLADDER_6, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_7, TRUE, - EL_BDX_BLADDER_7, -1, -1 + EL_BDX_BUBBLE_7, -1, -1 }, { O_BLADDER_7, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_BLADDER_8, TRUE, - EL_BDX_BLADDER_8, -1, -1 + EL_BDX_BUBBLE_8, -1, -1 }, { O_BLADDER_8, FALSE, - EL_BDX_BLADDER, -1, -1 + EL_BDX_BUBBLE, -1, -1 }, { O_WAITING_STONE, TRUE, -- 2.34.1