mail[Wesnoth-commits] r20761 - /trunk/data/core/units/humans/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by mythological on September 28, 2007 - 15:30:
Author: mythological
Date: Fri Sep 28 15:29:51 2007
New Revision: 20761

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20761&view=rev
Log:
Changed the way L3 outlaws advance from [advancefrom] to advanceto in order 
to fix the bugs with double recruit option - bug #10063 and bug #9786. Also, 
reapplied the changes to the Fugitive Soliton committed in r20177 which were 
reverted for some unknown reason.

Modified:
    trunk/data/core/units/humans/Outlaw.cfg
    trunk/data/core/units/humans/Outlaw_Bandit.cfg
    trunk/data/core/units/humans/Outlaw_Fugitive.cfg
    trunk/data/core/units/humans/Outlaw_Highwayman.cfg
    trunk/data/core/units/humans/Outlaw_Huntsman.cfg
    trunk/data/core/units/humans/Outlaw_Ranger.cfg
    trunk/data/core/units/humans/Outlaw_Trapper.cfg

Modified: trunk/data/core/units/humans/Outlaw.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw.cfg (original)
+++ trunk/data/core/units/humans/Outlaw.cfg Fri Sep 28 15:29:51 2007
@@ -9,11 +9,16 @@
     hitpoints=42
     movement_type=elusivefoot
     movement=7
-    experience=100
     level=2
     alignment=chaotic
+#ifdef USE_L3_OUTLAWS
+    experience=77
+    advanceto=Fugitive
+#else
+    experience=100
     advanceto=null
     {AMLA_TOUGH 3}
+#endif
     cost=28
     usage=mixed fighter
     unit_description= _ "After some years of service, former 'footpads' rise 
up in the ranks of their fellow outlaws. Having proven themselves in combat, 
they are given more dangerous tasks, and a greater share of the spoils. 
Though many opponents would mock their choice of weaponry, the outlaws are 
well aware of its deadly capacity, and also of the ready availability of 
ammunition. Outlaws are somewhat ill at ease fighting during the day, 
preferring the cover of nightfall."

Modified: trunk/data/core/units/humans/Outlaw_Bandit.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Bandit.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Bandit.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Bandit.cfg Fri Sep 28 15:29:51 2007
@@ -9,11 +9,16 @@
     hitpoints=50
     movement_type=smallfoot
     movement=5
-    experience=100
     level=2
     alignment=chaotic
+#ifdef USE_L3_OUTLAWS    
+    experience=70
+    advanceto=Highwayman
+#else
+    experience=100
     advanceto=null
     {AMLA_TOUGH 3}
+#endif
     cost=23
     usage=fighter
     unit_description= _ "Bandits are a motley collection of men, most of 
dubious background. They are the strong arm of any organized group of 
criminals, and though they may lack in finesse, or intelligence, they excel 
at their preferred task of pummeling victims into submission. Like any sort 
of outlaw, they're not comfortable fighting in broad daylight, being used to 
working at night."

Modified: trunk/data/core/units/humans/Outlaw_Fugitive.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Fugitive.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Fugitive.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Fugitive.cfg Fri Sep 28 15:29:51 2007
@@ -14,24 +14,21 @@
     level=3
     alignment=chaotic
     advanceto=null
-#ifdef USE_L3_OUTLAWS
-    [advancefrom]
-        unit=Outlaw
-        experience=77
-    [/advancefrom]
-#endif
     {AMLA_TOUGH 3}
     cost=56
     usage=mixed fighter
     unit_description= _ "Veteran criminals become notorious among the 
authorities for both their battle prowess and ability to elude capture. 
Dangerous and ruthless, they can be fearful in their element but no real 
match for professional law enforcment forces."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/human-outlaws/fugitive-defend.png" 
"units/human-outlaws/fugitive.png" {SOUND_LIST:HUMAN_HIT} }
+    [abilities]
+        {ABILITY_CONCEALMENT}
+    [/abilities]
     [attack]
         name=mace
         description= _ "mace"
         type=impact
         range=melee
-        damage=12
+        damage=11
         number=2
         icon=attacks/mace.png
     [/attack]
@@ -40,7 +37,7 @@
         description= _ "sling"
         type=impact
         range=ranged
-        damage=8
+        damage=7
         number=4
         icon=attacks/sling.png
     [/attack]

Modified: trunk/data/core/units/humans/Outlaw_Highwayman.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Highwayman.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Highwayman.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Highwayman.cfg Fri Sep 28 15:29:51 
2007
@@ -14,12 +14,6 @@
     level=3
     alignment=chaotic
     advanceto=null
-#ifdef USE_L3_OUTLAWS
-    [advancefrom]
-        unit=Bandit
-        experience=70
-    [/advancefrom]
-#endif
     {AMLA_TOUGH 3}
     cost=46
     usage=fighter

Modified: trunk/data/core/units/humans/Outlaw_Huntsman.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Huntsman.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Huntsman.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Huntsman.cfg Fri Sep 28 15:29:51 2007
@@ -12,12 +12,6 @@
     level=3
     alignment=chaotic
     advanceto=null
-#ifdef USE_L3_OUTLAWS
-    [advancefrom]
-        unit=Trapper
-        experience=65
-    [/advancefrom]
-#endif
     {AMLA_TOUGH 3}
     undead_variation=archer
     cost=54

Modified: trunk/data/core/units/humans/Outlaw_Ranger.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Ranger.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Ranger.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Ranger.cfg Fri Sep 28 15:29:51 2007
@@ -1,7 +1,7 @@
 #textdomain wesnoth-units
 
 [unit]
-    id=Human Ranger
+    id=Outlaw Ranger
     name= _ "Outlaw Ranger"
     race=human
     image="units/human-outlaws/ranger.png"
@@ -12,12 +12,6 @@
     level=3
     alignment=chaotic
     advanceto=null
-#ifdef USE_L3_OUTLAWS
-    [advancefrom]
-        unit=Trapper
-        experience=65
-    [/advancefrom]
-#endif
     {AMLA_TOUGH 3}
     undead_variation=archer
     cost=60
@@ -25,18 +19,6 @@
     unit_description= _ "Rangers are wild men and masters of forest and 
hills. They are excellent trackers, scouts, and archers, moving freely 
through the countryside under the cover of night. Most rulers are afraid of 
rangers and would rather put them in the dungeon than put their abilities to 
use."
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/human-outlaws/ranger-defend1.png" 
"units/human-outlaws/ranger.png" {SOUND_LIST:HUMAN_HIT} }
-    #  [defend]
-    #          [frame]
-    #                  begin=-150
-    #                  end=0
-    #                  image="units/human-outlaws/ranger-defend1.png"
-    #          [/frame]
-    #          [frame]
-    #                  begin=0
-    #                  end=150
-    #                  image="units/human-outlaws/ranger-defend2.png"
-    #          [/frame]
-    #  [/defend]
     # Rangers are almost like human elves
     [defense]
         swamp_water=40

Modified: trunk/data/core/units/humans/Outlaw_Trapper.cfg
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/units/humans/Outlaw_Trapper.cfg?rev=20761&r1=20760&r2=20761&view=diff
==============================================================================
--- trunk/data/core/units/humans/Outlaw_Trapper.cfg (original)
+++ trunk/data/core/units/humans/Outlaw_Trapper.cfg Fri Sep 28 15:29:51 2007
@@ -9,11 +9,16 @@
     hitpoints=45
     movement_type=smallfoot
     movement=5
-    experience=100
     level=2
     alignment=chaotic
+#ifdef USE_L3_OUTLAWS
+    experience=65
+    advanceto=Huntsman, Outlaw Ranger
+#else
+    experience=100
     advanceto=null
     {AMLA_TOUGH 3}
+#endif
     undead_variation=archer
     cost=27
     usage=archer




Related Messages


Powered by MHonArc, Updated Fri Sep 28 16:41:07 2007