diff --git a/src/main/java/constants/game/ExpTable.java b/src/main/java/constants/game/ExpTable.java index 1b963bf68c..561deb6e3c 100644 --- a/src/main/java/constants/game/ExpTable.java +++ b/src/main/java/constants/game/ExpTable.java @@ -38,7 +38,7 @@ public final class ExpTable { public static int getMountExpNeededForLevel(int level) { return mount[level]; } - + public static int getEquipExpNeededForLevel(int level) { return equip[level]; } diff --git a/src/main/java/constants/game/GameConstants.java b/src/main/java/constants/game/GameConstants.java index 6b14ce388d..eabe935cdd 100644 --- a/src/main/java/constants/game/GameConstants.java +++ b/src/main/java/constants/game/GameConstants.java @@ -20,38 +20,38 @@ import java.util.*; */ public class GameConstants { public static String[] WORLD_NAMES = {"Scania", "Bera", "Broa", "Windia", "Khaini", "Bellocan", "Mardia", "Kradia", "Yellonde", "Demethos", "Galicia", "El Nido", "Zenith", "Arcenia", "Kastia", "Judis", "Plana", "Kalluna", "Stius", "Croa", "Medere"}; - public static final int[] OWL_DATA = new int[]{1082002, 2070005, 2070006, 1022047, 1102041, 2044705, 2340000, 2040017, 1092030, 2040804}; + public static final int[] OWL_DATA = new int[]{1082002, 2070005, 2070006, 1022047, 1102041, 2044705, 2340000, 2040017, 1092030, 2040804}; public static final String[] stats = {"tuc", "reqLevel", "reqJob", "reqSTR", "reqDEX", "reqINT", "reqLUK", "reqPOP", "cash", "cursed", "success", "setItemID", "equipTradeBlock", "durability", "randOption", "randStat", "masterLevel", "reqSkillLevel", "elemDefault", "incRMAS", "incRMAF", "incRMAI", "incRMAL", "canLevel", "skill", "charmEXP"}; public static final int[] CASH_DATA = new int[]{50200004, 50200069, 50200117, 50100008, 50000047}; - + // Ronan's rates upgrade system private static final int[] DROP_RATE_GAIN = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}; private static final int[] MESO_RATE_GAIN = {1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 66, 78, 91, 105}; - private static final int[] EXP_RATE_GAIN = {1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610}; //fibonacci :3 - + private static final int[] EXP_RATE_GAIN = {1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610}; //fibonacci :3 + private static final int[] jobUpgradeBlob = {1, 20, 60, 110, 190}; private static final int[] jobUpgradeSpUp = {0, 1, 2, 3, 6}; private final static Map jobNames = new HashMap<>(); private final static NumberFormat nfFormatter = new DecimalFormat("#,###,###,###"); private final static NumberFormat nfParser = NumberFormat.getInstance(YamlConfig.config.server.USE_UNITPRICE_WITH_COMMA ? Locale.FRANCE : Locale.UK); - + public static final Disease[] CPQ_DISEASES = {Disease.SLOW, Disease.SEDUCE, Disease.STUN, Disease.POISON, - Disease.SEAL, Disease.DARKNESS, Disease.WEAKEN, Disease.CURSE}; - + Disease.SEAL, Disease.DARKNESS, Disease.WEAKEN, Disease.CURSE}; + public static final int MAX_FIELD_MOB_DAMAGE = getMaxObstacleMobDamageFromWz() * 2; - + public static int getPlayerBonusDropRate(int slot) { - return(DROP_RATE_GAIN[slot]); + return (DROP_RATE_GAIN[slot]); } - + public static int getPlayerBonusMesoRate(int slot) { - return(MESO_RATE_GAIN[slot]); + return (MESO_RATE_GAIN[slot]); } - + public static int getPlayerBonusExpRate(int slot) { - return(EXP_RATE_GAIN[slot]); + return (EXP_RATE_GAIN[slot]); } - + // "goto" command for players public static final HashMap GOTO_TOWNS = new HashMap() {{ put("southperry", 60000); @@ -91,7 +91,7 @@ public class GameConstants { put("neo", 240070000); put("mushking", 106020000); }}; - + // "goto" command for only-GMs public static final HashMap GOTO_AREAS = new HashMap() {{ put("gmmap", 180000000); @@ -114,7 +114,7 @@ public class GameConstants { put("bosspq", 970030000); put("fm", 910000000); }}; - + public static final List GAME_SONGS = new ArrayList(170) {{ add("Jukebox/Congratulation"); add("Bgm00/SleepyWood"); @@ -269,70 +269,70 @@ public class GameConstants { add("BgmUI/ShopBgm"); add("BgmUI/Title"); }}; - + // MapleStory default keyset private static final int[] DEFAULT_KEY = {18, 65, 2, 23, 3, 4, 5, 6, 16, 17, 19, 25, 26, 27, 31, 34, 35, 37, 38, 40, 43, 44, 45, 46, 50, 56, 59, 60, 61, 62, 63, 64, 57, 48, 29, 7, 24, 33, 41, 39}; private static final int[] DEFAULT_TYPE = {4, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 4, 4, 5, 6, 6, 6, 6, 6, 6, 5, 4, 5, 4, 4, 4, 4, 4}; private static final int[] DEFAULT_ACTION = {0, 106, 10, 1, 12, 13, 18, 24, 8, 5, 4, 19, 14, 15, 2, 17, 11, 3, 20, 16, 9, 50, 51, 6, 7, 53, 100, 101, 102, 103, 104, 105, 54, 22, 52, 21, 25, 26, 23, 27}; - + // HeavenMS custom keyset private static final int[] CUSTOM_KEY = {2, 3, 4, 5, 31, 56, 59, 32, 42, 6, 17, 29, 30, 41, 50, 60, 61, 62, 63, 64, 65, 16, 7, 9, 13, 8}; private static final int[] CUSTOM_TYPE = {4, 4, 4, 4, 5, 5, 6, 5, 5, 4, 4, 4, 5, 4, 4, 6, 6, 6, 6, 6, 6, 4, 4, 4, 4, 4}; private static final int[] CUSTOM_ACTION = {1, 0, 3, 2, 53, 54, 100, 52, 51, 19, 5, 9, 50, 7, 22, 101, 102, 103, 104, 105, 106, 8, 17, 26, 20, 4}; - + public static int[] getCustomKey(boolean customKeyset) { - return(customKeyset ? CUSTOM_KEY : DEFAULT_KEY); + return (customKeyset ? CUSTOM_KEY : DEFAULT_KEY); } - + public static int[] getCustomType(boolean customKeyset) { - return(customKeyset ? CUSTOM_TYPE : DEFAULT_TYPE); + return (customKeyset ? CUSTOM_TYPE : DEFAULT_TYPE); } - + public static int[] getCustomAction(boolean customKeyset) { - return(customKeyset ? CUSTOM_ACTION : DEFAULT_ACTION); + return (customKeyset ? CUSTOM_ACTION : DEFAULT_ACTION); } - + private static final int[] mobHpVal = {0, 15, 20, 25, 35, 50, 65, 80, 95, 110, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, - 375, 405, 435, 465, 495, 525, 580, 650, 720, 790, 900, 990, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, - 1900, 2000, 2100, 2200, 2300, 2400, 2520, 2640, 2760, 2880, 3000, 3200, 3400, 3600, 3800, 4000, 4300, 4600, 4900, 5200, - 5500, 5900, 6300, 6700, 7100, 7500, 8000, 8500, 9000, 9500, 10000, 11000, 12000, 13000, 14000, 15000, 17000, 19000, 21000, 23000, - 25000, 27000, 29000, 31000, 33000, 35000, 37000, 39000, 41000, 43000, 45000, 47000, 49000, 51000, 53000, 55000, 57000, 59000, 61000, 63000, - 65000, 67000, 69000, 71000, 73000, 75000, 77000, 79000, 81000, 83000, 85000, 89000, 91000, 93000, 95000, 97000, 99000, 101000, 103000, - 105000, 107000, 109000, 111000, 113000, 115000, 118000, 120000, 125000, 130000, 135000, 140000, 145000, 150000, 155000, 160000, 165000, 170000, 175000, 180000, - 185000, 190000, 195000, 200000, 205000, 210000, 215000, 220000, 225000, 230000, 235000, 240000, 250000, 260000, 270000, 280000, 290000, 300000, 310000, 320000, - 330000, 340000, 350000, 360000, 370000, 380000, 390000, 400000, 410000, 420000, 430000, 440000, 450000, 460000, 470000, 480000, 490000, 500000, 510000, 520000, - 530000, 550000, 570000, 590000, 610000, 630000, 650000, 670000, 690000, 710000, 730000, 750000, 770000, 790000, 810000, 830000, 850000, 870000, 890000, 910000}; - + 375, 405, 435, 465, 495, 525, 580, 650, 720, 790, 900, 990, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, + 1900, 2000, 2100, 2200, 2300, 2400, 2520, 2640, 2760, 2880, 3000, 3200, 3400, 3600, 3800, 4000, 4300, 4600, 4900, 5200, + 5500, 5900, 6300, 6700, 7100, 7500, 8000, 8500, 9000, 9500, 10000, 11000, 12000, 13000, 14000, 15000, 17000, 19000, 21000, 23000, + 25000, 27000, 29000, 31000, 33000, 35000, 37000, 39000, 41000, 43000, 45000, 47000, 49000, 51000, 53000, 55000, 57000, 59000, 61000, 63000, + 65000, 67000, 69000, 71000, 73000, 75000, 77000, 79000, 81000, 83000, 85000, 89000, 91000, 93000, 95000, 97000, 99000, 101000, 103000, + 105000, 107000, 109000, 111000, 113000, 115000, 118000, 120000, 125000, 130000, 135000, 140000, 145000, 150000, 155000, 160000, 165000, 170000, 175000, 180000, + 185000, 190000, 195000, 200000, 205000, 210000, 215000, 220000, 225000, 230000, 235000, 240000, 250000, 260000, 270000, 280000, 290000, 300000, 310000, 320000, + 330000, 340000, 350000, 360000, 370000, 380000, 390000, 400000, 410000, 420000, 430000, 440000, 450000, 460000, 470000, 480000, 490000, 500000, 510000, 520000, + 530000, 550000, 570000, 590000, 610000, 630000, 650000, 670000, 690000, 710000, 730000, 750000, 770000, 790000, 810000, 830000, 850000, 870000, 890000, 910000}; + public static String getJobName(int jobid) { String name = jobNames.get(jobid); - - if(name == null) { + + if (name == null) { Job job = Job.getById(jobid); - - if(job != null) { + + if (job != null) { name = job.name().toLowerCase(); name = name.replaceAll("[*0-9]", ""); name = name.substring(0, 1).toUpperCase() + name.substring(1); } else { name = ""; } - + jobNames.put(jobid, name); } - + return name; } - + public static int getJobUpgradeLevelRange(int jobbranch) { return jobUpgradeBlob[jobbranch]; } - + public static int getChangeJobSpUpgrade(int jobbranch) { return jobUpgradeSpUp[jobbranch]; } - + public static boolean isHallOfFameMap(int mapid) { - switch(mapid) { + switch (mapid) { case 102000004: // warrior case 101000004: // magician case 100000204: // bowman @@ -344,281 +344,285 @@ public class GameConstants { case 130000120: // cygnus 3rd floor (beginners) case 140010110: // aran return true; - + default: return false; } } - + public static boolean isPodiumHallOfFameMap(int mapid) { - switch(mapid) { + switch (mapid) { case 102000004: // warrior case 101000004: // magician case 100000204: // bowman case 103000008: // thief case 120000105: // pirate return true; - + default: return false; } } - + public static byte getHallOfFameBranch(Job job, int mapid) { - if(!isHallOfFameMap(mapid)) { + if (!isHallOfFameMap(mapid)) { return (byte) (26 + 4 * (mapid / 100000000)); // custom, 400 pnpcs available per continent } - - if(job.isA(Job.WARRIOR)) { + + if (job.isA(Job.WARRIOR)) { return 10; - } else if(job.isA(Job.MAGICIAN)) { + } else if (job.isA(Job.MAGICIAN)) { return 11; - } else if(job.isA(Job.BOWMAN)) { + } else if (job.isA(Job.BOWMAN)) { return 12; - } else if(job.isA(Job.THIEF)) { + } else if (job.isA(Job.THIEF)) { return 13; - } else if(job.isA(Job.PIRATE)) { + } else if (job.isA(Job.PIRATE)) { return 14; - } else if(job.isA(Job.DAWNWARRIOR1)) { + } else if (job.isA(Job.DAWNWARRIOR1)) { return 15; - } else if(job.isA(Job.BLAZEWIZARD1)) { + } else if (job.isA(Job.BLAZEWIZARD1)) { return 16; - } else if(job.isA(Job.WINDARCHER1)) { + } else if (job.isA(Job.WINDARCHER1)) { return 17; - } else if(job.isA(Job.NIGHTWALKER1)) { + } else if (job.isA(Job.NIGHTWALKER1)) { return 18; - } else if(job.isA(Job.THUNDERBREAKER1)) { + } else if (job.isA(Job.THUNDERBREAKER1)) { return 19; - } else if(job.isA(Job.ARAN1)) { + } else if (job.isA(Job.ARAN1)) { return 20; - } else if(job.isA(Job.EVAN1)) { + } else if (job.isA(Job.EVAN1)) { return 21; - } else if(job.isA(Job.BEGINNER)) { + } else if (job.isA(Job.BEGINNER)) { return 22; - } else if(job.isA(Job.NOBLESSE)) { + } else if (job.isA(Job.NOBLESSE)) { return 23; - } else if(job.isA(Job.LEGEND)) { + } else if (job.isA(Job.LEGEND)) { return 24; } else { return 25; } } - + public static int getOverallJobRankByScriptId(int scriptId) { int branch = (scriptId / 100) % 100; - - if(branch < 26) { + + if (branch < 26) { return (scriptId % 100) + 1; } else { return ((scriptId - 2600) % 400) + 1; } } - + public static boolean canPnpcBranchUseScriptId(byte branch, int scriptId) { scriptId /= 100; scriptId %= 100; - - if(branch < 26) { + + if (branch < 26) { return branch == scriptId; } else { return scriptId >= branch && scriptId < branch + 4; } } - + public static int getHallOfFameMapid(Job job) { int jobid = job.getId(); - - if(isCygnus(jobid)) { + + if (isCygnus(jobid)) { return 130000100; - } else if(isAran(jobid)) { + } else if (isAran(jobid)) { return 140010110; } else { - if(job.isA(Job.WARRIOR)) { + if (job.isA(Job.WARRIOR)) { return 102000004; - } else if(job.isA(Job.MAGICIAN)) { + } else if (job.isA(Job.MAGICIAN)) { return 101000004; - } else if(job.isA(Job.BOWMAN)) { + } else if (job.isA(Job.BOWMAN)) { return 100000204; - } else if(job.isA(Job.THIEF)) { + } else if (job.isA(Job.THIEF)) { return 103000008; - } else if(job.isA(Job.PIRATE)) { + } else if (job.isA(Job.PIRATE)) { return 120000105; } else { return 130000110; // beginner explorers are allotted with the Cygnus, available map lul } } } - + public static int getJobBranch(Job job) { int jobid = job.getId(); - - if(jobid % 1000 == 0) { + + if (jobid % 1000 == 0) { return 0; - } else if(jobid % 100 == 0) { + } else if (jobid % 100 == 0) { return 1; } else { return 2 + (jobid % 10); } } - + public static int getJobMaxLevel(Job job) { int jobBranch = getJobBranch(job); - - switch(jobBranch) { + + switch (jobBranch) { case 0: return 10; // beginner - + case 1: return 30; // 1st job - + case 2: return 70; // 2nd job - + case 3: return 120; // 3rd job - + default: return (job.getId() / 1000 == 1) ? 120 : 200; // 4th job: cygnus is 120, rest is 200 } } - + public static int getSkillBook(final int job) { if (job >= 2210 && job <= 2218) { - return job - 2209; + return job - 2209; } return 0; } - + public static boolean isAranSkills(final int skill) { - return Aran.FULL_SWING == skill || Aran.OVER_SWING == skill || Aran.COMBO_TEMPEST == skill || Aran.COMBO_FENRIR == skill || Aran.COMBO_DRAIN == skill - || Aran.HIDDEN_FULL_DOUBLE == skill || Aran.HIDDEN_FULL_TRIPLE == skill || Aran.HIDDEN_OVER_DOUBLE == skill || Aran.HIDDEN_OVER_TRIPLE == skill - || Aran.COMBO_SMASH == skill || Aran.DOUBLE_SWING == skill || Aran.TRIPLE_SWING == skill; + return Aran.FULL_SWING == skill || Aran.OVER_SWING == skill || Aran.COMBO_TEMPEST == skill || Aran.COMBO_FENRIR == skill || Aran.COMBO_DRAIN == skill + || Aran.HIDDEN_FULL_DOUBLE == skill || Aran.HIDDEN_FULL_TRIPLE == skill || Aran.HIDDEN_OVER_DOUBLE == skill || Aran.HIDDEN_OVER_TRIPLE == skill + || Aran.COMBO_SMASH == skill || Aran.DOUBLE_SWING == skill || Aran.TRIPLE_SWING == skill; } - + public static boolean isHiddenSkills(final int skill) { - return Aran.HIDDEN_FULL_DOUBLE == skill || Aran.HIDDEN_FULL_TRIPLE == skill || Aran.HIDDEN_OVER_DOUBLE == skill || Aran.HIDDEN_OVER_TRIPLE == skill; + return Aran.HIDDEN_FULL_DOUBLE == skill || Aran.HIDDEN_FULL_TRIPLE == skill || Aran.HIDDEN_OVER_DOUBLE == skill || Aran.HIDDEN_OVER_TRIPLE == skill; } - + public static boolean isCygnus(final int job) { return job / 1000 == 1; } - + public static boolean isAran(final int job) { return job == 2000 || (job >= 2100 && job <= 2112); } - + private static boolean isInBranchJobTree(int skillJobId, int jobId, int branchType) { - int branch = (int)(Math.pow(10, branchType)); - + int branch = (int) (Math.pow(10, branchType)); + int skillBranch = (skillJobId / branch) * branch; int jobBranch = (jobId / branch) * branch; - + return skillBranch == jobBranch; } - + private static boolean hasDivergedBranchJobTree(int skillJobId, int jobId, int branchType) { - int branch = (int)(Math.pow(10, branchType)); - + int branch = (int) (Math.pow(10, branchType)); + int skillBranch = skillJobId / branch; int jobBranch = jobId / branch; - + return skillBranch != jobBranch && skillBranch % 10 != 0; } - + public static boolean isInJobTree(int skillId, int jobId) { int skillJob = skillId / 10000; - - if(!isInBranchJobTree(skillJob, jobId, 0)) { - for(int i = 1; i <= 3; i++) { - if(hasDivergedBranchJobTree(skillJob, jobId, i)) return false; - if(isInBranchJobTree(skillJob, jobId, i)) return (skillJob <= jobId); + + if (!isInBranchJobTree(skillJob, jobId, 0)) { + for (int i = 1; i <= 3; i++) { + if (hasDivergedBranchJobTree(skillJob, jobId, i)) { + return false; + } + if (isInBranchJobTree(skillJob, jobId, i)) { + return (skillJob <= jobId); + } } } else { return (skillJob <= jobId); } - + return false; } - + public static boolean isPqSkill(final int skill) { - return (skill >= 20000014 && skill <= 20000018) || skill == 10000013 || skill == 20001013 || (skill % 10000000 >= 1009 && skill % 10000000 <= 1011) || skill % 10000000 == 1020; + return (skill >= 20000014 && skill <= 20000018) || skill == 10000013 || skill == 20001013 || (skill % 10000000 >= 1009 && skill % 10000000 <= 1011) || skill % 10000000 == 1020; } - + public static boolean bannedBindSkills(final int skill) { - return isAranSkills(skill) || isPqSkill(skill); + return isAranSkills(skill) || isPqSkill(skill); } public static boolean isGMSkills(final int skill) { - return skill >= 9001000 && skill <= 9101008 || skill >= 8001000 && skill <= 8001001; + return skill >= 9001000 && skill <= 9101008 || skill >= 8001000 && skill <= 8001001; } - + public static boolean isFreeMarketRoom(int mapid) { return mapid / 1000000 == 910 && mapid > 910000000; // FM rooms subset, thanks to shavitush (shavit) } - + public static boolean isMerchantLocked(MapleMap map) { - if(FieldLimit.CANNOTMIGRATE.check(map.getFieldLimit())) { // maps that cannot access cash shop cannot access merchants too (except FM rooms). + if (FieldLimit.CANNOTMIGRATE.check(map.getFieldLimit())) { // maps that cannot access cash shop cannot access merchants too (except FM rooms). return true; } - - switch(map.getId()) { + + switch (map.getId()) { case 910000000: return true; } - + return false; } - + public static boolean isBossRush(int mapid) { return mapid >= 970030100 && mapid <= 970042711; } - + public static boolean isDojo(int mapid) { return mapid >= 925020000 && mapid < 925040000; } - + public static boolean isDojoPartyArea(int mapid) { - return mapid >= 925030100 && mapid < 925040000; + return mapid >= 925030100 && mapid < 925040000; } - + public static boolean isDojoBoss(int mobid) { return mobid >= 9300184 && mobid < 9300216; } - + public static boolean isDojoBossArea(int mapid) { return isDojo(mapid) && (((mapid / 100) % 100) % 6) > 0; } - + public static boolean isPyramid(int mapid) { - return mapid >= 926010010 & mapid <= 930010000; + return mapid >= 926010010 & mapid <= 930010000; } - + public static boolean isAriantColiseumLobby(int mapid) { int mapbranch = mapid / 1000; - return mapbranch == 980010 && mapid % 10 == 0; + return mapbranch == 980010 && mapid % 10 == 0; } - + public static boolean isAriantColiseumArena(int mapid) { int mapbranch = mapid / 1000; - return mapbranch == 980010 && mapid % 10 == 1; + return mapbranch == 980010 && mapid % 10 == 1; } - + public static boolean isPqSkillMap(int mapid) { - return isDojo(mapid) || isPyramid(mapid); + return isDojo(mapid) || isPyramid(mapid); } - + public static boolean isFishingArea(int mapid) { - return mapid == 120010000 || mapid == 251000100 || mapid == 541010110; + return mapid == 120010000 || mapid == 251000100 || mapid == 541010110; } - + public static boolean isFinisherSkill(int skillId) { return skillId > 1111002 && skillId < 1111007 || skillId == 11111002 || skillId == 11111003; } - + public static boolean isMedalQuest(short questid) { return Quest.getInstance(questid).getMedalRequirement() != -1; } - + public static boolean hasSPTable(Job job) { switch (job) { case EVAN: @@ -637,54 +641,54 @@ public class GameConstants { return false; } } - + public static int getMonsterHP(final int level) { if (level < 0 || level >= mobHpVal.length) { return Integer.MAX_VALUE; } return mobHpVal[level]; } - + public static String ordinal(int i) { - String[] sufixes = new String[] { "th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th" }; + String[] sufixes = new String[]{"th", "st", "nd", "rd", "th", "th", "th", "th", "th", "th"}; switch (i % 100) { case 11: case 12: case 13: return i + "th"; - + default: return i + sufixes[i % 10]; } } - + public synchronized static String numberWithCommas(int i) { - if(!YamlConfig.config.server.USE_DISPLAY_NUMBERS_WITH_COMMA) { + if (!YamlConfig.config.server.USE_DISPLAY_NUMBERS_WITH_COMMA) { return nfFormatter.format(i); // will display number on whatever locale is currently assigned on NumberFormat } else { return NumberFormat.getNumberInstance(Locale.UK).format(i); } } - + public synchronized static Number parseNumber(String value) { try { return nfParser.parse(value); - } catch(Exception e) { + } catch (Exception e) { e.printStackTrace(); return 0.0f; } } - + private static int getMaxObstacleMobDamageFromWz() { DataProvider mapSource = DataProviderFactory.getDataProvider(WZFiles.MAP); int maxMobDmg = 0; - + DataDirectoryEntry root = mapSource.getRoot(); for (DataDirectoryEntry objData : root.getSubdirectories()) { if (!objData.getName().contentEquals("Obj")) { continue; } - + for (DataFileEntry obj : objData.getFiles()) { for (Data l0 : mapSource.getData(objData.getName() + "/" + obj.getName()).getChildren()) { for (Data l1 : l0.getChildren()) { @@ -698,8 +702,8 @@ public class GameConstants { } } } - + return maxMobDmg; } - + } diff --git a/src/main/java/constants/inventory/EquipSlot.java b/src/main/java/constants/inventory/EquipSlot.java index 63c7f7b3a9..30702e7a46 100644 --- a/src/main/java/constants/inventory/EquipSlot.java +++ b/src/main/java/constants/inventory/EquipSlot.java @@ -1,7 +1,6 @@ package constants.inventory; /** - * * @author The Spookster (The Real Spookster) */ public enum EquipSlot { @@ -33,10 +32,10 @@ public enum EquipSlot { private String name; private int[] allowed; - private EquipSlot() { + EquipSlot() { } - private EquipSlot(String wz, int... in) { + EquipSlot(String wz, int... in) { name = wz; allowed = in; } diff --git a/src/main/java/constants/inventory/EquipType.java b/src/main/java/constants/inventory/EquipType.java index afcc627420..9f7fed76ba 100644 --- a/src/main/java/constants/inventory/EquipType.java +++ b/src/main/java/constants/inventory/EquipType.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Map; /** - * * @author RonanLana */ public enum EquipType { @@ -66,30 +65,30 @@ public enum EquipType { private final int i; private static final Map map = new HashMap(34); - private EquipType(int val) { + EquipType(int val) { this.i = val; } public int getValue() { return i; } - + static { for (EquipType eqEnum : EquipType.values()) { map.put(eqEnum.i, eqEnum); } } - + public static EquipType getEquipTypeById(int itemid) { EquipType ret; int val = itemid / 100000; - - if(val == 13 || val == 14) { + + if (val == 13 || val == 14) { ret = map.get(itemid / 1000); } else { ret = map.get(itemid / 10000); } - + return (ret != null) ? ret : EquipType.UNDEFINED; } } \ No newline at end of file diff --git a/src/main/java/constants/inventory/ItemConstants.java b/src/main/java/constants/inventory/ItemConstants.java index 99746e61ac..e7a9cd7a2b 100644 --- a/src/main/java/constants/inventory/ItemConstants.java +++ b/src/main/java/constants/inventory/ItemConstants.java @@ -30,13 +30,12 @@ import java.util.Map; import java.util.Set; /** - * * @author Jay Estrella * @author Ronan */ public final class ItemConstants { protected static Map inventoryTypeCache = new HashMap<>(); - + public final static short LOCK = 0x01; public final static short SPIKES = 0x02; public final static short KARMA_USE = 0x02; @@ -53,11 +52,11 @@ public final class ItemConstants { static { int[] pi = {5000060, 5000100, 5000101, 5000102}; // i ain't going to open one gigantic itemid cache just for 4 perma itemids, no way! - for(int i : pi) { + for (int i : pi) { permanentItemids.add(i); } } - + public static int getFlagByInt(int type) { if (type == 128) { return PET_COME; @@ -74,16 +73,16 @@ public final class ItemConstants { public static boolean isBullet(int itemId) { return itemId / 10000 == 233; } - + public static boolean isPotion(int itemId) { return itemId / 1000 == 2000; } - + public static boolean isFood(int itemId) { int useType = itemId / 1000; return useType == 2022 || useType == 2010 || useType == 2020; } - + public static boolean isConsumable(int itemId) { return isPotion(itemId) || isFood(itemId); } @@ -99,7 +98,7 @@ public final class ItemConstants { public static boolean isArrowForBow(int itemId) { return itemId / 1000 == 2060; } - + public static boolean isArrow(int itemId) { return isArrowForBow(itemId) || isArrowForCrossBow(itemId); } @@ -107,112 +106,113 @@ public final class ItemConstants { public static boolean isPet(int itemId) { return itemId / 1000 == 5000; } - + public static boolean isExpirablePet(int itemId) { return YamlConfig.config.server.USE_ERASE_PET_ON_EXPIRATION || itemId == 5000054; } - + public static boolean isPermanentItem(int itemId) { return permanentItemids.contains(itemId); } - - public static boolean isNewYearCardEtc(int itemId) { + + public static boolean isNewYearCardEtc(int itemId) { return itemId / 10000 == 430; - } - - public static boolean isNewYearCardUse(int itemId) { + } + + public static boolean isNewYearCardUse(int itemId) { return itemId / 10000 == 216; } - + public static boolean isAccessory(int itemId) { return itemId >= 1110000 && itemId < 1140000; } - + public static boolean isTaming(int itemId) { int itemType = itemId / 1000; return itemType == 1902 || itemType == 1912; } - + public static boolean isTownScroll(int itemId) { return itemId >= 2030000 && itemId < 2030100; } - + public static boolean isAntibanishScroll(int itemId) { return itemId == 2030100; } - + public static boolean isCleanSlate(int scrollId) { return scrollId > 2048999 && scrollId < 2049004; } - + public static boolean isModifierScroll(int scrollId) { return scrollId == 2040727 || scrollId == 2041058; } - + public static boolean isFlagModifier(int scrollId, short flag) { - if(scrollId == 2041058 && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) return true; - if(scrollId == 2040727 && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES)) return true; - return false; + if (scrollId == 2041058 && ((flag & ItemConstants.COLD) == ItemConstants.COLD)) { + return true; + } + return scrollId == 2040727 && ((flag & ItemConstants.SPIKES) == ItemConstants.SPIKES); } - + public static boolean isChaosScroll(int scrollId) { - return scrollId >= 2049100 && scrollId <= 2049103; + return scrollId >= 2049100 && scrollId <= 2049103; } - + public static boolean isRateCoupon(int itemId) { int itemType = itemId / 1000; return itemType == 5211 || itemType == 5360; } - + public static boolean isExpCoupon(int couponId) { return couponId / 1000 == 5211; } - + public static boolean isPartyItem(int itemId) { return itemId >= 2022430 && itemId <= 2022433 || itemId >= 2022160 && itemId <= 2022163; } - + public static boolean isPartyAllcure(int itemId) { return itemId == 2022433 || itemId == 2022163; } - + public static boolean isHiredMerchant(int itemId) { return itemId / 10000 == 503; } - + public static boolean isPlayerShop(int itemId) { return itemId / 10000 == 514; } - + public static InventoryType getInventoryType(final int itemId) { if (inventoryTypeCache.containsKey(itemId)) { return inventoryTypeCache.get(itemId); } - + InventoryType ret = InventoryType.UNDEFINED; - - final byte type = (byte) (itemId / 1000000); - if (type >= 1 && type <= 5) { - ret = InventoryType.getByType(type); - } - + + final byte type = (byte) (itemId / 1000000); + if (type >= 1 && type <= 5) { + ret = InventoryType.getByType(type); + } + inventoryTypeCache.put(itemId, ret); return ret; } - + public static boolean isMakerReagent(int itemId) { return itemId / 10000 == 425; } - + public static boolean isOverall(int itemId) { return itemId / 10000 == 105; } - + public static boolean isCashStore(int itemId) { int itemType = itemId / 10000; return itemType == 503 || itemType == 514; } - + public static boolean isMapleLife(int itemId) { int itemType = itemId / 10000; return itemType == 543 && itemId != 5430000; @@ -221,7 +221,7 @@ public final class ItemConstants { public static boolean isWeapon(int itemId) { return itemId >= 1302000 && itemId < 1493000; } - + public static boolean isEquipment(int itemId) { return itemId < 2000000 && itemId != 0; } @@ -229,31 +229,31 @@ public final class ItemConstants { public static boolean isFishingChair(int itemId) { return itemId == 3011000; } - + public static boolean isMedal(int itemId) { return itemId >= 1140000 && itemId < 1143000; } - + public static boolean isWeddingRing(int itemId) { return itemId >= 1112803 && itemId <= 1112809; } - + public static boolean isWeddingToken(int itemId) { return itemId >= 4031357 && itemId <= 4031364; } - + public static boolean isFace(int itemId) { return itemId >= 20000 && itemId < 22000; } - + public static boolean isHair(int itemId) { return itemId >= 30000 && itemId < 35000; } - + public static boolean isFaceExpression(int itemId) { return itemId / 10000 == 516; } - + public static boolean isChair(int itemId) { return itemId / 10000 == 301; } diff --git a/src/main/java/constants/net/OpcodeConstants.java b/src/main/java/constants/net/OpcodeConstants.java index d37bff7331..4aaff7c080 100644 --- a/src/main/java/constants/net/OpcodeConstants.java +++ b/src/main/java/constants/net/OpcodeConstants.java @@ -19,27 +19,27 @@ */ package constants.net; -import java.util.Map; -import java.util.HashMap; import net.opcodes.RecvOpcode; import net.opcodes.SendOpcode; +import java.util.HashMap; +import java.util.Map; + /** - * * @author Ronan */ public class OpcodeConstants { public static Map sendOpcodeNames = new HashMap<>(); public static Map recvOpcodeNames = new HashMap<>(); - + public static void generateOpcodeNames() { for (SendOpcode op : SendOpcode.values()) { sendOpcodeNames.put(op.getValue(), op.name()); } - + for (RecvOpcode op : RecvOpcode.values()) { recvOpcodeNames.put(op.getValue(), op.name()); } } - + } diff --git a/src/main/java/constants/net/ServerConstants.java b/src/main/java/constants/net/ServerConstants.java index 9b5f6b1d8b..a710d80875 100644 --- a/src/main/java/constants/net/ServerConstants.java +++ b/src/main/java/constants/net/ServerConstants.java @@ -1,7 +1,7 @@ package constants.net; public class ServerConstants { - + //Server Version public static final short VERSION = 83; diff --git a/src/main/java/constants/skills/Aran.java b/src/main/java/constants/skills/Aran.java index 7a78c8ff69..68da1426cd 100644 --- a/src/main/java/constants/skills/Aran.java +++ b/src/main/java/constants/skills/Aran.java @@ -22,7 +22,6 @@ along with this program. If not, see . package constants.skills; /** - * * @author BubblesDev */ public class Aran { diff --git a/src/main/java/constants/skills/Archer.java b/src/main/java/constants/skills/Archer.java index cb3c37f9ea..37c4258e1d 100644 --- a/src/main/java/constants/skills/Archer.java +++ b/src/main/java/constants/skills/Archer.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Archer { diff --git a/src/main/java/constants/skills/Assassin.java b/src/main/java/constants/skills/Assassin.java index 0cf2cc90db..0bb306e6bf 100644 --- a/src/main/java/constants/skills/Assassin.java +++ b/src/main/java/constants/skills/Assassin.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Assassin { diff --git a/src/main/java/constants/skills/Bandit.java b/src/main/java/constants/skills/Bandit.java index ea149c37b1..84b8e06c64 100644 --- a/src/main/java/constants/skills/Bandit.java +++ b/src/main/java/constants/skills/Bandit.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Bandit { diff --git a/src/main/java/constants/skills/Beginner.java b/src/main/java/constants/skills/Beginner.java index 1e4be9c7de..669e1ef646 100644 --- a/src/main/java/constants/skills/Beginner.java +++ b/src/main/java/constants/skills/Beginner.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Beginner { diff --git a/src/main/java/constants/skills/Bishop.java b/src/main/java/constants/skills/Bishop.java index 23cc1e4a5a..778d3bc81d 100644 --- a/src/main/java/constants/skills/Bishop.java +++ b/src/main/java/constants/skills/Bishop.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Bishop { diff --git a/src/main/java/constants/skills/BlazeWizard.java b/src/main/java/constants/skills/BlazeWizard.java index e2e134af99..e1990bd203 100644 --- a/src/main/java/constants/skills/BlazeWizard.java +++ b/src/main/java/constants/skills/BlazeWizard.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class BlazeWizard { diff --git a/src/main/java/constants/skills/Bowmaster.java b/src/main/java/constants/skills/Bowmaster.java index 5114bcf3b0..f4e25c936c 100644 --- a/src/main/java/constants/skills/Bowmaster.java +++ b/src/main/java/constants/skills/Bowmaster.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Bowmaster { diff --git a/src/main/java/constants/skills/Brawler.java b/src/main/java/constants/skills/Brawler.java index f5ec4ed5ac..36d7192d29 100644 --- a/src/main/java/constants/skills/Brawler.java +++ b/src/main/java/constants/skills/Brawler.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Brawler { diff --git a/src/main/java/constants/skills/Buccaneer.java b/src/main/java/constants/skills/Buccaneer.java index f028198f2d..bf2eb912cf 100644 --- a/src/main/java/constants/skills/Buccaneer.java +++ b/src/main/java/constants/skills/Buccaneer.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Buccaneer { diff --git a/src/main/java/constants/skills/ChiefBandit.java b/src/main/java/constants/skills/ChiefBandit.java index 1102727ce0..899e2f26c8 100644 --- a/src/main/java/constants/skills/ChiefBandit.java +++ b/src/main/java/constants/skills/ChiefBandit.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class ChiefBandit { diff --git a/src/main/java/constants/skills/Corsair.java b/src/main/java/constants/skills/Corsair.java index 8a2f8a20a6..4d88071483 100644 --- a/src/main/java/constants/skills/Corsair.java +++ b/src/main/java/constants/skills/Corsair.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Corsair { diff --git a/src/main/java/constants/skills/Crossbowman.java b/src/main/java/constants/skills/Crossbowman.java index 071755a072..631178188c 100644 --- a/src/main/java/constants/skills/Crossbowman.java +++ b/src/main/java/constants/skills/Crossbowman.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Crossbowman { diff --git a/src/main/java/constants/skills/Crusader.java b/src/main/java/constants/skills/Crusader.java index 91b65a9551..243f1f2249 100644 --- a/src/main/java/constants/skills/Crusader.java +++ b/src/main/java/constants/skills/Crusader.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Crusader { diff --git a/src/main/java/constants/skills/DarkKnight.java b/src/main/java/constants/skills/DarkKnight.java index a9cdc2c75b..557c7cb41c 100644 --- a/src/main/java/constants/skills/DarkKnight.java +++ b/src/main/java/constants/skills/DarkKnight.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class DarkKnight { diff --git a/src/main/java/constants/skills/DawnWarrior.java b/src/main/java/constants/skills/DawnWarrior.java index 2bc5f6d84c..a947c48a55 100644 --- a/src/main/java/constants/skills/DawnWarrior.java +++ b/src/main/java/constants/skills/DawnWarrior.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class DawnWarrior { diff --git a/src/main/java/constants/skills/DragonKnight.java b/src/main/java/constants/skills/DragonKnight.java index 58881d149b..ffa574b05e 100644 --- a/src/main/java/constants/skills/DragonKnight.java +++ b/src/main/java/constants/skills/DragonKnight.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author David */ public class DragonKnight { diff --git a/src/main/java/constants/skills/Evan.java b/src/main/java/constants/skills/Evan.java index 045e4cde73..b26a75f337 100644 --- a/src/main/java/constants/skills/Evan.java +++ b/src/main/java/constants/skills/Evan.java @@ -1,58 +1,58 @@ package constants.skills; public class Evan { - // EVAN1 - public static final int BLESSING_OF_THE_FAIRY = 20010012; - public static final int THREE_SNAILS = 20011000; - public static final int RECOVERY = 20011001; - public static final int NIMBLE_FEET = 20011002; - public static final int LEGENDARY_SPIRIT = 20011003; - public static final int MONSTER_RIDER = 20011004; - public static final int JUMP_DOWN = 20011006; - public static final int ECHO_OF_HERO = 20011005; - public static final int MAKER = 20011007; - public static final int BAMBOO_THRUST = 20011009; - public static final int INVINCIBLE_BARRIER = 20011010; - public static final int POWER_EXPLOSION = 20011011; - // EVAN2 - public static final int DRAGON_SOUL = 22000000; - public static final int MAGIC_MISSILE = 22001001; - // EVAN3 - public static final int FIRE_CIRCLE = 22101000; - public static final int TELEPORT = 22101001; - // EVAN4 - public static final int LIGHTNING_BOLT = 22111000; - public static final int MAGIC_GUARD = 22111001; - // EVAN5 - public static final int ICE_BREATH = 22121000; - public static final int ELEMENTAL_RESET = 22121001; - // EVAN6 - public static final int MAGIC_FLARE = 22131000; - public static final int MAGIC_SHIELD = 22131001; - // EVAN7 - public static final int CRITICAL_MAGIC = 22140000; - public static final int DRAGON_THRUST = 22141001; - public static final int MAGIC_BOOSTER = 22141002; - public static final int SLOW = 22141003; - // EVAN8 - public static final int MAGIC_AMPLIFICATION = 22150000; - public static final int FIRE_BREATH = 22151001; - public static final int KILLER_WINGS = 22151002; - public static final int MAGIC_RESISTANCE = 22151003; - // EVAN9 - public static final int DRAGON_FURY = 22160000; - public static final int EARTHQUAKE = 22161001; - public static final int PHANTOM_IMPRINT = 22161002; - public static final int RECOVERY_AURA = 22161003; - // EVAN10 - public static final int MAGIC_MASTERY = 22170001; - public static final int MAPLE_WARRIOR = 22171000; - public static final int ILLUSION = 22171002; - public static final int FLAME_WHEEL = 22171003; - public static final int HEROS_WILL = 22171004; - // EVAN11 - public static final int BLESSING_OF_THE_ONYX = 22181000; - public static final int BLAZE = 22181001; - public static final int DARK_FOG = 22181002; - public static final int SOUL_STONE = 22181003; + // EVAN1 + public static final int BLESSING_OF_THE_FAIRY = 20010012; + public static final int THREE_SNAILS = 20011000; + public static final int RECOVERY = 20011001; + public static final int NIMBLE_FEET = 20011002; + public static final int LEGENDARY_SPIRIT = 20011003; + public static final int MONSTER_RIDER = 20011004; + public static final int JUMP_DOWN = 20011006; + public static final int ECHO_OF_HERO = 20011005; + public static final int MAKER = 20011007; + public static final int BAMBOO_THRUST = 20011009; + public static final int INVINCIBLE_BARRIER = 20011010; + public static final int POWER_EXPLOSION = 20011011; + // EVAN2 + public static final int DRAGON_SOUL = 22000000; + public static final int MAGIC_MISSILE = 22001001; + // EVAN3 + public static final int FIRE_CIRCLE = 22101000; + public static final int TELEPORT = 22101001; + // EVAN4 + public static final int LIGHTNING_BOLT = 22111000; + public static final int MAGIC_GUARD = 22111001; + // EVAN5 + public static final int ICE_BREATH = 22121000; + public static final int ELEMENTAL_RESET = 22121001; + // EVAN6 + public static final int MAGIC_FLARE = 22131000; + public static final int MAGIC_SHIELD = 22131001; + // EVAN7 + public static final int CRITICAL_MAGIC = 22140000; + public static final int DRAGON_THRUST = 22141001; + public static final int MAGIC_BOOSTER = 22141002; + public static final int SLOW = 22141003; + // EVAN8 + public static final int MAGIC_AMPLIFICATION = 22150000; + public static final int FIRE_BREATH = 22151001; + public static final int KILLER_WINGS = 22151002; + public static final int MAGIC_RESISTANCE = 22151003; + // EVAN9 + public static final int DRAGON_FURY = 22160000; + public static final int EARTHQUAKE = 22161001; + public static final int PHANTOM_IMPRINT = 22161002; + public static final int RECOVERY_AURA = 22161003; + // EVAN10 + public static final int MAGIC_MASTERY = 22170001; + public static final int MAPLE_WARRIOR = 22171000; + public static final int ILLUSION = 22171002; + public static final int FLAME_WHEEL = 22171003; + public static final int HEROS_WILL = 22171004; + // EVAN11 + public static final int BLESSING_OF_THE_ONYX = 22181000; + public static final int BLAZE = 22181001; + public static final int DARK_FOG = 22181002; + public static final int SOUL_STONE = 22181003; } diff --git a/src/main/java/constants/skills/FPArchMage.java b/src/main/java/constants/skills/FPArchMage.java index 754babc9e9..189725ec8a 100644 --- a/src/main/java/constants/skills/FPArchMage.java +++ b/src/main/java/constants/skills/FPArchMage.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class FPArchMage { diff --git a/src/main/java/constants/skills/FPMage.java b/src/main/java/constants/skills/FPMage.java index ee5dd506e5..ec495f925a 100644 --- a/src/main/java/constants/skills/FPMage.java +++ b/src/main/java/constants/skills/FPMage.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class FPMage { diff --git a/src/main/java/constants/skills/FPWizard.java b/src/main/java/constants/skills/FPWizard.java index b62b90208c..8739a262c5 100644 --- a/src/main/java/constants/skills/FPWizard.java +++ b/src/main/java/constants/skills/FPWizard.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class FPWizard { diff --git a/src/main/java/constants/skills/Fighter.java b/src/main/java/constants/skills/Fighter.java index f99c1bd06d..974bd404d7 100644 --- a/src/main/java/constants/skills/Fighter.java +++ b/src/main/java/constants/skills/Fighter.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Fighter { diff --git a/src/main/java/constants/skills/GM.java b/src/main/java/constants/skills/GM.java index defa357a62..b289537b5b 100644 --- a/src/main/java/constants/skills/GM.java +++ b/src/main/java/constants/skills/GM.java @@ -20,8 +20,8 @@ along with this program. If not, see . */ package constants.skills; + /** - * * @author BubblesDev */ public class GM { diff --git a/src/main/java/constants/skills/Gunslinger.java b/src/main/java/constants/skills/Gunslinger.java index e6228a8859..9b0c8f61fb 100644 --- a/src/main/java/constants/skills/Gunslinger.java +++ b/src/main/java/constants/skills/Gunslinger.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Gunslinger { diff --git a/src/main/java/constants/skills/Hermit.java b/src/main/java/constants/skills/Hermit.java index fae114363b..75f656de16 100644 --- a/src/main/java/constants/skills/Hermit.java +++ b/src/main/java/constants/skills/Hermit.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Hermit { diff --git a/src/main/java/constants/skills/Hero.java b/src/main/java/constants/skills/Hero.java index 1857550d36..5b3077c41b 100644 --- a/src/main/java/constants/skills/Hero.java +++ b/src/main/java/constants/skills/Hero.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Hero { diff --git a/src/main/java/constants/skills/Hunter.java b/src/main/java/constants/skills/Hunter.java index c7bc73c321..da0ad31af0 100644 --- a/src/main/java/constants/skills/Hunter.java +++ b/src/main/java/constants/skills/Hunter.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Hunter { diff --git a/src/main/java/constants/skills/ILArchMage.java b/src/main/java/constants/skills/ILArchMage.java index fb41656844..11e231cfb9 100644 --- a/src/main/java/constants/skills/ILArchMage.java +++ b/src/main/java/constants/skills/ILArchMage.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class ILArchMage { diff --git a/src/main/java/constants/skills/ILMage.java b/src/main/java/constants/skills/ILMage.java index ba2a43abf1..bafe8cd178 100644 --- a/src/main/java/constants/skills/ILMage.java +++ b/src/main/java/constants/skills/ILMage.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class ILMage { diff --git a/src/main/java/constants/skills/ILWizard.java b/src/main/java/constants/skills/ILWizard.java index 51c3493380..8c851ac0f2 100644 --- a/src/main/java/constants/skills/ILWizard.java +++ b/src/main/java/constants/skills/ILWizard.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class ILWizard { diff --git a/src/main/java/constants/skills/Legend.java b/src/main/java/constants/skills/Legend.java index e67742ce66..053ce4f46e 100644 --- a/src/main/java/constants/skills/Legend.java +++ b/src/main/java/constants/skills/Legend.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author kevintjuh93 */ public class Legend { diff --git a/src/main/java/constants/skills/Magician.java b/src/main/java/constants/skills/Magician.java index 07405d35fa..08bf71bb1a 100644 --- a/src/main/java/constants/skills/Magician.java +++ b/src/main/java/constants/skills/Magician.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Magician { diff --git a/src/main/java/constants/skills/Marauder.java b/src/main/java/constants/skills/Marauder.java index f07f679519..ab893af50b 100644 --- a/src/main/java/constants/skills/Marauder.java +++ b/src/main/java/constants/skills/Marauder.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Marauder { diff --git a/src/main/java/constants/skills/Marksman.java b/src/main/java/constants/skills/Marksman.java index 82e18014c4..7a701fef42 100644 --- a/src/main/java/constants/skills/Marksman.java +++ b/src/main/java/constants/skills/Marksman.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Marksman { diff --git a/src/main/java/constants/skills/NightLord.java b/src/main/java/constants/skills/NightLord.java index 2a0379f982..729d544f00 100644 --- a/src/main/java/constants/skills/NightLord.java +++ b/src/main/java/constants/skills/NightLord.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class NightLord { diff --git a/src/main/java/constants/skills/NightWalker.java b/src/main/java/constants/skills/NightWalker.java index 48b991130e..7447d94f0a 100644 --- a/src/main/java/constants/skills/NightWalker.java +++ b/src/main/java/constants/skills/NightWalker.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class NightWalker { diff --git a/src/main/java/constants/skills/Noblesse.java b/src/main/java/constants/skills/Noblesse.java index 074f726449..f80f809fdd 100644 --- a/src/main/java/constants/skills/Noblesse.java +++ b/src/main/java/constants/skills/Noblesse.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Noblesse { diff --git a/src/main/java/constants/skills/Outlaw.java b/src/main/java/constants/skills/Outlaw.java index 9a817225ab..572935eb69 100644 --- a/src/main/java/constants/skills/Outlaw.java +++ b/src/main/java/constants/skills/Outlaw.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Outlaw { diff --git a/src/main/java/constants/skills/Page.java b/src/main/java/constants/skills/Page.java index 615143ab5c..326a885442 100644 --- a/src/main/java/constants/skills/Page.java +++ b/src/main/java/constants/skills/Page.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Page { diff --git a/src/main/java/constants/skills/Paladin.java b/src/main/java/constants/skills/Paladin.java index 099ad8f384..5a7f0f2ade 100644 --- a/src/main/java/constants/skills/Paladin.java +++ b/src/main/java/constants/skills/Paladin.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Paladin { diff --git a/src/main/java/constants/skills/Pirate.java b/src/main/java/constants/skills/Pirate.java index 41e730d947..3886a541ec 100644 --- a/src/main/java/constants/skills/Pirate.java +++ b/src/main/java/constants/skills/Pirate.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Pirate { diff --git a/src/main/java/constants/skills/Priest.java b/src/main/java/constants/skills/Priest.java index 5a68536679..209174fb89 100644 --- a/src/main/java/constants/skills/Priest.java +++ b/src/main/java/constants/skills/Priest.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Priest { diff --git a/src/main/java/constants/skills/Ranger.java b/src/main/java/constants/skills/Ranger.java index d7766ac279..89e3dc45f7 100644 --- a/src/main/java/constants/skills/Ranger.java +++ b/src/main/java/constants/skills/Ranger.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Ranger { diff --git a/src/main/java/constants/skills/Rogue.java b/src/main/java/constants/skills/Rogue.java index 4816f1524e..70c32b6578 100644 --- a/src/main/java/constants/skills/Rogue.java +++ b/src/main/java/constants/skills/Rogue.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Rogue { diff --git a/src/main/java/constants/skills/Shadower.java b/src/main/java/constants/skills/Shadower.java index 9a2782965b..3c4cccb8f1 100644 --- a/src/main/java/constants/skills/Shadower.java +++ b/src/main/java/constants/skills/Shadower.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Shadower { diff --git a/src/main/java/constants/skills/Sniper.java b/src/main/java/constants/skills/Sniper.java index d806f92e8d..8bc0694859 100644 --- a/src/main/java/constants/skills/Sniper.java +++ b/src/main/java/constants/skills/Sniper.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Sniper { diff --git a/src/main/java/constants/skills/Spearman.java b/src/main/java/constants/skills/Spearman.java index 07bf8ae9bf..8cbbaab6de 100644 --- a/src/main/java/constants/skills/Spearman.java +++ b/src/main/java/constants/skills/Spearman.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class Spearman { diff --git a/src/main/java/constants/skills/SuperGM.java b/src/main/java/constants/skills/SuperGM.java index e6f9dbee3a..b01dce0a04 100644 --- a/src/main/java/constants/skills/SuperGM.java +++ b/src/main/java/constants/skills/SuperGM.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class SuperGM { diff --git a/src/main/java/constants/skills/ThunderBreaker.java b/src/main/java/constants/skills/ThunderBreaker.java index 675ab04d31..403f43d8a6 100644 --- a/src/main/java/constants/skills/ThunderBreaker.java +++ b/src/main/java/constants/skills/ThunderBreaker.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class ThunderBreaker { diff --git a/src/main/java/constants/skills/Warrior.java b/src/main/java/constants/skills/Warrior.java index 7bb463fa70..e1dc5677ff 100644 --- a/src/main/java/constants/skills/Warrior.java +++ b/src/main/java/constants/skills/Warrior.java @@ -5,11 +5,10 @@ package constants.skills; /** - * * @author Tyler */ public class Warrior { - public static final int IMPROVED_HPREC = 1000000; - public static final int IMPROVED_MAXHP = 1000001; - public static final int IRON_BODY = 1000003; + public static final int IMPROVED_HPREC = 1000000; + public static final int IMPROVED_MAXHP = 1000001; + public static final int IRON_BODY = 1000003; } diff --git a/src/main/java/constants/skills/WhiteKnight.java b/src/main/java/constants/skills/WhiteKnight.java index ceeb1101ab..7330ca2ab1 100644 --- a/src/main/java/constants/skills/WhiteKnight.java +++ b/src/main/java/constants/skills/WhiteKnight.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class WhiteKnight { diff --git a/src/main/java/constants/skills/WindArcher.java b/src/main/java/constants/skills/WindArcher.java index c692af89e8..8071f159e5 100644 --- a/src/main/java/constants/skills/WindArcher.java +++ b/src/main/java/constants/skills/WindArcher.java @@ -22,7 +22,6 @@ package constants.skills; /** - * * @author BubblesDev */ public class WindArcher { diff --git a/src/main/java/constants/string/CharsetConstants.java b/src/main/java/constants/string/CharsetConstants.java index da20cbfc01..0656d37375 100644 --- a/src/main/java/constants/string/CharsetConstants.java +++ b/src/main/java/constants/string/CharsetConstants.java @@ -3,9 +3,9 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ - + package constants.string; - + /* * Thanks to GabrielSin (EllinMS) - gabrielsin@playellin.net * Ellin diff --git a/src/main/java/constants/string/LanguageConstants.java b/src/main/java/constants/string/LanguageConstants.java index 5a16a6aba3..05854028ed 100644 --- a/src/main/java/constants/string/LanguageConstants.java +++ b/src/main/java/constants/string/LanguageConstants.java @@ -3,28 +3,27 @@ package constants.string; import client.Character; /** - * * @author Drago (Dragohe4rt) */ public class LanguageConstants { - + enum Language { LANG_PRT(0), LANG_ESP(1), LANG_ENG(2); - + int lang; - - private Language(int lang) { + + Language(int lang) { this.lang = lang; } - + private int getValue() { return this.lang; } - + } - + public static String[] CPQBlue = new String[3]; public static String[] CPQError = new String[3]; public static String[] CPQEntry = new String[3]; @@ -38,10 +37,10 @@ public class LanguageConstants { public static String[] CPQChallengeRoomAnswer = new String[3]; public static String[] CPQChallengeRoomSent = new String[3]; public static String[] CPQChallengeRoomDenied = new String[3]; - + static { int lang; - + lang = Language.LANG_PRT.getValue(); LanguageConstants.CPQBlue[lang] = "Maple Azul"; LanguageConstants.CPQRed[lang] = "Maple Vermelho"; @@ -49,7 +48,7 @@ public class LanguageConstants { LanguageConstants.CPQPlayerExit[lang] = " deixou o Carnaval de Monstros."; LanguageConstants.CPQError[lang] = "Ocorreu um problema. Favor recriar a sala."; LanguageConstants.CPQLeaderNotFound[lang] = "Nao foi possivel encontrar o Lider."; - LanguageConstants.CPQPickRoom[lang] = "Inscreva-se no Festival de Monstros!\r\n"; + LanguageConstants.CPQPickRoom[lang] = "Inscreva-se no Festival de Monstros!\r\n"; LanguageConstants.CPQChallengeRoomAnswer[lang] = "O grupo esta respondendo um desafio no momento."; LanguageConstants.CPQChallengeRoomSent[lang] = "Um desafio foi enviado para o grupo na sala. Aguarde um momento."; LanguageConstants.CPQChallengeRoomDenied[lang] = "O grupo na sala cancelou seu desafio."; @@ -71,7 +70,7 @@ public class LanguageConstants { LanguageConstants.CPQFindError[lang] = "No se pudo encontrar un grupo en esta sala.\r\nProbablemente el grupo fue deshecho dentro de la sala!"; LanguageConstants.CPQEntryLobby[lang] = "Ahora usted recibira los retos de otros grupos. Si usted no acepta un desafio en 3 minutos, usted sera llevado hacia fuera."; LanguageConstants.CPQEntry[lang] = "Usted puede seleccionar \"Invocar Monstruos\", \"Habilidad\", o \"Protector\" como su tactica durante el Carnaval de los Monstruos. Utilice Tab y F1 ~ F12 para acceso rapido!"; - + lang = Language.LANG_ENG.getValue(); LanguageConstants.CPQBlue[lang] = "Maple Blue"; LanguageConstants.CPQRed[lang] = "Maple Red"; @@ -86,8 +85,8 @@ public class LanguageConstants { LanguageConstants.CPQFindError[lang] = "We could not find a group in this room.\r\nProbably the group was scrapped inside the room!"; LanguageConstants.CPQEntryLobby[lang] = "You will now receive challenges from other groups. If you do not accept a challenge within 3 minutes, you will be taken out."; LanguageConstants.CPQEntry[lang] = "You can select \"Summon Monsters\", \"Ability\", or \"Protector\" as your tactic during the Monster Carnival. Use Tab and F1 ~ F12 for quick access!"; - - + + } public static String getMessage(Character chr, String[] message) {