parsing multi worded names

src/engine/ConfigParsing/EffectsData/Condition.java

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

src/engine/ConfigParsing/EffectsData/EffectData.java

@@ -0,0 +1,14 @@
+package engine.ConfigParsing.EffectsData;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+
+public class EffectData {
+    public String id;
+    public String name;
+    public int icon;
+    public ArrayList<mbEnums.EffectSourceType> sources;
+    public ArrayList<Mod> mods;
+    public ArrayList<String> conditions;
+}

src/engine/ConfigParsing/EffectsData/Mod.java

@@ -0,0 +1,10 @@
+package engine.ConfigParsing.EffectsData;
+
+import engine.mbEnums;
+
+import java.util.ArrayList;
+
+public class Mod {
+    public mbEnums.ModType type;
+    public ArrayList<String> values;
+}

src/engine/ConfigParsing/EffectsParser.java

@@ -0,0 +1,200 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2024
+//                www.magicbane.com
+
+
+package engine.ConfigParsing;
+
+import engine.ConfigParsing.EffectsData.Condition;
+import engine.ConfigParsing.EffectsData.EffectData;
+import engine.ConfigParsing.EffectsData.Mod;
+import engine.gameManager.ConfigManager;
+import engine.mbEnums;
+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.List;
+
+public class EffectsParser {
+
+    public static String EffectsPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/Effects.cfg";
+    public static HashMap<String, EffectData> effect_data = new HashMap<>();
+
+    public static void init() throws IOException {
+
+        ArrayList<ArrayList<String>> compiledData = new ArrayList<>();
+        List<String> fileData = Files.readAllLines(Paths.get(EffectsPath));
+        ArrayList<String> modData = new ArrayList<>();
+
+        for (String line : fileData) {
+
+            if (line.contains("EFFECTBEGIN")) {
+                modData = new ArrayList<>();
+                continue;
+            }
+
+            if (line.contains("EFFECTEND"))
+                compiledData.add(modData);
+            else
+                modData.add(line);
+        }
+
+        CreateBlocks(compiledData);
+    }
+
+    public static void CreateBlocks(ArrayList<ArrayList<String>> compiledData) {
+
+        for (ArrayList<String> compiledLines : compiledData) {
+
+            EffectData effectData = new EffectData();
+            effectData.id = compiledLines.get(1).replace("     ", "").split(" ")[0];
+            effectData.sources = new ArrayList<>();
+            effectData.mods = new ArrayList<>();
+            effectData.conditions = new ArrayList<>();
+
+            try {
+                String rawData = compiledLines.get(1).replace("     ", "");
+                if(rawData.contains("\"")){
+                    int startIndex = rawData.indexOf('"') + 1;
+                    int endIndex = rawData.lastIndexOf('"');
+                    char[] nameValue = rawData.toCharArray();
+                    String name = "";
+                    for(int i = startIndex; i < endIndex; i++){
+                        name += nameValue[i];
+                    }
+                    effectData.name = name;
+                }
+                int iconID;
+                try {
+                    iconID = Integer.parseInt(compiledLines.get(1).replace("     ", "").split(" ")[2]);
+                } catch(Exception e){
+                    iconID = 0;
+                }
+                effectData.icon = iconID;
+            } catch (Exception e) {
+                Logger.error(e);
+            }
+
+            int index = 0;
+
+            //log all sources
+
+            for (String line : compiledLines) {
+                String rawValue;
+                if (line.contains("SOURCEBEGIN")) {
+                    rawValue = compiledLines.get(index + 1).replace("          ", "");
+                    switch (rawValue) {
+                        case "Crush":
+                            rawValue = "Crushing";
+                            break;
+                        case "Slash":
+                            rawValue = "Slashing";
+                            break;
+                        case "Pierce":
+                            rawValue = "Piercing";
+                            break;
+
+                    }
+                    effectData.sources.add(mbEnums.EffectSourceType.valueOf(rawValue));
+                }
+                index++;
+            }
+
+            //log all mods
+
+            index = 0;
+
+            for (String line : compiledLines) {
+
+                if (line.contains("MODSBEGIN")) {
+
+                    int extra = 1;
+                    Mod mod = new Mod();
+
+                    while (!compiledLines.get(index + extra).contains("MODSEND")) {
+                        //data.mods.add(lines[index + extra].Replace("          ", ""));
+                        String rawValue = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
+                        try {
+                            mod.type = mbEnums.ModType.valueOf(rawValue);
+                        }catch(Exception e){
+                            mod.type = mbEnums.ModType.None;
+                        }
+                        GenerateModValues(mod, compiledLines.get(index + extra).replace("          ", "").replace("    ", "").split(" "));
+                        extra++;
+                    }
+                    effectData.mods.add(mod);
+                }
+                index++;
+            }
+
+            //log all conditions
+
+            index = 0;
+            for (String line : compiledLines) {
+
+                if (line.contains("CONDITIONBEGIN")) {
+
+                    int extra = 1;
+
+                    while (!compiledLines.get(index + extra).contains("CONDITIONEND")) {
+
+                        if (!compiledLines.get(index + extra).contains("#")) {
+                            //data.conditions.add(lines[index + extra].Replace("          ", ""));
+                            Condition condition = new Condition();
+                            condition.type = compiledLines.get(index + extra).replace("          ", "").split(" ")[0];
+                            condition.value = compiledLines.get(index + extra).replace("          ", "").split(" ")[1];
+                        }
+                        extra++;
+                    }
+                }
+                index++;
+            }
+            effect_data.put(effectData.id, effectData);
+        }
+        Logger.info("Effects.cfg Parsing Completed");
+    }
+
+    public static void GenerateModValues(Mod inMod, String[] data) {
+
+
+
+        int maxValue = 5;
+
+        if(inMod.type != null && inMod.type.name().equals("Health")){
+            maxValue = 7;
+        }
+
+        if(data.length < maxValue)
+            maxValue = data.length;
+
+        inMod.values = new ArrayList<>();
+
+        for (int i = 1; i < data.length; i++)
+            if (!data[i].isEmpty()) {
+                if (i >= maxValue)
+                    continue;
+
+                if (i == maxValue - 1)
+                    try {
+                        String entry = "";
+                        for (int j = i; j < data.length; j ++){
+                           entry += data[j] + " ";
+                        }
+                        entry = entry.trim();
+                        inMod.values.add(entry.trim());
+                    } catch (Exception e) {
+                        inMod.values.add(data[i]);
+                    }
+                else
+                    inMod.values.add(data[i]);
+            }
+    }
+}

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -32,14 +32,10 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
         ArrayList<BuildingLocation> buildingLocations = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(
+             PreparedStatement preparedStatement = connection.prepareStatement("select `ID`, `BuildingID`, `type`, `slot`, `unknown`, `locX`, `locY`, `locZ`, `w`,  `rotX`, `rotY`, `rotZ` from static_building_location " +
-                     "SELECT MIN(ID), BuildingID, slot, MIN(type), MIN(unknown), MIN(locX), MIN(locY), MIN(locZ), " +
+                     "where type = 6 or type = 8 " +
-                             "MIN(w), MIN(rotX), MIN(rotY), MIN(rotZ) " +
+                     "GROUP BY buildingID, slot " +
-                             "FROM static_building_location " +
+                     "ORDER BY buildingID, slot ASC;")) {
-                             "WHERE type IN (6, 8) " +
-                             "GROUP BY BuildingID, slot " +
-                             "ORDER BY BuildingID, slot ASC;"
-             )) {
 
             ResultSet rs = preparedStatement.executeQuery();
             buildingLocations = getObjectsFromRs(rs, 20);

src/engine/db/handlers/dbCityHandler.java

@@ -210,7 +210,7 @@ public class dbCityHandler extends dbHandlerBase {
     public boolean updateSiegesWithstood(City city, int value) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `siegesWithstood`=?"
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_city` SET `name`=?"
                      + " WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);

src/engine/db/handlers/dbHandlerBase.java

@@ -58,9 +58,6 @@ public abstract class dbHandlerBase {
 
                 int id = rs.getInt(1);
 
-                if (id == 883640)
-                    Logger.info("hit");
-
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {

src/engine/net/client/handlers/ClaimAssetMsgHandler.java

@@ -17,8 +17,9 @@ import engine.mbEnums.BuildingGroup;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClaimAssetMsg;
 import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.ErrorPopupMsg;
+import engine.objects.Blueprint;
-import engine.objects.*;
+import engine.objects.Building;
+import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
 
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -110,9 +111,9 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
             // Can't claim a tree if your guild already owns one
             // *** Refactor : Send error to player here
 
-            if(blueprint.getBuildingGroup() == BuildingGroup.TOL && !validateTreeClaim(sourcePlayer)){
+            if ((sourcePlayer.getGuild().isNation()) &&
+                    (blueprint.getBuildingGroup() == BuildingGroup.TOL))
                 return true;
-            }
 
             // Process the transfer of the building(s)
 
@@ -134,24 +135,4 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
         return true;
     }
 
-    private boolean validateTreeClaim(PlayerCharacter sourcePlayer) {
-
-        if(sourcePlayer.guild.equals(Guild.getErrantGuild())) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Errant Players Cannot Claim Cities!");
-            return false;
-        }
-
-        if(sourcePlayer.guild.getOwnedCity() != null) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Your Guild Already Owns A City!");
-            return false;
-        }
-
-        if(!GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus())) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only A Guild Leader Can Claim A Tree Of Life!");
-            return false;
-        }
-
-        return true;
-    }
-
 }

src/engine/net/client/handlers/PlaceAssetMsgHandler.java

@@ -528,15 +528,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
 
         if (cityObject.warehouse != null) {
-            if(cityObject.warehouse.building != null) {
+            PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-                //warehosue has a building already, warehouse still should exist
+            return false;
-                PlaceAssetMsg.sendPlaceAssetError(origin, 50, "");  //"You can only have one warehouse"
-                return false;
-            }else{
-                //warehouse has no building and needs a cleanup
-                DbManager.WarehouseQueries.DELETE_WAREHOUSE(cityObject.warehouse);
-                cityObject.warehouse = null;
-            }
         }
 
         // Create the warehouse object and it's entry in the database

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();