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/gameManager/CombatManager.java

@@ -197,8 +197,6 @@ public enum CombatManager {
                 }
         }
 
-        checkForProc(attacker,target,weapon);
-
         //get delay for the auto attack job
         long delay = 5000;
 
@@ -223,6 +221,16 @@ public enum CombatManager {
 
         if (inRange) {
 
+            if(attacker.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)){
+                if(!attacker.getTimestamps().contains(slot.name()+"Attack")){
+                    attacker.getTimestamps().put(slot.name()+"Attack", System.currentTimeMillis() - 1000);
+                } else if(System.currentTimeMillis() < attacker.getTimestamps().get(slot.name()+"Attack") + delay){
+                    setAutoAttackJob(attacker,slot,delay);
+                    return;
+                }
+            }
+
+
             //handle retaliate
             if (AbstractCharacter.IsAbstractCharacter(target)) {
                 if (((AbstractCharacter) target).combatTarget == null || !((AbstractCharacter) target).combatTarget.isAlive()) {
@@ -359,6 +367,9 @@ public enum CombatManager {
                 }
             }
 
+            //check for proccing
+            checkForProc(attacker,target,weapon);
+
             //calculate the base damage
             int damage = ThreadLocalRandom.current().nextInt(min, max + 1);
             if (damage == 0) {

src/engine/gameManager/ForgeManager.java

@@ -265,12 +265,12 @@ public enum ForgeManager implements Runnable {
 
         // Assign a prefix and suffix to this item if random rolled
 
-        if (workOrder.prefixToken == 0)
+        if (workOrder.prefixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0)
+        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
             forgedItem.suffixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.SUFFIX, template.modTable);
         else
             forgedItem.suffixToken = workOrder.suffixToken;

src/engine/gameManager/ItemManager.java

@@ -102,7 +102,7 @@ public enum ItemManager {
             if (characterSkill == null)
                 return false;
 
-            if (characterSkill.getModifiedAmountBeforeMods() > required_value)
+            if (characterSkill.getModifiedAmountBeforeMods() >= required_value)
                 return true;
 
         }

src/engine/loot/WorkOrder.java

@@ -135,7 +135,8 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+                !workOrder.vendor.getItemModTable().contains((template.modTable)))
             return 59;   //59: This hireling does not have this formula
 
         if (!Warehouse.calcCostOverrun(workOrder).isEmpty())

src/engine/mbEnums.java

@@ -2727,7 +2727,7 @@ public class mbEnums {
         ANTIMONY(1580014, 1256147265, 452320058, 1000, 10),
         AZOTH(1580012, -1205326951, 78329697, 2000, 20),
         BLOODSTONE(1580020, -1912381716, -1569826353, 500, 5),
-        BRONZEWOOD(1580006, -519681813, 1334770447, 500, 10),
+        BRONZEWOOD(1580006, -519681813, 1334770447, 1000, 30),
         COAL(1580008, -1672872311, 2559427, 3000, 30),
         DIAMOND(1580010, 1540225085, -1730704107, 2000, 20),
         GALVOR(1580017, -1683992404, -1596311545, 2000, 5),

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

@@ -102,6 +102,9 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
+        //cannot be subbed into a nation if you already have your own sub guilds
+        if(targetGuild.getSubGuildList() != null && targetGuild.getSubGuildList().size() > 0)
+            return true;
 
         if (!sourceGuild.canSubAGuild(targetGuild)) {
             sendChat(source, "This Guild can't be subbed.");

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

@@ -54,7 +54,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
             pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
 
         switch (msg.getTargetType()) {
-            case 53: //player character
+            case 52: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

src/engine/objects/CharacterItemManager.java

@@ -1400,6 +1400,7 @@ public class CharacterItemManager {
 
             if (!ItemManager.validForSkills(item, pc.getSkills())) {
                 this.forceToInventory(slot, item, pc, initialized);
+                this.equipped.remove(slot);
                 pc.applyBonuses();
             }
         }

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