Merge pull request #729 from GregoryLundberg/GL_HttT_errors

HttT Errors
wesnoth · Aug 12, 2016 · 12f7107 · 12f7107
2 parents 312a77c + 4da8f20
commit 12f7107
Show file tree

Hide file tree

Showing 33 changed files with 773 additions and 508 deletions.
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
@@ -584,3 +584,7 @@
         [/message]
     [/event]
 [/scenario]
+
+#undef AVOID_CHANTAL
+#undef HIGH_PRIORITY_TARGETS
+#undef EBESIEGED_RECRUITMENT
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
@@ -25,9 +25,11 @@
 #ifdef HARD
             [objective]
                 {ALTERNATIVE_OBJECTIVE_CAPTION}
-                description= _ "Defeat the enemy leader"+{OBJECTIVE_FOOTNOTE _"(special bonus)"}
+                description= _ "Defeat the enemy leader"+{EARLY_FINISH_BONUS_FOOTNOTE}+{OBJECTIVE_FOOTNOTE _"(special bonus)"}
                 condition=win
             [/objective]
+#else
+            {ALTERNATIVE_OBJECTIVE_BONUS ( _ "Defeat the enemy leader")}
 #endif
             [objective]
                 description= _ "Death of Konrad"
@@ -43,7 +45,6 @@
             [/objective]
 
             [gold_carryover]
-                bonus=no
                 carryover_percentage=40
             [/gold_carryover]
         [/objectives]
@@ -192,7 +193,7 @@
         [/message]
         [message]
             speaker=Delfador
-            message= _ "Yes, we will sail to the Isle of Alduin, my home Konrad, and the home of many magi."
+            message= _ "Yes, we will sail to the Isle of Alduin, my home, Konrad, and the home of many magi."
         [/message]
         [message]
             speaker=Kaylan
@@ -338,6 +339,7 @@
             facing=sw
             [modifications]
                 {TRAIT_LOYAL}
+                {TRAIT_INTELLIGENT}
             [/modifications]
             {IS_LOYAL}
         [/unit]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/03_The_Isle_of_Alduin.cfg
@@ -352,6 +352,7 @@
                 [/allow_recruit]
             [/then]
         [/if]
+        {CLEAR_VARIABLE received_mages}
 
         [kill]
             id=Seimus

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
@@ -120,7 +120,7 @@
 #ifdef HARD
         [terrain]
             x=4-6
-            y=40
+            y=40-41
             terrain=Ww
         [/terrain]
 #endif
@@ -309,16 +309,16 @@
     [event]
         name=moveto
 
-        [remove_item]
-            x,y=$x1,$y1
-        [/remove_item]
-
         [filter]
             side=1
             x=19
             y=23
         [/filter]
 
+        [remove_item]
+            x,y=$x1,$y1
+        [/remove_item]
+
         [unit]
             side=1
             x=19
@@ -382,16 +382,16 @@
 
     [event]
         name=moveto
-        [remove_item]
-            x,y=$x1,$y1
-        [/remove_item]
-
         [filter]
             side=1
             x=11
             y=33
         [/filter]
 
+        [remove_item]
+            x,y=$x1,$y1
+        [/remove_item]
+
         [unit]
             side=1
             x=11
@@ -456,16 +456,16 @@
 
     [event]
         name=moveto
-        [remove_item]
-            x,y=$x1,$y1
-        [/remove_item]
-
         [filter]
             side=1
             x=7
             y=35
         [/filter]
 
+        [remove_item]
+            x,y=$x1,$y1
+        [/remove_item]
+
         [unit]
             side=1
             x=7
@@ -504,16 +504,16 @@
 
     [event]
         name=moveto
-        [remove_item]
-            x,y=$x1,$y1
-        [/remove_item]
-
         [filter]
             x=5
             y=38
             side=1
         [/filter]
 
+        [remove_item]
+            x,y=$x1,$y1
+        [/remove_item]
+
         [unit]
             side=1
             x=5
@@ -564,16 +564,16 @@
 
     [event]
         name=moveto
-        [remove_item]
-            x,y=$x1,$y1
-        [/remove_item]
-
         [filter]
             side=1
             x=3
             y=10
         [/filter]
 
+        [remove_item]
+            x,y=$x1,$y1
+        [/remove_item]
+
         [unit]
             side=1
             x=3

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
@@ -22,11 +22,7 @@
                 condition=win
                 show_turn_counter=yes
             [/objective]
-            [objective]
-                {ALTERNATIVE_OBJECTIVE_CAPTION}
-                description= _ "Defeat all enemy leaders"+{OBJECTIVE_FOOTNOTE _"(special bonus)"}
-                condition=win
-            [/objective]
+            {ALTERNATIVE_OBJECTIVE ( _ "Defeat all enemy leaders")}
             [objective]
                 description= _ "Death of Konrad"
                 condition=lose
@@ -390,6 +386,7 @@
             [/else]
 #endif
         [/if]
+        {CLEAR_VARIABLE random}
     [/event]
 
     [event]
@@ -474,6 +471,7 @@
             message= _ "You regain your lost troops and $isle_damned_starting_gold gold!"
             image=wesnoth-icon.png
         [/message]
+        {CLEAR_VARIABLE isle_damned_starting_gold}
 
         [allow_recruit]
             side=1
@@ -535,6 +533,7 @@
             message= _ "You regain your lost troops and $isle_damned_starting_gold gold!"
             image=wesnoth-icon.png
         [/message]
+        {CLEAR_VARIABLE isle_damned_starting_gold}
 
         [allow_recruit]
             side=1
@@ -556,3 +555,9 @@
 
     {campaigns/Heir_To_The_Throne/utils/deaths.cfg}
 [/scenario]
+
+#undef EMPTY_TEMPLE_TRAP
+#undef MOREMIRMU_TRAP
+#undef XAKAE_TRAP
+#undef ISLE_GALLEON_ARRIVE
+#undef RESTORE_RECALL_LIST
diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
@@ -144,8 +144,8 @@
 #endif
 
     [time_area]
-        x=13-22,23 ,24 ,25-26
-        y=0-5  ,0-3,0-1,0-2
+        x=  11,  12,  13,  14,  15, 16-22,  23,  24, 25-26
+        y= 0-1, 0-2, 0-6, 0-5, 0-6,   0-5, 0-3, 0-1,   0-2
         {UNDERGROUND}
     [/time_area]
 
@@ -155,13 +155,41 @@
         {PLACE_IMAGE scenery/rock1.png 13 12}
         {PLACE_IMAGE scenery/rock2.png 25 28}
 
+#define ADVISOR
         [role]
-            type=Elvish Champion,Elvish Marshal,Elvish Captain,Elvish Hero,Knight,Elvish Outrider,Elvish Rider,Paladin,Mage,White Mage,Red Mage
             role=Advisor
+            [auto_recall][/auto_recall]
+
+            type="Elvish Sylph,Great Mage," +
+
+                 "Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
+                 "Paladin,Grand Knight," +
+                 "Mage of Light,Arch Mage,Silver Mage," +
+                 "Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
+                 "Highwayman,Fugitive,Huntsman,Ranger," +
+
+                 "Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
+                 "Knight,Lancer," +
+                 "White Mage,Red Mage," +
+                 "Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
+                 "Bandit,Outlaw,Trapper," +
+
+                 "Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
+                 "Horseman," +
+                 "Mage," +
+                 "Merman Fighter,Merman Hunter,Mermaid Initiate," +
+                 "Thug,Footpad,Poacher"
+            [else]
+                [unit]
+                    side=1
+                    type=Elvish Fighter
+                    role=Advisor
+                    placement=leader
+                [/unit]
+            [/else]
         [/role]
-        [recall]
-            role=Advisor
-        [/recall]
+#enddef
+        {ADVISOR}
     [/event]
 
     [event]
@@ -265,6 +293,7 @@
             speaker=Reglok
             message= _ "Greetings, friend. We are from the Elensefar Thieves’ Guild. We would like to help you against the orcs!"
         [/message]
+        {ADVISOR}
         [message]
             role=Advisor
             message= _ "Thieves, hmmm? Who says we can trust such as you?"
@@ -492,8 +521,8 @@
                 #create terrain
                 [terrain]
                     terrain=Wwf # wmllint: ignore
-                    x=7-8
-                    y=30-32
+                    x=8,7-8
+                    y=30,31-32
                 [/terrain]
                 #dialog
                 [message]
@@ -618,7 +647,7 @@
 
         [message]
             speaker=Konrad
-            message= _ "Oh, and you want me to get this scepter?"
+            message= _ "Oh, and you want me to get this Sceptre?"
         [/message]
 
         [message]
@@ -646,6 +675,7 @@
             message= _ "We cannot go to Wesmere, for Asheviere’s orcs have the approaches ringed about with steel; Kalenz and I barely escaped, and Chantal cannot get out. Until we are stronger, we must go where the orcs are not."
         [/message]
 
+        {CLEAR_VARIABLE thieves_ford}
         [endlevel]
             result=victory
             bonus=yes
@@ -719,3 +749,5 @@
 
     {campaigns/Heir_To_The_Throne/utils/deaths.cfg}
 [/scenario]
+
+#undef ADVISOR