From 60324e49d8a25ac65d30277282de63e68b719ca5 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Sun, 8 Mar 2020 22:10:18 +1100 Subject: [PATCH] Fixup daff648 --- .../scenarios/9_Caverns_of_Flame.cfg | 256 +++++++++--------- 1 file changed, 124 insertions(+), 132 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg index df1073a9e7d8..a5098e145e54 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg @@ -934,150 +934,142 @@ name= _ "Glildur" canrecruit=yes x,y=23,3 - profile="portraits/elves/captain.png~CHAN( - if((blue < 100) and (red > green), red*0.6, red), - if( - (blue < 100) and (red < green), green*0.7, - (blue < 100) and (red < 100) and (red > green), green*0.7, - green - ), - if((blue < 100) and (red < green), blue*1.5, blue) - )" - facing=sw - [modifications] - {TRAIT_RESILIENT} - {TRAIT_INTELLIGENT} - [object] - silent=yes - [effect] - apply_to=image_mod - add=CS(-10,-25,+5) - [/effect] - [/object] - [/modifications] - extra_recruit=Elvish Hero, Elvish Ranger - [/unit] - [message] - speaker=Glildur - message= _ "End of the road, little dwarves! That ruby is as good as ours..." - [/message] - {RANDOM_MERCENARY_2 "Dwarvish Lord"} - {RANDOM_MERCENARY_2 "Dwarvish Lord"} - {RANDOM_MERCENARY_2 "Dwarvish Lord"} - {RANDOM_MERCENARY_2 "Dwarvish Lord"} + {SOF_GLILDUR_PORTRAIT} + facing=sw + [modifications] + {TRAIT_RESILIENT} + {TRAIT_INTELLIGENT} + [object] + silent=yes + [effect] + apply_to=image_mod + add=CS(-10,-25,+5) + [/effect] + [/object] + [/modifications] + extra_recruit=Elvish Hero, Elvish Ranger + [/unit] + [message] + speaker=Glildur + message= _ "End of the road, little dwarves! That ruby is as good as ours..." + [/message] + {RANDOM_MERCENARY_2 "Dwarvish Lord"} + {RANDOM_MERCENARY_2 "Dwarvish Lord"} + {RANDOM_MERCENARY_2 "Dwarvish Lord"} + {RANDOM_MERCENARY_2 "Dwarvish Lord"} #ifdef HARD - {RANDOM_MERCENARY_2 "Dwarvish Lord"} + {RANDOM_MERCENARY_2 "Dwarvish Lord"} #endif - {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} - {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} - {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} - {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} + {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} + {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} + {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} + {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} #ifdef HARD - {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} + {RANDOM_MERCENARY_2 "Dwarvish Dragonguard"} #endif - {RANDOM_MERCENARY_2 "Elvish Champion"} - {RANDOM_MERCENARY_2 "Elvish Champion"} - {RANDOM_MERCENARY_2 "Elvish Champion"} - {RANDOM_MERCENARY_2 "Elvish Champion"} + {RANDOM_MERCENARY_2 "Elvish Champion"} + {RANDOM_MERCENARY_2 "Elvish Champion"} + {RANDOM_MERCENARY_2 "Elvish Champion"} + {RANDOM_MERCENARY_2 "Elvish Champion"} #ifdef HARD - {RANDOM_MERCENARY_2 "Elvish Champion"} + {RANDOM_MERCENARY_2 "Elvish Champion"} #endif - {RANDOM_MERCENARY_2 "Elvish Avenger"} - {RANDOM_MERCENARY_2 "Elvish Avenger"} - {RANDOM_MERCENARY_2 "Elvish Avenger"} - {RANDOM_MERCENARY_2 "Elvish Avenger"} + {RANDOM_MERCENARY_2 "Elvish Avenger"} + {RANDOM_MERCENARY_2 "Elvish Avenger"} + {RANDOM_MERCENARY_2 "Elvish Avenger"} + {RANDOM_MERCENARY_2 "Elvish Avenger"} #ifdef HARD - {RANDOM_MERCENARY_2 "Elvish Avenger"} + {RANDOM_MERCENARY_2 "Elvish Avenger"} #endif - {RANDOM_MERCENARY_2 "Elvish Outrider"} - {RANDOM_MERCENARY_2 "Elvish Outrider"} - {RANDOM_MERCENARY_2 "Elvish Outrider"} - {RANDOM_MERCENARY_2 "Elvish Outrider"} + {RANDOM_MERCENARY_2 "Elvish Outrider"} + {RANDOM_MERCENARY_2 "Elvish Outrider"} + {RANDOM_MERCENARY_2 "Elvish Outrider"} + {RANDOM_MERCENARY_2 "Elvish Outrider"} #ifdef HARD - {RANDOM_MERCENARY_2 "Elvish Outrider"} + {RANDOM_MERCENARY_2 "Elvish Outrider"} #endif - [message] - speaker=Rugnur - message= _ "Thursagan! The elves are right on our tail! What should we do?" - [/message] - [message] - speaker=Thursagan - message= _ "We should try to set off the volcano as soon as possible. Draw the elves further into the caves, so they can’t escape when it does erupt." - [/message] - [terrain] - terrain=Qxu^Bp/ - x=34,34,35 - y=4,5,6 - [/terrain] - [unstore_unit] - variable=harohk - find_vacant=no - [/unstore_unit] - {CLEAR_VARIABLE harohk} - [/event] + [message] + speaker=Rugnur + message= _ "Thursagan! The elves are right on our tail! What should we do?" + [/message] + [message] + speaker=Thursagan + message= _ "We should try to set off the volcano as soon as possible. Draw the elves further into the caves, so they can’t escape when it does erupt." + [/message] + [terrain] + terrain=Qxu^Bp/ + x=34,34,35 + y=4,5,6 + [/terrain] + [unstore_unit] + variable=harohk + find_vacant=no + [/unstore_unit] + {CLEAR_VARIABLE harohk} + [/event] - [event] - name=last_breath - [filter] - id=Glildur - [/filter] - [message] - speaker=Glildur - message= _ "Damnation! I almost had it... but now I join Landar..." - [/message] - [/event] + [event] + name=last_breath + [filter] + id=Glildur + [/filter] + [message] + speaker=Glildur + message= _ "Damnation! I almost had it... but now I join Landar..." + [/message] + [/event] - #when the elves lose troops, the orcs gain them - [event] - name=die - first_time_only=no - [filter] - side=2 - [/filter] - [gold] - side=4 - amount=50 - [/gold] - [gold] - side=5 - amount=50 - [/gold] - [/event] + #when the elves lose troops, the orcs gain them + [event] + name=die + first_time_only=no + [filter] + side=2 + [/filter] + [gold] + side=4 + amount=50 + [/gold] + [gold] + side=5 + amount=50 + [/gold] + [/event] - # the orcs are held back - [event] - name=enter_hex - [filter] - side=1 - x,y=30,3-8 - [/filter] - [filter_condition] - [variable] - name=turn_number - less_than=6 - [/variable] - [/filter_condition] - {MOVE_UNIT (id=Gathor) 36 5} - [remove_shroud] - side=1 - x,y=32-43,3-9 - [/remove_shroud] - [redraw] - side=1 - [/redraw] - [message] - speaker=Gathor - message= _ "Ah ha! I knew it, there are intruders! And yet our damned bridge is broken, it was built by idiots. Come, come, bring planks, we've got to get across!" - [/message] - [message] - speaker=Rugnur - message= _ "Huh. Well, let's not stay here too long." - [/message] - [message] - speaker=Thursagan - message= _ "Right, if we can get both the orcs and the elves behind us, maybe they'll fight each other." - [/message] - [/event] - [/scenario] + # the orcs are held back + [event] + name=enter_hex + [filter] + side=1 + x,y=30,3-8 + [/filter] + [filter_condition] + [variable] + name=turn_number + less_than=6 + [/variable] + [/filter_condition] + {MOVE_UNIT (id=Gathor) 36 5} + [remove_shroud] + side=1 + x,y=32-43,3-9 + [/remove_shroud] + [redraw] + side=1 + [/redraw] + [message] + speaker=Gathor + message= _ "Ah ha! I knew it, there are intruders! And yet our damned bridge is broken, it was built by idiots. Come, come, bring planks, we've got to get across!" + [/message] + [message] + speaker=Rugnur + message= _ "Huh. Well, let's not stay here too long." + [/message] + [message] + speaker=Thursagan + message= _ "Right, if we can get both the orcs and the elves behind us, maybe they'll fight each other." + [/message] + [/event] +[/scenario] #undef RANDOM_MERCENARY_2