1.3.7

Author: LeandroTheDev

.gitignore

@@ -3,6 +3,6 @@ CakeBuild
 Releases
 LevelUP/bin
 LevelUP/obj
+LevelUP/Properties
 LevelUP.sln
-build.ps1
-build.sh
+build.ps1

LevelUP/Server/LevelVitality.cs

@@ -111,14 +111,17 @@ private void PlayerJoin(IServerPlayer player)
         playerStats.UpdateMaxHealth();
 
         if (Configuration.enableExtendedLog)
+        {
             Debug.Log($"{player.PlayerName} joined the world with max: {playerStats.MaxHealth} health and {playerStats.Health} actual health");
+            Debug.Log($"VITALITY Calculation Variables: {playerMaxHealth}:{playerRegen}, Level: {Configuration.VitalityGetLevelByEXP(playerExp)}");
+        }
     }
 
     private void PlayerDisconnect(IServerPlayer player)
     {
         // Disconnected during the loading
         if (player == null) return;
-        
+
         // Get stats
         EntityBehaviorHealth playerStats = player.Entity.GetBehavior<EntityBehaviorHealth>();
         if (playerStats == null) { Debug.Log($"ERROR SAVING PLAYER STATE: Player Stats is null, caused by {player.PlayerName}"); return; }

LevelUP/Shared/OverrideBlockBreak.cs

@@ -70,6 +70,42 @@ public static float GetMiningSpeedModifier(float __result, IWorldAccessor world,
         return __result;
     }
 
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(CollectibleObject), "GetMiningSpeed")]
+    public static float GetMiningSpeed(float __result, IItemStack itemstack, BlockSelection blockSel, Block block, IPlayer forPlayer)
+    {
+        float miningSpeedCompatibility = forPlayer.Entity.Attributes.GetFloat("LevelUP_BlockBreak_ExtendMiningSpeed_GetMiningSpeedModifier");
+        forPlayer.Entity.Attributes.RemoveAttribute("LevelUP_BlockBreak_ExtendMiningSpeed_GetMiningSpeedModifier");
+        switch (forPlayer.InventoryManager.ActiveTool)
+        {
+            case EnumTool.Axe:
+                if (block.BlockMaterial == EnumBlockMaterial.Wood)
+                    return Configuration.enableLevelAxe ? __result * forPlayer.Entity.WatchedAttributes.GetFloat("LevelUP_Axe_MiningSpeed", 1.0f) + miningSpeedCompatibility : __result;
+                else return 1.0f;
+            case EnumTool.Pickaxe:
+                if (block.BlockMaterial == EnumBlockMaterial.Brick ||
+                    block.BlockMaterial == EnumBlockMaterial.Ceramic ||
+                    block.BlockMaterial == EnumBlockMaterial.Metal ||
+                    block.BlockMaterial == EnumBlockMaterial.Ore ||
+                    block.BlockMaterial == EnumBlockMaterial.Stone)
+                    return Configuration.enableLevelPickaxe ? __result * forPlayer.Entity.WatchedAttributes.GetFloat("LevelUP_Pickaxe_MiningSpeed", 1.0f) + miningSpeedCompatibility : __result;
+                else return 1.0f;
+            case EnumTool.Shovel:
+                if (block.BlockMaterial == EnumBlockMaterial.Soil ||
+                    block.BlockMaterial == EnumBlockMaterial.Gravel ||
+                    block.BlockMaterial == EnumBlockMaterial.Sand ||
+                    block.BlockMaterial == EnumBlockMaterial.Snow)
+                    return Configuration.enableLevelShovel ? __result * forPlayer.Entity.WatchedAttributes.GetFloat("LevelUP_Shovel_MiningSpeed", 1.0f) + miningSpeedCompatibility : __result;
+                else return 1.0f;
+            case EnumTool.Knife:
+                if (block.BlockMaterial == EnumBlockMaterial.Plant ||
+                    block.BlockMaterial == EnumBlockMaterial.Leaves)
+                    return Configuration.enableLevelKnife ? __result * forPlayer.Entity.WatchedAttributes.GetFloat("LevelUP_Knife_MiningSpeed", 1.0f) + miningSpeedCompatibility : __result;
+                else return 1.0f;
+        }
+        return __result;
+    }
+
     // Overwrite Wood Axe Breaking
     [HarmonyPrefix]
     [HarmonyPatch(typeof(ItemAxe), "OnBlockBrokenWith")]
@@ -139,7 +175,7 @@ public static ItemStack[] GetDrops(ItemStack[] __result, BlockCrop __instance, I
                 }
                 index++;
             }
-            
+
             // Add harvest experience
             if (exp != null)
             {

LevelUP/Shared/OverrideDamageInteraction.cs

@@ -61,7 +61,6 @@ public static void ReceiveDamageStart(Entity __instance, DamageSource damageSour
         // Damage bug treatment
         if (damage > 0 && __instance.ShouldReceiveDamage(damageSource, damage))
         {
-
             // Player Does Damage
             // Checking if damage sources is from a player and from a server and if entity is alive
             if (damageSource.SourceEntity is EntityPlayer || damageSource.GetCauseEntity() is EntityPlayer && __instance.World.Side == EnumAppSide.Server && __instance.Alive)
@@ -212,7 +211,11 @@ public static void ReceiveDamageStart(Entity __instance, DamageSource damageSour
 
                 }
                 // Ranged Action
-                else if (damageSource.GetCauseEntity() is EntityPlayer && damageSource.SourceEntity is EntityProjectile)
+                // Native Game: damageSource.SourceEntity is EntityProjectile
+                // Combat Overhaul compatibility: damageSource.SourceEntity.GetType().ToString() == "CombatOverhaul.RangedSystems.ProjectileEntity")
+                else if (damageSource.GetCauseEntity() is EntityPlayer &&
+                    (damageSource.SourceEntity is EntityProjectile ||
+                    damageSource.SourceEntity.GetType().ToString() == "CombatOverhaul.RangedSystems.ProjectileEntity"))
                 {
 
                     // Get entities

LevelUP/modinfo.json

@@ -6,7 +6,7 @@
         "BoboDev"
     ],
     "description": "Add level system to your character",
-    "version": "1.3.7-pre.1",
+    "version": "1.3.7",
     "dependencies": {
         "game": ""
     }

build.sh

@@ -0,0 +1,3 @@
+dotnet run --project ./CakeBuild/CakeBuild.csproj -- "$@"
+rm -rf "$VINTAGE_STORY/Mods/levelup"
+cp -r ./Releases/levelup "$VINTAGE_STORY/Mods/levelup"