diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
index 304242d96f69ce27becb818a1153df95996710f3..7f6cab713a2f383071ac441bba37710a37ce54ff 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
@@ -31,6 +31,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
@@ -140,49 +141,46 @@ public class FeedableBeasts extends AbstractNpcAI
MAD_COW_POLYMORPH.put(21829, 21507);
}
- // TODO: NpcString
- private static final String[][] TEXT =
+ private static final NpcStringId[][] TEXT =
{
{
- "What did you just do to me?",
- "You want to tame me, huh?",
- "Do not give me this. Perhaps you will be in danger.",
- "Bah bah. What is this unpalatable thing?",
- "My belly has been complaining. This hit the spot.",
- "What is this? Can I eat it?",
- "You don't need to worry about me.",
- "Delicious food, thanks.",
- "I am starting to like you!",
- "Gulp"
+ NpcStringId.WHAT_DID_YOU_JUST_DO_TO_ME,
+ NpcStringId.ARE_YOU_TRYING_TO_TAME_ME_DONT_DO_THAT,
+ NpcStringId.DONT_GIVE_SUCH_A_THING_YOU_CAN_ENDANGER_YOURSELF,
+ NpcStringId.YUCK_WHAT_IS_THIS_IT_TASTES_TERRIBLE,
+ NpcStringId.IM_HUNGRY_GIVE_ME_A_LITTLE_MORE_PLEASE,
+ NpcStringId.WHAT_IS_THIS_IS_THIS_EDIBLE,
+ NpcStringId.DONT_WORRY_ABOUT_ME,
+ NpcStringId.THANK_YOU_THAT_WAS_DELICIOUS,
+ NpcStringId.I_THINK_I_AM_STARTING_TO_LIKE_YOU,
+ NpcStringId.EEEEEK_EEEEEK
},
{
- "I do not think you have given up on the idea of taming me.",
- "That is just food to me. Perhaps I can eat your hand too.",
- "Will eating this make me fat? Ha ha",
- "Why do you always feed me?",
- "Do not trust me. I may betray you"
+ NpcStringId.DONT_KEEP_TRYING_TO_TAME_ME_I_DONT_WANT_TO_BE_TAMED,
+ NpcStringId.IT_IS_JUST_FOOD_TO_ME_ALTHOUGH_IT_MAY_ALSO_BE_YOUR_HAND,
+ NpcStringId.IF_I_KEEP_EATING_LIKE_THIS_WONT_I_BECOME_FAT_CHOMP_CHOMP,
+ NpcStringId.WHY_DO_YOU_KEEP_FEEDING_ME,
+ NpcStringId.DONT_TRUST_ME_IM_AFRAID_I_MAY_BETRAY_YOU_LATER
},
{
- "Destroy",
- "Look what you have done!",
- "Strange feeling...! Evil intentions grow in my heart...!",
- "It is happenning!",
- "This is sad...Good is sad...!"
+ NpcStringId.GRRRRR,
+ NpcStringId.YOU_BROUGHT_THIS_UPON_YOURSELF,
+ NpcStringId.I_FEEL_STRANGE_I_KEEP_HAVING_THESE_EVIL_THOUGHTS,
+ NpcStringId.ALAS_SO_THIS_IS_HOW_IT_ALL_ENDS,
+ NpcStringId.I_DONT_FEEL_SO_GOOD_OH_MY_MIND_IS_VERY_TROUBLED
}
};
- private static final String[] TAMED_TEXT =
+ private static final NpcStringId[] TAMED_TEXT =
{
- "Refills! Yeah!",
- "I am such a gluttonous beast, it is embarrassing! Ha ha",
- "Your cooperative feeling has been getting better and better.",
- "I will help you!",
- "The weather is really good. Wanna go for a picnic?",
- "I really like you! This is tasty...",
- "If you do not have to leave this place, then I can help you.",
- "What can I help you with?",
- "I am not here only for food!",
- "Yam, yam, yam, yam, yam!"
+ NpcStringId.S1_SO_WHAT_DO_YOU_THINK_IT_IS_LIKE_TO_BE_TAMED,
+ NpcStringId.S1_WHENEVER_I_SEE_SPICE_I_THINK_I_WILL_MISS_YOUR_HAND_THAT_USED_TO_FEED_IT_TO_ME,
+ NpcStringId.S1_DONT_GO_TO_THE_VILLAGE_I_DONT_HAVE_THE_STRENGTH_TO_FOLLOW_YOU,
+ NpcStringId.THANK_YOU_FOR_TRUSTING_ME_S1_I_HOPE_I_WILL_BE_HELPFUL_TO_YOU,
+ NpcStringId.S1_WILL_I_BE_ABLE_TO_HELP_YOU,
+ NpcStringId.I_GUESS_ITS_JUST_MY_ANIMAL_MAGNETISM,
+ NpcStringId.TOO_MUCH_SPICY_FOOD_MAKES_ME_SWEAT_LIKE_A_BEAST,
+ NpcStringId.ANIMALS_NEED_LOVE_TOO
};
private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
index 3da59e3c7d7e147ac0e72347a89352d502e5e986..2564cee109cb70a170bcd9a4a7ff6ea65bf196d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SummonMinions.java
@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.gameserver.network.serverpackets.NpcSay;
/**
* Summon Minions AI. Based on work of Slyce.
@@ -84,6 +83,15 @@ public class SummonMinions extends AbstractNpcAI
MINIONS.put(22774, Arrays.asList(22768, 22768));
}
+ // Timak Orc Troop Messages
+ private static final NpcStringId[] ATTACK_LEADER_MSG =
+ {
+ NpcStringId.FORCES_OF_DARKNESS_FOLLOW_ME,
+ NpcStringId.DESTROY_THE_ENEMY_MY_BROTHERS,
+ NpcStringId.SHOW_YOURSELVES,
+ NpcStringId.COME_OUT_YOU_CHILDREN_OF_DARKNESS
+ };
+
private SummonMinions(String name, String descr)
{
super(name, descr);
@@ -197,15 +205,12 @@ public class SummonMinions extends AbstractNpcAI
}
else
{
+ broadcastNpcSay(npc, Say2.NPC_ALL, ATTACK_LEADER_MSG[getRandom(ATTACK_LEADER_MSG.length)]);
for (int val : MINIONS.get(npcId))
{
this.addSpawn(val, (npc.getX() + getRandom(-100, 100)), (npc.getY() + getRandom(-100, 100)), npc.getZ(), 0, false, 0);
}
}
- if (npcId == 20767)
- {
- npc.broadcastPacket(new NpcSay(npcObjId, Say2.NPC_ALL, npcId, NpcStringId.COME_OUT_YOU_CHILDREN_OF_DARKNESS));
- }
break;
}
}