Applied embargoed patches - Marks Nov 1, 2021 Release.

CHANGELOG

@@ -40,3 +40,7 @@
 - Removed ridiculous noted Manta ray drop across all Revenants
 - Reverted the absurd 50-100 noted Sharks drop to a more believable number of 4 across all Revenants
 - Reverted the noted tuna potato drop to a maximum of 5 across all Revenants
+- Fixed a potential exploit with defensive brews and titan effects
+- Fixed a potential exploit with chinchompas
+- Addressed a potentially serious issue with charm droprates
+< ---- ABOVE Released NOVEMBER 1, 2021 ---- >

Server/data/configs/npc_spawns.json

@@ -2015,10 +2015,6 @@
     "npc_id": "782",
     "loc_data": "{3150,3406,0,0,0}"
   },
-  {
-    "npc_id": "6390",
-    "loc_data": "{3094,3258,0,0,0}"
-  },
   {
     "npc_id": "783",
     "loc_data": "{3221,3435,0,1,0}"
@@ -4443,10 +4439,6 @@
     "npc_id": "2327",
     "loc_data": "{2814,3337,0,1,6}"
   },
-  {
-    "npc_id": "2329",
-    "loc_data": "{3093,3260,0,1,6}-{1702,4822,0,0,0}"
-  },
   {
     "npc_id": "2330",
     "loc_data": "{2766,3211,0,1,0}"

Server/data/configs/ranged_weapon_configs.json

@@ -1176,7 +1176,7 @@
     "weapon_type": "6",
     "animation": "2779",
     "drop_ammo": "0",
-    "ammunition": "10034"
+    "ammunition": "10033"
   },
   {
     "itemId": "10034",

Server/src/main/java/core/game/content/consumable/effects/PercentHeal.java

@@ -12,10 +12,10 @@ public class PercentHeal extends ConsumableEffect {
 
     @Override
     public void activate(Player p) {
-        int amount = (int) Math.floor(p.getSkills().getMaximumLifepoints() * perc);
+        int maxHp = p.getSkills().getMaximumLifepoints();
-        if(p.getSkills().getLifepoints() + amount > (p.getSkills().getMaximumLifepoints() + (p.getSkills().getMaximumLifepoints() * perc))){
+        int curHp = p.getSkills().getLifepoints();
-            amount = 0;
+        int amount = (int) Math.floor(maxHp * perc);
-        }
+        amount = Math.min(amount, (int)((1.0 + perc) * (double)maxHp - (double)curHp));
         p.getSkills().healNoRestrictions(amount);
     }
 }

Server/src/main/java/core/game/node/entity/npc/familiar/ElementalTitanNPC.java

@@ -8,7 +8,7 @@ import core.game.node.entity.skill.summoning.familiar.FamiliarSpecial;
 public abstract class ElementalTitanNPC extends Familiar {
 
     private static final int scrollHealAmount = 8;
-    private static final double  scrollDefenceBoostPercent = 12.5;
+    private static final double scrollDefenceBoostPercent = 0.125;
 
     public ElementalTitanNPC(Player owner, int id, int ticks, int pouchId, int specialCost, int attackStyle) {
         super(owner, id, ticks, pouchId, specialCost, attackStyle);
@@ -20,7 +20,10 @@ public abstract class ElementalTitanNPC extends Familiar {
     @Override
     protected boolean specialMove(FamiliarSpecial special) {
         int currentDefenceLevel = owner.getSkills().getLevel(Skills.DEFENCE);
-        owner.getSkills().updateLevel(Skills.DEFENCE, (int)(scrollDefenceBoostPercent * currentDefenceLevel));
+        int maximumDefenceLevel = owner.getSkills().getStaticLevel(Skills.DEFENCE);
+        owner.getSkills().updateLevel(Skills.DEFENCE,
+            (int)((1.0 + scrollDefenceBoostPercent) * currentDefenceLevel),
+            (int)((1.0 + scrollDefenceBoostPercent) * maximumDefenceLevel));
         int currentHp = owner.getSkills().getLifepoints();
         int maxHp = owner.getSkills().getMaximumLifepoints() + scrollHealAmount;
         int healAmount = Math.min(maxHp - currentHp, scrollHealAmount);

Server/src/main/java/core/game/node/entity/player/Player.java

@@ -577,7 +577,7 @@ public class Player extends Entity {
 				packetDispatch.sendMessage("Unhandled special attack for item " + weaponId + "!");
 			}
 		}
-		if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10034) {
+		if (style == CombatStyle.RANGE && equipment.getNew(3).getId() == 10033 || equipment.getNew(3).getId() == 10034) {
 			return ChinchompaSwingHandler.getInstance();
 		}
 		return style.getSwingHandler();

Server/src/main/kotlin/rs09/game/content/global/worldevents/holiday/halloween/SimpleHalloweenEvent.kt

@@ -9,7 +9,7 @@ import java.util.*
 
 class SimpleHalloweenEvent : WorldEvent("hween"){
     override fun checkActive(): Boolean {
-        return true
+        return false
     }
 
     override fun initialize() {

Server/src/main/kotlin/rs09/game/node/entity/combat/handlers/RangeSwingHandler.kt

@@ -367,6 +367,7 @@ open class RangeSwingHandler
             if (dropRate == -1.0) {
                 return
             }
+            e.equipment.replace(Item(ammo.id, ammo.amount - amount, ammo.charge), state.weapon.ammunitionSlot)
             if (dropLocation == null) {
                 return
             }
@@ -374,7 +375,6 @@ open class RangeSwingHandler
             if (flag and 0x200000 != 0) { //Water
                 dropLocation = null
             }
-            e.equipment.replace(Item(ammo.id, ammo.amount - amount, ammo.charge), state.weapon.ammunitionSlot)
             if (dropLocation != null && state.rangeWeapon.isDropAmmo) {
                 val rate = 5 * (1.0 + e.skills.getLevel(Skills.RANGE) * 0.01) * dropRate
                 if (RandomFunction.randomize(rate.toInt()) != 0) {