Changeset 276

Timestamp:

May 18, 2016, 4:56:14 PM (9 years ago)

Author:

alloc

Message:

fixes 8_11_13_1

Location:

binary-improvements

Files:

• 7dtd-server-fixes/ModInfo.xml (modified) (1 diff)
• 7dtd-server-fixes/src/ChatHookExample.cs (modified) (1 diff)
• 7dtd-server-fixes/src/PersistentData/Player.cs (modified) (4 diffs)
• 7dtd-server-fixes/src/PersistentData/Players.cs (modified) (1 diff)
• CoppisAdditions/src/ChatFilter.cs (modified) (1 diff)

binary-improvements/7dtd-server-fixes/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Common functions" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="10" />
+                <Version value="11" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/7dtd-server-fixes/src/ChatHookExample.cs

@@ -14 +14 @@
                                                 GameManager.Instance.GameMessageServer (_cInfo, EnumGameMessages.Chat, string.Format("!{0}", _message), _playerName, false, "", false);
                                         } else {
-                                                Log.Error ("Argument _cInfo null on message: {0}", _message);
+                                                Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _message);
                                         }
                                         return false;

binary-improvements/7dtd-server-fixes/src/PersistentData/Player.cs

@@ -26 +26 @@
                 [OptionalField]
                 private int maxChatLength;
+                [OptionalField]
+                private uint expToNextLevel;
+                [OptionalField]
+                private int level;
+
                 [NonSerialized]
                 private ClientInfo
@@ -112 +117 @@
                 }
 
+
+                // Deprecated
                 public uint Experience {
                         get {
-                                return experience;
+                                return 0;
                         }
                 }
@@ -120 +127 @@
                 public float Level {
                         get {
-                                float perc = (float)experience / 600000;
-                                perc = Mathf.Sqrt (perc);
-                                return Mathf.Clamp ((perc * 60) + 1, 1, 60);
+                                float expForNextLevel = (int)Math.Min ((Progression.BaseExpToLevel * Mathf.Pow (Progression.ExpMultiplier, level + 1)), int.MaxValue);
+                                float fLevel = level + 1f - ((float)expToNextLevel / expForNextLevel);
+                                return fLevel;
                         }
                 }
@@ -176 +183 @@
 
                 public void Update (PlayerDataFile _pdf) {
-                        experience = _pdf.experience;
+                        experience = 0;
+                        expToNextLevel = _pdf.experience;
+                        level = _pdf.level;
                         inventory.Update (_pdf);
                 }

binary-improvements/7dtd-server-fixes/src/PersistentData/Players.cs

@@ -12 +12 @@
                 public Player this [string steamId, bool create] {
                         get {
-                                if (players.ContainsKey (steamId)) {
+                                if (string.IsNullOrEmpty (steamId)) {
+                                        return null;
+                                } else if (players.ContainsKey (steamId)) {
                                         return players [steamId];
                                 } else {

binary-improvements/CoppisAdditions/src/ChatFilter.cs

@@ -32 +32 @@
                                         }
                                 } else {
-                                        Log.Error ("Argument _cInfo null on message: {0}", _message);
+//                                      Log.Error ("ChatFilter: Argument _cInfo null on message: {0}", _message);
                                 }
                         }