[Wesnoth-cvs-commits] wesnoth ./changelog data/scenarios/Heir_To_The_...

[ott]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     ott <address@hidden>    05/09/18 19:48:55

Modified files:
        .              : changelog 
        data/scenarios/Heir_To_The_Throne: Bay_of_Pearls.cfg 
                                           Isle_of_Anduin.cfg 
                                           The_Siege_of_Elensefar.cfg 

Log message:
        fix Delfador losing XP in HttT

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.945&tr2=1.946&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg.diff?tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg.diff?tr1=1.42&tr2=1.43&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.945 wesnoth/changelog:1.946
--- wesnoth/changelog:1.945     Sun Sep 18 18:16:55 2005
+++ wesnoth/changelog   Sun Sep 18 19:48:52 2005
@@ -20,6 +20,8 @@
      * fix Konrad II's lines not being spoken in The Council (#14500)
      * change the holy waters to "holy amulets" (also #14539)
      * Drowned Plains now has fog (#14499)
+   * Heir to the Throne
+     * fix Delfador losing experience at Siege of Elensefar (#14508)
  * units:
    * changed Orcish Shamans from 20 to 23 HP (Novice 24, Old 22)
    * changed all Orcish Shamans from 60 to 70% defense on villages
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.36 
wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.37
--- wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:1.36    Wed Jul 
27 20:03:32 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg Sun Sep 18 
19:48:55 2005
@@ -174,9 +174,13 @@
                [/message]
 
                #Delfador leaves the party
-               [kill]
-               description=Delfador
-               [/kill]
+                [store_unit]
+                        variable=delfador_store
+                        kill=yes
+                        [filter]
+                        description=Delfador
+                        [/filter]
+                [/store_unit]
        [/event]
 
        #comic relief with Bugg becoming a 'sea orc'
Index: wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg
diff -u wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.33 
wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.34
--- wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg:1.33   Mon Jul 
18 19:53:47 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg        Sun Sep 
18 19:48:55 2005
@@ -167,7 +167,7 @@
        [unstore_unit]
        variable=delfador_store
        [/unstore_unit]
-       {CLEAR_VARIABLE konrad_store}
+       {CLEAR_VARIABLE delfador_store}
 
        [redraw]
        [/redraw]
Index: wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
diff -u 
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.42 
wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.43
--- wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg:1.42   
Mon Jul 18 19:53:47 2005
+++ wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg        
Sun Sep 18 19:48:55 2005
@@ -517,19 +517,14 @@
                        y=18,17,16
                [/move_unit_fake]
 
-               [unit]
-               description=Delfador
-               user_description= _ "Delfador"
-               unrenamable=yes
-               type=Elder Mage
-               x=24
-               y=16
-               side=1
-               [modifications]
-                       {TRAIT_LOYAL}
-                       {TRAIT_INTELLIGENT}
-               [/modifications]
-               [/unit]
+               {VARIABLE delfador_store.x 24}
+               {VARIABLE delfador_store.y 16}
+
+               #show Delfador
+               [unstore_unit]
+               variable=delfador_store
+               [/unstore_unit]
+               {CLEAR_VARIABLE delfador_store}
                [unit]
                description=Kalenz
                user_description= _ "Kalenz"