diff --git a/data/campaigns/Under_the_Burning_Suns/maps/8Frying8 b/data/campaigns/Under_the_Burning_Suns/maps/8Frying8 index d9ac60e2638..2baef9527c8 100644 --- a/data/campaigns/Under_the_Burning_Suns/maps/8Frying8 +++ b/data/campaigns/Under_the_Burning_Suns/maps/8Frying8 @@ -13,12 +13,12 @@ WWWWWWWWWWWWW&WWWWWWWWWWWMMMJJJJIIJJJEIJJJJJJMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWWWWW&WWWWWuWuWWWMMMJJJJIJJJJJIJJIJJJMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWWWWWW&&uuuWuWuWWWMMMJJJJJJIIEIIIIIJMMMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWWWuuuu&WWWWWWuuWWMMMJJJIIIJJEJJIIJJMMMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW -WWWWWWWWWWWuWWWWWpWWWWWWuWWMMMJJJIIJJIEEJJJJMMMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW +WWWWWWWWWWWuWWWWWpWuWWWWuWWMMMJJJIIJJIEEJJJJMMMMWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWWWuWuuuuuurWWWWuuWMMIJIIIIJJJIIEIJJJJJMMMWMMMWWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWWWuuWrruCuurrWWWWIIIMIJJJJJJJIIEEIIJJJMMMMMMMMWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWWuuWWWWWWKCuuupWWMMMMMJJJUJJJJJEEUEEIJJJJJMMMMMMWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWWuuWWWWWWWWCruuurWMMMMJJJJJJJJIIEG@GGEEUEJJJJMMMMWWWWWWWWWWWWWWWWWWWWWWWW -WWWWWWW[uu[uWWWWWWupruuMMMMMMJJJJJJIIIEGG@@GEJEJEEJJMMMWWWWWWWWWWWWWWWWWWWWWWWWW +WWWWWWW[uu[uWWWWuuupruuMMMMMMJJJJJJIIIEGG@@GEJEJEEJJMMMWWWWWWWWWWWWWWWWWWWWWWWWW WWWWW&&&uuurWWWWWWWurMMJJJJUJJJIJIIIIIEEUG@GEJJJUEJJMMMWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWW&uWWWWWWWWWMMMMJJJJJEEEEIEEEIIIIEEUEEJJEEJJJMMMWWWWWWWWWWWWWWWWWWWWWWWWW WWWWWWWW&uWuWWWWWWWMMMJJJJJJJUJJEGGGEEIEEIEIJJJEUJJJMMMWWWWWWWWWWWWWWWWWWWWWWWWW diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/6_1_Hunting_Trolls.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/6_1_Hunting_Trolls.cfg index 1771c6d1c43..008e9b5e015 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/6_1_Hunting_Trolls.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/6_1_Hunting_Trolls.cfg @@ -2335,24 +2335,11 @@ side=1 [/message] [/then] + [/if] [/then] - [else] - - [message] - description=Dwarf Ghost - message= _ "Thank you. You have done for me what all my dwarven kin never did. May Moradin bless you and watch over you. I leave now for the halls of my ancestors..." - [/message] - - [kill] - description=Dwarf Ghost - animate=yes - [/kill] - - [/else] - [/if] [/event] @@ -2403,6 +2390,25 @@ side=1 name=met_ghost value=2 [/set_variable] + + # kills dwarf ghost blocking passage + [kill] + description=Dwarf Ghost + animate=no + [/kill] + + # create new unit so that ghost can deliver final dialogue before leaving + {UNIT_ (Haunt) (Dwarf Ghost) 2 14 13} + + [message] + description=Dwarf Ghost + message= _ "Thank you. You have done for me what all my dwarven kin never could. I will no longer block your way. May Moradin bless you and watch over you. I leave now for the halls of my ancestors..." + [/message] + + [kill] + description=Dwarf Ghost + animate=yes + [/kill] [/then] [/if] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg index 3be61664c94..ba73b7ea6d7 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/6_2_Hunting_Dwarves.cfg @@ -1463,11 +1463,11 @@ moves=0 #endif #ifdef MEDIUM income=10 - gold=125 + gold=110 #endif #ifdef HARD income=12 - gold=150 + gold=130 #endif [/modify_side] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg index 8f20f41c441..33a025ddece 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/8_Frying_Pan.cfg @@ -462,7 +462,10 @@ name=prestart # rocks in human outpost/elves base cave {PUT_IMG misc/rocks.png 16 17} - + + # chest of gold in human outpost at cave mouth + (PUT_IMG items/chest-plain-open.png 17 21} + # kill Elyssa to keep her from being recruited [kill] @@ -4872,7 +4875,6 @@ message= _ "We're still trying to get a head count, but between the underground [/else] [/if] - [message] description=Kaleh message= _ "Well, Nym's right, we don't know what's out there. So we should set up a perimeter guard around the cave mouth and start discovering what this side of the mountains looks like." @@ -4908,6 +4910,50 @@ immediate=yes [/event] +# Event 14.5 Player discovers human's chest of gold at cave mouth + +[event] +name=moveto + +[filter] +x,y=17,21 +side=1 +[/filter] + +{PUT_IMG items/chest-plain-open.png 17 21} + +[sound] +name=gold.ogg +[/sound] + +[message] +speaker=unit +message= _ "Looks like the guards at this outpost had been saving away a bit of loot. I don't suppose they're going to mind anymore if we made use of it." +[/message] + +#ifdef EASY +[gold] + amount=50 + side=1 +[/gold] +#endif + +#ifdef MEDIUM +[gold] + amount=50 + side=1 +[/gold] +#endif + +#ifdef HARD +[gold] + amount=25 + side=1 +[/gold] +#endif + +[/event] + # Event 15: Elves step out into the daylight, Eloh appears diff --git a/data/campaigns/Under_the_Burning_Suns/units/Dread_Bat.cfg b/data/campaigns/Under_the_Burning_Suns/units/Dread_Bat.cfg index b65ab59cc08..3d260bfb42f 100644 --- a/data/campaigns/Under_the_Burning_Suns/units/Dread_Bat.cfg +++ b/data/campaigns/Under_the_Burning_Suns/units/Dread_Bat.cfg @@ -19,7 +19,7 @@ sound=bat-flapping.wav [/frame] [/movement_anim] - hitpoints=34 + hitpoints=33 movement_type=undeadfly movement=9 experience=40 @@ -40,7 +40,7 @@ name=fangs type=blade range=melee - damage=8 + damage=6 number=4 [specials] {WEAPON_SPECIAL_DRAIN}