From: Holger Schemel Date: Sun, 30 May 2021 22:14:11 +0000 (+0200) Subject: added improved element collecting animations X-Git-Tag: 4.3.0.0~142 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=31293fa5f373168828272f461ce38ff70b0a3cb8;p=rocksndiamonds.git added improved element collecting animations --- diff --git a/graphics/gfx_classic/RocksCollect.png b/graphics/gfx_classic/RocksCollect.png new file mode 100644 index 00000000..e5a72bfb Binary files /dev/null and b/graphics/gfx_classic/RocksCollect.png differ diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 343c2724..96d500c1 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -153,6 +153,11 @@ struct ConfigInfo image_config[] = { "bd_diamond.falling.ypos", "10" }, { "bd_diamond.falling.frames", "2" }, { "bd_diamond.falling.delay", "4" }, + { "bd_diamond.collecting", "RocksCollect.png" }, + { "bd_diamond.collecting.xpos", "0" }, + { "bd_diamond.collecting.ypos", "8" }, + { "bd_diamond.collecting.frames", "7" }, + { "bd_diamond.collecting.anim_mode", "linear" }, { "bd_magic_wall", "RocksElements.png" }, { "bd_magic_wall.xpos", "12" }, @@ -979,11 +984,10 @@ struct ConfigInfo image_config[] = { "emerald.falling.ypos", "0" }, { "emerald.falling.frames", "2" }, { "emerald.falling.delay", "4" }, - { "emerald.collecting", "RocksMore.png" }, - { "emerald.collecting.xpos", "3" }, - { "emerald.collecting.ypos", "2" }, - { "emerald.collecting.frames", "3" }, - { "emerald.collecting.delay", "2" }, + { "emerald.collecting", "RocksCollect.png" }, + { "emerald.collecting.xpos", "0" }, + { "emerald.collecting.ypos", "0" }, + { "emerald.collecting.frames", "7" }, { "emerald.collecting.anim_mode", "linear" }, { "diamond", "RocksElements.png" }, @@ -1000,11 +1004,10 @@ struct ConfigInfo image_config[] = { "diamond.falling.ypos", "0" }, { "diamond.falling.frames", "2" }, { "diamond.falling.delay", "4" }, - { "diamond.collecting", "RocksMore.png" }, - { "diamond.collecting.xpos", "7" }, - { "diamond.collecting.ypos", "2" }, - { "diamond.collecting.frames", "3" }, - { "diamond.collecting.delay", "2" }, + { "diamond.collecting", "RocksCollect.png" }, + { "diamond.collecting.xpos", "0" }, + { "diamond.collecting.ypos", "1" }, + { "diamond.collecting.frames", "7" }, { "diamond.collecting.anim_mode", "linear" }, { "bomb", "RocksElements.png" }, @@ -1033,6 +1036,11 @@ struct ConfigInfo image_config[] = { "dynamite.active.frames", "7" }, { "dynamite.active.delay", "12" }, { "dynamite.active.anim_mode", "linear" }, + { "dynamite.collecting", "RocksCollect.png" }, + { "dynamite.collecting.xpos", "0" }, + { "dynamite.collecting.ypos", "7" }, + { "dynamite.collecting.frames", "7" }, + { "dynamite.collecting.anim_mode", "linear" }, { "em_dynamite", "RocksEMC.png" }, { "em_dynamite.xpos", "0" }, @@ -1047,6 +1055,11 @@ struct ConfigInfo image_config[] = { "em_dynamite.active.EDITOR", "RocksEMC.png" }, { "em_dynamite.active.EDITOR.xpos", "2" }, { "em_dynamite.active.EDITOR.ypos", "15" }, + { "em_dynamite.collecting", "RocksCollect.png" }, + { "em_dynamite.collecting.xpos", "0" }, + { "em_dynamite.collecting.ypos", "15" }, + { "em_dynamite.collecting.frames", "7" }, + { "em_dynamite.collecting.anim_mode", "linear" }, { "wall_emerald", "RocksElements.png" }, { "wall_emerald.xpos", "4" }, @@ -1522,23 +1535,48 @@ struct ConfigInfo image_config[] = { "em_key_1.xpos", "4" }, { "em_key_1.ypos", "6" }, { "em_key_1.frames", "1" }, + { "em_key_1.collecting", "RocksCollect.png" }, + { "em_key_1.collecting.xpos", "7" }, + { "em_key_1.collecting.ypos", "4" }, + { "em_key_1.collecting.frames", "7" }, + { "em_key_1.collecting.anim_mode", "linear" }, { "em_key_2", "RocksSP.png" }, { "em_key_2.xpos", "5" }, { "em_key_2.ypos", "6" }, { "em_key_2.frames", "1" }, + { "em_key_2.collecting", "RocksCollect.png" }, + { "em_key_2.collecting.xpos", "7" }, + { "em_key_2.collecting.ypos", "5" }, + { "em_key_2.collecting.frames", "7" }, + { "em_key_2.collecting.anim_mode", "linear" }, { "em_key_3", "RocksSP.png" }, { "em_key_3.xpos", "6" }, { "em_key_3.ypos", "6" }, { "em_key_3.frames", "1" }, + { "em_key_3.collecting", "RocksCollect.png" }, + { "em_key_3.collecting.xpos", "7" }, + { "em_key_3.collecting.ypos", "6" }, + { "em_key_3.collecting.frames", "7" }, + { "em_key_3.collecting.anim_mode", "linear" }, { "em_key_4", "RocksSP.png" }, { "em_key_4.xpos", "7" }, { "em_key_4.ypos", "6" }, { "em_key_4.frames", "1" }, + { "em_key_4.collecting", "RocksCollect.png" }, + { "em_key_4.collecting.xpos", "7" }, + { "em_key_4.collecting.ypos", "7" }, + { "em_key_4.collecting.frames", "7" }, + { "em_key_4.collecting.anim_mode", "linear" }, { "dc_key_white", "RocksSP.png" }, { "dc_key_white.xpos", "13" }, { "dc_key_white.ypos", "1" }, { "dc_key_white.frames", "1" }, + { "dc_key_white.collecting", "RocksCollect.png" }, + { "dc_key_white.collecting.xpos", "7" }, + { "dc_key_white.collecting.ypos", "0" }, + { "dc_key_white.collecting.frames", "7" }, + { "dc_key_white.collecting.anim_mode", "linear" }, { "em_gate_1", "RocksSP.png" }, { "em_gate_1.xpos", "0" }, @@ -2118,41 +2156,37 @@ struct ConfigInfo image_config[] = { "envelope_1.xpos", "0" }, { "envelope_1.ypos", "4" }, { "envelope_1.frames", "1" }, - { "envelope_1.collecting", "RocksMore.png" }, - { "envelope_1.collecting.xpos", "5" }, - { "envelope_1.collecting.ypos", "4" }, - { "envelope_1.collecting.frames", "3" }, - { "envelope_1.collecting.delay", "2" }, + { "envelope_1.collecting", "RocksCollect.png" }, + { "envelope_1.collecting.xpos", "7" }, + { "envelope_1.collecting.ypos", "8" }, + { "envelope_1.collecting.frames", "7" }, { "envelope_1.collecting.anim_mode", "linear" }, { "envelope_2", "RocksMore.png" }, { "envelope_2.xpos", "1" }, { "envelope_2.ypos", "4" }, { "envelope_2.frames", "1" }, - { "envelope_2.collecting", "RocksMore.png" }, - { "envelope_2.collecting.xpos", "5" }, - { "envelope_2.collecting.ypos", "4" }, - { "envelope_2.collecting.frames", "3" }, - { "envelope_2.collecting.delay", "2" }, + { "envelope_2.collecting", "RocksCollect.png" }, + { "envelope_2.collecting.xpos", "7" }, + { "envelope_2.collecting.ypos", "9" }, + { "envelope_2.collecting.frames", "7" }, { "envelope_2.collecting.anim_mode", "linear" }, { "envelope_3", "RocksMore.png" }, { "envelope_3.xpos", "2" }, { "envelope_3.ypos", "4" }, { "envelope_3.frames", "1" }, - { "envelope_3.collecting", "RocksMore.png" }, - { "envelope_3.collecting.xpos", "5" }, - { "envelope_3.collecting.ypos", "4" }, - { "envelope_3.collecting.frames", "3" }, - { "envelope_3.collecting.delay", "2" }, + { "envelope_3.collecting", "RocksCollect.png" }, + { "envelope_3.collecting.xpos", "7" }, + { "envelope_3.collecting.ypos", "10" }, + { "envelope_3.collecting.frames", "7" }, { "envelope_3.collecting.anim_mode", "linear" }, { "envelope_4", "RocksMore.png" }, { "envelope_4.xpos", "3" }, { "envelope_4.ypos", "4" }, { "envelope_4.frames", "1" }, - { "envelope_4.collecting", "RocksMore.png" }, - { "envelope_4.collecting.xpos", "5" }, - { "envelope_4.collecting.ypos", "4" }, - { "envelope_4.collecting.frames", "3" }, - { "envelope_4.collecting.delay", "2" }, + { "envelope_4.collecting", "RocksCollect.png" }, + { "envelope_4.collecting.xpos", "7" }, + { "envelope_4.collecting.ypos", "11" }, + { "envelope_4.collecting.frames", "7" }, { "envelope_4.collecting.anim_mode", "linear" }, { "sign_radioactivity", "RocksDC.png" }, @@ -2277,6 +2311,11 @@ struct ConfigInfo image_config[] = { "extra_time.ypos", "0" }, { "extra_time.frames", "6" }, { "extra_time.delay", "4" }, + { "extra_time.collecting", "RocksCollect.png" }, + { "extra_time.collecting.xpos", "7" }, + { "extra_time.collecting.ypos", "2" }, + { "extra_time.collecting.frames", "7" }, + { "extra_time.collecting.anim_mode", "linear" }, { "shield_normal", "RocksDC.png" }, { "shield_normal.xpos", "8" }, @@ -2289,6 +2328,11 @@ struct ConfigInfo image_config[] = { "shield_normal.active.frames", "3" }, { "shield_normal.active.delay", "8" }, { "shield_normal.active.anim_mode", "pingpong" }, + { "shield_normal.collecting", "RocksCollect.png" }, + { "shield_normal.collecting.xpos", "7" }, + { "shield_normal.collecting.ypos", "1" }, + { "shield_normal.collecting.frames", "7" }, + { "shield_normal.collecting.anim_mode", "linear" }, { "shield_deadly", "RocksDC.png" }, { "shield_deadly.xpos", "8" }, @@ -2301,6 +2345,11 @@ struct ConfigInfo image_config[] = { "shield_deadly.active.frames", "3" }, { "shield_deadly.active.delay", "8" }, { "shield_deadly.active.anim_mode", "pingpong" }, + { "shield_deadly.collecting", "RocksCollect.png" }, + { "shield_deadly.collecting.xpos", "7" }, + { "shield_deadly.collecting.ypos", "3" }, + { "shield_deadly.collecting.frames", "7" }, + { "shield_deadly.collecting.anim_mode", "linear" }, { "switchgate_closed", "RocksDC.png" }, { "switchgate_closed.xpos", "8" }, @@ -2352,11 +2401,21 @@ struct ConfigInfo image_config[] = { "pearl.breaking.frames", "4" }, { "pearl.breaking.delay", "2" }, { "pearl.breaking.anim_mode", "linear" }, + { "pearl.collecting", "RocksCollect.png" }, + { "pearl.collecting.xpos", "0" }, + { "pearl.collecting.ypos", "16" }, + { "pearl.collecting.frames", "7" }, + { "pearl.collecting.anim_mode", "linear" }, { "crystal", "RocksDC.png" }, { "crystal.xpos", "9" }, { "crystal.ypos", "11" }, { "crystal.frames", "1" }, + { "crystal.collecting", "RocksCollect.png" }, + { "crystal.collecting.xpos", "0" }, + { "crystal.collecting.ypos", "17" }, + { "crystal.collecting.frames", "7" }, + { "crystal.collecting.anim_mode", "linear" }, { "wall_pearl", "RocksDC.png" }, { "wall_pearl.xpos", "10" }, @@ -2540,18 +2599,38 @@ struct ConfigInfo image_config[] = { "key_1.xpos", "4" }, { "key_1.ypos", "1" }, { "key_1.frames", "1" }, + { "key_1.collecting", "RocksCollect.png" }, + { "key_1.collecting.xpos", "0" }, + { "key_1.collecting.ypos", "3" }, + { "key_1.collecting.frames", "7" }, + { "key_1.collecting.anim_mode", "linear" }, { "key_2", "RocksElements.png" }, { "key_2.xpos", "5" }, { "key_2.ypos", "1" }, { "key_2.frames", "1" }, + { "key_2.collecting", "RocksCollect.png" }, + { "key_2.collecting.xpos", "0" }, + { "key_2.collecting.ypos", "4" }, + { "key_2.collecting.frames", "7" }, + { "key_2.collecting.anim_mode", "linear" }, { "key_3", "RocksElements.png" }, { "key_3.xpos", "6" }, { "key_3.ypos", "1" }, { "key_3.frames", "1" }, + { "key_3.collecting", "RocksCollect.png" }, + { "key_3.collecting.xpos", "0" }, + { "key_3.collecting.ypos", "5" }, + { "key_3.collecting.frames", "7" }, + { "key_3.collecting.anim_mode", "linear" }, { "key_4", "RocksElements.png" }, { "key_4.xpos", "7" }, { "key_4.ypos", "1" }, { "key_4.frames", "1" }, + { "key_4.collecting", "RocksCollect.png" }, + { "key_4.collecting.xpos", "0" }, + { "key_4.collecting.ypos", "6" }, + { "key_4.collecting.frames", "7" }, + { "key_4.collecting.anim_mode", "linear" }, { "gate_1", "RocksElements.png" }, { "gate_1.xpos", "4" }, @@ -2701,6 +2780,11 @@ struct ConfigInfo image_config[] = { "emerald_yellow.falling.ypos", "8" }, { "emerald_yellow.falling.frames", "2" }, { "emerald_yellow.falling.delay", "4" }, + { "emerald_yellow.collecting", "RocksCollect.png" }, + { "emerald_yellow.collecting.xpos", "0" }, + { "emerald_yellow.collecting.ypos", "9" }, + { "emerald_yellow.collecting.frames", "7" }, + { "emerald_yellow.collecting.anim_mode", "linear" }, { "emerald_red", "RocksElements.png" }, { "emerald_red.xpos", "8" }, { "emerald_red.ypos", "9" }, @@ -2715,6 +2799,11 @@ struct ConfigInfo image_config[] = { "emerald_red.falling.ypos", "9" }, { "emerald_red.falling.frames", "2" }, { "emerald_red.falling.delay", "4" }, + { "emerald_red.collecting", "RocksCollect.png" }, + { "emerald_red.collecting.xpos", "0" }, + { "emerald_red.collecting.ypos", "13" }, + { "emerald_red.collecting.frames", "7" }, + { "emerald_red.collecting.anim_mode", "linear" }, { "emerald_purple", "RocksElements.png" }, { "emerald_purple.xpos", "10" }, { "emerald_purple.ypos", "9" }, @@ -2729,6 +2818,11 @@ struct ConfigInfo image_config[] = { "emerald_purple.falling.ypos", "9" }, { "emerald_purple.falling.frames", "2" }, { "emerald_purple.falling.delay", "4" }, + { "emerald_purple.collecting", "RocksCollect.png" }, + { "emerald_purple.collecting.xpos", "0" }, + { "emerald_purple.collecting.ypos", "14" }, + { "emerald_purple.collecting.frames", "7" }, + { "emerald_purple.collecting.anim_mode", "linear" }, { "wall_emerald_yellow", "RocksElements.png" }, { "wall_emerald_yellow.xpos", "8" }, @@ -2862,6 +2956,11 @@ struct ConfigInfo image_config[] = { "speed_pill.xpos", "14" }, { "speed_pill.ypos", "9" }, { "speed_pill.frames", "1" }, + { "speed_pill.collecting", "RocksCollect.png" }, + { "speed_pill.collecting.xpos", "0" }, + { "speed_pill.collecting.ypos", "2" }, + { "speed_pill.collecting.frames", "7" }, + { "speed_pill.collecting.anim_mode", "linear" }, { "dark_yamyam", "RocksElements.png" }, { "dark_yamyam.xpos", "8" }, @@ -2923,14 +3022,29 @@ struct ConfigInfo image_config[] = { "dynabomb_increase_number.xpos", "12" }, { "dynabomb_increase_number.ypos", "11" }, { "dynabomb_increase_number.frames", "1" }, + { "dynabomb_increase_number.collecting", "RocksCollect.png" }, + { "dynabomb_increase_number.collecting.xpos", "0" }, + { "dynabomb_increase_number.collecting.ypos", "10" }, + { "dynabomb_increase_number.collecting.frames", "7" }, + { "dynabomb_increase_number.collecting.anim_mode", "linear" }, { "dynabomb_increase_size", "RocksElements.png" }, { "dynabomb_increase_size.xpos", "15" }, { "dynabomb_increase_size.ypos", "11" }, { "dynabomb_increase_size.frames", "1" }, + { "dynabomb_increase_size.collecting", "RocksCollect.png" }, + { "dynabomb_increase_size.collecting.xpos", "0" }, + { "dynabomb_increase_size.collecting.ypos", "11" }, + { "dynabomb_increase_size.collecting.frames", "7" }, + { "dynabomb_increase_size.collecting.anim_mode", "linear" }, { "dynabomb_increase_power", "RocksElements.png" }, { "dynabomb_increase_power.xpos", "12" }, { "dynabomb_increase_power.ypos", "9" }, { "dynabomb_increase_power.frames", "1" }, + { "dynabomb_increase_power.collecting", "RocksCollect.png" }, + { "dynabomb_increase_power.collecting.xpos", "0" }, + { "dynabomb_increase_power.collecting.ypos", "12" }, + { "dynabomb_increase_power.collecting.frames", "7" }, + { "dynabomb_increase_power.collecting.anim_mode", "linear" }, { "pig", "RocksHeroes.png" }, { "pig.xpos", "8" }, @@ -4002,18 +4116,38 @@ struct ConfigInfo image_config[] = { "emc_key_5.xpos", "0" }, { "emc_key_5.ypos", "5" }, { "emc_key_5.frames", "1" }, + { "emc_key_5.collecting", "RocksCollect.png" }, + { "emc_key_5.collecting.xpos", "7" }, + { "emc_key_5.collecting.ypos", "12" }, + { "emc_key_5.collecting.frames", "7" }, + { "emc_key_5.collecting.anim_mode", "linear" }, { "emc_key_6", "RocksEMC.png" }, { "emc_key_6.xpos", "1" }, { "emc_key_6.ypos", "5" }, { "emc_key_6.frames", "1" }, + { "emc_key_6.collecting", "RocksCollect.png" }, + { "emc_key_6.collecting.xpos", "7" }, + { "emc_key_6.collecting.ypos", "13" }, + { "emc_key_6.collecting.frames", "7" }, + { "emc_key_6.collecting.anim_mode", "linear" }, { "emc_key_7", "RocksEMC.png" }, { "emc_key_7.xpos", "2" }, { "emc_key_7.ypos", "5" }, { "emc_key_7.frames", "1" }, + { "emc_key_7.collecting", "RocksCollect.png" }, + { "emc_key_7.collecting.xpos", "7" }, + { "emc_key_7.collecting.ypos", "14" }, + { "emc_key_7.collecting.frames", "7" }, + { "emc_key_7.collecting.anim_mode", "linear" }, { "emc_key_8", "RocksEMC.png" }, { "emc_key_8.xpos", "3" }, { "emc_key_8.ypos", "5" }, { "emc_key_8.frames", "1" }, + { "emc_key_8.collecting", "RocksCollect.png" }, + { "emc_key_8.collecting.xpos", "7" }, + { "emc_key_8.collecting.ypos", "15" }, + { "emc_key_8.collecting.frames", "7" }, + { "emc_key_8.collecting.anim_mode", "linear" }, { "emc_gate_5", "RocksEMC.png" }, { "emc_gate_5.xpos", "0" }, @@ -4235,11 +4369,21 @@ struct ConfigInfo image_config[] = { "emc_lenses.xpos", "6" }, { "emc_lenses.ypos", "4" }, { "emc_lenses.frames", "1" }, + { "emc_lenses.collecting", "RocksCollect.png" }, + { "emc_lenses.collecting.xpos", "7" }, + { "emc_lenses.collecting.ypos", "16" }, + { "emc_lenses.collecting.frames", "7" }, + { "emc_lenses.collecting.anim_mode", "linear" }, { "emc_magnifier", "RocksEMC.png" }, { "emc_magnifier.xpos", "7" }, { "emc_magnifier.ypos", "4" }, { "emc_magnifier.frames", "1" }, + { "emc_magnifier.collecting", "RocksCollect.png" }, + { "emc_magnifier.collecting.xpos", "7" }, + { "emc_magnifier.collecting.ypos", "17" }, + { "emc_magnifier.collecting.frames", "7" }, + { "emc_magnifier.collecting.anim_mode", "linear" }, { "emc_wall_9", "RocksEMC.png" }, { "emc_wall_9.xpos", "10" },