diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java index 92526a16ad..c569524a49 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/HellboundIsland/QuarryRebel/QuarryRebel.java @@ -34,9 +34,9 @@ import ai.AbstractNpcAI; public class QuarryRebel extends AbstractNpcAI { // Monsters - private static final int FIRE_SLAVE_BRIDGET = 19503; - private static final int FLOX_GOLEM = 19506; - private static final int EDAN = 19509; + private static final int CANTERA_BRIDGET = 23815; + private static final int CANTERA_FLOXIS = 23813; + private static final int CANTERA_BELIKA = 23814; private static final int DISCIPLINED_DEATHMOZ = 19504; private static final int MAGICAL_DEATHMOZ = 19505; private static final int DISCIPLINED_FLOXIS = 19507; @@ -54,8 +54,8 @@ public class QuarryRebel extends AbstractNpcAI private QuarryRebel() { - addKillId(FIRE_SLAVE_BRIDGET, FLOX_GOLEM, EDAN); - addAttackId(FIRE_SLAVE_BRIDGET, FLOX_GOLEM, EDAN); + addKillId(CANTERA_BRIDGET, CANTERA_FLOXIS, CANTERA_BELIKA); + addAttackId(CANTERA_BRIDGET, CANTERA_FLOXIS, CANTERA_BELIKA); } @Override @@ -65,19 +65,19 @@ public class QuarryRebel extends AbstractNpcAI { switch (npc.getId()) { - case FIRE_SLAVE_BRIDGET: + case CANTERA_BRIDGET: { spawnNextMob(_lastMagicAttack ? MAGICAL_DEATHMOZ : DISCIPLINED_DEATHMOZ, player, npc.getLocation()); npc.deleteMe(); break; } - case FLOX_GOLEM: + case CANTERA_FLOXIS: { spawnNextMob(_lastMagicAttack ? MAGICAL_FLOXIS : DISCIPLINED_FLOXIS, player, npc.getLocation()); npc.deleteMe(); break; } - case EDAN: + case CANTERA_BELIKA: { spawnNextMob(_lastMagicAttack ? MAGICAL_BELIKA : DISCIPLINED_BELIKA, player, npc.getLocation()); npc.deleteMe(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Hellbound/DesertQuarry.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Hellbound/DesertQuarry.xml index ad18e22a01..3de7b9d17c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Hellbound/DesertQuarry.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Hellbound/DesertQuarry.xml @@ -4,110 +4,66 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml index d4ffaecd64..77e07a0385 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/11100-11199.xml @@ -2984,6 +2984,70 @@ icon.skill0000 A1 + + icon.skill0000 + A2 + 5 + 1 + COMBINATION + 5-12 + 300 + icon.skill1469 + -709 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + 100 + 97 + SHOCK + 2 + true + SELF + POINT_BLANK + NOT_FRIEND + + + 600 + 600 + + + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 + + + + + icon.skill0000 + A2 + 5 + 1 + COMBINATION + 5-12 + 300 + icon.skill1469 + -709 + NONE + NONE;STRIDER;WYVERN;WOLF + 5 + 0 + 100 + 97 + SHOCK + 2 + true + SELF + POINT_BLANK + NOT_FRIEND + + + 600 + 600 + + + 10279;10517;10025;10776;11770;1904;11264;11093;13314;1912 + + + icon.skill0945 diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml index c4896754e0..5a94c77efb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/14800-14899.xml @@ -162,7 +162,7 @@ - + icon.skill0350