Debugging

src/engine/ConfigParsing/EffectEntry/Condition.java

@@ -0,0 +1,6 @@
+package engine.ConfigParsing.EffectEntry;
+
+public class Condition {
+    public String type;
+    public String value;
+}

src/engine/ConfigParsing/EffectEntry/EffectEntry.java

@@ -0,0 +1,12 @@
+package engine.ConfigParsing.EffectEntry;
+
+import java.util.HashSet;
+
+public class EffectEntry {
+    public String id;
+    public String name;
+    public int icon;
+    public HashSet<String> sources = new HashSet<>();
+    public HashSet<String> mods;
+    public HashSet<String> conditions;
+}

src/engine/ConfigParsing/EffectEntry/Mod.java

@@ -0,0 +1,12 @@
+package engine.ConfigParsing.EffectEntry;
+
+import engine.mbEnums;
+
+public class Mod {
+    public mbEnums.ModType type;
+    public int min;
+    public int max;
+    public float scale;
+    public String slopeType;
+    public String target;
+}

src/engine/ConfigParsing/EffectsParser.java

@@ -0,0 +1,88 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+package engine.ConfigParsing;
+
+import engine.ConfigParsing.EffectEntry.EffectEntry;
+import engine.gameManager.ConfigManager;
+import org.pmw.tinylog.Logger;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class EffectsParser {
+
+    public static String EffectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
+    public static HashMap<String, EffectEntry> effect_data = new HashMap<>();
+    private static final Pattern EFFECT_REGEX = Pattern.compile("(?<=EFFECTBEGIN)(.+?)(?=EFFECTEND)", Pattern.DOTALL);
+    private static final Pattern SOURCE_REGEX = Pattern.compile("(?<=SOURCEBEGIN)(.+?)(?=SOURCEEND)", Pattern.DOTALL);
+    private static final Pattern MODS_REGEX = Pattern.compile("(?<=MODSBEGIN)(.+?)(?=MODSEEND)", Pattern.DOTALL);
+    private static final Pattern STRSPLIT_REGEX = Pattern.compile("([^\"]\\S*|\".+?\")\\s*");
+    public static void init() throws IOException {
+
+        byte[] fileData = Files.readAllBytes(Paths.get(EffectsPath));
+        String fileContents = new String(fileData);
+        Matcher matcher = EFFECT_REGEX.matcher(fileContents);
+
+        // Iterate effect entries from .wpak config data
+
+        while (matcher.find()) {
+            EffectEntry effectEntry = parseEffectEntry(matcher.group());
+
+            if (effectEntry != null)
+                effect_data.put(effectEntry.id, effectEntry);
+        }
+    }
+
+    private static EffectEntry parseEffectEntry(String effectData) {
+        EffectEntry effectEntry = new EffectEntry();
+
+        // Remove all lines that contain a # and leading/trailing blanks
+
+        effectData = effectData.replaceAll("(?m)^.*#.*\r?\n?", "");
+        effectData = effectData.trim();
+
+        // Parse effect entry description
+
+        String firstLine = "";
+
+        try {
+            firstLine = effectData.substring(0, effectData.indexOf('\n'));
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+
+        ArrayList<String> effectDescription = new ArrayList<>();
+
+        Matcher matcher = STRSPLIT_REGEX.matcher(firstLine);
+
+        while (matcher.find())
+            effectDescription.add(matcher.group(1));
+
+        effectEntry.id = effectDescription.get(0);
+        effectEntry.name = effectDescription.get(1);
+        effectEntry.icon = Integer.parseInt(effectDescription.get(2));
+
+        // Parse source entries
+
+        matcher = SOURCE_REGEX.matcher(effectData);
+
+        while (matcher.find())
+            effectEntry.sources.add(matcher.group().trim());
+
+        // Parse modifier entries
+
+        return effectEntry;
+
+    }
+}

src/engine/gameManager/BuildingManager.java

@@ -777,7 +777,7 @@ public enum BuildingManager {
         int newMeshUUID;
         boolean success;
 
-        // If this building has no blueprint then set rank and exit immediately.
+        // If this building has no blueprint then set rank and exit immediatly.
 
         if (building.blueprintUUID == 0 || building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)) {
             building.rank = rank;

src/engine/objects/Building.java

@@ -505,11 +505,6 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
-        if (city.destroyed.get() == true) {
-            Logger.error(city.getName() + "derankk called on destroyed city");
-            return;
-        }
-
         bane = city.getBane();
 
         // We need to collect the spires and shrines on the citygrid in case
@@ -597,13 +592,6 @@ public class Building extends AbstractWorldObject {
             return;
         }
 
-        if (city.destroyed.get() == true) {
-            Logger.error(city.getName() + "attempt to destroy a destroyed city");
-            return;
-        }
-
-        city.destroyed.set(true);
-
         // Must remove a bane before considering destruction of a TOL
 
         if (bane != null) {

src/engine/objects/City.java

@@ -41,7 +41,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public class City extends AbstractWorldObject {
@@ -81,7 +80,6 @@ public class City extends AbstractWorldObject {
     private String hash;
     public Warehouse warehouse;
     public Realm realm;
-    public AtomicBoolean destroyed = new AtomicBoolean(false);
 
     /**
      * ResultSet Constructor
@@ -1106,7 +1104,7 @@ public class City extends AbstractWorldObject {
 
         Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("destroyCity: " + this.getName());
+        destroyCityThread.setName("destroyCity:" + this.getName());
         destroyCityThread.start();
     }
 
@@ -1114,7 +1112,7 @@ public class City extends AbstractWorldObject {
 
         Thread transferCityThread = new Thread(new TransferCityThread(this, newOwner));
 
-        transferCityThread.setName("TransferCity: " + this.getName());
+        transferCityThread.setName("TransferCity:" + this.getName());
         transferCityThread.start();
     }
 

src/engine/server/world/WorldServer.java

@@ -9,6 +9,7 @@
 
 package engine.server.world;
 
+import engine.ConfigParsing.EffectsParser;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.DataWarehouse;
@@ -76,7 +77,7 @@ public class WorldServer {
         super();
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws IOException {
 
         WorldServer worldServer;
 
@@ -93,6 +94,8 @@ public class WorldServer {
             return;
         }
 
+        EffectsParser.init();
+
         try {
 
             worldServer = new WorldServer();

src/engine/workthreads/DestroyCityThread.java

@@ -83,6 +83,8 @@ public class DestroyCityThread implements Runnable {
             }
         }
 
+        Building tol = null;
+
         // Build list of buildings within this parent zone
 
         for (Building cityBuilding : cityZone.zoneBuildingSet) {
@@ -98,6 +100,13 @@ public class DestroyCityThread implements Runnable {
             if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
                 continue;
 
+            // TOL is processed after all other structures in the city zone
+
+            if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) {
+                tol = cityBuilding;
+                continue;
+            }
+
             // All buildings are moved to a location relative
             // to their new parent zone
 
@@ -137,6 +146,11 @@ public class DestroyCityThread implements Runnable {
             }
         }
 
+        // Destroy the tol
+
+        if (tol != null)
+            BuildingManager.setRank(tol, -1);
+
         if (city.realm != null)
             city.realm.removeCity(city.getObjectUUID());