diff --git a/data/campaigns/Under_the_Burning_Suns/maps/5StruggleNew5 b/data/campaigns/Under_the_Burning_Suns/maps/5StruggleNew5 index c2e5a4fa6cf..4f61fe3f03e 100644 --- a/data/campaigns/Under_the_Burning_Suns/maps/5StruggleNew5 +++ b/data/campaigns/Under_the_Burning_Suns/maps/5StruggleNew5 @@ -14,32 +14,32 @@ WWWWWWWWWWWWWWWWWWWWWWuuooouuuuuW[WWWWWrru[oKouuuupWWWWW WWWWWWWWWWWWWWWWWWWWWWrruuupuWuuuupuWuruuuuuouuruuWWWWWW WWWWWWWWWWWWWWWWWWWWWWWruuuu[WWWurruuuuWWWp]uuruuWWWWWWW WWWWWWWWWWWWWWWWWWWWWWWWrr]WWWWrrWr]urWWWWWWuu[W]WWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWWrrWWWWWrWWWpuurWWWWWuWWWW&W&WWWW -WWWWWWWWWWWWWWWWWWWWWWWW]]uu[urWWWWW[urWWWprrWWW&W&W&WWW -WWWWWWWWWWWWWWWWWWWWWWWWWWupu[uuWWWruurWWWWrWWW&&WWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWWWWWWWuu'W'uWuuuWWuuWWWW&WWWWWWWW -WWWrWWWWWWWWWuuuWWWWWWWWWWWWWrr'''ur[uu]]uuWWWW&uuWWWWWW -WWruuuWuruWWWuWWuurrWWWWWW&&uuuu'uruuuuuuuuWW&&WWrWWWWWW -WW]uuuuuu[uuuWWWWWWWrWWWW[uu&^&^uuuWuruuuuu&&WWWWrWWWWWW -Wuuu1uuuuuuuWuW[[WWWuuWWWWupuu&u&&WWWWruu&^uWWWWWrWWWWWW -uuuuuuu]uuuuuu[u[[WWWuWWWWurrouruuWWWruuu&uu]]W]uWWWWWWW -WWWWWWuWWWurrruuuuWWWuWWWuroooru[uuurrup&uu]]c]cccWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWWrrWWWWWrWWWpuurWWWWWuWWWWXWXWWWW +WWWWWWWWWWWWWWWWWWWWWWWW]]uu[urWWWWW[urWWWprrWWWXWXWXWWW +WWWWWWWWWWWWWWWWWWWWWWWWWWupu[uuWWWruurWWWWrWWWXXWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWWWWWWWuu'W'uWuuuWWuuWWWWXWWWWWWWW +WWWrWWWWWWWWWuuuWWWWWWWWWWWWWrr'''ur[uu]]uuWWWWXuuWWWWWW +WWruuuWuruWWWuWWuurrWWWWWWXXuuuu'uruuuuuuuuWWXXWWrWWWWWW +WW]uuuuuu[uuuWWWWWWWrWWWW[uuX|X|uuuWuruuuuuXXWWWWrWWWWWW +Wuuu1uuuuuuuWuW[[WWWuuWWWWupuuXuXXWWWWruuX|uWWWWWrWWWWWW +uuuuuuu]uuuuuu[u[[WWWuWWWWurrouruuWWWruuuXuu]]W]uWWWWWWW +WWWWWWuWWWurrruuuuWWWuWWWuroooru[uuurrupXuu]]c]cccWWWWWW WWWWWWWWWWWWWWrWuuuuWuW[[uroKouu[[Duruuuuu]]cccccWWWWWWW WWWWWWWWWWWWWWWWuuuuuuWuupruoorruuuWWWuuu]u]cccccWWWWWWW -WWWWWWWWWWWWWWWWWWuruuuWuuu&uururuuWWruu]]]]]cccWWWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWWu&&u^&p&uu]]ruu&&]]]]WcWWWWWWWWW -WWWWWWWWWWWWWWWWWWWWWWW&&uuru'&'uruuuuu&]]rr]WWWWWWWWWWW -WWWWWWWWWWWWWWWWWWWWW&&WWuru['''ruuDu&&u]u]]]WWWWWWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWWWWuuuu'uuuuuu&uWuuuurrWWWWWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWWWuurWWuW[uuW[&WWWuWuuuuWWWWWWWWW -WWWWWWWWWWWWWWWWWWWWWWWW]]rWWWWW[uuWW&WWWrWWrr[WWWWWWWWW +WWWWWWWWWWWWWWWWWWuruuuWuuuXuururuuWWruu]]]]]cccWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWWuXXu|XpXuu]]ruuXX]]]]WcWWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWXXuuru'X'uruuuuuX]]rr]WWWWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWXXWWuru['''ruuDuXXu]u]]]WWWWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWWWWuuuu'uuuuuuXuWuuuurrWWWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWWWuurWWuW[uuW[XWWWuWuuuuWWWWWWWWW +WWWWWWWWWWWWWWWWWWWWWWWW]]rWWWWW[uuWWXWWWrWWrr[WWWWWWWWW WWWWWWWWWWWWWWWWWWWrWWWW]ruWWWW]rrWWWWWrrWWWrruWWWWWWWWW -WWWWWWWWWWWWWWW&WWWuWWWWWu[WWWWuuWWrrrrWWWWuuuWWWWWWWWWW -WWWWWWWWWWWWWWWW&&uWWWW[]uu]WuuruurWWWWWWW]uuuWWWDWWWWWW -WWWWWWWWWWWWWWWWWW&&WWDuunuu[rr[[uWWWWWWD[u[[uuuuuuWWWWW -WWWWWWWWWWWWWWWWWWWW&&uunKnuuruWWWurrrWWWuuuu&]]uuWWWWWW -WWWWWWWWWWWWWWWWWWWWWu&&nnnuuuuWWWWWWWuurru[un&&&&W&WWWW -WWWWWWWWWWWWWWWWWWWWWuDuuuu[uDWWWWWWWWWWWW]unKnuuW&WWWWW +WWWWWWWWWWWWWWWXWWWuWWWWWu[WWWWuuWWrrrrWWWWuuuWWWWWWWWWW +WWWWWWWWWWWWWWWWXXuWWWW[]uu]WuuruurWWWWWWW]uuuWWWDWWWWWW +WWWWWWWWWWWWWWWWWWXXWWDuunuu[rr[[uWWWWWWD[u[[uuuuuuWWWWW +WWWWWWWWWWWWWWWWWWWWXXuunKnuuruWWWurrrWWWuuuuX]]uuWWWWWW +WWWWWWWWWWWWWWWWWWWWWuXXnnnuuuuWWWWWWWuurru[unXXXXWXWWWW +WWWWWWWWWWWWWWWWWWWWWuDuuuu[uDWWWWWWWWWWWW]unKnuuWXWWWWW WWWWWWWWWWWWWWWWWWWWWWu[uDu[uWWWWWWWWWWWWWDunnnuuWWWWWWW WWWWWWWWWWWWWWWWWWWWWWWWuWWuuuWuWWWWWWWrWruuuuuDuWWWWWWW WWWWWWWWWWWWWWWWWWWWWWWWWWWWurur]rWWWrr]ru[WuuuWWWWWWWWW diff --git a/data/campaigns/Under_the_Burning_Suns/maps/6_2DwarfMission3 b/data/campaigns/Under_the_Burning_Suns/maps/6_2DwarfMission3 index a25b518f161..14b2a83b526 100644 --- a/data/campaigns/Under_the_Burning_Suns/maps/6_2DwarfMission3 +++ b/data/campaigns/Under_the_Burning_Suns/maps/6_2DwarfMission3 @@ -24,9 +24,9 @@ WWWWWWWWWWWWWWWuRuWWWWWrrWWWWWWWWWWWWWWWWWWWWWWuuuWW WWWWWWWWWWWWWWWWR[uuurrWWWWWWWWWWWWWWWWWWWWWWWWuuuWW WWWWWWWWWWWWWWWWuR[uuWWWWWWWWWWWWWWWWWWWWWWWWWWWuWWW WWWWWWWWWWWWWWWWuRuuuuWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW -WWWWWWWWWWWWW&W&&^u^&&WWWWWWWWWWWWWWWWWWWWWWWWWWWWWW -WWWWWWuWWWWW&W&&&^&^&&&&WWWWWnnnWWWWWWWWWWWWWWWWWWWW -WWWWWuuuWWWWWWWW&R&u&WWW&WWWun1nWWWuWWWWWWWWWWWWWWWW +WWWWWWWWWWWWWXWXX|u|XXWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW +WWWWWWuWWWWWXWXXX|X|XXXXWWWWWnnnWWWWWWWWWWWWWWWWWWWW +WWWWWuuuWWWWWWWWXRXuXWWWXWWWun1nWWWuWWWWWWWWWWWWWWWW WWWWWWuWWWWWWWWWuRuuuuuuWWWWuunuuuuWuuWWWWWWWWWWWWWW WWWWWuuuWWWWWWWRRWuWWWWuWWWruuuWWWWWWWuuWWWWWWWWWWWW WWWWWWuWWWWWWWRWWWWWWuuWWWWrWWWWWWWWWWWWuWWWWWWWWWWW diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg index 8057a30f205..f710da8b205 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg @@ -612,7 +612,7 @@ name=prestart description=Il-tian [/recall] [recall] - description=We-jiall + description=We-jial [/recall] #teleport merfolk to nearby water @@ -654,7 +654,7 @@ name=prestart [teleport] [filter] - description=We-jiall + description=We-jial [/filter] x,y=42,42 [/teleport] @@ -1218,7 +1218,7 @@ x,y=13,41 [teleport] [filter] - description=We-jiall + description=We-jial [/filter] x,y=6,42 [/teleport] @@ -1845,7 +1845,7 @@ name=sighted fire_event=no [/kill] -{UNIT_T (Sea Serpent2) (Sea Serpent) 2 13 9} +{UNIT_T (Sea Serpent) (Sea Serpent) 2 13 9} [message] description=Sea Serpent diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/12_Final.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/12_Final.cfg index f6741d55726..5c5af9f8a3f 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/12_Final.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/12_Final.cfg @@ -1291,7 +1291,7 @@ message= _ "You think you killed me? You have no idea what you are facing." [message] speaker=Nym image=portraits/nym.png -message= _ "Who are you really? Are you Yanqui, back to avenge your imprisonment?" +message= _ "Who is she really? Could it be Yanqui, back to avenge his imprisonment?" [/message] [message] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg index 4748b372c1f..a2586fd4998 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/5_Struggle.cfg @@ -3117,7 +3117,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Kaleh message= _ "Where did you come from?" [/message] @@ -3127,7 +3127,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Zhul message= _ "The real fighting? I thought that what we were waist-deep in?" [/message] @@ -3137,7 +3137,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Nym message= _ "How do you mean?" [/message] @@ -3147,7 +3147,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Elyssa message= _ "Their knowledge of these tunnels is uncanny. I could have sworn a minute ago that that wall was solid rock." [/message] @@ -3213,7 +3213,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Kaleh message= _ "Where did you come from?" [/message] @@ -3223,7 +3223,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Zhul message= _ "The front? I thought this was was the front." [/message] @@ -3233,7 +3233,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Nym message= _ "It has?" [/message] @@ -3243,7 +3243,7 @@ side=1 [/message] [message] - speaker=second_unit + speaker=Elyssa message= _ "Their knowledge of these tunnels is uncanny. I could have sworn a minute ago that that wall was solid rock." [/message] 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 4ae75f3175b..dd6d6c2b461 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 @@ -2028,7 +2028,7 @@ x=4,4,4,4,5,5,6 y=24,23,22,21,21,20,19 [/move_unit_fake] -{UNIT_ (Troll2) (Zurg) 2 22 19} +{UNIT_ (Troll) (Zurg) 2 6 19} [remove_shroud] x=5-7 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 b3629a85f08..b7372dc91d0 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 @@ -704,7 +704,10 @@ name=prestart [/then] [/if] - + + #to do: put hero icon on troll/dwarf ally + + #initialize starting variables [set_variable] diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg index 859fbcb06a6..f15817b9299 100644 --- a/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg +++ b/data/campaigns/Under_the_Burning_Suns/scenarios/9_Water.cfg @@ -546,19 +546,19 @@ name=prestart # add items to map # merfolk trapped in cages - {PUT_IMG merfolk/merman-warrior.png 25 36} + {PUT_IMG units/merfolk/warrior.png 25 36} {PUT_IMG items/cage.png 25 36} - {PUT_IMG merfolk/merman-warrior.png 34 31} + {PUT_IMG units/merfolk/warrior.png 34 31} {PUT_IMG items/cage.png 34 31} - {PUT_IMG merfolk/merman-spearman.png 18 32} + {PUT_IMG units/merfolk/spearman.png 18 32} {PUT_IMG items/cage.png 18 32} - {PUT_IMG merfolk/mermaid-priestess.png 31 25} + {PUT_IMG units/merfolk/priestess.png 31 25} {PUT_IMG items/cage.png 31 25} - {PUT_IMG merfolk/mermaid-enchantress.png 27 19} + {PUT_IMG units/merfolk/enchantress.png 27 19} {PUT_IMG items/cage.png 27 19} # human ships @@ -2273,7 +2273,7 @@ side=1 [/unit] [message] - description=We-jiall + description=We-jial message= _ "Thanks you for rescuing me. How did you manage to escape?" [/message] @@ -2283,7 +2283,7 @@ side=1 [/message] [message] - description=We-jiall + description=We-jial message= _ "Don't not worry yourself, now that I am free all will be set to rights. It is not our mission to defeat all the evil in this world. Protecting the elves is most important, we must bring them to our master. All else is secondary." [/message] @@ -3964,16 +3964,26 @@ y=15-17 side=1 [/filter] -[message] -description=Eloh -message= _ "You think you can strike me down. This is just a small part of my true power." -[/message] +[if] + [have_unit] + description=Eloh + [/have_unit] + + [then] -[message] -description=Kaleh -image=portraits/kaleh.png + [message] + description=Eloh + message= _ "You think you can strike me down. This is just a small part of my true power." + [/message] + + [message] + description=Kaleh + image=portraits/kaleh.png message= _ "Small part or no, if it is mortally possible to destroy you, I shall. Your hands are stained in our blood, you are not our god." -[/message] + [/message] + + [/then] +[/if] [/event] diff --git a/data/campaigns/Under_the_Burning_Suns/units/Sea_Serpent2.cfg b/data/campaigns/Under_the_Burning_Suns/units/Sea_Serpent2.cfg deleted file mode 100644 index 58ce99f0961..00000000000 --- a/data/campaigns/Under_the_Burning_Suns/units/Sea_Serpent2.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[unit] -#textdomain wesnoth - id=Sea Serpent - name= _ "Sea Serpent" - race=monster - image="units/monsters/seaserpent.png" - [defend] - [frame] - begin=-150 - end=150 - image="units/monsters/seaserpent-defend.png" - [/frame] - [/defend] -#normally hp is 85 - hitpoints=62 - movement_type=deepsea - movement=8 - experience=100 - level=3 - alignment=chaotic - advanceto=null - {AMLA_TOUGH 3} - cost=40 - usage=fighter - unit_description= _ "Sea Serpents are gigantic monsters, capable of capsizing boats by themselves." - get_hit_sound=groan.wav -# attack used to be 2-18 - [attack] - name=fangs - type=pierce - range=melee - damage=16 - number=2 - [animation] - [frame] - begin=-200 - end=100 - image="units/monsters/seaserpent-attack.png" - [/frame] - [/animation] - [/attack] -[/unit] diff --git a/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg b/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg index 37e59ba8f3d..0da124141ad 100644 --- a/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg +++ b/data/campaigns/Under_the_Burning_Suns/utils/terrain.cfg @@ -69,17 +69,17 @@ symbol_image=lava {TERRAIN_BASE y lava} -# chasm Terrain +# chasm Terrain (obselete, & char is used by impassable mountains) -[terrain] - symbol_image=abyss2 - id=Chasm - name="Chasm" - char=& - aliasof=X -[/terrain] +#[terrain] +# symbol_image=abyss2 +# id=Chasm +# name="Chasm" +# char=& +# aliasof=X +#[/terrain] -{TERRAIN_BASE & abyss2} +#{TERRAIN_BASE & abyss2} # stone bridge over chasm