[[Balancing changes]]

* increased the HP of the White Mage from 32 to 35
* decreased the ranged attack of the White Mage from 7-4 to 9-3
* increased the melee attack of the White Mage from 6-1 to 6-2
* increased the HP of the Mage of Light from 42 to 47
* changed the ranged attack of the Mage of Light from 9-4 to 12-3
* decreased the melee attack of the Royal Guard from 12-4 to 11-4
* decreased the melee attack of the Merman Warrior from 8-4 to 10-3
* decreased the pierce melee attack of the Merman Triton from 11-4 to 14-3
* decreased the blade melee attack of the Merman Triton from 11-4 to 19-2
* decreased the melee attack of the Naga Myrmidon from 8-6 to 9-5
* increased the melee attack of the Lich from 5-3 to 8-3
* increased the melee attack of the Ancient Lich from 6-4 to 8-4
* increased the defence of the Bat line on all terrains from 50% to 60%

changelog

@@ -11,6 +11,21 @@ Version 1.3.11+svn:
      Amohsad Caldera, Hexcake, Waterloo Sunset, 8p Morituri, Merkwuerdigliebe
  * sound:
    * added new music track, "Vengeful Pursuit" by Jeremy Nicoll.
+ * units:
+   * balancing changes:
+     * increased the HP of the White Mage from 32 to 35
+     * decreased the ranged attack of the White Mage from 7-4 to 9-3
+     * increased the melee attack of the White Mage from 6-1 to 6-2
+     * increased the HP of the Mage of Light from 42 to 47
+     * changed the ranged attack of the Mage of Light from 9-4 to 12-3
+     * decreased the melee attack of the Royal Guard from 12-4 to 11-4
+     * decreased the melee attack of the Merman Warrior from 8-4 to 10-3
+     * decreased the pierce melee attack of the Merman Triton from 11-4 to 14-3
+     * decreased the blade melee attack of the Merman Triton from 11-4 to 19-2
+     * decreased the melee attack of the Naga Myrmidon from 8-6 to 9-5
+     * increased the melee attack of the Lich from 5-3 to 8-3
+     * increased the melee attack of the Ancient Lich from 6-4 to 8-4
+     * increased the defence of the Bat line on all terrains from 50% to 60%
  * user interface:
    * changed the default setting for the turn bell to on
    * removed the turn_cmd preference option

data/core/units.cfg

@@ -652,6 +652,55 @@
         [/resistance]
     [/movetype]
 
+    [movetype]
+        name=smallfly
+        flies=true
+        [movement_costs]
+            deep_water=1
+            shallow_water=1
+            swamp_water=1
+            grassland=1
+            sand=1
+            forest=1
+            hills=1
+            mountains=1
+            village=1
+            castle=1
+            cave=1
+            tundra=1
+            canyon=1
+            cavewall=99
+            fungus=1
+        [/movement_costs]
+
+        [defense]
+            deep_water=40
+            shallow_water=40
+            swamp_water=40
+            grassland=40
+            sand=40
+            forest=40
+            hills=40
+            mountains=40
+            village=40
+            castle=40
+            cave=40
+            tundra=40
+            canyon=40
+            cavewall=40
+            fungus=40
+        [/defense]
+
+        [resistance]
+            blade=100
+            pierce=100
+            impact=120
+            fire=100
+            cold=100
+            arcane=80
+        [/resistance]
+    [/movetype]
+
     [movetype]
         name=deepsea
         [movement_costs]

data/core/units/bats/Bat_Blood.cfg

@@ -6,7 +6,7 @@
     image="units/undead/bloodbat.png"
     ellipse="misc/ellipse"
     hitpoints=27
-    movement_type=fly
+    movement_type=smallfly
     movement=9
     experience=100
     level=1
@@ -21,14 +21,6 @@
 Special Notes:"+{SPECIAL_NOTES_DRAIN}
     {DEFENSE_ANIM "units/undead/bloodbat-defend.png" "units/undead/bloodbat.png" {SOUND_LIST:BAT_HIT} }
     die_sound=bat-flapping.wav
-    [movement_costs]
-        cave=1
-        fungus=1
-    [/movement_costs]
-    [defense]
-        cave=50
-        fungus=50
-    [/defense]
     [resistance]
         cold=70
     [/resistance]

data/core/units/bats/Bat_Vampire.cfg

@@ -6,7 +6,7 @@
     image="units/undead/bat.png"
     ellipse="misc/ellipse-nozoc"
     hitpoints=17
-    movement_type=fly
+    movement_type=smallfly
     movement=8
     experience=14
     level=0
@@ -20,14 +20,6 @@
 Special Notes:"+{SPECIAL_NOTES_DRAIN}
     {DEFENSE_ANIM "units/undead/bat-defend.png" "units/undead/bat.png" {SOUND_LIST:BAT_HIT} }
     die_sound=bat-flapping.wav
-    [movement_costs]
-        cave=1
-        fungus=1
-    [/movement_costs]
-    [defense]
-        cave=50
-        fungus=50
-    [/defense]
     [resistance]
         cold=70
     [/resistance]

data/core/units/humans/Loyalist_Royal_Guard.cfg

@@ -29,7 +29,7 @@
         icon=attacks/greatsword-human.png
         type=blade
         range=melee
-        damage=12
+        damage=11
         number=4
     [/attack]
     [attack_anim]

data/core/units/humans/Mage_White.cfg

@@ -6,7 +6,7 @@
     gender=male,female
     image="units/human-magi/white-mage.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
-    hitpoints=32
+    hitpoints=35
     movement_type=smallfoot
     movement=5
     experience=150
@@ -121,7 +121,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CU
         type=impact
         range=melee
         damage=6
-        number=1
+        number=2
     [/attack]
     [attack]
         name=lightbeam
@@ -131,8 +131,8 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CU
         [specials]
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-        damage=7
+        damage=9
-        number=4
+        number=3
     [/attack]
     [attack_anim]
         [attack_filter]

data/core/units/humans/Mage_of_Light.cfg

@@ -7,7 +7,7 @@
     image="units/human-magi/white-cleric.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     halo=halo/illuminates-aura.png
-    hitpoints=42
+    hitpoints=47
     movement_type=smallfoot
     movement=5
     experience=100
@@ -112,8 +112,8 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_ARCANE}+{SPECIAL_NOTES_CU
         [specials]
             {WEAPON_SPECIAL_MAGICAL}
         [/specials]
-        damage=9
+        damage=15
-        number=4
+        number=3
     [/attack]
     [attack_anim]
         [attack_filter]

data/core/units/merfolk/Triton.cfg

@@ -24,16 +24,16 @@
         description=_"trident"
         type=pierce
         range=melee
-        damage=11
+        damage=14
-        number=4
+        number=3
     [/attack]
     [attack]
         name=trident
         description=_"trident"
         type=blade
         range=melee
-        damage=11
+        damage=19
-        number=4
+        number=2
     [/attack]
     [attack_anim]
         [attack_filter]

data/core/units/nagas/Myrmidon.cfg

@@ -30,8 +30,8 @@
         icon=attacks/sword-orcish.png
         type=blade
         range=melee
-        damage=8
+        damage=9
-        number=6
+        number=5
     [/attack]
     [attack_anim]
         [attack_filter]

data/core/units/undead/Necro_Ancient_Lich.cfg

@@ -38,7 +38,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_DRAIN}
         icon=attacks/touch-undead.png
         type=arcane
         range=melee
-        damage=6
+        damage=8
         number=4
         [specials]
             {WEAPON_SPECIAL_DRAIN}

data/core/units/undead/Necro_Lich.cfg

@@ -37,7 +37,7 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}+{SPECIAL_NOTES_DRAIN}
         icon=attacks/touch-undead.png
         type=arcane
         range=melee
-        damage=5
+        damage=8
         number=3
         [specials]
             {WEAPON_SPECIAL_DRAIN}

players_changelog

@@ -15,6 +15,21 @@ Version 1.3.11+svn:
       Daggers, Siege Castles, The Wilderlands, Xanthe Chaos, Forest of Fear,
       Amohsad Caldera, Hexcake, Waterloo Sunset, 8p Morituri, Merkwuerdigliebe.
 
+  * Unit changes and balancing
+    * Increased the HP of the White Mage from 32 to 35.
+    * Decreased the ranged attack of the White Mage from 7-4 to 9-3.
+    * Increased the melee attack of the White Mage from 6-1 to 6-2.
+    * Increased the HP of the Mage of Light from 42 to 47.
+    * Changed the ranged attack of the Mage of Light from 9-4 to 12-3.
+    * Decreased the melee attack of the Royal Guard from 12-4 to 11-4.
+    * Decreased the melee attack of the Merman Warrior from 8-4 to 10-3.
+    * Decreased the pierce melee attack of the Merman Triton from 11-4 to 14-3.
+    * Decreased the blade melee attack of the Merman Triton from 11-4 to 19-2.
+    * Decreased the melee attack of the Naga Myrmidon from 8-6 to 9-5.
+    * Increased the melee attack of the Lich from 5-3 to 8-3.
+    * Increased the melee attack of the Ancient Lich from 6-4 to 8-4.
+    * Increased the defence of the Bat line on all terrains from 50% to 60%.
+
   * User interface
     * Changed the default setting for the turn bell to on.
 

src/server/server.cpp

@@ -1199,8 +1199,8 @@ void server::process_data_game(const network::connection sock, const config& dat
 		return;
 	} else if (data.child("turn")) {
 		// Make a modifiable copy.
-		config data = data;
+		config mdata = data;
-		config* const turn = data.child("turn");
+		config* const turn = mdata.child("turn");
 		g->filter_commands(sock, *turn);
 
 		// Notify the game of the commands, and if it changes
@@ -1249,9 +1249,9 @@ void server::process_data_game(const network::connection sock, const config& dat
 		// just forward them on to the client that should receive them.
 		if (nprivate > 0 && npublic == 0 && nother == 0) {
 			if (team_name == game_config::observer_team_name) {
-				g->send_data_observers(data, sock);
+				g->send_data_observers(mdata, sock);
 			} else {
-				g->send_data_team(data, team_name, sock);
+				g->send_data_team(mdata, team_name, sock);
 			}
 			return;
 		}
@@ -1260,10 +1260,10 @@ void server::process_data_game(const network::connection sock, const config& dat
 		// then let them go through. It's exceedingly unlikely that
 		// this will happen anyway, and if it does, the client should
 		// respect not displaying the message.
-		g->send_data(data, sock);
+		g->send_data(mdata, sock);
 
 		if (g->started()) {
-			g->record_data(data);
+			g->record_data(mdata);
 		}
 		return;
 	}