Reworked Singapore/Malaysia + warp fix

Reworked many aspects of the Malaysia/Singapore region (added DB data,
enabled Latanica & Scarga expedition, fixed maps). Fixed some issues
related with player warping.
This commit is contained in:
ronancpl
2017-07-14 20:40:06 -03:00
parent 7f80f45553
commit 8fab2a6e3e
120 changed files with 17684 additions and 16759 deletions
+12 -2
View File
@@ -1604,7 +1604,7 @@ public class MapleMap {
}
}, time);
}
public void addPlayer(final MapleCharacter chr) {
chrWLock.lock();
try {
@@ -1849,6 +1849,16 @@ public class MapleMap {
}
return closest;
}
public MaplePortal findMarketPortal() {
for (MaplePortal portal : portals.values()) {
String ptScript = portal.getScriptName();
if(ptScript != null && ptScript.contains("market")) {
return portal;
}
}
return null;
}
public Collection<MaplePortal> getPortals() {
return Collections.unmodifiableCollection(portals.values());
@@ -2769,7 +2779,7 @@ public class MapleMap {
private boolean specialEquip() {//Maybe I shouldn't use fieldType :\
return fieldType == 4 || fieldType == 19;
}
public void setCoconut(MapleCoconut nut) {
this.coconut = nut;
}
+1 -1
View File
@@ -42,7 +42,7 @@ public enum MapleMiniDungeon {
THE_RESTORING_MEMORY(240040511, 240040800, 19),
NEWT_SECURED_ZONE(240040520, 240040900, 19),
PILLAGE_OF_TREASURE_ISLAND(251010402, 251010410, 30),
;
LONGEST_RIDE_ON_BYEBYE_STATION(551030000, 551030001, 19);
private int baseId;
private int dungeonId;