measure twice, cut five times

hybrasyl · Aug 22, 2023 · 577c8df · 577c8df
1 parent 619b7fb
commit 577c8df
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 15 deletions.
diff --git a/src/Hybrasyl.Xml.csproj b/src/Hybrasyl.Xml.csproj
@@ -4,8 +4,8 @@
         <TargetFramework>net7.0</TargetFramework>
         <AssemblyName>Hybrasyl.Xml</AssemblyName>
         <RootNamespace>Hybrasyl.Xml</RootNamespace>
-        <PackageVersion>0.9.3.19</PackageVersion>
-        <Version>0.9.3.19</Version>
+        <PackageVersion>0.9.3.20</PackageVersion>
+        <Version>0.9.3.20</Version>
         <BuildDocFx Condition="'$(Configuration)'=='Debug'">false</BuildDocFx>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Authors>ERISCO LLC</Authors>

diff --git a/src/Objects/ServerConstants.cs b/src/Objects/ServerConstants.cs
@@ -34,7 +34,8 @@ public partial class ServerConstants : HybrasylEntity<ServerConstants>
     private int _playerMaxDropDistance;
     private int _playerPickupDistance;
     private int _playerExchangeDistance;
-    private int _playerMaximumGold;
+    private int _playerMaxCastDistance;
+    private uint _playerMaxGold;
     private int _itemVariantIdStart;
     private int _logDefaultLevels;
     private int _playerGroupSharingDistance;
@@ -59,7 +60,7 @@ public partial class ServerConstants : HybrasylEntity<ServerConstants>
     private int _mailMessageCooldown;
     private int _playerMinStat;
     private int _playerMaxStat;
-    private int _playerMinBaseHpMp;
+    private uint _playerMinBaseHpMp;
     private uint _playerMaxBaseHpMp;
     private float _playerMinDmg;
     private float _playerMaxDmg;
@@ -69,6 +70,8 @@ public partial class ServerConstants : HybrasylEntity<ServerConstants>
     private float _playerMaxMr;
     private float _playerMinAc;
     private float _playerMaxAc;
+    private float _playerMinRegen;
+    private float _playerMaxRegen;
     private string _className0;
     private string _className1;
     private string _className2;
@@ -90,7 +93,8 @@ public ServerConstants()
         _playerMaxDropDistance = 2;
         _playerPickupDistance = 2;
         _playerExchangeDistance = 2;
-        _playerMaximumGold = 1000000000;
+        _playerMaxCastDistance = 12;
+        _playerMaxGold = ((uint)(1000000000));
         _itemVariantIdStart = 100000;
         _logDefaultLevels = 1;
         _playerGroupSharingDistance = 20;
@@ -115,16 +119,18 @@ public ServerConstants()
         _mailMessageCooldown = 60;
         _playerMinStat = 1;
         _playerMaxStat = 255;
-        _playerMinBaseHpMp = 1;
+        _playerMinBaseHpMp = ((uint)(1));
         _playerMaxBaseHpMp = ((uint)(4294967295));
         _playerMinDmg = ((float)(-16F));
-        _playerMaxDmg = ((float)(-16F));
+        _playerMaxDmg = ((float)(16F));
         _playerMinHit = ((float)(-16F));
-        _playerMaxHit = ((float)(-16F));
+        _playerMaxHit = ((float)(16F));
         _playerMinMr = ((float)(-16F));
-        _playerMaxMr = ((float)(-16F));
+        _playerMaxMr = ((float)(16F));
         _playerMinAc = ((float)(-90F));
         _playerMaxAc = ((float)(100F));
+        _playerMinRegen = ((float)(-16F));
+        _playerMaxRegen = ((float)(16F));
         _className0 = "Peasant";
         _className1 = "Warrior";
         _className2 = "Rogue";
@@ -221,15 +227,27 @@ public int PlayerExchangeDistance
         }
     }
 
-    public int PlayerMaximumGold
+    public int PlayerMaxCastDistance
     {
         get
         {
-            return _playerMaximumGold;
+            return _playerMaxCastDistance;
         }
         set
         {
-            _playerMaximumGold = value;
+            _playerMaxCastDistance = value;
+        }
+    }
+
+    public uint PlayerMaxGold
+    {
+        get
+        {
+            return _playerMaxGold;
+        }
+        set
+        {
+            _playerMaxGold = value;
         }
     }
 
@@ -521,7 +539,7 @@ public int PlayerMaxStat
         }
     }
 
-    public int PlayerMinBaseHpMp
+    public uint PlayerMinBaseHpMp
     {
         get
         {
@@ -641,6 +659,30 @@ public float PlayerMaxAc
         }
     }
 
+    public float PlayerMinRegen
+    {
+        get
+        {
+            return _playerMinRegen;
+        }
+        set
+        {
+            _playerMinRegen = value;
+        }
+    }
+
+    public float PlayerMaxRegen
+    {
+        get
+        {
+            return _playerMaxRegen;
+        }
+        set
+        {
+            _playerMaxRegen = value;
+        }
+    }
+
     public string ClassName0
     {
         get

diff --git a/src/XSD/ServerConfig.xsd b/src/XSD/ServerConfig.xsd
@@ -248,7 +248,7 @@
             <xs:element name="PlayerPickupDistance" type="xs:int" default="2" />
             <xs:element name="PlayerExchangeDistance" type="xs:int" default="2" />
             <xs:element name="PlayerMaxCastDistance" type="xs:int" default="12" />
-            <xs:element name="PlayerMaxGold" type="xs:uint" default="1000000000" />
+            <xs:element name="PlayerMaxGold" type="xs:unsignedInt" default="1000000000" />
             <xs:element name="ItemVariantIdStart" type="xs:int" default="100000" />
             <xs:element name="LogDefaultLevels" type="xs:int" default="1" />
             <xs:element name="PlayerGroupSharingDistance" type="xs:int" default="20" />
@@ -273,7 +273,7 @@
             <xs:element name="MailMessageCooldown" type="xs:int" default="60" />
             <xs:element name="PlayerMinStat" type="xs:int" default="1" />
             <xs:element name="PlayerMaxStat" type="xs:int" default="255" />
-            <xs:element name="PlayerMinBaseHpMp" type="xs:int" default="1" />
+            <xs:element name="PlayerMinBaseHpMp" type="xs:unsignedInt" default="1" />
             <xs:element name="PlayerMaxBaseHpMp" type="xs:unsignedInt" default="4294967295" />
             <xs:element name="PlayerMinDmg" type="xs:float" default="-16.0" />
             <xs:element name="PlayerMaxDmg" type="xs:float" default="16.0" />