Author: esr
Date: Tue Nov 18 00:45:44 2008
New Revision: 30806
URL: http://svn.gna.org/viewcvs/wesnoth?rev=30806&view=rev
Log:
Address bug #11745 and bug #12260 by removing the Charisma and Camouflage
special AMLAs.
Modified:
trunk/data/campaigns/Under_the_Burning_Suns/TODO
trunk/data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg
trunk/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg
Modified: trunk/data/campaigns/Under_the_Burning_Suns/TODO
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/TODO?rev=30806&r1=30805&r2=30806&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/TODO (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/TODO Tue Nov 18 00:45:44 2008
@@ -1,18 +1,6 @@
Main issues with UtBS were identified by fabi in
https://mail.gna.org/public/wesnoth-dev/2008-11/msg00007.html
I have attached to each one a proposed disposition.
-
-- A bug in the ALMA of the main character causes all the players units
- to have no upkeep (bug report: https://gna.org/bugs/index.php?12260)
-
- Disposition: Remove the custom AMLAs for Kaleh. These were a hack
- by rhuvaen, not part of the original UtBS. They push the WML engine
- bryond its limits, notably in bad interactions with the help system.
-
-- In scenario 4 the game slows down more and more with every new
- turn. (bug report: https://gna.org/bugs/index.php?11745)
-
- Disposition: Solved by removing the camouflage AMLA.
- In scenario 2 units take damage from dehydration during daytime,
strange behaviour of this have been reported.
Modified: trunk/data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg?rev=30806&r1=30805&r2=30806&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg (original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/units/Kaleh.cfg Tue Nov 18
00:45:44 2008
@@ -155,14 +155,10 @@
{CHANGE_AMLA Hero 4 1 4}
# bola
{CHANGE_AMLA Hero 7 1 0}
- # camouflage
- {CHANGE_AMLA Hero 8 1 2}
# sustenance
{CHANGE_AMLA Hero 8 1 5}
# armor-clad
{CHANGE_AMLA Hero 8 1 6}
- # charisma
- {CHANGE_AMLA Hero 3 1 8}
# stun
{CHANGE_AMLA Hero 5 1 5}
[/variation]
@@ -187,14 +183,10 @@
{CHANGE_AMLA Captain2 5 0 8}
# bola
{CHANGE_AMLA Captain2 6 0 0}
- # camouflage
- {CHANGE_AMLA Captain2 8 0 4}
# sustenance
{ENABLE_AMLA "bow,bolas" Captain2 8 0 8}
# armor-clad
{ENABLE_AMLA "sword" Captain2 8 0 10}
- # charisma
- {CHANGE_AMLA Captain2 3 0 12}
# stun
{ENABLE_AMLA "sword,sword" Captain2 5 0 8}
[/variation]
@@ -218,14 +210,10 @@
{CHANGE_AMLA Marshal 5 1 8}
# bola
{ENABLE_AMLA "not available" Marshal 6 1 0}
- # camouflage
- {CHANGE_AMLA Marshal 8 1 2}
# sustenance
{ENABLE_AMLA "bolas" Marshal 8 1 12}
# armor-clad
{ENABLE_AMLA "" Marshal 8 1 12}
- # charisma
- {ENABLE_AMLA "" Marshal 3 1 16}
# stun - already enabled
{ENABLE_AMLA "sword" Marshal 5 1 8}
[/variation]
@@ -250,14 +238,10 @@
{CHANGE_AMLA Hero2 5 0 8}
# bola
{CHANGE_AMLA Hero2 8 0 0}
- # camouflage
- {CHANGE_AMLA Hero2 9 0 4}
# sustenance
{ENABLE_AMLA "bolas" Hero2 9 0 8}
# armor-clad
{ENABLE_AMLA "sword,sword" Hero2 9 0 10}
- # charisma
- {CHANGE_AMLA Hero2 5 0 14}
# stun
{ENABLE_AMLA "sword" Hero2 6 0 8}
[/variation]
@@ -281,14 +265,10 @@
{CHANGE_AMLA Champion 5 1 8}
# bola
{ENABLE_AMLA "not available" Champion 8 1 0}
- # camouflage
- {CHANGE_AMLA Champion 9 1 2}
# sustenance
{ENABLE_AMLA "" Champion 9 1 12}
# armor-clad
{ENABLE_AMLA "" Champion 9 1 12}
- # charisma
- {CHANGE_AMLA Champion 5 1 16}
# stun - already enabled
{ENABLE_AMLA "sword" Champion 6 1 8}
[/variation]
@@ -313,14 +293,10 @@
{CHANGE_AMLA Champion 2 0 50}
# bola
{ENABLE_AMLA "not available" Champion 4 0 50}
- # camouflage
- {CHANGE_AMLA Champion 4 0 50}
# sustenance
{ENABLE_AMLA "" Champion 4 0 50}
# armor-clad
{ENABLE_AMLA "sword" Champion 4 0 50}
- # charisma
- {CHANGE_AMLA Champion 2 0 50}
# stun - already enabled
{ENABLE_AMLA "sword" Champion 2 0 50}
[/variation]
@@ -344,14 +320,10 @@
{CHANGE_AMLA Marshal 1 0 28}
# bola
{ENABLE_AMLA "not available" Marshal 4 0 50}
- # camouflage
- {CHANGE_AMLA Marshal 4 0 24}
# sustenance
{ENABLE_AMLA "" Marshal 3 0 30}
# armor-clad
{ENABLE_AMLA "" Marshal 3 0 34}
- # charisma
- {CHANGE_AMLA Marshal 3 0 36}
# stun - already enabled
{ENABLE_AMLA "sword" Marshal 2 0 30}
[/variation]
@@ -413,32 +385,7 @@
icon=attacks/bolas.png
)}
-# VIII - CAMOUFLAGE
-{KALEH_ADVANCEMENT 1 camouflage (_ "skilled at hiding in the desert")
units/elves-desert/kaleh-defend.png "" 7 5 (apply_to=new_ability
-[abilities]
- [hides]
- id=camouflage
- name= _ "camouflage"
- name_inactive= _ "camouflage"
- description= _ "Camouflage:
-This unit can hide in desert dunes and desert mountains and craters, and
remain undetected by its enemies.
-
-Enemy units cannot see this unit while it is in desert dunes, desert mountains
and craters, except if they have units next to it. Any enemy unit that first
discovers this unit immediately loses all its remaining movement."
- description_inactive= _ "Camouflage:
-This unit can hide in desert dunes and desert mountains and craters, and
remain undetected by its enemies.
-
-Enemy units cannot see this unit while it is in desert dunes and desert
mountains and craters, except if they have units next to it. Any enemy unit
that first discovers this unit immediately loses all its remaining movement."
- affect_self=yes
- [filter_self]
- [filter_location]
- terrain=Hd,Md,Dd^Dc
- [/filter_location]
- [/filter_self]
- [/hides]
-[/abilities]
-)}
-
-# IX - SUSTENANCE
+# VII - SUSTENANCE
{KALEH_ADVANCEMENT 1 sustenance (_ "gain +20% resistance under the sun")
attacks/sand-storm.png "bow,bolas" 3 5 (apply_to=new_ability
[abilities]
[resistance]
@@ -462,7 +409,7 @@
[/abilities]
)}
-# X - ARMOR-CLAD
+# VIII - ARMOR-CLAD
{KALEH_ADVANCEMENT 1 armor (_ "gain +10% resistance to blade, pierce and
impact") attacks/heater-shield.png "non_existant" 3 5 (apply_to=new_ability
[abilities]
[resistance]
@@ -483,25 +430,7 @@
[/abilities]
)}
-# XI - CHARISMA
-{KALEH_ADVANCEMENT 1 charisma (_ "a charismatic leader - all adjacent units
pay no upkeep") attacks/glowing-fist.png "non_existant" 3 5
(apply_to=new_ability
-[abilities]
- [resistance]
- id=charisma
- max_value=-60
- apply_to=none
- [filter_base_value]
- greater_than=100
- [/filter_base_value]
- name= _ "charisma"
- description= _ "Charisma:
-Adjacent units will be treated loyal and not pay upkeep."
- affect_self=yes
- [/resistance]
-[/abilities]
-)}
-
-# XII - STUN
+# IX - STUN
{KALEH_ADVANCEMENT 1 stun (_ "gain a stunning attack that disrupts enemy ZOC")
attacks/scimitar.png "non_existant" 3 5 (apply_to=new_attack
name=sword_rush
description= _ "sword"
Modified: trunk/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg?rev=30806&r1=30805&r2=30806&view=diff
==============================================================================
--- trunk/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg
(original)
+++ trunk/data/campaigns/Under_the_Burning_Suns/utils/kaleh-abilities.cfg Tue
Nov 18 00:45:44 2008
@@ -1,57 +1,5 @@
#textdomain wesnoth-utbs
# add the events for Kaleh abilities
-[event]
- # charisma ability
- name=moveto
- first_time_only=no
- [filter]
- side=1
- [filter_adjacent]
- [/filter_adjacent]
- [or]
- side=1
- [/or]
- [or]
- side=1
- [filter_wml]
- morale="loyalized"
- [/filter_wml]
- [/or]
- [/filter]
- [store_unit]
- variable=player_unit
- kill=no
- [filter]
- side=1
- [/filter]
- [/store_unit]
- {FOREACH player_unit i}
- {VARIABLE player_unit[$i].upkeep "full"}
- {VARIABLE player_unit[$i].morale ""}
- [unstore_unit]
- variable=player_unit[$i]
- [/unstore_unit]
- {NEXT i}
- [store_unit]
- variable=player_unit
- kill=no
- [filter]
- side=1
- canrecruit=no
- [filter_adjacent]
- [/filter_adjacent]
- [/filter]
- [/store_unit]
- {FOREACH player_unit i}
- {VARIABLE player_unit[$i].upkeep "loyal"}
- {VARIABLE player_unit[$i].morale "loyalized"}
- [unstore_unit]
- variable=player_unit[$i]
- [/unstore_unit]
- {NEXT i}
- [allow_undo]
- [/allow_undo]
-[/event]
# the stun attack
[event]
@@ -120,6 +68,7 @@
[/object]
{NEXT i}
[/event]
+
# upgrade leadership event
[event]
name=post_advance
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
