[Wesnoth-cvs-commits] wesnoth ./changelog src/unit_types.cpp data/gam...

[John McNabb]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     John McNabb <address@hidden>    05/04/24 02:06:12

Modified files:
        .              : changelog 
        src            : unit_types.cpp 
        data           : game.cfg multiplayer.cfg 
        data/units     : Dwarvish_Guardsman.cfg Dwarvish_Stalwart.cfg 
                         Dwarvish_Sentinel.cfg Orcish_Assassin.cfg 

Log message:
        balancing changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/changelog.diff?tr1=1.614&tr2=1.615&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/src/unit_types.cpp.diff?tr1=1.99&tr2=1.100&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/game.cfg.diff?tr1=1.152&tr2=1.153&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/multiplayer.cfg.diff?tr1=1.102&tr2=1.103&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Guardsman.cfg.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Stalwart.cfg.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Dwarvish_Sentinel.cfg.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/data/units/Orcish_Assassin.cfg.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: wesnoth/changelog
diff -u wesnoth/changelog:1.614 wesnoth/changelog:1.615
--- wesnoth/changelog:1.614     Sat Apr 23 17:11:40 2005
+++ wesnoth/changelog   Sun Apr 24 02:06:11 2005
@@ -21,6 +21,10 @@
  * terrain improvements:
    * new forest tiles
  * unit balancing:
+     * Dwarvish Guardsmen line removed as leaders in multiplayer       
+     * Dwarvish Guardsmen line only get 1 trait instead of 2   
+     * revert Drakes pierce resistance to 110%
+     * revert Orcish Assassin to 3-3 ranged attack     
      * reduced resistance of Ulfserker and Berserker
      * Elvish Rider: increase melee to 6-4, increase ranged to 7-3
      * Elvish Outrider: increase melee to 8-4, increase ranged to 7-4
@@ -47,6 +51,7 @@
    * added a ./configure --enable-dummy-locales option for Wesnoth to generate
      its own set of i18n locale files and use them instead of the potentially
      missing system files (highly experimental)
+ * added support for num_traits in individual unit_types overriding race 
num_traits
  * fixed the missing 'elder-mage-halo7.png' in the Elder Mage
  * fixed some OoS errors when chatting while a fight is taking place
  * fixed the spurious "statistics verification failed" messages
Index: wesnoth/data/game.cfg
diff -u wesnoth/data/game.cfg:1.152 wesnoth/data/game.cfg:1.153
--- wesnoth/data/game.cfg:1.152 Wed Apr 20 08:38:47 2005
+++ wesnoth/data/game.cfg       Sun Apr 24 02:06:12 2005
@@ -1618,7 +1618,7 @@
 
                [resistance]
                blade=90
-               pierce=120
+               pierce=110
                impact=80
                fire=50
                cold=150
@@ -1665,7 +1665,7 @@
 
                [resistance]
                blade=80
-               pierce=110
+               pierce=100
                impact=70
                fire=50
                cold=150
Index: wesnoth/data/multiplayer.cfg
diff -u wesnoth/data/multiplayer.cfg:1.102 wesnoth/data/multiplayer.cfg:1.103
--- wesnoth/data/multiplayer.cfg:1.102  Sat Apr  2 21:34:56 2005
+++ wesnoth/data/multiplayer.cfg        Sun Apr 24 02:06:12 2005
@@ -81,7 +81,7 @@
        id=Knalgan Alliance
        name={MENU_IMG_TXT "dwarf-warrior.png" (_"Knalgan Alliance")}
        type=Dwarvish Steelclad
-       leader=Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish 
Thunderguard,Rogue,Trapper,Bandit
+       leader=Dwarvish Steelclad,Dwarvish Thunderguard,Rogue,Trapper,Bandit
        recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish 
Thunderer,Thief,Poacher,Footpad,Thug,Gryphon Rider
        music="wesnoth-7.ogg"
        terrain_liked=hHm
@@ -170,7 +170,7 @@
        id=Dwarves
        name={MENU_IMG_TXT "dwarf-warrior.png" _"Dwarves"}
        type=Dwarvish Steelclad
-       leader=Dwarvish Steelclad,Dwarvish Stalwart,Dwarvish Thunderguard
+       leader=Dwarvish Steelclad,Dwarvish Thunderguard
        recruit=Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish Thunderer,Dwarvish 
Guardsman
        music="wesnoth-7.ogg"
        terrain_liked=hHm
@@ -272,7 +272,7 @@
        id=Knalgan Alliance
        name={MENU_IMG_TXT "dwarf-lord.png" (_"Knalgan Alliance")}
        type=Dwarvish Lord
-       leader=Dwarvish Lord,Dwarvish Sentinel,Dwarvish 
Dragonguard,Assassin,Trapper,Bandit
+       leader=Dwarvish Lord,Dwarvish Dragonguard,Assassin,Trapper,Bandit
        recruit=Dwarvish Guardsman,Dwarvish Stalwart,Dwarvish Fighter,Dwarvish 
Steelclad,Dwarvish Ulfserker,Dwarvish Berserker,Dwarvish Thunderer,Dwarvish 
Thunderguard,Thief,Rogue,Poacher,Trapper,Footpad,Outlaw,Thug,Bandit,Gryphon 
Rider,Gryphon Master
        music="wesnoth-7.ogg"
        terrain_liked=hHm
Index: wesnoth/data/units/Dwarvish_Guardsman.cfg
diff -u wesnoth/data/units/Dwarvish_Guardsman.cfg:1.12 
wesnoth/data/units/Dwarvish_Guardsman.cfg:1.13
--- wesnoth/data/units/Dwarvish_Guardsman.cfg:1.12      Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Dwarvish_Guardsman.cfg   Sun Apr 24 02:06:12 2005
@@ -11,6 +11,7 @@
     hills=50
     [/defense]
 movement=4
+num_traits=1
 experience=42
 ability=steadfast
 level=1
Index: wesnoth/data/units/Dwarvish_Sentinel.cfg
diff -u wesnoth/data/units/Dwarvish_Sentinel.cfg:1.4 
wesnoth/data/units/Dwarvish_Sentinel.cfg:1.5
--- wesnoth/data/units/Dwarvish_Sentinel.cfg:1.4        Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Dwarvish_Sentinel.cfg    Sun Apr 24 02:06:12 2005
@@ -13,6 +13,7 @@
     hills=50
     [/defense]
 movement=4
+num_traits=1
 experience=500
 ability=steadfast
 level=3
Index: wesnoth/data/units/Dwarvish_Stalwart.cfg
diff -u wesnoth/data/units/Dwarvish_Stalwart.cfg:1.10 
wesnoth/data/units/Dwarvish_Stalwart.cfg:1.11
--- wesnoth/data/units/Dwarvish_Stalwart.cfg:1.10       Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Dwarvish_Stalwart.cfg    Sun Apr 24 02:06:12 2005
@@ -13,6 +13,7 @@
     hills=50
     [/defense]
 movement=4
+num_traits=1
 experience=65
 ability=steadfast
 level=2
Index: wesnoth/data/units/Orcish_Assassin.cfg
diff -u wesnoth/data/units/Orcish_Assassin.cfg:1.18 
wesnoth/data/units/Orcish_Assassin.cfg:1.19
--- wesnoth/data/units/Orcish_Assassin.cfg:1.18 Sun Mar 27 23:06:16 2005
+++ wesnoth/data/units/Orcish_Assassin.cfg      Sun Apr 24 02:06:12 2005
@@ -36,8 +36,8 @@
        name=darts
        type=blade
        range=long
-       damage=4
-       number=2
+       damage=3
+       number=3
        special=poison
                [frame]
                begin=-150
Index: wesnoth/src/unit_types.cpp
diff -u wesnoth/src/unit_types.cpp:1.99 wesnoth/src/unit_types.cpp:1.100
--- wesnoth/src/unit_types.cpp:1.99     Sat Apr 23 21:55:38 2005
+++ wesnoth/src/unit_types.cpp  Sun Apr 24 02:06:12 2005
@@ -1,4 +1,4 @@
-/* $Id: unit_types.cpp,v 1.99 2005/04/23 21:55:38 silene Exp $ */
+/* $Id: unit_types.cpp,v 1.100 2005/04/24 02:06:12 darthfool Exp $ */
 /*
    Copyright (C) 2003 by David White <address@hidden>
    Part of the Battle for Wesnoth Project http://wesnoth.whitevine.net
@@ -693,7 +693,9 @@
        }
 }
 
-int unit_type::num_traits() const { return race_->num_traits(); }
+int unit_type::num_traits() const { 
+  return (cfg_["num_traits"].size() ? atoi(cfg_["num_traits"].c_str()) : 
race_->num_traits());
+}
 
 std::string unit_type::generate_description() const
 {