From 4be99e8e000313333b67dd2a1bae0385083bee87 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 9 Dec 2019 13:19:29 +0000 Subject: [PATCH] Fixed console warnings. --- .../data/scripts/ai/others/AreaSkillNpc.java | 13 --- .../dist/game/data/multisell/2177.xml | 81 ------------------- .../data/scripts/ai/others/AreaSkillNpc.java | 13 --- .../Q00931_MemoriesOfTheWind.java | 19 +---- .../Q10540_ThwartingMimirsPlan.java | 2 +- .../dist/game/data/stats/npcs/34200-34299.xml | 38 +++++++++ .../data/scripts/ai/others/AreaSkillNpc.java | 4 - .../data/scripts/ai/others/AreaSkillNpc.java | 4 - .../data/scripts/ai/others/AreaSkillNpc.java | 4 - 9 files changed, 41 insertions(+), 137 deletions(-) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..155cfb90b1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -61,19 +61,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13452, // Solo Dance 13453, // Solo Dance 13454, // Solo Dance - 13576, // Solo Dance - 13577, // Solo Dance - 13541, // Solo Dance - 13542, // Solo Dance - 13543, // Solo Dance - 13544, // Solo Dance - 13545, // Solo Dance - 13546, // Solo Dance - 13547, // Solo Dance - 13548, // Solo Dance - 13549, // Solo Dance - 13580, // Solo Dance - 13581, // Solo Dance }; private static final int[] DECOY = // ai_decoy { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2177.xml b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2177.xml index e2d809c4b6..e0b5739f92 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2177.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/multisell/2177.xml @@ -11,15 +11,6 @@ - - - - - - - - - @@ -28,15 +19,6 @@ - - - - - - - - - @@ -45,15 +27,6 @@ - - - - - - - - - @@ -62,15 +35,6 @@ - - - - - - - - - @@ -79,15 +43,6 @@ - - - - - - - - - @@ -96,15 +51,6 @@ - - - - - - - - - @@ -113,15 +59,6 @@ - - - - - - - - - @@ -130,15 +67,6 @@ - - - - - - - - - @@ -147,13 +75,4 @@ - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..155cfb90b1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -61,19 +61,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13452, // Solo Dance 13453, // Solo Dance 13454, // Solo Dance - 13576, // Solo Dance - 13577, // Solo Dance - 13541, // Solo Dance - 13542, // Solo Dance - 13543, // Solo Dance - 13544, // Solo Dance - 13545, // Solo Dance - 13546, // Solo Dance - 13547, // Solo Dance - 13548, // Solo Dance - 13549, // Solo Dance - 13580, // Solo Dance - 13581, // Solo Dance }; private static final int[] DECOY = // ai_decoy { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java index 7d97e8d903..8550bac118 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00931_MemoriesOfTheWind/Q00931_MemoriesOfTheWind.java @@ -39,7 +39,6 @@ public class Q00931_MemoriesOfTheWind extends Quest // Monsters private static final int EL_FERA = 23797; private static final int EL_FLOATO = 23559; - private static final int ENERGY_OF_WIND = 19647; private static final int KERBEROS_LAGER_N = 23550; // (night) private static final int KERBEROS_LAGER = 23541; private static final int KERBEROS_FORT_N = 23551; // (night) @@ -70,7 +69,7 @@ public class Q00931_MemoriesOfTheWind extends Quest addStartNpc(CYPHONA); addTalkId(CYPHONA); addKillId(EL_FERA, EL_FLOATO); - addKillId(ENERGY_OF_WIND, KERBEROS_LAGER, KERBEROS_LAGER_N, KERBEROS_FORT, KERBEROS_FORT_N, KERBEROS_NERO, KERBEROS_NERO_N, FURY_SYLPH_BARRENA, FURY_SYLPH_BARRENA_N, FURY_SYLPH_TEMPTRESS, FURY_SYLPH_TEMPTRESS_N, FURY_SYLPH_PURKA, FURY_SYLPH_PURKA_N, FURY_KERBEROS_LEGER, FURY_KERBEROS_LEGER_N, FURY_KERBEROS_NERO, FURY_KERBEROS_NERO_N); + addKillId(KERBEROS_LAGER, KERBEROS_LAGER_N, KERBEROS_FORT, KERBEROS_FORT_N, KERBEROS_NERO, KERBEROS_NERO_N, FURY_SYLPH_BARRENA, FURY_SYLPH_BARRENA_N, FURY_SYLPH_TEMPTRESS, FURY_SYLPH_TEMPTRESS_N, FURY_SYLPH_PURKA, FURY_SYLPH_PURKA_N, FURY_KERBEROS_LEGER, FURY_KERBEROS_LEGER_N, FURY_KERBEROS_NERO, FURY_KERBEROS_NERO_N); registerQuestItems(MEMORIES_OF_THE_WIND); addCondMinLevel(MIN_LEVEL, "34055-00.htm"); addCondCompletedQuest(Q10831_UnbelievableSight.class.getSimpleName(), "34055-00.htm"); @@ -285,27 +284,13 @@ public class Q00931_MemoriesOfTheWind extends Quest case FURY_KERBEROS_LEGER_N: case FURY_KERBEROS_NERO_N: { - if (getRandom(100) < 50) - { - final Npc mob = addSpawn(ENERGY_OF_WIND, npc.getX(), npc.getY(), npc.getZ(), 0, true, 120000); - addAttackPlayerDesire(mob, killer, 5); - } - else if (getRandom(100) < 25) + if (getRandom(100) < 25) { final Npc mob = addSpawn(EL_FERA, npc.getX(), npc.getY(), npc.getZ(), 0, true, 120000); addAttackPlayerDesire(mob, killer, 5); } break; } - case ENERGY_OF_WIND: - { - if (getRandom(100) < 50) - { - final Npc mob = addSpawn(EL_FLOATO, npc.getX(), npc.getY(), npc.getZ(), 0, true, 120000); - addAttackPlayerDesire(mob, killer, 5); - } - break; - } case EL_FERA: case EL_FLOATO: { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java index c4cdbefd6a..9c98489735 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10540_ThwartingMimirsPlan/Q10540_ThwartingMimirsPlan.java @@ -34,7 +34,7 @@ public class Q10540_ThwartingMimirsPlan extends Quest // NPCs private static final int KRENAHT = 34237; // Boss - private static final int MIMIR = 26137; + private static final int MIMIR = 26148; // Misc private static final int MIN_LEVEL = 100; private static final int GIANTS_SCROLL_R_GRADE_WEAPON = 36386; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34200-34299.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34200-34299.xml index 49f70cf87f..c488bd1e40 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34200-34299.xml +++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/npcs/34200-34299.xml @@ -632,6 +632,44 @@ + + + ETC + FEMALE + + + + + + + + + + + + + + + + + + ETC + FEMALE + + + + + + + + + + + + + + + KAMAEL FEMALE diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..f84b001cc5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -61,8 +61,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13452, // Solo Dance 13453, // Solo Dance 13454, // Solo Dance - 13576, // Solo Dance - 13577, // Solo Dance 13541, // Solo Dance 13542, // Solo Dance 13543, // Solo Dance @@ -72,8 +70,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13547, // Solo Dance 13548, // Solo Dance 13549, // Solo Dance - 13580, // Solo Dance - 13581, // Solo Dance }; private static final int[] DECOY = // ai_decoy { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..f84b001cc5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -61,8 +61,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13452, // Solo Dance 13453, // Solo Dance 13454, // Solo Dance - 13576, // Solo Dance - 13577, // Solo Dance 13541, // Solo Dance 13542, // Solo Dance 13543, // Solo Dance @@ -72,8 +70,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13547, // Solo Dance 13548, // Solo Dance 13549, // Solo Dance - 13580, // Solo Dance - 13581, // Solo Dance }; private static final int[] DECOY = // ai_decoy { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java index 7cc32dc91c..f84b001cc5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/AreaSkillNpc.java @@ -61,8 +61,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13452, // Solo Dance 13453, // Solo Dance 13454, // Solo Dance - 13576, // Solo Dance - 13577, // Solo Dance 13541, // Solo Dance 13542, // Solo Dance 13543, // Solo Dance @@ -72,8 +70,6 @@ public class AreaSkillNpc extends AbstractNpcAI 13547, // Solo Dance 13548, // Solo Dance 13549, // Solo Dance - 13580, // Solo Dance - 13581, // Solo Dance }; private static final int[] DECOY = // ai_decoy {