diff --git a/data/campaigns/Delfadors_Memoirs/utils/bigmap.cfg b/data/campaigns/Delfadors_Memoirs/utils/bigmap.cfg index 6bab4f6c44d0..43f490c32325 100644 --- a/data/campaigns/Delfadors_Memoirs/utils/bigmap.cfg +++ b/data/campaigns/Delfadors_Memoirs/utils/bigmap.cfg @@ -18,16 +18,15 @@ #enddef #define DM_TRACK STAGE -[story] - [part] - show_title=yes - {DM_BIGMAP} - {STAGE} - [/part] -[/story] + [story] + [part] + show_title=yes + {DM_BIGMAP} + {STAGE} + [/part] + [/story] #enddef - # trackplacer: tracks begin # # Hand-hack this section strictly at your own risk. @@ -121,7 +120,6 @@ {NEW_BATTLE 605 427} #enddef - #define SEARCH_STAGE8 {OLD_REST 808 690} {OLD_JOURNEY 792 704} diff --git a/data/campaigns/Northern_Rebirth/utils/bigmap.cfg b/data/campaigns/Northern_Rebirth/utils/bigmap.cfg index b0f6c0f0231f..23da2e0cb351 100644 --- a/data/campaigns/Northern_Rebirth/utils/bigmap.cfg +++ b/data/campaigns/Northern_Rebirth/utils/bigmap.cfg @@ -18,13 +18,13 @@ #enddef #define NR_TRACK STAGE -[story] - [part] - show_title=yes - {NR_BIGMAP} - {STAGE} - [/part] -[/story] + [story] + [part] + show_title=yes + {NR_BIGMAP} + {STAGE} + [/part] + [/story] #enddef #define SHOWDOWN_STAGE1 diff --git a/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg b/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg index 80b27e959d2c..a838ece8593c 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg @@ -18,16 +18,15 @@ #enddef #define THOT_TRACK STAGE -[story] - [part] - show_title=yes - {THOT_BIGMAP} - {STAGE} - [/part] -[/story] + [story] + [part] + show_title=yes + {THOT_BIGMAP} + {STAGE} + [/part] + [/story] #enddef - # trackplacer: tracks begin # # Hand-hack this section strictly at your own risk. @@ -254,4 +253,3 @@ #enddef # trackplacer: tracks end - diff --git a/data/campaigns/Two_Brothers/utils/bigmap.cfg b/data/campaigns/Two_Brothers/utils/bigmap.cfg index 1c71ea14f60b..6b9672f678c8 100644 --- a/data/campaigns/Two_Brothers/utils/bigmap.cfg +++ b/data/campaigns/Two_Brothers/utils/bigmap.cfg @@ -18,16 +18,15 @@ #enddef #define TB_TRACK STAGE -[story] - [part] - show_title=yes - {TB_BIGMAP} - {STAGE} - [/part] -[/story] + [story] + [part] + show_title=yes + {TB_BIGMAP} + {STAGE} + [/part] + [/story] #enddef - # trackplacer: tracks begin # # Hand-hack this section strictly at your own risk. diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg index 714bab5234b7..e990053f3d60 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/05_A_Subterranean_Struggle.cfg @@ -1746,380 +1746,380 @@ # run 2 troll shamans up to western threatre, and 1 up to eastern # bottleneck (reduced to 1 on each side) -[event] - name=enemy_attack - - [if] - [variable] - name=ally_race - equals=dwarf - [/variable] + [event] + name=enemy_attack - [then] - #if allied with dwarves + [if] + [variable] + name=ally_race + equals=dwarf + [/variable] + + [then] + #if allied with dwarves - #west side + #west side - [move_unit_fake] - type=Troll Shaman - side=2 - x=22,23,24,25,26,27,27,27,28 - y=37,37,36,36,35,35,34,33,32 - [/move_unit_fake] + [move_unit_fake] + type=Troll Shaman + side=2 + x=22,23,24,25,26,27,27,27,28 + y=37,37,36,36,35,35,34,33,32 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 2 (Troll Shaman) 28 32 (Troll Flamecaster) ( _ "Troll Flamecaster")} + {NAMED_GENERIC_UNIT 2 (Troll Shaman) 28 32 (Troll Flamecaster) ( _ "Troll Flamecaster")} #ifdef HARD - [move_unit_fake] - type=Troll Shaman - side=2 - x=32,33,34,34,34,34,33,32,31,30 - y=38,38,37,36,35,34,34,33,33,32 - [/move_unit_fake] + [move_unit_fake] + type=Troll Shaman + side=2 + x=32,33,34,34,34,34,33,32,31,30 + y=38,38,37,36,35,34,34,33,33,32 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 2 (Troll Shaman) 32 32 () ( _ "Troll Flamecaster")} + {NAMED_GENERIC_UNIT 2 (Troll Shaman) 32 32 () ( _ "Troll Flamecaster")} #endif - #east side + #east side - [move_unit_fake] - type=Troll Shaman - side=3 - x=47,47,47,46,45,44,43,42,42,42,42,41 - y=37,36,35,34,34,33,33,32,31,30,29,29 - [/move_unit_fake] + [move_unit_fake] + type=Troll Shaman + side=3 + x=47,47,47,46,45,44,43,42,42,42,42,41 + y=37,36,35,34,34,33,33,32,31,30,29,29 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 3 (Troll Shaman) 41 29 () ( _ "Troll Flamecaster")} + {NAMED_GENERIC_UNIT 3 (Troll Shaman) 41 29 () ( _ "Troll Flamecaster")} #ifndef EASY - [move_unit_fake] - type=Troll Shaman - side=3 - x=47,47,47,46,45,44,43,43,43,43 - y=27,26,25,24,24,23,23,22,21,20 - [/move_unit_fake] + [move_unit_fake] + type=Troll Shaman + side=3 + x=47,47,47,46,45,44,43,43,43,43 + y=27,26,25,24,24,23,23,22,21,20 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 3 (Troll Shaman) 43 20 () ( _ "Troll Flamecaster")} + {NAMED_GENERIC_UNIT 3 (Troll Shaman) 43 20 () ( _ "Troll Flamecaster")} #endif - [message] - speaker=Troll Flamecaster - message= _ "Burn, burn and die!" - [/message] - - [color_adjust] - red,green,blue=255,0,0 - [/color_adjust] - - [redraw] - [/redraw] - - [delay] - time=100 - [/delay] - - [color_adjust] - red,green,blue=0,0,0 - [/color_adjust] - - [redraw] - [/redraw] - - [message] - speaker=Dwarf Leader - message= _ "Dive for cover!" - [/message] - - [message] - speaker=Kaleh - message= _ "Those new troll shamans are decimating the dwarves with blasts of fire! This doesn’t look good." - [/message] - - [store_unit] - [filter] - role="Dwarf Defender" - x=24-46 - y=19-35 - [/filter] - variable=victims - kill=no - [/store_unit] - - #if easy kill 50% - #if medium kill 60% - #if hard kill 80% - - {VARIABLE deaths $victims.length} - {VARIABLE_OP deaths multiply {ON_DIFFICULTY 0.6 0.7 0.8}} - {VARIABLE_OP deaths round 0} - - #{DEBUG_MSG "Killing $deaths defenders out of $victims.length"} - - {VARIABLE i 1} - {REPEAT $deaths ( - {RANDOM "1..$victims.length"} - {VARIABLE_OP random sub 1} - - {VARIABLE casualty $victims[$random].id} - - #have some dwarves scream as they die - [switch] - variable=i - - [case] - value=1 + [message] + speaker=Troll Flamecaster + message= _ "Burn, burn and die!" + [/message] - [message] - id=$casualty - message= _ "Aauughh!" - [/message] - [/case] + [color_adjust] + red,green,blue=255,0,0 + [/color_adjust] - [case] - value=2 + [redraw] + [/redraw] - [message] - id=$casualty - message= _ "No...!" - [/message] - [/case] + [delay] + time=100 + [/delay] - [case] - value=3 + [color_adjust] + red,green,blue=0,0,0 + [/color_adjust] - [message] - id=$casualty - message= _ "Help me!!" - [/message] - [/case] - [/switch] + [redraw] + [/redraw] - [kill] - id=$casualty - animate=yes - fire_event=no - [/kill] + [message] + speaker=Dwarf Leader + message= _ "Dive for cover!" + [/message] - {VARIABLE_OP i add 1} + [message] + speaker=Kaleh + message= _ "Those new troll shamans are decimating the dwarves with blasts of fire! This doesn’t look good." + [/message] - # Update the victims array [store_unit] [filter] - find_in=victims - [not] - id=$casualty - [/not] + role="Dwarf Defender" + x=24-46 + y=19-35 [/filter] - variable=victims kill=no [/store_unit] - )} - [message] - speaker=Dwarf Leader - message= _ "More accursed troll magic. Fall back!" - [/message] + #if easy kill 50% + #if medium kill 60% + #if hard kill 80% + + {VARIABLE deaths $victims.length} + {VARIABLE_OP deaths multiply {ON_DIFFICULTY 0.6 0.7 0.8}} + {VARIABLE_OP deaths round 0} + + #{DEBUG_MSG "Killing $deaths defenders out of $victims.length"} + + {VARIABLE i 1} + {REPEAT $deaths ( + {RANDOM "1..$victims.length"} + {VARIABLE_OP random sub 1} + + {VARIABLE casualty $victims[$random].id} + + #have some dwarves scream as they die + [switch] + variable=i + + [case] + value=1 + + [message] + id=$casualty + message= _ "Aauughh!" + [/message] + [/case] + + [case] + value=2 + + [message] + id=$casualty + message= _ "No...!" + [/message] + [/case] + + [case] + value=3 + + [message] + id=$casualty + message= _ "Help me!!" + [/message] + [/case] + [/switch] + + [kill] + id=$casualty + animate=yes + fire_event=no + [/kill] + + {VARIABLE_OP i add 1} + + # Update the victims array + [store_unit] + [filter] + find_in=victims + [not] + id=$casualty + [/not] + [/filter] + + variable=victims + kill=no + [/store_unit] + )} - [message] - speaker=Dwarf Leader - # wmllint: local spelling hurtin' - message= _ "I need to go back and rally more reinforcements. We’re hurtin’, Kaleh, I’ll need your men to cover for us. Do your best, boy, and may your ancestors watch over you." - [/message] + [message] + speaker=Dwarf Leader + message= _ "More accursed troll magic. Fall back!" + [/message] - [kill] - id=Dwarf Leader - animate=no - [/kill] - [/then] + [message] + speaker=Dwarf Leader + # wmllint: local spelling hurtin' + message= _ "I need to go back and rally more reinforcements. We’re hurtin’, Kaleh, I’ll need your men to cover for us. Do your best, boy, and may your ancestors watch over you." + [/message] - [else] - #if allied with trolls + [kill] + id=Dwarf Leader + animate=no + [/kill] + [/then] + + [else] + #if allied with trolls - #west side - [move_unit_fake] - type=Dwarvish Thunderguard - side=4 - x=26,27,28,29,30,30,30,30 - y=18,19,19,19,19,20,21,22 - [/move_unit_fake] + #west side + [move_unit_fake] + type=Dwarvish Thunderguard + side=4 + x=26,27,28,29,30,30,30,30 + y=18,19,19,19,19,20,21,22 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 30 22 (Dwarf Grenadier) ( _ "Dwarf Grenadier")} + {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 30 22 (Dwarf Grenadier) ( _ "Dwarf Grenadier")} - [move_unit_fake] - type=Dwarvish Thunderguard - side=4 - x=26,27,28,29,30,30,31,32,32 - y=18,19,19,19,19,20,21,21,22 - [/move_unit_fake] + [move_unit_fake] + type=Dwarvish Thunderguard + side=4 + x=26,27,28,29,30,30,31,32,32 + y=18,19,19,19,19,20,21,21,22 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 32 22 () ( _ "Dwarf Grenadier")} + {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 32 22 () ( _ "Dwarf Grenadier")} #ifdef HARD - [move_unit_fake] - type=Dwarvish Thunderguard - side=4 - x=26,27,28,29,30,30,31,32,33,34 - y=18,19,19,19,19,20,21,21,22,22 - [/move_unit_fake] + [move_unit_fake] + type=Dwarvish Thunderguard + side=4 + x=26,27,28,29,30,30,31,32,33,34 + y=18,19,19,19,19,20,21,21,22,22 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 34 22 () ( _ "Dwarf Grenadier")} + {NAMED_GENERIC_UNIT 4 (Dwarvish Thunderguard) 34 22 () ( _ "Dwarf Grenadier")} #endif - #east side + #east side - [move_unit_fake] - type=Dwarvish Thunderguard - side=5 - x=45,44,44,43,42,41,41,40 - y=18,18,19,20,20,21,22,22 - [/move_unit_fake] + [move_unit_fake] + type=Dwarvish Thunderguard + side=5 + x=45,44,44,43,42,41,41,40 + y=18,18,19,20,20,21,22,22 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 40 22 () ( _ "Dwarf Grenadier")} + {NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 40 22 () ( _ "Dwarf Grenadier")} #ifndef EASY - [move_unit_fake] - type=Dwarvish Thunderguard - side=5 - x=45,44,44,43,43,42,42 - y=18,18,19,20,21,21,22 - [/move_unit_fake] + [move_unit_fake] + type=Dwarvish Thunderguard + side=5 + x=45,44,44,43,43,42,42 + y=18,18,19,20,21,21,22 + [/move_unit_fake] - {NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 42 22 () ( _ "Dwarf Grenadier")} + {NAMED_GENERIC_UNIT 5 (Dwarvish Thunderguard) 42 22 () ( _ "Dwarf Grenadier")} #endif - [message] - speaker=Dwarf Grenadier - message= _ "Let’s blast those monsters back to the pits they spawned from! Fire in the hole!" - [/message] - - [color_adjust] - red,green,blue=255,0,0 - [/color_adjust] - - [redraw] - [/redraw] - - [delay] - time=100 - [/delay] - - [color_adjust] - red,green,blue=0,0,0 - [/color_adjust] - - [redraw] - [/redraw] - - [message] - speaker=Troll Leader - message= _ "More dwarven trickery! Fall back!" - [/message] - - [message] - speaker=Kaleh - message= _ "Those new dwarves are lobbing explosives at the trolls with devastating effect! I don’t think the trolls can take this much longer." - [/message] - - [store_unit] - [filter] - role="Troll Defender" - x=24-46 - y=19-35 - [/filter] - variable=victims - kill=no - [/store_unit] - - #if easy kill 50% - #if medium kill 60% - #if hard kill 75% - - {VARIABLE deaths $victims.length} - {VARIABLE_OP deaths multiply {ON_DIFFICULTY 0.5 0.6 0.75}} - {VARIABLE_OP deaths round 0} - - #{DEBUG_MSG "Killing $deaths defenders out of $victims.length"} - - {VARIABLE i 1} - {REPEAT $deaths ( - {RANDOM "1..$victims.length"} - {VARIABLE_OP random sub 1} - - {VARIABLE casualty $victims[$random].id} - - #have some trolls scream as they die - [switch] - variable=i - - [case] - value=1 + [message] + speaker=Dwarf Grenadier + message= _ "Let’s blast those monsters back to the pits they spawned from! Fire in the hole!" + [/message] - [message] - id=$casualty - message= _ "Aaughh!" - [/message] - [/case] + [color_adjust] + red,green,blue=255,0,0 + [/color_adjust] - [case] - value=2 + [redraw] + [/redraw] - [message] - id=$casualty - message= _ "No...!" - [/message] - [/case] + [delay] + time=100 + [/delay] - [case] - value=3 + [color_adjust] + red,green,blue=0,0,0 + [/color_adjust] - [message] - id=$casualty - message= _ "Gaaghh!" # wmllint: no spellcheck - [/message] - [/case] - [/switch] + [redraw] + [/redraw] - [kill] - id=$casualty - animate=yes - fire_event=no - [/kill] + [message] + speaker=Troll Leader + message= _ "More dwarven trickery! Fall back!" + [/message] - {VARIABLE_OP i add 1} + [message] + speaker=Kaleh + message= _ "Those new dwarves are lobbing explosives at the trolls with devastating effect! I don’t think the trolls can take this much longer." + [/message] - # Update the victims array [store_unit] [filter] - find_in=victims - [not] - id=$casualty - [/not] + role="Troll Defender" + x=24-46 + y=19-35 [/filter] - variable=victims kill=no [/store_unit] - )} - [message] - speaker=Troll Leader - message= _ "I must go back and find more trolls to fight. You must hold them back, Kaleh. Be strong like rock. Griknagh will be with you." - [/message] + #if easy kill 50% + #if medium kill 60% + #if hard kill 75% + + {VARIABLE deaths $victims.length} + {VARIABLE_OP deaths multiply {ON_DIFFICULTY 0.5 0.6 0.75}} + {VARIABLE_OP deaths round 0} + + #{DEBUG_MSG "Killing $deaths defenders out of $victims.length"} + + {VARIABLE i 1} + {REPEAT $deaths ( + {RANDOM "1..$victims.length"} + {VARIABLE_OP random sub 1} + + {VARIABLE casualty $victims[$random].id} + + #have some trolls scream as they die + [switch] + variable=i + + [case] + value=1 + + [message] + id=$casualty + message= _ "Aaughh!" + [/message] + [/case] + + [case] + value=2 + + [message] + id=$casualty + message= _ "No...!" + [/message] + [/case] + + [case] + value=3 + + [message] + id=$casualty + message= _ "Gaaghh!" # wmllint: no spellcheck + [/message] + [/case] + [/switch] + + [kill] + id=$casualty + animate=yes + fire_event=no + [/kill] + + {VARIABLE_OP i add 1} + + # Update the victims array + [store_unit] + [filter] + find_in=victims + [not] + id=$casualty + [/not] + [/filter] + + variable=victims + kill=no + [/store_unit] + )} - [kill] - id=Troll Leader - animate=no - [/kill] - [/else] - [/if] + [message] + speaker=Troll Leader + message= _ "I must go back and find more trolls to fight. You must hold them back, Kaleh. Be strong like rock. Griknagh will be with you." + [/message] - {CLEAR_VARIABLE casualty,deaths,victims,i} -[/event] + [kill] + id=Troll Leader + animate=no + [/kill] + [/else] + [/if] + + {CLEAR_VARIABLE casualty,deaths,victims,i} + [/event] # Event 4: Ally reinforcements # message: ally leader sent us to help you diff --git a/data/core/units/dwarves/Thunderer.cfg b/data/core/units/dwarves/Thunderer.cfg index f136c3e8cc86..865cff3ee52c 100644 --- a/data/core/units/dwarves/Thunderer.cfg +++ b/data/core/units/dwarves/Thunderer.cfg @@ -196,7 +196,7 @@ [/attack_anim] [victory_anim] - range=ranged + range=ranged direction=s,se,sw [frame] image="units/dwarves/thunderer/thunderer-se-ranged-kill1.png:100"