proc fix

src/engine/ConfigParsing/EffectEntry/Condition.java

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

src/engine/ConfigParsing/EffectEntry/EffectEntry.java

@@ -1,12 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,80 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2024
-//                www.magicbane.com
-
-package engine.ConfigParsing;
-
-import engine.ConfigParsing.EffectEntry.EffectEntry;
-import engine.gameManager.ConfigManager;
-
-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 = effectData.substring(0, effectData.indexOf('\n'));
-        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/CombatManager.java

@@ -221,16 +221,6 @@ 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()) {

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 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.prefixToken == 0)
             forgedItem.prefixToken = calcRandomMod(workOrder.vendor, mbEnums.ItemModType.PREFIX, template.modTable);
         else
             forgedItem.prefixToken = workOrder.prefixToken;
 
-        if (workOrder.suffixToken == 0 && workOrder.vendor.getItemModTable().contains((template.modTable)))
+        if (workOrder.suffixToken == 0)
             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,8 +135,7 @@ public class WorkOrder implements Delayed {
         if (!workOrder.vendor.charItemManager.hasRoomInventory(template.item_wt))
             return 30;  //30: That person cannot carry that item
 
-        if ((workOrder.prefixToken != 0 || workOrder.suffixToken != 0) &&
+        if (!workOrder.vendor.getItemModTable().contains((template.modTable)))
-                !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, 1000, 30),
+        BRONZEWOOD(1580006, -519681813, 1334770447, 500, 10),
         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,9 +102,6 @@ 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 52: //player character
+            case 53: //player character
                 pet.setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
                 break;
             case 37://mob

src/engine/objects/CharacterItemManager.java

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