From 5c1d43991af1356df48c3c44fedd2c718c80ab90 Mon Sep 17 00:00:00 2001
From: totles <totles@z4lab.com>
Date: Tue, 26 Nov 2019 15:49:10 +0100
Subject: [PATCH] balance/feature update, 1.2.2

added back broken a17 changes and updated some values
---
 7d2d-z4lab-modlet/Config/XUi/styles.xml   |  2 +-
 7d2d-z4lab-modlet/Config/entitygroups.xml |  4 ++++
 7d2d-z4lab-modlet/Config/gamestages.xml   |  2 +-
 7d2d-z4lab-modlet/Config/items.xml        | 20 ++++++++++----------
 7d2d-z4lab-modlet/Config/materials.xml    |  5 +++++
 7d2d-z4lab-modlet/Config/progression.xml  |  3 +++
 7d2d-z4lab-modlet/Config/recipes.xml      |  3 +++
 7d2d-z4lab-modlet/Config/traders.xml      |  4 ++--
 7d2d-z4lab-modlet/ModInfo.xml             |  2 +-
 currently-not-used.xml                    | 23 -----------------------
 serverconfig.xml                          |  8 ++++----
 11 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/7d2d-z4lab-modlet/Config/XUi/styles.xml b/7d2d-z4lab-modlet/Config/XUi/styles.xml
index cd20ac7..7b5822d 100644
--- a/7d2d-z4lab-modlet/Config/XUi/styles.xml
+++ b/7d2d-z4lab-modlet/Config/XUi/styles.xml
@@ -1,4 +1,4 @@
 <configs>
 	<!-- toolbelt color active item -->
-	<set xpath="/styles/style[@name='itemStack']/style_entry[@name='holding_color']/@value"> 180,142,173 </set>
+	<set xpath="/styles/style[@name='itemStack']/style_entry[@name='holding_color']/@value"> 208,135,112 </set>
 </configs>
\ No newline at end of file
diff --git a/7d2d-z4lab-modlet/Config/entitygroups.xml b/7d2d-z4lab-modlet/Config/entitygroups.xml
index 2452261..7e788f0 100644
--- a/7d2d-z4lab-modlet/Config/entitygroups.xml
+++ b/7d2d-z4lab-modlet/Config/entitygroups.xml
@@ -2,4 +2,8 @@
 	<!-- replaces vultures with soliders, due to server performance, still a problem in A18 -->
 	<set xpath="/entitygroups/entitygroup[contains(@name, '')]/entity[@name='animalZombieVulture']/@name">zombieSoldier</set>
 	<set xpath="/entitygroups/entitygroup[contains(@name, '')]/entity[@name='animalZombieVultureRadiated']/@name">zombieSoldier</set>
+
+	<!-- also reduce spawn rate of them -->
+	<set xpath="/entitygroups/entitygroup/entity[@name='animalZombieVulture']/@prob">0.1</set>
+	<set xpath="/entitygroups/entitygroup/entity[@name='animalZombieVultureRadiated']/@prob">0.1</set>
 </configs>
\ No newline at end of file
diff --git a/7d2d-z4lab-modlet/Config/gamestages.xml b/7d2d-z4lab-modlet/Config/gamestages.xml
index e3943b4..7ea4578 100644
--- a/7d2d-z4lab-modlet/Config/gamestages.xml
+++ b/7d2d-z4lab-modlet/Config/gamestages.xml
@@ -8,7 +8,7 @@
 	<set xpath="gamestages/config/@survivalistGameDifficultyBonus">2.5</set>
 	<set xpath="gamestages/config/@insaneGameDifficultyBonus">3</set>
 
-	<!-- <set xpath="gamestages/config/@startingWeight">1</set> -->
+	<set xpath="gamestages/config/@startingWeight">2</set>
 	<set xpath="gamestages/config/@diminishingReturns">0.1</set>
 
 	<!-- spawn additional zombies if horde night is finished too soon -->
diff --git a/7d2d-z4lab-modlet/Config/items.xml b/7d2d-z4lab-modlet/Config/items.xml
index 5ae498f..e310fc6 100644
--- a/7d2d-z4lab-modlet/Config/items.xml
+++ b/7d2d-z4lab-modlet/Config/items.xml
@@ -188,16 +188,16 @@
 	<!-- stack size changes -->
 	<set xpath="/items/item/property[@name='Stacknumber' and @value='20000']/@value">24000</set>
 	<set xpath="/items/item/property[@name='Stacknumber' and @value='6000']/@value">12000</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='1200']/@value">2400</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='1000']/@value">2400</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='500']/@value">1500</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='250']/@value">500</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='128']/@value">250</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='100']/@value">200</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='40']/@value">100</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='15']/@value">100</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='10']/@value">50</set>
-	<set xpath="/items/item/property[@name='Stacknumber' and @value='5']/@value">50</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='1200']/@value">2500</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='1000']/@value">2500</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='500']/@value">2500</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='250']/@value">750</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='128']/@value">500</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='100']/@value">500</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='40']/@value">200</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='15']/@value">150</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='10']/@value">150</set>
+	<set xpath="/items/item/property[@name='Stacknumber' and @value='5']/@value">100</set>
 	<!-- Water from faucet -->
 	<append xpath="/items/item[@name='drinkJarEmpty']/property[@class='Action1']">
 		<property name="Focused_blockname_6" value="Faucet Small"/>
diff --git a/7d2d-z4lab-modlet/Config/materials.xml b/7d2d-z4lab-modlet/Config/materials.xml
index 2dfc82c..3037fd7 100644
--- a/7d2d-z4lab-modlet/Config/materials.xml
+++ b/7d2d-z4lab-modlet/Config/materials.xml
@@ -2,4 +2,9 @@
 	<!-- change stability of gravel/sand/dirt -->
 	<set xpath="/materials/material[@id='Mgravel']/property[@name='stability_glue']/@value">30</set>
 	<set xpath="/materials/material[@id='Msand']/property[@name='stability_glue']/@value">30</set>
+
+	<!-- More XP for mining and resources, default values are now higher than this -->
+	<set xpath="/materials/material[@id='MresourceWood']/property[@name='Experience']/@value">1.21</set>
+	<set xpath="/materials/material[@id='Mstone']/property[@name='Experience']/@value">1.21</set>
+	<set xpath="/materials/material[@id='MresourceClayLump']/property[@name='Experience']/@value">.95</set>
 </configs>
diff --git a/7d2d-z4lab-modlet/Config/progression.xml b/7d2d-z4lab-modlet/Config/progression.xml
index 57399e6..ab20245 100644
--- a/7d2d-z4lab-modlet/Config/progression.xml
+++ b/7d2d-z4lab-modlet/Config/progression.xml
@@ -1,4 +1,7 @@
 <configs>
+<!-- reduced points scaling for level requirements, default 1.14 -->
+<set xpath="/progression/attributes/@cost_multiplier_per_level">1.1</set>
+
 <!-- removed perks -->
 	<remove xpath="/progression/perks/perk[@name='perkPackMule']" />
 	<remove xpath="/progression/perks/perk[@name='perkParkour']" />
diff --git a/7d2d-z4lab-modlet/Config/recipes.xml b/7d2d-z4lab-modlet/Config/recipes.xml
index 86129e7..aaaeda6 100644
--- a/7d2d-z4lab-modlet/Config/recipes.xml
+++ b/7d2d-z4lab-modlet/Config/recipes.xml
@@ -1,4 +1,7 @@
 <configs>
+	<!-- change required meat for cooking -->
+	<set xpath="/recipes/recipe/ingredient[@name='foodRawMeat' and @count='5']/@count">4</set>
+	
 	<append xpath="/recipes" >
 		<!-- Spikes -->
 		<recipe name="woodLogSpike1" count="1">
diff --git a/7d2d-z4lab-modlet/Config/traders.xml b/7d2d-z4lab-modlet/Config/traders.xml
index 51de652..fe86820 100644
--- a/7d2d-z4lab-modlet/Config/traders.xml
+++ b/7d2d-z4lab-modlet/Config/traders.xml
@@ -2,6 +2,6 @@
 	<!-- xml fix for broken quality stuff -->
 	<set xpath="/traders/@quality_mod">1,6</set>
 	<!-- Trade pricing harder (default value "2" and "0.2") -->
-	<set xpath="/traders/@buy_markup">2.4</set> 
-	<set xpath="/traders/@sell_markdown">0.4</set>
+	<set xpath="/traders/@buy_markup">2.5</set> 
+	<set xpath="/traders/@sell_markdown">0.5</set>
 </configs>
\ No newline at end of file
diff --git a/7d2d-z4lab-modlet/ModInfo.xml b/7d2d-z4lab-modlet/ModInfo.xml
index 8718c29..8260bbb 100644
--- a/7d2d-z4lab-modlet/ModInfo.xml
+++ b/7d2d-z4lab-modlet/ModInfo.xml
@@ -4,6 +4,6 @@
         <Name value="7d2d-z4lab-modlet" />
         <Description value="Rebalancing modlet for z4lab's 7d2d server" />
         <Author value="totles" />
-        <Version value="1.2.1" />
+        <Version value="1.2.2" />
     </ModInfo>
 </xml>
diff --git a/currently-not-used.xml b/currently-not-used.xml
index fd18607..cd94091 100644
--- a/currently-not-used.xml
+++ b/currently-not-used.xml
@@ -122,29 +122,6 @@
 	<set xpath="/entity_classes/entity_class[@name='animalZombieDog']/drop[@name='foodRottingFlesh'][@tag='butcherHarvest']/@count">8</set>
 </entityclasses>
 
-<entitygroups>
-	<!-- reduce vultre spawn rate -->
-	<set xpath="/entitygroups/entitygroup/entity[@name='animalZombieVulture']/@prob">0.1</set>
-	<set xpath="/entitygroups/entitygroup/entity[@name='animalZombieVultureRadiated']/@prob">0.1</set>
-</entitygroups>
-
-<recipes>
-	<!-- change required meat for cooking -->
-	<set xpath="/recipes/recipe/ingredient[@name='foodRawMeat' and @count='5']/@count">4</set>
-	<set xpath="/recipes/recipe/ingredient[@name='foodRawMeat' and @count='10']/@count">8</set>	
-</recipes>
-
-<progression>
-	<!-- reduced points scaling for level requirements -->
-	<set xpath="/progression/attributes/@cost_multiplier_per_level">1.05</set>
-</progression>
-
-<materials>
-	<!-- More XP for mining and resources, default values are now higher than this -->
-	<set xpath="/materials/material[@id='MresourceWood']/property[@name='Experience']/@value">1.21</set>
-	<set xpath="/materials/material[@id='Mstone']/property[@name='Experience']/@value">1.21</set>
-	<set xpath="/materials/material[@id='MresourceClayLump']/property[@name='Experience']/@value">.95</set>
-</materials>
 
 <blocks>
 	<set xpath="/blocks/block[@name='bodyBagBlack']/drop[@event='Harvest' and @name='resourceFemur']/@prob">0.6</set>
diff --git a/serverconfig.xml b/serverconfig.xml
index 2b495d4..9d59a14 100644
--- a/serverconfig.xml
+++ b/serverconfig.xml
@@ -11,12 +11,12 @@
 
 	<!-- Networking -->
 	<property name="ServerPort"						value="26900"/>				<!-- Port you want the server to listen on. -->
-	<property name="ServerVisibility"				value="1"/>					<!-- Visibility of this server: 2 = public, 1 = only shown to friends, 0 = not listed. As you are never friend of a dedicated server setting this to "1" will only work when the first player connects manually by IP. -->
+	<property name="ServerVisibility"				value="0"/>					<!-- Visibility of this server: 2 = public, 1 = only shown to friends, 0 = not listed. As you are never friend of a dedicated server setting this to "1" will only work when the first player connects manually by IP. -->
 	<property name="ServerDisabledNetworkProtocols"	value="SteamNetworking"/>	<!-- Networking protocols that should not be used. Separated by comma. Possible values: LiteNetLib, SteamNetworking. Dedicated servers should disable SteamNetworking if there is no NAT router in between your users and the server or when port-forwarding is set up correctly -->
-	<property name="ServerMaxWorldTransferSpeedKiBs" value="1024"/>				<!-- Maximum (!) speed in kiB/s the world is transferred at to a client on first connect if it does not have the world yet. Maximum is about 1300 kiB/s, even if you set a higher value. -->
+	<property name="ServerMaxWorldTransferSpeedKiBs" value="1200"/>				<!-- Maximum (!) speed in kiB/s the world is transferred at to a client on first connect if it does not have the world yet. Maximum is about 1300 kiB/s, even if you set a higher value. -->
 
 	<!-- Slots -->
-	<property name="ServerMaxPlayerCount"			value="8"/>					<!-- Maximum Concurrent Players -->
+	<property name="ServerMaxPlayerCount"			value="12"/>					<!-- Maximum Concurrent Players -->
 	<property name="ServerReservedSlots"			value="0"/>					<!-- Out of the MaxPlayerCount this many slots can only be used by players with a specific permission level -->
 	<property name="ServerReservedSlotsPermission"	value="100"/>				<!-- Required permission level to use reserved slots above -->
 	<property name="ServerAdminSlots"				value="2"/>					<!-- This many admins can still join even if the server has reached MaxPlayerCount -->
@@ -93,7 +93,7 @@
 	<property name="BloodMoonEnemyCount"			value="12" />				<!-- The number of zombies spawned during blood moons per player. -->
 
 	<!-- Loot -->
-	<property name="LootAbundance"					value="65" />				<!-- percentage in whole numbers -->
+	<property name="LootAbundance"					value="75" />				<!-- percentage in whole numbers -->
 	<property name="LootRespawnDays"				value="999" />				<!-- days in whole numbers -->
 	<property name="AirDropFrequency"				value="168"/>				<!-- How often airdrop occur in game-hours, 0 == never -->
 	<property name="AirDropMarker"					value="false"/>				<!-- Sets if a marker is added to map/compass for air drops. -->