Preparing for release

Solving conflicts.
Set constants to GMS-like. Ready for release.
This commit is contained in:
ronancpl
2017-11-29 10:34:46 -02:00
parent 85a81b9bf9
commit b9b0015e00
16 changed files with 910 additions and 77 deletions

View File

@@ -69,9 +69,6 @@ import scripting.event.EventInstanceManager;
import server.CashShop;
import server.MapleInventoryManipulator;
import server.MapleItemInformationProvider;
import server.maps.MapleMiniGame;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.MaplePortal;
import server.MapleShop;
import server.MapleStatEffect;
@@ -93,6 +90,9 @@ import server.maps.MapleMapEffect;
import server.maps.MapleMapFactory;
import server.maps.MapleMapObject;
import server.maps.MapleMapObjectType;
import server.maps.MapleMiniGame;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.maps.MapleSummon;
import server.maps.PlayerNPCs;
import server.maps.SavedLocation;