diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a9714b2fa3..3e46402f8e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -68,7 +68,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -121,8 +120,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a9714b2fa3..3e46402f8e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -68,7 +68,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -121,8 +120,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a9714b2fa3..3e46402f8e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -68,7 +68,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -121,8 +120,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a9714b2fa3..3e46402f8e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -68,7 +68,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -121,8 +120,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a9714b2fa3..3e46402f8e 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -68,7 +68,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -121,8 +120,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 587daa85c4..540c18dddb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -67,7 +67,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -120,8 +119,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 587daa85c4..540c18dddb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -67,7 +67,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -120,8 +119,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index 587daa85c4..540c18dddb 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -67,7 +67,6 @@ public class FeedableBeasts extends AbstractNpcAI // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -120,8 +119,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java index f20c0b5314..afd35c7371 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -65,6 +65,7 @@ public class FeedableBeasts extends Quest // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(); + static { MAD_COW_POLYMORPH.put(21824, 21468); MAD_COW_POLYMORPH.put(21825, 21469); diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java index a757a32915..256f89275b 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java @@ -35,7 +35,7 @@ import ai.AbstractNpcAI; /** * Growth-capable mobs: Polymorphing upon successful feeding. - * @author Fulminus + * @author Fulminus, Mobius */ public class FeedableBeasts extends AbstractNpcAI { @@ -44,30 +44,23 @@ public class FeedableBeasts extends AbstractNpcAI private static final int SKILL_GOLDEN_SPICE = 2188; private static final int SKILL_CRYSTAL_SPICE = 2189; private static final int FOODSKILLDIFF = GOLDEN_SPICE - SKILL_GOLDEN_SPICE; - // Tamed Wild Beasts - private static final int TRAINED_BUFFALO1 = 16013; - private static final int TRAINED_BUFFALO2 = 16014; - private static final int TRAINED_COUGAR1 = 16015; - private static final int TRAINED_COUGAR2 = 16016; - private static final int TRAINED_KOOKABURRA1 = 16017; - private static final int TRAINED_KOOKABURRA2 = 16018; - // private static final int TRAINED_TINY_BABY_BUFFALO = 16020; // TODO: Implement. - // private static final int TRAINED_TINY_BABY_COUGAR = 16022; // TODO: Implement. - // private static final int TRAINED_TINY_BABY_KOOKABURRA = 16024; // TODO: Implement. + // @formatter:off private static final int[] TAMED_BEASTS = { - TRAINED_BUFFALO1, TRAINED_BUFFALO2, TRAINED_COUGAR1, TRAINED_COUGAR2, TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 + 16013, 16014, 16015, 16016, 16017, 16018 }; // all mobs that can eat... private static final int[] FEEDABLE_BEASTS = { - TRAINED_BUFFALO1, TRAINED_BUFFALO2, TRAINED_COUGAR1, TRAINED_COUGAR2, TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 + 21451, 21452, 21453, 21454, 21455, 21456, 21457, 21458, 21459, 21460, 21461, 21462, 21463, 21464, 21465, 21466, 21467, 21468, 21469, // Alpen Kookaburra + 21470, 21471, 21472, 21473, 21474, 21475, 21476, 21477, 21478, 21479, 21480, 21481, 21482, 21483, 21484, 21485, 21486, 21487, 21488, // Alpen Buffalo + 21489, 21490, 21491, 21492, 21493, 21494, 21495, 21496, 21497, 21498, 21499, 21500, 21501, 21502, 21503, 21504, 21505, 21506, 21507, // Alpen Cougar + 21824, 21825, 21826, 21827, 21828, 21829 // Alpen Kookaburra, Buffalo, Cougar }; // @formatter:on private static final Map MAD_COW_POLYMORPH = new HashMap<>(6); - static { MAD_COW_POLYMORPH.put(21824, 21468); @@ -120,8 +113,8 @@ public class FeedableBeasts extends AbstractNpcAI NpcStringId.ANIMALS_NEED_LOVE_TOO }; - private final Map _feedInfo = new ConcurrentHashMap<>(); - private static Map GROWTH_CAPABLE_MOBS = new HashMap<>(); + private static final Map _feedInfo = new ConcurrentHashMap<>(); + private static final Map GROWTH_CAPABLE_MOBS = new HashMap<>(); // all mobs that grow by eating private static class GrowthCapableMob @@ -185,8 +178,8 @@ public class FeedableBeasts extends AbstractNpcAI final int[][] Kookabura_1_Gold_2 = {{ 21461, 21463 }}; final int[][] Kookabura_1_Crystal_1 = {{ 21464, 21466 }}; final int[][] Kookabura_1_Crystal_2 = {{ 21465, 21467 }}; - final int[][] Kookabura_2_1 = {{ 21468, 21824}, { TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 }}; - final int[][] Kookabura_2_2 = {{ 21469, 21825}, { TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 }}; + final int[][] Kookabura_2_1 = {{ 21468, 21824}, { 16017, 16018 }}; + final int[][] Kookabura_2_2 = {{ 21469, 21825}, { 16017, 16018 }}; final int[][] Buffalo_0_Gold = {{ 21471, 21472, 21473, 21474 }}; final int[][] Buffalo_0_Crystal = {{ 21475, 21476, 21477, 21478 }}; @@ -194,17 +187,17 @@ public class FeedableBeasts extends AbstractNpcAI final int[][] Buffalo_1_Gold_2 = {{ 21481, 21482 }}; final int[][] Buffalo_1_Crystal_1 = {{ 21483, 21485 }}; final int[][] Buffalo_1_Crystal_2 = {{ 21484, 21486 }}; - final int[][] Buffalo_2_1 = {{ 21487, 21826}, {TRAINED_BUFFALO1, TRAINED_BUFFALO2 }}; - final int[][] Buffalo_2_2 = {{ 21488, 21827}, {TRAINED_BUFFALO1, TRAINED_BUFFALO2 }}; + final int[][] Buffalo_2_1 = {{ 21487,21826}, {16013, 16014 }}; + final int[][] Buffalo_2_2 = {{ 21488,21827}, {16013, 16014 }}; final int[][] Cougar_0_Gold = {{ 21490, 21491, 21492, 21493 }}; final int[][] Cougar_0_Crystal = {{ 21494, 21495, 21496, 21497 }}; final int[][] Cougar_1_Gold_1 = {{ 21498, 21500 }}; final int[][] Cougar_1_Gold_2 = {{ 21499, 21501 }}; - final int[][] Cougar_1_Crystal_1 = {{ 21502, 21504 }}; - final int[][] Cougar_1_Crystal_2 = {{ 21503, 21505 }}; - final int[][] Cougar_2_1 = {{ 21506, 21828 }, { TRAINED_COUGAR1, TRAINED_COUGAR2 }}; - final int[][] Cougar_2_2 = {{ 21507, 21829 }, { TRAINED_COUGAR1, TRAINED_COUGAR2 }}; + final int[][] Cougar_1_Crystal_1 = {{ 21502,21504 }}; + final int[][] Cougar_1_Crystal_2 = {{ 21503,21505 }}; + final int[][] Cougar_2_1 = {{ 21506, 21828 }, { 16015,16016 }}; + final int[][] Cougar_2_2 = {{ 21507, 21829 }, { 16015,16016 }}; //@formatter:on // Alpen Kookabura