Reactor spray-drop + Quest with equipped items + MapleMapInfoRetriever

Implemented GMS-like "item spraying" from reactors. All boxes holding more than 5 drops have been changed to use this behavior.
Added information for players trying to start/complete quests having the required item equipped. It is expected to have all required items unequipped before handling a quest operation.
New check-purpose tool: MapleMapInfoRetriever. It's sole function is to detect and report map XMLs that has no "info" node in between the server files.

.gitignore

@@ -38,3 +38,7 @@
 /tools/MobBookUpdate/build/
 /tools/MobBookUpdate/dist/
 /tools/MobBookUpdate/nbproject/private/
+
+/tools/MapleMapInfoRetriever/build/
+/tools/MapleMapInfoRetriever/dist/
+/tools/MapleMapInfoRetriever/nbproject/private/

docs/feature_list.txt

@@ -49,7 +49,7 @@ Cash & Items:
 * Owl of Minerva.
 * Pet item ignore.
 
-Monsters & Maps:
+Monsters, Maps & Reactors:
 * Every monsterbook card is now droppable by overworld mobs.
 * Added meso drop data for basically every missing overworld mob.
 * Monsterbook displays drop data info conformant with the underlying DB (needs custom wz). See more on the MobBookUpdate feature.
@@ -58,6 +58,7 @@ Monsters & Maps:
 * If multiple bosses are on the same area, client will prioritize Boss HP bar of the target of the player.
 * Boats, elevator and other travelling mechanics fully working.
 * PQs, Taxis and other event-driven situations warps players at random spawnpoints, GMS-like.
+* Some reactors (PQ bonus boxes) now sprays items on the map, instead of dropping everything at once.
 
 PQ potentials:
 * Lobby system - Multiple PQ instances on same channel.
@@ -92,6 +93,7 @@ External tools:
 * MapleArrowFetcher - Updates min/max quantity dropped on all arrows drop data, calculations based on mob level and whether it's a boss or not.
 * MapleCouponInstaller - Retrieves coupon info from the WZ and makes a SQL table with it. The server will use that table to gather info regarding rates and intervals.
 * MapleIdRetriever - Two behaviors: generates a SQL table with relation (id, name) of the handbook given as input. Given a file with names, outputs a file with ids.
+* MapleMapInfoRetriever - Basic tool for detecting missing info nodes on the map field structures (maps failing to have an info node on the WZ is an critical issue).
 * MapleMesoFetcher - Creates meso drop data for mobs with more than 4 items (thus overworld mobs), calculations based on mob level and whether it's a boss or not.
 * MapleQuestItemFetcher - Searches the SQL tables and project files and reports in all relevant data regarding missing/erroneous quest items.
 * MobBookIndexer - Generates a SQL table with all relations of cardid and mobid present in the mob book.

docs/mychanges_ptbr.txt

@@ -681,3 +681,8 @@ Rearranjado ID de jogador agora come
 Corrigido timer de quest não saindo do cliente quando dado o termino bem-sucedido da quest.
 Corrigido MapleArrowFetcher atribuindo valores iguais para min e max ranges. Max deve sempre ser maior que min.
 Corrigido bug no ThreadTracker não mostrando os últimos locks capturados pelas threads corretamente.
+
+18 - 20 Novembro 2017,
+Implementado items sendo dropados de reatores intervaladamente, GMS-like.
+Adicionado informação ao jogador que tentar completar uma quest com item necessário equipado.
+Nova ferramenta: MapleMapInfoRetriever. Detecção básica de mapas com sem nó de info em sua estrutura WZ.

scripts/quest/21600.js

@@ -0,0 +1,47 @@
+/*
+	This file is part of the MapleSolaxiaV2 Maple Story Server
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+var status = -1;
+
+function start(mode, type, selection) {
+    if (mode == -1) {
+        qm.dispose();
+    } else {
+        if(mode == 0 && type > 0) {
+            qm.dispose();
+            return;
+        }
+        
+        if (mode == 1)
+            status++;
+        else
+            status--;
+        
+        if (status == 0) {
+            qm.sendNext("Hey, Aran. You seem pretty strong, since that time from when you got freed from the glacier. Suitable enough to #bride a wolf#k, if you ask me.");
+        } else if (status == 1) {
+            qm.sendAcceptDecline("Picked your interest, huh? Very well, first you must make your way to #bAqua#k, there is a person there who makes #rfood for wolf cubs#k. Bring one portion to me, and I shall deem you able to tame and take care of one. What do you say, will you try for it?");
+        } else if (status == 2) {
+            qm.sendNext("Alright. The one you must meet is #bNanuke#k, she is on top of a #rsnowy whale#k, somewhere in the ocean. Good luck!");
+            qm.forceStartQuest();
+            
+            qm.dispose();
+        }
+    }
+}

scripts/reactor/2002017.js

@@ -20,10 +20,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*@author Ronan
- *Reactor : OrbisPQ Bonus Reactor - 2202004.js
+ *Reactor : OrbisPQ Bonus Reactor - 2002017.js
  * Drops all the Bonus Items
  */
  
 function act() {
-        rm.dropItems(true, 1, 100, 400, 15);
+        rm.sprayItems(true, 1, 100, 400, 15);
 }

scripts/reactor/2002018.js

@@ -0,0 +1,29 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/*@author Ronan
+ *Reactor : OrbisPQ Bonus Reactor - 2002018.js
+ * Drops all the Bonus Items
+ */
+ 
+function act() {
+        rm.sprayItems(true, 1, 100, 400, 15);
+}

scripts/reactor/2202004.js

@@ -25,5 +25,5 @@
  */
  
 function act() {
-        rm.dropItems(true, 1, 30, 60, 15);
+        rm.sprayItems(true, 1, 30, 60, 15);
 }

scripts/reactor/2512001.js

@@ -29,5 +29,5 @@ function act() {
 	var now = eim.getIntProperty("openedChests");
 	var nextNum = now + 1;
 	eim.setIntProperty("openedChests", nextNum);
-	rm.dropItems(true, 1, 50, 100, 15);
+	rm.sprayItems(true, 1, 50, 100, 15);
 }

scripts/reactor/2612000.js

@@ -24,5 +24,5 @@
  */
  
 function act() {
-	rm.dropItems();
+	rm.sprayItems();
 }

scripts/reactor/2612001.js

@@ -24,5 +24,5 @@
  */
  
 function act() {
-	rm.dropItems();
+	rm.sprayItems();
 }

scripts/reactor/2612002.js

@@ -24,5 +24,5 @@
  */
  
 function act() {
-	rm.dropItems();
+	rm.sprayItems();
 }

scripts/reactor/2612003.js

@@ -24,5 +24,5 @@
  */
  
 function act() {
-	rm.dropItems();
+	rm.sprayItems();
 }

scripts/reactor/2612004.js

@@ -24,5 +24,5 @@
  */
  
 function act() {
-	rm.dropItems();
+	rm.sprayItems();
 }

scripts/reactor/6102002.js

@@ -25,5 +25,5 @@
  */
  
 function act() {
-	rm.dropItems(true, 1, 90, 360, 15);
+	rm.sprayItems(true, 1, 90, 360, 15);
 }

scripts/reactor/6102003.js

@@ -25,5 +25,5 @@
  */
  
 function act() {
-	rm.dropItems(true, 1, 90, 360, 15);
+	rm.sprayItems(true, 1, 90, 360, 15);
 }

scripts/reactor/6102004.js

@@ -25,5 +25,5 @@
  */
  
 function act() {
-	rm.dropItems(true, 1, 90, 360, 15);
+	rm.sprayItems(true, 1, 90, 360, 15);
 }

scripts/reactor/6102005.js

@@ -25,5 +25,5 @@
  */
  
 function act() {
-	rm.dropItems(true, 1, 90, 360, 15);
+	rm.sprayItems(true, 1, 90, 360, 15);
 }

scripts/reactor/6702003.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702004.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702005.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702006.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702007.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702008.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702009.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702010.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702011.js

@@ -29,6 +29,6 @@ function act() {
 	if (rand < 1) rand = 1;
 	//We'll make it drop a lot of crap :D
 	for (var i = 0; i<rand; i++) {
-		rm.dropItems(true, 1, 30, 60, 15);
+		rm.sprayItems(true, 1, 30, 60, 15);
 	}
 }

scripts/reactor/6702012.js

@@ -0,0 +1,34 @@
+/*
+	This file is part of the OdinMS Maple Story Server
+    Copyright (C) 2008 Patrick Huy <patrick.huy@frz.cc>
+		       Matthias Butz <matze@odinms.de>
+		       Jan Christian Meyer <vimes@odinms.de>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ *AmoriaPQ Bonus Reactor
+ *6702012.js
+ */
+
+function act() {
+	rand = Math.floor(Math.random() * 4);
+	if (rand < 1) rand = 1;
+	//We'll make it drop a lot of crap :D
+	for (var i = 0; i<rand; i++) {
+		rm.sprayItems(true, 1, 30, 60, 15);
+	}
+}

scripts/reactor/9202012.js

@@ -26,5 +26,5 @@
 */
 
 function act() {
-	rm.dropItems(true, 1, 30, 60, 10);
+	rm.sprayItems(true, 1, 30, 60, 10);
 }

src/constants/ServerConstants.java

@@ -24,7 +24,7 @@ public class ServerConstants {
     public static final long RESPAWN_INTERVAL = 10 * 1000;	//10 seconds, 10000.
     public static final long PURGING_INTERVAL = 5 * 60 * 1000;
     public static final long RANKING_INTERVAL = 60 * 60 * 1000;	//60 minutes, 3600000.
-    public static final long COUPON_INTERVAL = 60 * 60 * 1000;	//60 minutes, 3600000.
+    public static final long  COUPON_INTERVAL = 60 * 60 * 1000;	//60 minutes, 3600000.
     
     public static final boolean ENABLE_PIC = false;             //Pick true/false to enable or disable Pic. Delete character needs this feature ENABLED.
     public static final boolean ENABLE_PIN = false;             //Pick true/false to enable or disable Pin.

src/net/server/channel/handlers/AbstractDealDamageHandler.java

@@ -133,7 +133,7 @@ public abstract class AbstractDealDamageHandler extends AbstractMaplePacketHandl
                 return null;
             }
             if (display > 80) { //Hmm
-                if (!theSkill.getAction()) {
+                if (!mySkill.getAction()) {
                     AutobanFactory.FAST_ATTACK.autoban(chr, "WZ Edit; adding action to a skill: " + display);
                     return null;
                 }

src/scripting/reactor/ReactorActionManager.java

@@ -21,6 +21,7 @@
 */
 package scripting.reactor;
 
+import client.MapleCharacter;
 import client.MapleClient;
 import client.inventory.Equip;
 import client.inventory.Item;
@@ -53,6 +54,7 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
     private MapleReactor reactor;
     private MapleClient client;
     private Invocable iv;
+    private ScheduledFuture<?> sprayTask = null;
 
     public ReactorActionManager(MapleClient c, MapleReactor reactor, Invocable iv) {
         super(c);
@@ -69,6 +71,22 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
         reactor.getMap().destroyNPC(npcId);
     }
 
+    public void sprayItems() {
+        sprayItems(false, 0, 0, 0, 0);
+    }
+
+    public void sprayItems(boolean meso, int mesoChance, int minMeso, int maxMeso) {
+        sprayItems(meso, mesoChance, minMeso, maxMeso, 0);
+    }
+    
+    public void sprayItems(boolean meso, int mesoChance, int minMeso, int maxMeso, int minItems) {
+        sprayItems((int)reactor.getPosition().getX(), (int)reactor.getPosition().getY(), meso, mesoChance, minMeso, maxMeso, minItems);
+    }
+
+    public void sprayItems(int posX, int posY, boolean meso, int mesoChance, int minMeso, int maxMeso, int minItems) {
+        dropItems(true, posX, posY, meso, mesoChance, minMeso, maxMeso, minItems);
+    }
+    
     public void dropItems() {
         dropItems(false, 0, 0, 0, 0);
     }
@@ -82,6 +100,10 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
     }
 
     public void dropItems(int posX, int posY, boolean meso, int mesoChance, int minMeso, int maxMeso, int minItems) {
+        dropItems(false, posX, posY, meso, mesoChance, minMeso, maxMeso, minItems);
+    }
+    
+    public void dropItems(boolean delayed, int posX, int posY, boolean meso, int mesoChance, final int minMeso, final int maxMeso, int minItems) {
         List<ReactorDropEntry> chances = getDropChances();
         List<ReactorDropEntry> items = new LinkedList<>();
         int numItems = 0;
@@ -105,24 +127,61 @@ public class ReactorActionManager extends AbstractPlayerInteraction {
         final Point dropPos = new Point(posX, posY);
         dropPos.x -= (12 * numItems);
         
-        for (ReactorDropEntry d : items) {
+        if(!delayed) {
-            if (d.itemId == 0) {
+            for (ReactorDropEntry d : items) {
-                int range = maxMeso - minMeso;
+                if (d.itemId == 0) {
-                int displayDrop = (int) (Math.random() * range) + minMeso;
+                    int range = maxMeso - minMeso;
-                int mesoDrop = (displayDrop * client.getWorldServer().getMesoRate());
+                    int displayDrop = (int) (Math.random() * range) + minMeso;
-                reactor.getMap().spawnMesoDrop(mesoDrop, reactor.getMap().calcDropPos(dropPos, reactor.getPosition()), reactor, client.getPlayer(), false, (byte) 2);
+                    int mesoDrop = (displayDrop * client.getWorldServer().getMesoRate());
-            } else {
+                    reactor.getMap().spawnMesoDrop(mesoDrop, reactor.getMap().calcDropPos(dropPos, reactor.getPosition()), reactor, client.getPlayer(), false, (byte) 2);
-                Item drop;
-                MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
-                if (ii.getInventoryType(d.itemId) != MapleInventoryType.EQUIP) {
-                    drop = new Item(d.itemId, (short) 0, (short) 1);
                 } else {
-                    drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId));
+                    Item drop;
+                    MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+                    if (ii.getInventoryType(d.itemId) != MapleInventoryType.EQUIP) {
+                        drop = new Item(d.itemId, (short) 0, (short) 1);
+                    } else {
+                        drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId));
+                    }
+
+                    reactor.getMap().dropFromReactor(getPlayer(), reactor, drop, dropPos, (short)d.questid);
                 }
-                
+                dropPos.x += 25;
-                reactor.getMap().dropFromReactor(getPlayer(), reactor, drop, dropPos, (short)d.questid);
             }
-            dropPos.x += 25;
+        } else {
+            final MapleCharacter chr = client.getPlayer();
+            final MapleReactor r = reactor;
+            final List<ReactorDropEntry> dropItems = items;
+            final int worldMesoRate = client.getWorldServer().getMesoRate();
+            
+            sprayTask = TimerManager.getInstance().register(new Runnable() {
+                @Override
+                public void run() {
+                    if(dropItems.isEmpty()) {
+                        sprayTask.cancel(false);
+                        return;
+                    }
+                    
+                    ReactorDropEntry d = dropItems.remove(0);
+                    if (d.itemId == 0) {
+                        int range = maxMeso - minMeso;
+                        int displayDrop = (int) (Math.random() * range) + minMeso;
+                        int mesoDrop = (displayDrop * worldMesoRate);
+                        r.getMap().spawnMesoDrop(mesoDrop, r.getMap().calcDropPos(dropPos, r.getPosition()), r, chr, false, (byte) 2);
+                    } else {
+                        Item drop;
+                        MapleItemInformationProvider ii = MapleItemInformationProvider.getInstance();
+                        if (ii.getInventoryType(d.itemId) != MapleInventoryType.EQUIP) {
+                            drop = new Item(d.itemId, (short) 0, (short) 1);
+                        } else {
+                            drop = ii.randomizeStats((Equip) ii.getEquipById(d.itemId));
+                        }
+
+                        r.getMap().dropFromReactor(getPlayer(), r, drop, dropPos, (short)d.questid);
+                    }
+                    
+                    dropPos.x += 25;
+                }
+            }, 100);
         }
     }
 

src/server/maps/MapleMap.java

@@ -52,7 +52,9 @@ import java.util.Map.Entry;
 import java.util.Random;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicInteger;
+import tools.locks.MonitoredReentrantLock;
 import tools.locks.MonitoredReentrantReadWriteLock;
+import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
@@ -90,6 +92,8 @@ import tools.locks.MonitoredLockType;
 
 public class MapleMap {
     private static final List<MapleMapObjectType> rangedMapobjectTypes = Arrays.asList(MapleMapObjectType.SHOP, MapleMapObjectType.ITEM, MapleMapObjectType.NPC, MapleMapObjectType.MONSTER, MapleMapObjectType.DOOR, MapleMapObjectType.SUMMON, MapleMapObjectType.REACTOR);
+    private static final Map<Integer, Pair<Integer, Integer>> dropBoundsCache = new HashMap<>(100);
+    
     private Map<Integer, MapleMapObject> mapobjects = new LinkedHashMap<>();
     private Collection<SpawnPoint> monsterSpawn = Collections.synchronizedList(new LinkedList<SpawnPoint>());
     private Collection<SpawnPoint> allMonsterSpawn = Collections.synchronizedList(new LinkedList<SpawnPoint>());
@@ -104,6 +108,7 @@ public class MapleMap {
     private LinkedList<WeakReference<MapleMapObject>> registeredDrops = new LinkedList<>();
     private List<Rectangle> areas = new ArrayList<>();
     private MapleFootholdTree footholds = null;
+    private Pair<Integer, Integer> xLimits;  // caches the min and max x's with available footholds
     private Rectangle mapArea = new Rectangle();
     private int mapid;
     private AtomicInteger runningOid = new AtomicInteger(1000000001);
@@ -148,12 +153,16 @@ public class MapleMap {
     private MapleSnowball snowball0 = null;
     private MapleSnowball snowball1 = null;
     private MapleCoconut coconut;
+    
     //locks
     private final ReadLock chrRLock;
     private final WriteLock chrWLock;
     private final ReadLock objectRLock;
     private final WriteLock objectWLock;
 
+    // due to the nature of loadMapFromWz (synchronized), sole function that calls 'generateMapDropRangeCache', this lock remains optional.
+    private static final Lock bndLock = new MonitoredReentrantLock(MonitoredLockType.MAP_BOUNDS, true);
+    
     public MapleMap(int mapid, int world, int channel, int returnMapId, float monsterRate) {
         this.mapid = mapid;
         this.channel = channel;
@@ -437,17 +446,63 @@ public class MapleMap {
         return new Point(initial.x, dropY);
     }
 
+    public void generateMapDropRangeCache() {
+        bndLock.lock();
+        try {
+            Integer mapId = Integer.valueOf(mapid);
+            Pair<Integer, Integer> bounds = dropBoundsCache.get(mapId);
+            
+            if(bounds != null) {
+                xLimits = bounds;
+            } else {
+                Point lp = new Point(mapArea.x, mapArea.y), rp = new Point(mapArea.x + mapArea.width, mapArea.y), fallback = new Point(mapArea.x + (mapArea.width / 2), mapArea.y);
+
+                lp = bsearchDropPos(lp, fallback);
+                rp = bsearchDropPos(rp, fallback);
+
+                xLimits = new Pair<>(lp.x, rp.x);
+                dropBoundsCache.put(mapId, xLimits);
+            }
+        } finally {
+            bndLock.unlock();
+        }
+    }
+    
+    public Point bsearchDropPos(Point initial, Point fallback) {
+        Point res, dropPos = null;
+                
+        int awayx = fallback.x;
+        int homex = initial.x;
+                
+        int y = initial.y - 85;
+        
+        do {
+            int distx = awayx - homex;
+            int dx = distx / 2;
+            
+            int searchx = homex + dx;
+            if((res = calcPointBelow(new Point(searchx, y))) != null) {
+                awayx = searchx;
+                dropPos = res;
+            } else {
+                homex = searchx;
+            }
+        } while(Math.abs(homex - awayx) > 5);
+        
+        return (dropPos != null) ? dropPos : fallback;
+    }
+    
     public Point calcDropPos(Point initial, Point fallback) {
+        if(initial.x < xLimits.left) initial.x = xLimits.left;
+        else if(initial.x > xLimits.right) initial.x = xLimits.right;
+        
         Point ret = calcPointBelow(new Point(initial.x, initial.y - 85));
         if (ret == null) {
+            ret = bsearchDropPos(initial, fallback);
+        }
+        
+        if(!mapArea.contains(ret)) { // found drop pos outside the map :O
             return fallback;
-        } else if(!mapArea.contains(ret)) {
-            if(initial.y > mapArea.y + mapArea.height) return fallback; // found drop pos underneath the map :O
-            
-            int borderX = (initial.x < mapArea.x) ? mapArea.x : mapArea.x + mapArea.width;
-            ret = calcPointBelow(new Point(borderX, initial.y - 85));
-            
-            if(ret == null) return fallback;
         }
         
         return ret;

src/server/maps/MapleMapFactory.java

@@ -275,7 +275,9 @@ public class MapleMapFactory {
             e.printStackTrace();
             // swallow cause I'm cool
         }
+        
         map.setBackgroundTypes(backTypes);
+        map.generateMapDropRangeCache();
 
         mapsWLock.lock();
         try {

src/server/quest/requirements/ItemRequirement.java

@@ -73,10 +73,19 @@ public class ItemRequirement extends MapleQuestRequirement {
 				count += item.getQuantity();
 			}
 			//Weird stuff, nexon made some quests only available when wearing gm clothes. This enables us to accept it ><
-			if (iType.equals(MapleInventoryType.EQUIP) && chr.isGM()) {
+			if (iType.equals(MapleInventoryType.EQUIP)) {
-				for (Item item : chr.getInventory(MapleInventoryType.EQUIPPED).listById(itemId)) {
+                                if(chr.isGM()) {
-					count += item.getQuantity();
+                                        for (Item item : chr.getInventory(MapleInventoryType.EQUIPPED).listById(itemId)) {
-				}
+                                                count += item.getQuantity();
+                                        }
+                                } else {
+                                        if(count < countNeeded) {
+                                                if(chr.getInventory(MapleInventoryType.EQUIPPED).countById(itemId) + count >= countNeeded) {
+                                                        chr.dropMessage(5, "Unequip the required " + ii.getName(itemId) + " before trying this quest operation.");
+                                                        return false;
+                                                }
+                                        }
+                                }
 			}
 			
 			if(count < countNeeded || countNeeded <= 0 && count > 0) {

src/tools/locks/MonitoredLockType.java

@@ -66,8 +66,9 @@ public enum MonitoredLockType {
     MAP_OBJS(37),
     MAP_FACTORY(38),
     MAP_ITEM(39),
-    MINIDUNGEON(40),
+    MAP_BOUNDS(41),
-    REACTOR(41);
+    MINIDUNGEON(41),
+    REACTOR(42);
     
     private final int i;
     

tools/MapleMapInfoRetriever/build.xml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See commented blocks below for -->
+<!-- some examples of how to customize the build. -->
+<!-- (If you delete it and reopen the project it will be recreated.) -->
+<!-- By default, only the Clean and Build commands use this build script. -->
+<!-- Commands such as Run, Debug, and Test only use this build script if -->
+<!-- the Compile on Save feature is turned off for the project. -->
+<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
+<!-- in the project's Project Properties dialog box.-->
+<project name="MapleMapInfoRetriever" default="default" basedir=".">
+    <description>Builds, tests, and runs the project MapleMapInfoRetriever.</description>
+    <import file="nbproject/build-impl.xml"/>
+    <!--
+
+    There exist several targets which are by default empty and which can be 
+    used for execution of your tasks. These targets are usually executed 
+    before and after some main targets. They are: 
+
+      -pre-init:                 called before initialization of project properties
+      -post-init:                called after initialization of project properties
+      -pre-compile:              called before javac compilation
+      -post-compile:             called after javac compilation
+      -pre-compile-single:       called before javac compilation of single file
+      -post-compile-single:      called after javac compilation of single file
+      -pre-compile-test:         called before javac compilation of JUnit tests
+      -post-compile-test:        called after javac compilation of JUnit tests
+      -pre-compile-test-single:  called before javac compilation of single JUnit test
+      -post-compile-test-single: called after javac compilation of single JUunit test
+      -pre-jar:                  called before JAR building
+      -post-jar:                 called after JAR building
+      -post-clean:               called after cleaning build products
+
+    (Targets beginning with '-' are not intended to be called on their own.)
+
+    Example of inserting an obfuscator after compilation could look like this:
+
+        <target name="-post-compile">
+            <obfuscate>
+                <fileset dir="${build.classes.dir}"/>
+            </obfuscate>
+        </target>
+
+    For list of available properties check the imported 
+    nbproject/build-impl.xml file. 
+
+
+    Another way to customize the build is by overriding existing main targets.
+    The targets of interest are: 
+
+      -init-macrodef-javac:     defines macro for javac compilation
+      -init-macrodef-junit:     defines macro for junit execution
+      -init-macrodef-debug:     defines macro for class debugging
+      -init-macrodef-java:      defines macro for class execution
+      -do-jar:                  JAR building
+      run:                      execution of project 
+      -javadoc-build:           Javadoc generation
+      test-report:              JUnit report generation
+
+    An example of overriding the target for project execution could look like this:
+
+        <target name="run" depends="MapleMapInfoRetriever-impl.jar">
+            <exec dir="bin" executable="launcher.exe">
+                <arg file="${dist.jar}"/>
+            </exec>
+        </target>
+
+    Notice that the overridden target depends on the jar target and not only on 
+    the compile target as the regular run target does. Again, for a list of available 
+    properties which you can use, check the target you are overriding in the
+    nbproject/build-impl.xml file. 
+
+    -->
+</project>

tools/MapleMapInfoRetriever/lib/MapReport.txt

@@ -0,0 +1 @@
+All map files contains 'info' node.

tools/MapleMapInfoRetriever/manifest.mf

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+X-COMMENT: Main-Class will be added automatically by build
+

tools/MapleMapInfoRetriever/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=8863f245
+build.xml.script.CRC32=86cbb34a
+build.xml.stylesheet.CRC32=8064a381@1.75.2.48
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=8863f245
+nbproject/build-impl.xml.script.CRC32=187fba9b
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

tools/MapleMapInfoRetriever/nbproject/project.properties

@@ -0,0 +1,77 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.processors.list=
+annotation.processing.run.all.processors=true
+annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=MapleMapInfoRetriever
+application.vendor=RonanLana
+build.classes.dir=${build.dir}/classes
+build.classes.excludes=**/*.java,**/*.form
+# This directory is removed when the project is cleaned:
+build.dir=build
+build.generated.dir=${build.dir}/generated
+build.generated.sources.dir=${build.dir}/generated-sources
+# Only compile against the classpath explicitly listed here:
+build.sysclasspath=ignore
+build.test.classes.dir=${build.dir}/test/classes
+build.test.results.dir=${build.dir}/test/results
+# Uncomment to specify the preferred debugger connection transport:
+#debug.transport=dt_socket
+debug.classpath=\
+    ${run.classpath}
+debug.test.classpath=\
+    ${run.test.classpath}
+# Os arquivos em build.classes.dir que devem ser exclu\u00eddos do jar de distribui\u00e7\u00e3o
+dist.archive.excludes=
+# This directory is removed when the project is cleaned:
+dist.dir=dist
+dist.jar=${dist.dir}/MapleMapInfoRetriever.jar
+dist.javadoc.dir=${dist.dir}/javadoc
+endorsed.classpath=
+excludes=
+file.reference.commons-io-2.6.jar=lib/commons-io-2.6.jar
+includes=**
+jar.compress=false
+javac.classpath=\
+    ${file.reference.commons-io-2.6.jar}
+# Space-separated list of extra javac options
+javac.compilerargs=
+javac.deprecation=false
+javac.processorpath=\
+    ${javac.classpath}
+javac.source=1.7
+javac.target=1.7
+javac.test.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+javac.test.processorpath=\
+    ${javac.test.classpath}
+javadoc.additionalparam=
+javadoc.author=false
+javadoc.encoding=${source.encoding}
+javadoc.noindex=false
+javadoc.nonavbar=false
+javadoc.notree=false
+javadoc.private=false
+javadoc.splitindex=true
+javadoc.use=true
+javadoc.version=false
+javadoc.windowtitle=
+main.class=maplemapinforetriever.MapleMapInfoRetriever
+manifest.file=manifest.mf
+meta.inf.dir=${src.dir}/META-INF
+mkdist.disabled=false
+platform.active=JDK_1.7
+run.classpath=\
+    ${javac.classpath}:\
+    ${build.classes.dir}
+# Space-separated list of JVM arguments used when running the project.
+# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
+# To set system properties for unit tests define test-sys-prop.name=value:
+run.jvmargs=
+run.test.classpath=\
+    ${javac.test.classpath}:\
+    ${build.test.classes.dir}
+source.encoding=UTF-8
+src.dir=src
+test.src.dir=test

tools/MapleMapInfoRetriever/nbproject/project.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.java.j2seproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
+            <name>MapleMapInfoRetriever</name>
+            <explicit-platform explicit-source-supported="true"/>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+    </configuration>
+</project>

tools/MapleMapInfoRetriever/src/maplemapinforetriever/MapleMapInfoRetriever.java

@@ -0,0 +1,182 @@
+/*
+	This file is part of the MapleSolaxiaV2 Maple Story Server
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation version 3 as published by
+    the Free Software Foundation. You may not use, modify or distribute
+    this program under any other version of the GNU Affero General Public
+    License.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package maplemapinforetriever;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.apache.commons.io.FileUtils;
+
+/**
+ *
+ * @author RonanLana
+ * 
+ * The main objective of this tool is to locate all mapids that doesn't have
+ * the "info" node in their WZ node tree.
+ */
+public class MapleMapInfoRetriever {
+    static String mapWzPath = "../../wz/Map.wz/Map";
+    static String newFile = "lib/MapReport.txt";
+    
+    static List<Integer> missingInfo = new ArrayList<>();
+
+    static PrintWriter printWriter = null;
+    static InputStreamReader fileReader = null;
+    static BufferedReader bufferedReader = null;
+    static byte status = 0;
+    static boolean hasInfo;
+
+    private static String getName(String token) {
+        int i, j;
+        char[] dest;
+        String d;
+
+        i = token.lastIndexOf("name");
+        i = token.indexOf("\"", i) + 1; //lower bound of the string
+        j = token.indexOf("\"", i);     //upper bound
+
+        dest = new char[50];
+        token.getChars(i, j, dest, 0);
+
+        d = new String(dest);
+        return(d.trim());
+    }
+
+    private static void forwardCursor(int st) {
+        String line = null;
+
+        try {
+            while(status >= st && (line = bufferedReader.readLine()) != null) {
+                simpleToken(line);
+            }
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void simpleToken(String token) {
+        if(token.contains("/imgdir")) {
+            status -= 1;
+        }
+        else if(token.contains("imgdir")) {
+            status += 1;
+        }
+    }
+
+    private static boolean translateToken(String token) {
+        String d;
+        int temp;
+
+        if(token.contains("/imgdir")) {
+            status -= 1;
+        }
+        else if(token.contains("imgdir")) {
+            if(status == 1) {
+                d = getName(token);
+                if(d.contains("info")) {
+                    hasInfo = true;
+                    return true;
+                }
+                
+                temp = status;
+                forwardCursor(temp);
+            }
+
+            status += 1;
+        }
+        
+        return false;
+    }
+
+    private static void searchMapDirectory(int mapArea) {
+        try {
+            Iterator iter = FileUtils.iterateFiles(new File(mapWzPath + "/Map" + mapArea), new String[]{"xml"}, true);
+            System.out.println("Parsing map area " + mapArea);
+            
+            while(iter.hasNext()) {
+                File file = (File) iter.next();
+                searchMapFile(file);
+            }
+        } catch(IllegalArgumentException e) {}
+    }
+        
+    private static void searchMapFile(File file) {
+        // This will reference one line at a time
+        String line = null;
+
+        try {
+            fileReader = new InputStreamReader(new FileInputStream(file), "UTF-8");
+            bufferedReader = new BufferedReader(fileReader);
+
+            hasInfo = false;
+            status = 0;
+            
+            while((line = bufferedReader.readLine()) != null) {
+                if(translateToken(line)) {
+                    break;
+                }
+            }
+            
+            if(!hasInfo) missingInfo.add(Integer.valueOf(file.getName().split(".img.xml")[0]));
+
+            bufferedReader.close();
+            fileReader.close();
+        }
+
+        catch(IOException ex) {
+            System.out.println("Error reading file '" + file.getName() + "'");
+        }
+        catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void writeReport() {
+        try {
+            printWriter = new PrintWriter(newFile, "UTF-8");
+
+            if(!missingInfo.isEmpty()) {
+                for(Integer i : missingInfo) {
+                    printWriter.println(i);
+                }
+            } else {
+                printWriter.println("All map files contains 'info' node.");
+            }
+
+            printWriter.close();
+        } catch(IOException e) {
+            e.printStackTrace();
+        }
+    }
+    
+    public static void main(String[] args) {
+        for(int i = 0; i < 10; i++) {
+            searchMapDirectory(i);
+        }
+        writeReport();
+    }
+
+}

tools/MapleQuestItemFetcher/nbproject/private/private.xml

@@ -2,8 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
+        <group/>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/tools/MapleQuestItemFetcher/src/maplequestitemfetcher/MapleQuestItemFetcher.java</file>
-        </group>
     </open-files>
 </project-private>

tools/MobBookUpdate/nbproject/private/private.xml

@@ -2,8 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
+        <group/>
-            <file>file:/C:/Nexon/MapleSolaxia/MapleSolaxiaV2/tools/MobBookUpdate/src/mobbookupdate/MobBookUpdate.java</file>
-        </group>
     </open-files>
 </project-private>