Auto-leveling camp modifications

.gitignore

@@ -24,5 +24,3 @@
 hs_err_pid*
 replay_pid*
 
-*.code-workspace
-

src/engine/Enum.java

@@ -1196,7 +1196,6 @@ public class Enum {
         Durability,
         ExclusiveDamageCap,
         Fade,
-        Fear,
         Fly,
         Health,
         HealthFull,

src/engine/db/handlers/dbEffectsBaseHandler.java

@@ -280,9 +280,6 @@ public class dbEffectsBaseHandler extends dbHandlerBase {
             case Stunned:
                 abstractEffectModifier = new StunnedEffectModifier(rs);
                 break;
-            case Fear:
-                abstractEffectModifier = new FearEffectModifier(rs);
-                break;
             case Value:
                 abstractEffectModifier = new ValueEffectModifier(rs);
                 if (effectBase != null) {

src/engine/devcmd/cmds/SetCampLevelCmd.java

@@ -0,0 +1,61 @@
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
+import engine.gameManager.ZoneManager;
+import engine.objects.*;
+
+public class SetCampLevelCmd extends AbstractDevCmd {
+    public SetCampLevelCmd() { super("setcamplevel"); }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] args, AbstractGameObject target) {
+
+        if (args.length > 1)
+        {
+             this.sendUsage(pcSender);
+        }
+
+        int targetLevel = 0;
+        if (args.length == 1) {
+            try {
+                targetLevel = Integer.parseInt(args[0]);
+            } catch (NumberFormatException nfe) {
+                throwbackError(pcSender, "Argument MUST be integer.  Received: " + args[0]);
+            } catch (Exception e) {
+                throwbackError(pcSender, "Unknown command parsing provided camp level: " + args[0]);
+            }
+        }
+
+        if ((target instanceof Mob))
+        {
+            // Get the camp that owns the targeted Mob
+            Zone campZone = ((Mob) target).parentZone;
+
+            // Make sure that the zone we're targeting is valid for action
+            if (campZone == null ||
+                    campZone.zoneMobSet.isEmpty() ||
+                    campZone.isPlayerCity()) {
+                throwbackError(pcSender, "Current zone must own mobs, and NOT be a city.");
+                return;
+            }
+
+            campZone.setCampLvl(targetLevel);
+        }
+        else if (target instanceof PlayerCharacter)
+        {
+            PlayerCharacter pc = (PlayerCharacter)target;
+            PowersManager.applyPower(pc, pc, pc.getLoc(), "CMP-001", targetLevel, false);
+        }
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "Sets the level of the currently occupied camp to the desired level";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "'./setcamplevel levelNum'";
+    }
+}

src/engine/gameManager/CombatManager.java

@@ -433,11 +433,6 @@ public enum CombatManager {
             if (bonus != null && bonus.getBool(ModType.Stunned, SourceType.None))
                 attackFailure = true;
 
-            //see if attacker is feared. If so, stop here
-            
-            if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
-                attackFailure = true;
-
             //Get Range of weapon
 
             float range;

src/engine/gameManager/DevCmdManager.java

@@ -143,6 +143,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
+        DevCmdManager.registerDevCmd(new SetCampLevelCmd());
 
     }
 

src/engine/gameManager/LootManager.java

@@ -14,6 +14,7 @@ import engine.net.DispatchMessage;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
+import engine.util.ZoneLevel;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -100,6 +101,16 @@ public enum LootManager {
         boolean hotzoneWasRan = false;
         float dropRate = 1.0f;
 
+        if (mob.getSafeZone() == false)
+            dropRate = LootManager.NORMAL_DROP_RATE;
+
+        if (inHotzone == true)
+            dropRate = LootManager.HOTZONE_DROP_RATE;
+
+        // Adjust for camp scaling
+        Zone camp = mob.getParentZone();
+        dropRate = dropRate * ZoneLevel.getLootDropModifier(camp);
+
         // Iterate all entries in this bootySet and process accordingly
 
         for (BootySetEntry bse : entries) {
@@ -109,12 +120,6 @@ public enum LootManager {
                     break;
                 case "LOOT":
 
-                    if (mob.getSafeZone() == false)
-                        dropRate = LootManager.NORMAL_DROP_RATE;
-
-                    if (inHotzone == true)
-                        dropRate = LootManager.HOTZONE_DROP_RATE;
-
                     if (ThreadLocalRandom.current().nextInt(1, 100 + 1) < (bse.dropChance * dropRate))
                         GenerateLootDrop(mob, bse.genTable, false);  //generate normal loot drop
 
@@ -196,6 +201,9 @@ public enum LootManager {
                 Logger.error("Failed to GenerateSuffix for item: " + outItem.getName());
             }
         }
+
+        // We don't want to bother with identifying gear
+        outItem.setIsID(true);
         return outItem;
     }
 
@@ -306,6 +314,9 @@ public enum LootManager {
         else
             gold = (int) (gold * NORMAL_GOLD_RATE);
 
+        Zone camp = mob.getParentZone();
+        gold = (int) (gold * ZoneLevel.getGoldDropModifier(camp));
+
         if (gold > 0) {
             MobLoot goldAmount = new MobLoot(mob, gold);
             mob.getCharItemManager().addItemToInventory(goldAmount);

src/engine/gameManager/MovementManager.java

@@ -79,11 +79,6 @@ public enum MovementManager {
             return;
         }
 
-        // Will this prevent movement at all or only player input for movement?
-        if (toMove.getBonuses().getBool(ModType.Fear, SourceType.None)) {
-            return;
-        }
-
         if (msg.getEndLat() > MBServerStatics.MAX_WORLD_WIDTH)
             msg.setEndLat((float) MBServerStatics.MAX_WORLD_WIDTH);
 
@@ -412,10 +407,6 @@ public enum MovementManager {
             PlayerBonuses bonus = member.getBonuses();
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
-            
-            //don't move if player is feared
-            if (bonus.getBool(ModType.Fear, SourceType.None))
-                continue;
 
             member.update();
 

src/engine/gameManager/PowersManager.java

@@ -313,9 +313,6 @@ public enum PowersManager {
         if (bonus != null && (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotCast, SourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType)))
             return true;
 
-        if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
-            return true;
-
         // if moving make sure spell valid for movement
         Vector3fImmutable endLoc = playerCharacter.getEndLoc();
 
@@ -598,9 +595,6 @@ public enum PowersManager {
         SourceType sourceType = SourceType.GetSourceType(pb.getCategory());
         if (bonus != null && (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotCast, SourceType.None) || bonus.getBool(ModType.BlockedPowerType, sourceType)))
             return true;
-        
-        if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
-            return true;
 
         // if moving make sure spell valid for movement
         // if flying, make sure spell valid for flying.
@@ -767,11 +761,6 @@ public enum PowersManager {
                 finishRecycleTime(msg.getPowerUsedID(), playerCharacter, true);
                 return;
             }
-
-            if (bonus.getBool(ModType.Fear, SourceType.None)) {
-                finishRecycleTime(msg.getPowerUsedID(), playerCharacter, true);
-                return;
-            }
         }
 
         // get target loc
@@ -1053,9 +1042,6 @@ public enum PowersManager {
                 return;
         }
 
-        if (bonus != null && bonus.getBool(ModType.Fear, SourceType.None))
-            return;
-
         msg.setNumTrains(9999);
         msg.setUnknown04(2);
         DispatchMessage.sendToAllInRange(caster, msg);
@@ -2579,10 +2565,6 @@ public enum PowersManager {
 
     }
 
-    public static void cancelOnFear(AbstractCharacter ac) {
-
-    }
-
     private static PowersBase getLastPower(AbstractCharacter ac) {
         if (ac == null)
             return null;

src/engine/jobs/FearWanderJob.java

@@ -1,42 +0,0 @@
-package engine.jobs;
-
-import engine.job.AbstractJob;
-import engine.objects.AbstractCharacter;
-import engine.math.Vector3fImmutable;
-import engine.server.MBServerStatics;
-
-import java.util.Random;
-
-public class FearWanderJob extends AbstractJob {
-    private final AbstractCharacter target;
-    private final Random rand = new Random();
-
-    public FearWanderJob(AbstractCharacter target) {
-        super();
-        this.target = target;
-    }
-
-    @Override
-    public void doJob() {
-        // Only wander if still feared
-        if (target == null || !target.getBonuses().getBool(engine.Enum.ModType.Fear, engine.Enum.SourceType.None))
-            return;
-
-        // Pick a random direction and distance
-        float angle = rand.nextFloat() * (float)Math.PI * 2f;
-        float distance = 5f + rand.nextFloat() * 10f; // 5-15 units
-
-        Vector3fImmutable current = target.getLoc();
-        float newX = current.x + (float)Math.cos(angle) * distance;
-        float newZ = current.z + (float)Math.sin(angle) * distance;
-
-        // Clamp to world bounds if needed
-        newX = (float) Math.max(0, Math.min(newX, MBServerStatics.MAX_WORLD_WIDTH));
-        newZ = (float) Math.max(0, Math.min(newZ, MBServerStatics.MAX_WORLD_HEIGHT));
-
-        Vector3fImmutable dest = new Vector3fImmutable(newX, current.y, newZ);
-
-        // Issue movement (implement setEndLoc or similar in your AbstractCharacter)
-        target.setEndLoc(dest);
-    }
-}

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -11,6 +11,7 @@ package engine.mobileAI.Threads;
 import engine.gameManager.ZoneManager;
 import engine.objects.Mob;
 import engine.objects.Zone;
+import engine.util.ZoneLevel;
 import org.pmw.tinylog.Logger;
 
 /**
@@ -25,7 +26,6 @@ import org.pmw.tinylog.Logger;
 
 public class MobRespawnThread implements Runnable {
 
-
     public MobRespawnThread() {
         Logger.info(" MobRespawnThread thread has started!");
 
@@ -34,23 +34,85 @@ public class MobRespawnThread implements Runnable {
     @Override
     public void run() {
 
+        long startTime = System.currentTimeMillis();
+        long rollingKeepFraction = (Zone.rollingAvgMobsAliveDepth - 1) / Zone.rollingAvgMobsAliveDepth;
+        long rollingAddFraction = 1 / Zone.rollingAvgMobsAliveDepth;
+
         while (true) {
 
             try {
+
                 for (Zone zone : ZoneManager.getAllZones()) {
 
-                    if (zone.respawnQue.isEmpty() == false && zone.lastRespawn + 100 < System.currentTimeMillis()) {
-
-                        Mob respawner = zone.respawnQue.iterator().next();
-
-                        if (respawner == null)
-                            continue;
-
-                        respawner.respawn();
-                        zone.respawnQue.remove(respawner);
-                        zone.lastRespawn = System.currentTimeMillis();
+                    /*
+                    if (zone.respawnQue.size() > ZoneLevel.queueLengthToLevelUp) {
+                        zone.setCampLvl(zone.getCamplvl() + 1);
                     }
+                    else if (zone.respawnQue.isEmpty() &&
+                            (zone.lastRespawn + ZoneLevel.msToLevelDown < System.currentTimeMillis()) &&
+                            zone.getCamplvl() > 0) {
+                        zone.setCampLvl(zone.getCamplvl() - 1);
+                    }
+                     */
+
+                    int aliveCount = 0;
+                    int deadCount = 0;
+                    for (Mob mob : zone.zoneMobSet) {
+                        if (mob.isAlive()) {
+                            aliveCount = aliveCount + 1;
+                        }
+                        else {
+                            deadCount = deadCount + 1;
+                        }
+                    }
+
+                    zone.rollingAvgMobsAlive =
+                            ((zone.rollingAvgMobsAlive * (Zone.rollingAvgMobsAliveDepth - 1) + aliveCount) / Zone.rollingAvgMobsAliveDepth);
+
+                    /*
+                    if (startTime + ZoneLevel.msDelayToCampLevel < System.currentTimeMillis()) {
+                        if (aliveCount > Math.floor(zone.zoneMobSet.size() / 2.0)) {
+                            if (zone.levelUpTimer == 0) {
+                                zone.levelUpTimer = System.currentTimeMillis();
+                            } else if (zone.levelUpTimer + ZoneLevel.msTolevelUp < System.currentTimeMillis()) {
+                                zone.setCampLvl(zone.getCampLvl() + 1);
+
+                                zone.levelUpTimer = 0;
+                            }
+                        } else if (aliveCount == 0) {
+
+                            if (zone.levelDownTimer == 0) {
+                                zone.levelDownTimer = System.currentTimeMillis();
+                            } else if (zone.levelDownTimer + ZoneLevel.msToLevelDown < System.currentTimeMillis()) {
+                                if (zone.getCampLvl() > 0) {
+                                    zone.setCampLvl(zone.getCampLvl() + 1);
+
+                                    zone.levelDownTimer = 0;
+                                }
+                            }
+                        } else {
+                            zone.levelUpTimer = 0;
+                            zone.levelDownTimer = 0;
+                        }
+                    }
+                    */
                 }
+
+                // --------------------------------------------------------------------------------------------------------------------
+                // Manage mob respawn
+                // --------------------------------------------------------------------------------------------------------------------
+                if (!Zone.respawnQue.isEmpty() && Zone.lastRespawn + 100 < System.currentTimeMillis()) {
+
+                    Mob respawner = Zone.respawnQue.iterator().next();
+
+                    if (respawner == null)
+                        continue;
+
+                    respawner.respawn();
+                    Zone.respawnQue.remove(respawner);
+                    Zone.lastRespawn = System.currentTimeMillis();
+                }
+
             } catch (Exception e) {
                 Logger.error(e);
             }

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -124,7 +124,7 @@ public class CombatUtilities {
     }
 
     public static boolean canSwing(Mob agent) {
-        return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.Fear, SourceType.None));
+        return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None));
     }
 
     public static void swingIsMiss(Mob agent, AbstractWorldObject target, int animation) {

src/engine/mobileAI/utilities/MovementUtilities.java

@@ -169,7 +169,7 @@ public class MovementUtilities {
         if (agent.getMobBase() != null && Enum.MobFlagType.SENTINEL.elementOf(agent.getMobBase().getFlags()))
             return false;
 
-        return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.Fear, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None));
+        return (agent.isAlive() && !agent.getBonuses().getBool(ModType.Stunned, SourceType.None) && !agent.getBonuses().getBool(ModType.CannotMove, SourceType.None));
     }
 
     public static Vector3fImmutable randomPatrolLocation(Mob agent, Vector3fImmutable center, float radius) {

src/engine/objects/AbstractCharacter.java

@@ -1653,30 +1653,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         PowersManager.cancelOnStun(this);
     }
 
-    public final void cancelOnFear() {
-        boolean changed = false;
-        for (String s : this.effects.keySet()) {
-            Effect eff = this.effects.get(s);
-            if (eff == null)
-                continue;
-            if (eff.cancelOnFear() && eff.cancel()) {
-                eff.cancelJob();
-                this.effects.remove(s);
-                changed = true;
-            }
-        }
-
-        JobContainer wanderJob = this.getTimers().get("FearWander");
-        if (wanderJob != null) {
-            wanderJob.cancelJob();
-            this.getTimers().remove("FearWander");
-        }
-        if (changed) {
-            applyBonuses();
-        }
-        PowersManager.cancelOnFear(this);
-    }
-
     //Call to apply any new effects to player
     public synchronized void applyBonuses() {
         PlayerCharacter player;

src/engine/objects/Effect.java

@@ -48,7 +48,6 @@ public class Effect {
     private boolean cancelOnTerritoryClaim;
     private boolean cancelOnUnEquip;
     private boolean cancelOnStun;
-    private boolean cancelOnFear;
     private boolean bakedInStat = false;
     private boolean isStatic = false;
     private int effectSourceType = 0;
@@ -81,7 +80,6 @@ public class Effect {
         this.cancelOnTerritoryClaim = false;
         this.cancelOnUnEquip = false;
         this.cancelOnStun = false;
-        this.cancelOnFear = false;
         this.eb = eb;
         this.trains = trains;
     }
@@ -101,7 +99,6 @@ public class Effect {
         this.cancelOnTerritoryClaim = false;
         this.cancelOnUnEquip = false;
         this.cancelOnStun = false;
-        this.cancelOnFear = false;
         this.eb = eb;
         this.trains = trains;
         this.isStatic = isStatic;
@@ -584,12 +581,6 @@ public class Effect {
         return this.cancelOnStun;
     }
 
-    public boolean cancelOnFear() {
-        if (this.eb == null)
-            return true;
-        return this.cancelOnFear;
-    }
-
     public boolean cancelOnTakeDamage() {
         if (this.eb == null)
             return true;

src/engine/objects/Mob.java

@@ -31,6 +31,7 @@ import engine.net.client.msg.PlaceAssetMsg;
 import engine.powers.EffectsBase;
 import engine.powers.MobPowerEntry;
 import engine.server.MBServerStatics;
+import engine.util.ZoneLevel;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -101,6 +102,8 @@ public class Mob extends AbstractIntelligenceAgent {
     private DateTime upgradeDateTime = null;
     private boolean lootSync = false;
 
+    private String originalFirstName;
+    private String originalLastName;
 
     /**
      * No Id Constructor
@@ -129,6 +132,9 @@ public class Mob extends AbstractIntelligenceAgent {
             this.lastName = "the " + contract.getName();
         }
         clearStatic();
+
+        originalFirstName = this.firstName;
+        originalLastName = this.lastName;
     }
 
     /**
@@ -150,6 +156,9 @@ public class Mob extends AbstractIntelligenceAgent {
         this.building = building;
         initializeMob(false, false, false);
         clearStatic();
+
+        originalFirstName = this.firstName;
+        originalLastName = this.lastName;
     }
 
     /**
@@ -166,6 +175,9 @@ public class Mob extends AbstractIntelligenceAgent {
         this.BehaviourType = Enum.MobBehaviourType.Pet1;
         initializeMob(true, false, false);
         clearStatic();
+
+        originalFirstName = this.firstName;
+        originalLastName = this.lastName;
     }
 
     //SIEGE CONSTRUCTOR
@@ -180,6 +192,9 @@ public class Mob extends AbstractIntelligenceAgent {
         this.equip = new HashMap<>();
         initializeMob(false, true, isPlayerGuard);
         clearStatic();
+
+        originalFirstName = this.firstName;
+        originalLastName = this.lastName;
     }
 
     /**
@@ -288,6 +303,8 @@ public class Mob extends AbstractIntelligenceAgent {
             Logger.error("Mobile:" + this.dbID + ": " + e);
         }
 
+        originalFirstName = this.firstName;
+        originalLastName = this.lastName;
     }
 
     public static void serializeMobForClientMsgOtherPlayer(Mob mob, ByteBufferWriter writer) throws SerializationException {
@@ -1249,7 +1266,7 @@ public class Mob extends AbstractIntelligenceAgent {
         if (!this.isMoving())
             return;
 
-        if (this.isAlive() == false || this.getBonuses().getBool(ModType.Stunned, SourceType.None) || this.getBonuses().getBool(ModType.Fear, SourceType.None) || this.getBonuses().getBool(ModType.CannotMove, SourceType.None)) {
+        if (this.isAlive() == false || this.getBonuses().getBool(ModType.Stunned, SourceType.None) || this.getBonuses().getBool(ModType.CannotMove, SourceType.None)) {
             //Target is stunned or rooted. Don't move
 
             this.stopMovement(this.getMovementLoc());
@@ -1382,6 +1399,12 @@ public class Mob extends AbstractIntelligenceAgent {
 
         NPCManager.applyRuneSetEffects(this);
 
+        // Set Name based on parent zone level
+        Zone camp = this.getParentZone();
+        this.lastName = this.originalLastName + ZoneLevel.getNameSuffix(camp);
+
+        //PowersManager.applyPower(this, this, this.getLoc(), "CMP-001", camp.getCamplvl(), false);
+
         this.recalculateStats();
         this.setHealth(this.healthMax);
 
@@ -1495,6 +1518,10 @@ public class Mob extends AbstractIntelligenceAgent {
             s *= (1 + this.bonuses.getFloatPercentAll(ModType.StaminaFull, SourceType.None));
         }
 
+        // Modify max health based on camp level - bad, we need to use effects for this
+        Zone camp = this.getParentZone();
+        h = h * ZoneLevel.getMaxHealthPctModifier(camp);
+
         // Set max health, mana and stamina
 
         if (h > 0)
@@ -1595,6 +1622,11 @@ public class Mob extends AbstractIntelligenceAgent {
                 Logger.error("Error: missing bonuses");
 
             defense = (defense < 1) ? 1 : defense;
+
+            // Modify defense for camp level - bad, we need to use effects for this
+            Zone camp = this.getParentZone();
+            defense = defense * ZoneLevel.getDefPctModifier(camp);
+
             this.defenseRating = (short) (defense + 0.5f);
         } catch (Exception e) {
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. Setting to Default Defense." + e.getMessage());
@@ -1796,6 +1828,10 @@ public class Mob extends AbstractIntelligenceAgent {
             atr *= (1 + neg_Bonus);
         }
 
+        // Modify atr for camp level - bad, we need to use effects for this
+        Zone camp = this.getParentZone();
+        atr = atr * ZoneLevel.getAtrPctModifier(camp);
+
         atr = (atr < 1) ? 1 : atr;
 
         // set atr

src/engine/objects/PlayerCharacter.java

@@ -4407,10 +4407,6 @@ public class PlayerCharacter extends AbstractCharacter {
         if (this.bonuses.getBool(ModType.Stunned, SourceType.None))
             return 0f;
 
-        if (this.bonuses.getBool(
-            ModType.Fear, SourceType.None))
-            return 0f;
-
         // Get base skill amount
         CharacterSkill sk = this.skills.get(type);
         float amount;
@@ -4440,10 +4436,6 @@ public class PlayerCharacter extends AbstractCharacter {
         // must not be stunned
         if (this.bonuses.getBool(ModType.Stunned, SourceType.None))
             return 0f;
-        
-        if (this.bonuses.getBool(ModType.Fear, SourceType.None))
-        return 0f;
-
 
         // Get base skill amount
         CharacterSkill sk = this.skills.get(sourceType.name());
@@ -4905,12 +4897,6 @@ public class PlayerCharacter extends AbstractCharacter {
             this.region = AbstractWorldObject.GetRegionByWorldObject(this);
             return;
         }
-        if (this.isAlive() == false || this.getBonuses().getBool(ModType.Fear, SourceType.None)) {
-            //Target is feared. Don't move
-            this.stopMovement(newLoc);
-            this.region = AbstractWorldObject.GetRegionByWorldObject(this);
-            return;
-        }
         if (newLoc.equals(this.getEndLoc())) {
             this.stopMovement(newLoc);
             this.region = AbstractWorldObject.GetRegionByWorldObject(this);

src/engine/objects/Zone.java

@@ -18,7 +18,10 @@ import engine.math.Bounds;
 import engine.math.Vector2f;
 import engine.math.Vector3fImmutable;
 import engine.net.ByteBufferWriter;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.server.MBServerStatics;
+import engine.util.ZoneLevel;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -61,6 +64,13 @@ public class Zone extends AbstractGameObject {
     //public static ArrayList<Mob> respawnQue = new ArrayList<>();
     public static final Set<Mob> respawnQue = Collections.newSetFromMap(new ConcurrentHashMap<>());
     public static long lastRespawn = 0;
+
+    private int campLvl = 0;
+    public long levelUpTimer = 0;
+    public long levelDownTimer = 0;
+    public int rollingAvgMobsAlive = 0;
+    public static final int rollingAvgMobsAliveDepth = 100;
+
     /**
      * ResultSet Constructor
      */
@@ -100,8 +110,33 @@ public class Zone extends AbstractGameObject {
 
         if (hash == null)
             setHash();
+    }
 
+    public void setCampLvl(int level)
+    {
+        this.campLvl = level;
 
+        if (this.campLvl > ZoneLevel.campMaxLvl)
+        {
+            this.campLvl = ZoneLevel.campMaxLvl;
+        }
+        else if (this.campLvl < 0)
+        {
+            this.campLvl = 0;
+        }
+
+        //if (this.campLvl > ZoneLevel.campLvlAnnounceThreshold)
+        {
+            ChatSystemMsg chatMsg = new ChatSystemMsg(null, this.getName() + " has reached camp level " + this.campLvl + "! Will anyone contest?!");
+            chatMsg.setMessageType(2);
+            chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+            DispatchMessage.dispatchMsgToAll(chatMsg);
+        }
+    }
+
+    public int getCampLvl()
+    {
+        return this.campLvl;
     }
 
     public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) {

src/engine/powers/ActionsBase.java

@@ -247,8 +247,6 @@ public class ActionsBase {
             //TODO make this more efficient then testing strings
             if (this.stackType.equals("Stun") && bonus.getBool(ModType.ImmuneTo, SourceType.Stun))
                 return true; //Currently stun immune. Skip stun
-            else if (this.stackType.equals("Fear") && bonus.getBool(ModType.ImmuneTo, SourceType.Fear))
-                return true; //Currently fear immune. Skip fear
             else if (this.stackType.equals("Snare") && bonus.getBool(ModType.ImmuneTo, SourceType.Snare))
                 return true; //Currently snare immune. Skip snare
             else if (this.stackType.equals("Blindness") && bonus.getBool(ModType.ImmuneTo, SourceType.Blind))

src/engine/powers/effectmodifiers/FearEffectModifier.java

@@ -1,58 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.powers.effectmodifiers;
-
-import engine.Enum.GameObjectType;
-import engine.Enum.ModType;
-import engine.Enum.SourceType;
-import engine.jobs.FearWanderJob;
-import engine.job.JobContainer;
-import engine.job.JobScheduler;
-import engine.jobs.AbstractEffectJob;
-import engine.objects.*;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class FearEffectModifier extends AbstractEffectModifier {
-
-    public FearEffectModifier(ResultSet rs) throws SQLException {
-        super(rs);
-    }
-
-    @Override
-    protected void _applyEffectModifier(AbstractCharacter source, AbstractWorldObject awo, int trains, AbstractEffectJob effect) {
-        // Optional: custom logic when fear is applied
-    }
-
-    @Override
-    public void applyBonus(AbstractCharacter ac, int trains) {
-        PlayerBonuses bonus = ac.getBonuses();
-
-        bonus.setBool(this.modType, this.sourceType, true);
-        ac.cancelOnFear();
-        ac.setIsCasting(false);
-        ac.stopMovement(ac.getLoc());
-        
-        // Schedule the wander job if not already scheduled
-        if (ac.getTimers().get("FearWander") == null) {
-            JobContainer wanderJob = JobScheduler.getInstance().scheduleJob(
-                new FearWanderJob(ac), 2000
-            );
-
-            ac.getTimers().put("FearWander", wanderJob);
-        }
-    }
-
-    @Override
-    public void applyBonus(Item item, int trains) {}
-    @Override
-    public void applyBonus(Building building, int trains) {}
-}

src/engine/server/world/WorldServer.java

@@ -288,6 +288,7 @@ public class WorldServer {
 
 	private boolean init() {
 
+		Logger.info("Server Code: [NovaTest] Branch");
 		Logger.info("MAGICBANE SERVER GREETING:");
 		Logger.info(ConfigManager.MB_WORLD_GREETING.getValue());
 

src/engine/util/ZoneLevel.java

@@ -0,0 +1,84 @@
+package engine.util;
+
+import engine.objects.Zone;
+
+public class ZoneLevel {
+
+    private static final float healthPctPerLevel = (float)0.2;
+    private static final float atrPctPerLevel = (float)0.2;
+    private static final float defPctPerLevel = (float)0.2;
+    private static final float lootPctPerLevel = (float)0.1;
+    private static final float goldPctPerLevel = (float)0.2;
+
+    public static final int campLvlAnnounceThreshold = 5;
+    public static final int campMaxLvl = 10;
+
+    public static final int queueLengthToLevelUp = 5;
+    public static final int msToLevelDown = 60 * 1000;
+    public static final int msTolevelUp = 60 * 1000;
+    public static final long msDelayToCampLevel = 60 * 1000;
+
+    private static final String[] nameMap =
+            {
+              "",
+              " I",
+              " II",
+              " III",
+              " IV",
+              " V",
+              " VI",
+              " VII",
+              " VIII",
+              " IX",
+              " X"
+            };
+
+    public static String getNameSuffix(Zone zone)
+    {
+        try {
+            return nameMap[zone.getCampLvl()];
+        }
+        catch (Exception ignored)
+        {
+        }
+
+        return "";
+    }
+
+    public static float getMaxHealthPctModifier(Zone zone)
+    {
+        return getGenericModifier(zone, healthPctPerLevel);
+    }
+
+    public static float getAtrPctModifier(Zone zone)
+    {
+        return getGenericModifier(zone, atrPctPerLevel);
+    }
+
+    public static float getDefPctModifier(Zone zone)
+    {
+        return getGenericModifier(zone, defPctPerLevel);
+    }
+
+    public static float getLootDropModifier(Zone zone)
+    {
+        return getGenericModifier(zone, lootPctPerLevel);
+    }
+
+    public static float getGoldDropModifier(Zone zone)
+    {
+        return getGenericModifier(zone, goldPctPerLevel);
+    }
+
+    private static float getGenericModifier(Zone zone, float modifierPerLevel)
+    {
+        float modifier = (float)1.0;
+
+        if (zone != null)
+        {
+            modifier += zone.getCampLvl() * modifierPerLevel;
+        }
+
+        return modifier;
+    }
+}