From edd38a686b5db642f598e7849e954e0bf66c1deb Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 19:33:34 -0400 Subject: [PATCH 01/10] Add missing archer skill constants --- src/main/java/constants/skills/Archer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/constants/skills/Archer.java b/src/main/java/constants/skills/Archer.java index 37c4258e1d..d4379ae076 100644 --- a/src/main/java/constants/skills/Archer.java +++ b/src/main/java/constants/skills/Archer.java @@ -25,6 +25,10 @@ package constants.skills; * @author BubblesDev */ public class Archer { + public static final int BLESSING_OF_AMAZON = 3000000; + public static final int EYE_OF_AMAZON = 3000002; public static final int CRITICAL_SHOT = 3000001; public static final int FOCUS = 3001003; + public static final int DOUBLE_SHOT = 3001005; + public static final int ARROW_BLOW = 3001004; } \ No newline at end of file From fe7ea6fcefb2645b930d293db9985f37be12b678 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 19:39:14 -0400 Subject: [PATCH 02/10] Add remaining missing archer tree skill constants --- src/main/java/constants/skills/Bowmaster.java | 2 ++ src/main/java/constants/skills/Crossbowman.java | 2 ++ src/main/java/constants/skills/Hunter.java | 1 + src/main/java/constants/skills/Marksman.java | 1 + src/main/java/constants/skills/Ranger.java | 4 ++++ src/main/java/constants/skills/Sniper.java | 3 +++ 6 files changed, 13 insertions(+) diff --git a/src/main/java/constants/skills/Bowmaster.java b/src/main/java/constants/skills/Bowmaster.java index f4e25c936c..7f8508715d 100644 --- a/src/main/java/constants/skills/Bowmaster.java +++ b/src/main/java/constants/skills/Bowmaster.java @@ -26,7 +26,9 @@ package constants.skills; */ public class Bowmaster { public static final int MAPLE_WARRIOR = 3121000; + public static final int VENGEANCE = 3121001; public static final int SHARP_EYES = 3121002; + public static final int DRAGONS_BREATH = 3121003; public static final int HURRICANE = 3121004; public static final int BOW_EXPERT = 3120005; public static final int PHOENIX = 3121006; diff --git a/src/main/java/constants/skills/Crossbowman.java b/src/main/java/constants/skills/Crossbowman.java index 631178188c..944f22421b 100644 --- a/src/main/java/constants/skills/Crossbowman.java +++ b/src/main/java/constants/skills/Crossbowman.java @@ -28,5 +28,7 @@ public class Crossbowman { public static final int CROSSBOW_MASTERY = 3200000; public static final int FINAL_ATTACK = 3200001; public static final int CROSSBOW_BOOSTER = 3201002; + public static final int POWER_KNOCKBACK = 3201003; public static final int SOUL_ARROW = 3201004; + public static final int IRON_ARROW = 3201005; } diff --git a/src/main/java/constants/skills/Hunter.java b/src/main/java/constants/skills/Hunter.java index da0ad31af0..69ecdb1e7f 100644 --- a/src/main/java/constants/skills/Hunter.java +++ b/src/main/java/constants/skills/Hunter.java @@ -28,6 +28,7 @@ public class Hunter { public static final int BOW_MASTERY = 3100000; public static final int FINAL_ATTACK = 3100001; public static final int BOW_BOOSTER = 3101002; + public static final int POWER_KNOCKBACK = 3101003; public static final int SOUL_ARROW = 3101004; public static final int ARROW_BOMB = 3101005; } \ No newline at end of file diff --git a/src/main/java/constants/skills/Marksman.java b/src/main/java/constants/skills/Marksman.java index 7a701fef42..4509ee361f 100644 --- a/src/main/java/constants/skills/Marksman.java +++ b/src/main/java/constants/skills/Marksman.java @@ -28,6 +28,7 @@ public class Marksman { public static final int MAPLE_WARRIOR = 3221000; public static final int PIERCING_ARROW = 3221001; public static final int SHARP_EYES = 3221002; + public static final int DRAGONS_BREATH = 3221003; public static final int MARKSMAN_BOOST = 3220004; public static final int FROST_PREY = 3221005; public static final int BLIND = 3221006; diff --git a/src/main/java/constants/skills/Ranger.java b/src/main/java/constants/skills/Ranger.java index 89e3dc45f7..cd5b427f2a 100644 --- a/src/main/java/constants/skills/Ranger.java +++ b/src/main/java/constants/skills/Ranger.java @@ -25,7 +25,11 @@ package constants.skills; * @author BubblesDev */ public class Ranger { + public static final int THRUST = 3110000; public static final int MORTAL_BLOW = 3110001; public static final int PUPPET = 3111002; + public static final int INFERNO = 3111003; + public static final int ARROW_RAIN = 3111004; public static final int SILVER_HAWK = 3111005; + public static final int STRAFE = 3111006; } diff --git a/src/main/java/constants/skills/Sniper.java b/src/main/java/constants/skills/Sniper.java index 8bc0694859..dc43fbba25 100644 --- a/src/main/java/constants/skills/Sniper.java +++ b/src/main/java/constants/skills/Sniper.java @@ -25,8 +25,11 @@ package constants.skills; * @author BubblesDev */ public class Sniper { + public static final int THRUST = 3210000; public static final int MORTAL_BLOW = 3210001; public static final int PUPPET = 3211002; public static final int BLIZZARD = 3211003; + public static final int ARROW_ERUPTION = 3210004; public static final int GOLDEN_EAGLE = 3211005; + public static final int STRAFE = 3210006; } From a1382dfbd000c012d2db2b19dd18fc819555c0d4 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:17:30 -0400 Subject: [PATCH 03/10] Fix mistake in skill IDs --- src/main/java/constants/skills/Sniper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/constants/skills/Sniper.java b/src/main/java/constants/skills/Sniper.java index dc43fbba25..55503fd15b 100644 --- a/src/main/java/constants/skills/Sniper.java +++ b/src/main/java/constants/skills/Sniper.java @@ -29,7 +29,7 @@ public class Sniper { public static final int MORTAL_BLOW = 3210001; public static final int PUPPET = 3211002; public static final int BLIZZARD = 3211003; - public static final int ARROW_ERUPTION = 3210004; + public static final int ARROW_ERUPTION = 3211004; public static final int GOLDEN_EAGLE = 3211005; - public static final int STRAFE = 3210006; + public static final int STRAFE = 3211006; } From e4bba96d1f2d190045b55e8d7343afafabb223af Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:20:36 -0400 Subject: [PATCH 04/10] Add missing skill IDs for mage tree --- src/main/java/constants/skills/Bishop.java | 1 + src/main/java/constants/skills/Cleric.java | 2 ++ src/main/java/constants/skills/FPWizard.java | 1 + src/main/java/constants/skills/ILMage.java | 1 + src/main/java/constants/skills/ILWizard.java | 2 ++ src/main/java/constants/skills/Magician.java | 2 ++ src/main/java/constants/skills/Priest.java | 1 + 7 files changed, 10 insertions(+) diff --git a/src/main/java/constants/skills/Bishop.java b/src/main/java/constants/skills/Bishop.java index 778d3bc81d..07227c7c0d 100644 --- a/src/main/java/constants/skills/Bishop.java +++ b/src/main/java/constants/skills/Bishop.java @@ -32,6 +32,7 @@ public class Bishop { public static final int INFINITY = 2321004; public static final int HOLY_SHIELD = 2321005; public static final int RESURRECTION = 2321006; + public static final int ANGEL_RAY = 2321007; public static final int GENESIS = 2321008; public static final int HEROS_WILL = 2321009; } \ No newline at end of file diff --git a/src/main/java/constants/skills/Cleric.java b/src/main/java/constants/skills/Cleric.java index f6e72a5c89..c970ec762e 100644 --- a/src/main/java/constants/skills/Cleric.java +++ b/src/main/java/constants/skills/Cleric.java @@ -25,5 +25,7 @@ public class Cleric { public static final int MP_EATER = 2300000; public static final int HEAL = 2301002; public static final int INVINCIBLE = 2301003; + public static final int TELEPORT = 2301001; public static final int BLESS = 2301004; + public static final int HOLY_ARROW = 2301005; } \ No newline at end of file diff --git a/src/main/java/constants/skills/FPWizard.java b/src/main/java/constants/skills/FPWizard.java index 8739a262c5..7b9ec690eb 100644 --- a/src/main/java/constants/skills/FPWizard.java +++ b/src/main/java/constants/skills/FPWizard.java @@ -27,6 +27,7 @@ package constants.skills; public class FPWizard { public static final int MP_EATER = 2100000; public static final int MEDITATION = 2101001; + public static final int TELEPORT = 2101002; public static final int SLOW = 2101003; public static final int FIRE_ARROW = 2101004; public static final int POISON_BREATH = 2101005; diff --git a/src/main/java/constants/skills/ILMage.java b/src/main/java/constants/skills/ILMage.java index bafe8cd178..cb30830d4b 100644 --- a/src/main/java/constants/skills/ILMage.java +++ b/src/main/java/constants/skills/ILMage.java @@ -28,6 +28,7 @@ public class ILMage { public static final int PARTIAL_RESISTANCE = 2210000; public static final int ELEMENT_AMPLIFICATION = 2210001; public static final int ICE_STRIKE = 2211002; + public static final int THUNDER_SPEAR = 2211003; public static final int SEAL = 2211004; public static final int SPELL_BOOSTER = 2211005; public static final int ELEMENT_COMPOSITION = 2211006; diff --git a/src/main/java/constants/skills/ILWizard.java b/src/main/java/constants/skills/ILWizard.java index 8c851ac0f2..86f40cac61 100644 --- a/src/main/java/constants/skills/ILWizard.java +++ b/src/main/java/constants/skills/ILWizard.java @@ -27,6 +27,8 @@ package constants.skills; public class ILWizard { public static final int MP_EATER = 2200000; public static final int MEDITATION = 2201001; + public static final int TELEPORT = 2201002; public static final int SLOW = 2201003; public static final int COLD_BEAM = 2201004; + public static final int THUNDERBOLT = 2201005; } diff --git a/src/main/java/constants/skills/Magician.java b/src/main/java/constants/skills/Magician.java index 08bf71bb1a..b87b170a27 100644 --- a/src/main/java/constants/skills/Magician.java +++ b/src/main/java/constants/skills/Magician.java @@ -29,4 +29,6 @@ public class Magician { public static final int IMPROVED_MAX_MP_INCREASE = 2000001; public static final int MAGIC_GUARD = 2001002; public static final int MAGIC_ARMOR = 2001003; + public static final int ENERGY_BOLT = 2001004; + public static final int MAGIC_CLAW = 2001005; } diff --git a/src/main/java/constants/skills/Priest.java b/src/main/java/constants/skills/Priest.java index 209174fb89..bfa4e0b006 100644 --- a/src/main/java/constants/skills/Priest.java +++ b/src/main/java/constants/skills/Priest.java @@ -29,6 +29,7 @@ public class Priest { public static final int DISPEL = 2311001; public static final int MYSTIC_DOOR = 2311002; public static final int HOLY_SYMBOL = 2311003; + public static final int SHINING_RAY = 2311004; public static final int DOOM = 2311005; public static final int SUMMON_DRAGON = 2311006; } From 435ca37a71d3a84ee59e521d70e09025058ff142 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:26:14 -0400 Subject: [PATCH 05/10] Add missing skill IDs for pirate tree --- src/main/java/constants/skills/Corsair.java | 2 ++ src/main/java/constants/skills/Gunslinger.java | 1 + src/main/java/constants/skills/Marauder.java | 2 ++ src/main/java/constants/skills/Outlaw.java | 1 + src/main/java/constants/skills/Pirate.java | 4 ++++ 5 files changed, 10 insertions(+) diff --git a/src/main/java/constants/skills/Corsair.java b/src/main/java/constants/skills/Corsair.java index 4d88071483..c13f8f5964 100644 --- a/src/main/java/constants/skills/Corsair.java +++ b/src/main/java/constants/skills/Corsair.java @@ -31,6 +31,8 @@ public class Corsair { public static final int AERIAL_STRIKE = 5221003; public static final int RAPID_FIRE = 5221004; public static final int BATTLE_SHIP = 5221006; + public static final int BATTLESHIP_CANNON = 5221007; + public static final int BATTLESHIP_TORPEDO = 5221008; public static final int HYPNOTIZE = 5221009; public static final int SPEED_INFUSION = 5221010; public static final int BULLSEYE = 5220011; diff --git a/src/main/java/constants/skills/Gunslinger.java b/src/main/java/constants/skills/Gunslinger.java index 9b0c8f61fb..52764f01a8 100644 --- a/src/main/java/constants/skills/Gunslinger.java +++ b/src/main/java/constants/skills/Gunslinger.java @@ -30,5 +30,6 @@ public class Gunslinger { public static final int GRENADE = 5201002; public static final int GUN_BOOSTER = 5201003; public static final int BLANK_SHOT = 5201004; + public static final int WINGS = 5201005; public static final int RECOIL_SHOT = 5201006; } \ No newline at end of file diff --git a/src/main/java/constants/skills/Marauder.java b/src/main/java/constants/skills/Marauder.java index ab893af50b..771cc67bd0 100644 --- a/src/main/java/constants/skills/Marauder.java +++ b/src/main/java/constants/skills/Marauder.java @@ -27,6 +27,8 @@ package constants.skills; public class Marauder { public static final int STUN_MASTERY = 5110000; public static final int ENERGY_CHARGE = 5110001; + public static final int ENERGY_BLAST = 5111002; public static final int ENERGY_DRAIN = 5111004; public static final int TRANSFORMATION = 5111005; + public static final int SHOCKWAVE = 5111006; } diff --git a/src/main/java/constants/skills/Outlaw.java b/src/main/java/constants/skills/Outlaw.java index 572935eb69..1af08d881a 100644 --- a/src/main/java/constants/skills/Outlaw.java +++ b/src/main/java/constants/skills/Outlaw.java @@ -25,6 +25,7 @@ package constants.skills; * @author BubblesDev */ public class Outlaw { + public static final int BURST_FIRE = 5210000; public static final int OCTOPUS = 5211001; public static final int GAVIOTA = 5211002; public static final int FLAME_THROWER = 5211004; diff --git a/src/main/java/constants/skills/Pirate.java b/src/main/java/constants/skills/Pirate.java index 3886a541ec..b23689223d 100644 --- a/src/main/java/constants/skills/Pirate.java +++ b/src/main/java/constants/skills/Pirate.java @@ -25,5 +25,9 @@ package constants.skills; * @author BubblesDev */ public class Pirate { + public static final int BULLET_TIME = 5000000; + public static final int FLASH_FIST = 5001001; + public static final int SOMERSAULT_KICK = 5001002; + public static final int DOUBLE_SHOT = 5001003; public static final int DASH = 5001005; } \ No newline at end of file From 2a1570e03a0bf2078b7f1d8cc7243e71b48155ac Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:29:33 -0400 Subject: [PATCH 06/10] Add missing skill IDs for thief tree --- src/main/java/constants/skills/ChiefBandit.java | 1 + src/main/java/constants/skills/Rogue.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/constants/skills/ChiefBandit.java b/src/main/java/constants/skills/ChiefBandit.java index 899e2f26c8..bb6da2cd86 100644 --- a/src/main/java/constants/skills/ChiefBandit.java +++ b/src/main/java/constants/skills/ChiefBandit.java @@ -25,6 +25,7 @@ package constants.skills; * @author BubblesDev */ public class ChiefBandit { + public static final int SHIELD_MASTERY = 4210000; public static final int CHAKRA = 4211001; public static final int ASSAULTER = 4211002; public static final int PICKPOCKET = 4211003; diff --git a/src/main/java/constants/skills/Rogue.java b/src/main/java/constants/skills/Rogue.java index 70c32b6578..ad0c2083e3 100644 --- a/src/main/java/constants/skills/Rogue.java +++ b/src/main/java/constants/skills/Rogue.java @@ -26,6 +26,7 @@ package constants.skills; */ public class Rogue { public static final int NIMBLE_BODY = 4001000; + public static final int KEEN_EYES = 4001001; public static final int DARK_SIGHT = 4001003; public static final int DISORDER = 4001002; public static final int DOUBLE_STAB = 4001334; From c96e4a0e67991df5332f44a9048b8cd7cd41d9cc Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:36:28 -0400 Subject: [PATCH 07/10] Add missing skill IDs for warrior tree --- src/main/java/constants/skills/Crusader.java | 2 ++ src/main/java/constants/skills/DragonKnight.java | 2 ++ src/main/java/constants/skills/Warrior.java | 3 +++ src/main/java/constants/skills/WhiteKnight.java | 1 + 4 files changed, 8 insertions(+) diff --git a/src/main/java/constants/skills/Crusader.java b/src/main/java/constants/skills/Crusader.java index 243f1f2249..dced7e30c8 100644 --- a/src/main/java/constants/skills/Crusader.java +++ b/src/main/java/constants/skills/Crusader.java @@ -25,6 +25,8 @@ package constants.skills; * @author BubblesDev */ public class Crusader { + public static final int IMPROVING_MPREC = 1110000; + public static final int SHIELD_MASTERY = 1111001; public static final int COMBO = 1111002; public static final int SWORD_PANIC = 1111003; public static final int AXE_PANIC = 1111004; diff --git a/src/main/java/constants/skills/DragonKnight.java b/src/main/java/constants/skills/DragonKnight.java index ffa574b05e..356c2978c5 100644 --- a/src/main/java/constants/skills/DragonKnight.java +++ b/src/main/java/constants/skills/DragonKnight.java @@ -28,6 +28,8 @@ public class DragonKnight { public static final int ELEMENTAL_RESISTANCE = 1310000; public static final int SPEAR_CRUSHER = 1311001; public static final int POLE_ARM_CRUSHER = 1311002; + public static final int SPEAR_DRAGON_FURY = 1311003; + public static final int POLE_ARM_DRAGON_FURY = 1311004; public static final int SACRIFICE = 1311005; public static final int DRAGON_ROAR = 1311006; public static final int POWER_CRASH = 1311007; diff --git a/src/main/java/constants/skills/Warrior.java b/src/main/java/constants/skills/Warrior.java index e1dc5677ff..d627cacd3d 100644 --- a/src/main/java/constants/skills/Warrior.java +++ b/src/main/java/constants/skills/Warrior.java @@ -10,5 +10,8 @@ package constants.skills; public class Warrior { public static final int IMPROVED_HPREC = 1000000; public static final int IMPROVED_MAXHP = 1000001; + public static final int ENDURE = 1000002; public static final int IRON_BODY = 1000003; + public static final int POWER_STRIKE = 1000004; + public static final int SLASH_BLAST = 1000005; } diff --git a/src/main/java/constants/skills/WhiteKnight.java b/src/main/java/constants/skills/WhiteKnight.java index 7330ca2ab1..6cfe57a15d 100644 --- a/src/main/java/constants/skills/WhiteKnight.java +++ b/src/main/java/constants/skills/WhiteKnight.java @@ -26,6 +26,7 @@ package constants.skills; */ public class WhiteKnight { public static final int IMPROVING_MP_RECOVERY = 1210000; + public static final int SHIELD_MASTERY = 1211001; public static final int CHARGE_BLOW = 1211002; public static final int SWORD_FIRE_CHARGE = 1211003; public static final int BW_FIRE_CHARGE = 1211004; From 48ae8c0e93c1a1748077a6cf2d0e7ddbc9f5833b Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 20:52:52 -0400 Subject: [PATCH 08/10] Add missing skill IDs for Knights of Cygnus --- .../java/constants/skills/BlazeWizard.java | 24 ++++++++++++------- .../java/constants/skills/DawnWarrior.java | 9 +++++++ .../java/constants/skills/NightWalker.java | 21 ++++++++++------ .../java/constants/skills/ThunderBreaker.java | 17 +++++++++---- .../java/constants/skills/WindArcher.java | 9 +++++++ 5 files changed, 61 insertions(+), 19 deletions(-) diff --git a/src/main/java/constants/skills/BlazeWizard.java b/src/main/java/constants/skills/BlazeWizard.java index e1990bd203..3f83bde715 100644 --- a/src/main/java/constants/skills/BlazeWizard.java +++ b/src/main/java/constants/skills/BlazeWizard.java @@ -25,18 +25,26 @@ package constants.skills; * @author BubblesDev */ public class BlazeWizard { - public static final int ELEMENTAL_RESET = 12101005; - public static final int ELEMENT_AMPLIFICATION = 12110001; - public static final int FIRE_STRIKE = 12111006; - public static final int FLAME = 12001004; - public static final int FLAME_GEAR = 12111005; - public static final int IFRIT = 12111004; + // 1st job public static final int INCREASING_MAX_MP = 12000000; - public static final int MAGIC_ARMOR = 12001002; public static final int MAGIC_GUARD = 12001001; + public static final int MAGIC_ARMOR = 12001002; + public static final int MAGIC_CLAW = 12001003; + public static final int FLAME = 12001004; + // 2nd job public static final int MEDITATION = 12101000; - public static final int SEAL = 12111002; public static final int SLOW = 12101001; + public static final int FIRE_ARROW = 12101002; + public static final int TELEPORT = 12101003; public static final int SPELL_BOOSTER = 12101004; + public static final int ELEMENTAL_RESET = 12101005; public static final int FIRE_PILLAR = 12101006; + // 3rd job + public static final int ELEMENTAL_RESISTANCE = 12110000; + public static final int ELEMENT_AMPLIFICATION = 12110001; + public static final int SEAL = 12111002; + public static final int METEOR_SHOWER = 12111003; + public static final int IFRIT = 12111004; + public static final int FLAME_GEAR = 12111005; + public static final int FIRE_STRIKE = 12111006; } \ No newline at end of file diff --git a/src/main/java/constants/skills/DawnWarrior.java b/src/main/java/constants/skills/DawnWarrior.java index a947c48a55..fad4878809 100644 --- a/src/main/java/constants/skills/DawnWarrior.java +++ b/src/main/java/constants/skills/DawnWarrior.java @@ -25,17 +25,26 @@ package constants.skills; * @author BubblesDev */ public class DawnWarrior { + // 1st job public static final int MAX_HP_INCREASE = 11000000; public static final int IRON_BODY = 11001001; + public static final int POWER_STRIKE = 11001002; + public static final int SLASH_BLAST = 11001003; public static final int SOUL = 11001004; + // 2nd job public static final int SWORD_MASTERY = 11100000; public static final int SWORD_BOOSTER = 11101001; public static final int FINAL_ATTACK = 11101002; public static final int RAGE = 11101003; + public static final int SOUL_BLADE = 11101004; + public static final int SOUL_RUSH = 11101005; + // 3rd job public static final int INCREASED_MP_RECOVERY = 11110000; public static final int COMBO = 11111001; public static final int PANIC = 11111002; public static final int COMA = 11111003; + public static final int BRANDISH = 11111004; public static final int ADVANCED_COMBO = 11110005; + public static final int SOUL_DRIVER = 11111006; public static final int SOUL_CHARGE = 11111007; } \ No newline at end of file diff --git a/src/main/java/constants/skills/NightWalker.java b/src/main/java/constants/skills/NightWalker.java index 7447d94f0a..cac276618a 100644 --- a/src/main/java/constants/skills/NightWalker.java +++ b/src/main/java/constants/skills/NightWalker.java @@ -25,20 +25,27 @@ package constants.skills; * @author BubblesDev */ public class NightWalker { - public static final int ALCHEMIST = 14110003; - public static final int DISORDER = 14001002; + // 1st job + public static final int NIMBLE_BODY = 14000000; + public static final int KEEN_EYES = 14000001; + public static final int DISORDER = 14000002; public static final int DARK_SIGHT = 14001003; public static final int LUCKY_SEVEN = 14001004; public static final int DARKNESS = 14001005; - public static final int CLAW_BOOSTER = 14101002; + // 2nd job public static final int CLAW_MASTERY = 14100000; public static final int CRITICAL_THROW = 14100001; + public static final int CLAW_BOOSTER = 14101002; public static final int HASTE = 14101003; - public static final int POISON_BOMB = 14111006; + public static final int FLASH_JUMP = 14101004; + public static final int VANISH = 14100005; + public static final int VAMPIRE = 14101006; + // 3rd job public static final int SHADOW_PARTNER = 14111000; public static final int SHADOW_WEB = 14111001; - public static final int VANISH = 14100005; - public static final int FLASH_JUMP = 14101004; - public static final int VAMPIRE = 14101006; + public static final int AVENGER = 14111002; + public static final int ALCHEMIST = 14110003; public static final int VENOM = 14110004; + public static final int TRIPLE_THROW = 14110005; + public static final int POISON_BOMB = 14111006; } diff --git a/src/main/java/constants/skills/ThunderBreaker.java b/src/main/java/constants/skills/ThunderBreaker.java index 403f43d8a6..54c9a675b1 100644 --- a/src/main/java/constants/skills/ThunderBreaker.java +++ b/src/main/java/constants/skills/ThunderBreaker.java @@ -25,18 +25,27 @@ package constants.skills; * @author BubblesDev */ public class ThunderBreaker { + // 1st job + public static final int QUICK_MOTION = 15000000; + public static final int FIRST_STRIKE = 15001001; + public static final int SOMERSAULT_KICK = 15001002; public static final int DASH = 15001003; + public static final int LIGHTNING = 15001004; + // 2nd job public static final int IMPROVE_MAX_HP = 15100000; public static final int KNUCKLER_MASTERY = 15100001; - public static final int ENERGY_CHARGE = 15100004; public static final int KNUCKLER_BOOSTER = 15101002; public static final int CORKSCREW_BLOW = 15101003; - public static final int LIGHTNING = 15001004; + public static final int ENERGY_CHARGE = 15100004; + public static final int ENERGY_BLAST = 15101005; public static final int LIGHTNING_CHARGE = 15101006; - public static final int ENERGY_DRAIN = 15111001; + // 3rd job + public static final int CRITICAL_PUNCH = 15110000; public static final int TRANSFORMATION = 15111002; + public static final int BARRAGE = 15111004; public static final int SPEED_INFUSION = 15111005; + public static final int SHOCK_WAVE = 15111003; + public static final int ENERGY_DRAIN = 15111001; public static final int SPARK = 15111006; public static final int SHARK_WAVE = 15111007; - public static final int BARRAGE = 15111004; } diff --git a/src/main/java/constants/skills/WindArcher.java b/src/main/java/constants/skills/WindArcher.java index 8071f159e5..30a2dd5dc4 100644 --- a/src/main/java/constants/skills/WindArcher.java +++ b/src/main/java/constants/skills/WindArcher.java @@ -25,18 +25,27 @@ package constants.skills; * @author BubblesDev */ public class WindArcher { + // 1st job public static final int CRITICAL_SHOT = 13000000; + public static final int EYE_OF_AMAZON = 13000001; public static final int FOCUS = 13001002; + public static final int DOUBLE_SHOT = 13001003; public static final int STORM = 13001004; + // 2nd job public static final int BOW_MASTERY = 13100000; public static final int BOW_BOOSTER = 13101001; public static final int FINAL_ATTACK = 13101002; public static final int SOUL_ARROW = 13101003; + public static final int THRUST = 13100004; public static final int STORM_BREAK = 13101005; public static final int WIND_WALK = 13101006; + // 3rd job + public static final int ARROW_RAIN = 13111000; public static final int HURRICANE = 13111002; + public static final int BOW_EXPERT = 13110003; public static final int PUPPET = 13111004; public static final int EAGLE_EYE = 13111005; public static final int WIND_PIERCING = 13111006; public static final int WIND_SHOT = 13111007; + public static final int STRAFE = 13111001; } \ No newline at end of file From 456ab667e9df6f404a7d88382642352b31be7ca2 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 17 Aug 2022 21:01:31 -0400 Subject: [PATCH 09/10] Add missing skill IDs for Aran --- src/main/java/constants/skills/Aran.java | 32 +++++++++++++++--------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/src/main/java/constants/skills/Aran.java b/src/main/java/constants/skills/Aran.java index 68da1426cd..92429df116 100644 --- a/src/main/java/constants/skills/Aran.java +++ b/src/main/java/constants/skills/Aran.java @@ -25,30 +25,38 @@ package constants.skills; * @author BubblesDev */ public class Aran { - public static final int DOUBLE_SWING = 21000002; - public static final int TRIPLE_SWING = 21100001; + // 1st job public static final int COMBO_ABILITY = 21000000; + public static final int DOUBLE_SWING = 21000002; public static final int COMBAT_STEP = 21001001; public static final int POLEARM_BOOSTER = 21001003; - public static final int MAPLE_WARRIOR = 21121000; - public static final int FREEZE_STANDING = 21121003; - public static final int SNOW_CHARGE = 21111005; - public static final int HEROS_WILL = 21121008; - public static final int HIGH_DEFENSE = 21120004; - public static final int BODY_PRESSURE = 21101003; + // 2nd job + public static final int POLEARM_MASTERY = 21100000; + public static final int TRIPLE_SWING = 21100001; + public static final int FINAL_CHARGE = 21100002; public static final int COMBO_DRAIN = 21100005; public static final int COMBO_SMASH = 21100004; - public static final int COMBO_FENRIR = 21110004; - public static final int COMBO_CRITICAL = 21110000; + public static final int BODY_PRESSURE = 21101003; + // 3rd job public static final int FULL_SWING = 21110002; + public static final int COMBO_CRITICAL = 21110000; + public static final int FINAL_TOSS = 21110003; // Final Toss seems to be missing from the handbook, sourced ID elsewhere + public static final int COMBO_FENRIR = 21110004; + public static final int SNOW_CHARGE = 21111005; + public static final int SMART_KNOCKBACK = 21111001; public static final int ROLLING_SPIN = 21110006; public static final int HIDDEN_FULL_DOUBLE = 21110007; public static final int HIDDEN_FULL_TRIPLE = 21110008; - public static final int SMART_KNOCKBACK = 21111001; + // 4th job + public static final int MAPLE_WARRIOR = 21121000; + public static final int HIGH_MASTERY = 21120001; public static final int OVER_SWING = 21120002; + public static final int HIGH_DEFENSE = 21120004; + public static final int FINAL_BLOW = 21120005; public static final int COMBO_TEMPEST = 21120006; public static final int COMBO_BARRIER = 21120007; + public static final int FREEZE_STANDING = 21121003; + public static final int HEROS_WILL = 21121008; public static final int HIDDEN_OVER_DOUBLE = 21120009; public static final int HIDDEN_OVER_TRIPLE = 21120010; - public static final int HIGH_MASTERY = 21120001; } \ No newline at end of file From 13ffce3ab3224a260646bf02055e9237a5de386e Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Fri, 19 Aug 2022 01:29:06 -0400 Subject: [PATCH 10/10] Fixes --- src/main/java/constants/skills/Bowmaster.java | 1 - src/main/java/constants/skills/Crusader.java | 2 +- src/main/java/constants/skills/WhiteKnight.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/constants/skills/Bowmaster.java b/src/main/java/constants/skills/Bowmaster.java index 7f8508715d..1fa83a6934 100644 --- a/src/main/java/constants/skills/Bowmaster.java +++ b/src/main/java/constants/skills/Bowmaster.java @@ -26,7 +26,6 @@ package constants.skills; */ public class Bowmaster { public static final int MAPLE_WARRIOR = 3121000; - public static final int VENGEANCE = 3121001; public static final int SHARP_EYES = 3121002; public static final int DRAGONS_BREATH = 3121003; public static final int HURRICANE = 3121004; diff --git a/src/main/java/constants/skills/Crusader.java b/src/main/java/constants/skills/Crusader.java index dced7e30c8..3517561359 100644 --- a/src/main/java/constants/skills/Crusader.java +++ b/src/main/java/constants/skills/Crusader.java @@ -26,7 +26,7 @@ package constants.skills; */ public class Crusader { public static final int IMPROVING_MPREC = 1110000; - public static final int SHIELD_MASTERY = 1111001; + public static final int SHIELD_MASTERY = 1110001; public static final int COMBO = 1111002; public static final int SWORD_PANIC = 1111003; public static final int AXE_PANIC = 1111004; diff --git a/src/main/java/constants/skills/WhiteKnight.java b/src/main/java/constants/skills/WhiteKnight.java index 6cfe57a15d..5556147c7c 100644 --- a/src/main/java/constants/skills/WhiteKnight.java +++ b/src/main/java/constants/skills/WhiteKnight.java @@ -26,7 +26,7 @@ package constants.skills; */ public class WhiteKnight { public static final int IMPROVING_MP_RECOVERY = 1210000; - public static final int SHIELD_MASTERY = 1211001; + public static final int SHIELD_MASTERY = 1210001; public static final int CHARGE_BLOW = 1211002; public static final int SWORD_FIRE_CHARGE = 1211003; public static final int BW_FIRE_CHARGE = 1211004;