Jelajahi Sumber

BETA: Datapack part for [L6296].
* Cleanup.

Zoey76 11 tahun lalu
induk
melakukan
127b6a78ef
18 mengubah file dengan 28 tambahan dan 38 penghapusan
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java
  3. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DragonValley.java
  4. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java
  5. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java
  6. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java
  7. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java
  8. 7 9
      L2J_DataPack_BETA/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java
  9. 2 3
      L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
  10. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
  11. 2 3
      L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
  12. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java
  13. 2 3
      L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java
  14. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java
  15. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java
  16. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/quests/999_T1Tutorial/__init__.py
  17. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java
  18. 1 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/BeastFarm.java

@@ -377,7 +377,7 @@ public class BeastFarm extends AbstractNpcAI
 		else
 		{
 			caster.sendMessage("The beast spit out the feed instead of eating it.");
-			((L2Attackable) npc).dropItem(caster, food, 1);
+			npc.dropItem(caster, food, 1);
 		}
 		return super.onSkillSee(npc, caster, skill, targets, isSummon);
 	}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/Chimeras.java

@@ -100,7 +100,7 @@ public class Chimeras extends AbstractNpcAI
 					npc.setIsDead(true);
 					if (npc.getId() == CELTUS)
 					{
-						((L2Attackable) npc).dropItem(caster, CONTAINED_LIFE_FORCE, 1);
+						npc.dropItem(caster, CONTAINED_LIFE_FORCE, 1);
 					}
 					else
 					{

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/DragonValley.java

@@ -105,7 +105,7 @@ public final class DragonValley extends AbstractNpcAI
 		L2Attackable mob = (L2Attackable) npc;
 		if (Util.contains(HERB_DROP, npc.getId()) && mob.isSweepActive())
 		{
-			((L2Attackable) npc).dropItem(killer, getRandom(8604, 8605), 1);
+			npc.dropItem(killer, getRandom(8604, 8605), 1);
 		}
 		else if (npc.getId() == NECROMANCER_OF_THE_VALLEY)
 		{

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java

@@ -21,7 +21,6 @@ package ai.group_template;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
@@ -148,7 +147,7 @@ public final class IsleOfPrayer extends AbstractNpcAI
 	{
 		if (getRandom(1000) <= chance)
 		{
-			((L2MonsterInstance) npc).dropItem(killer, itemId, 1);
+			npc.dropItem(killer, itemId, 1);
 		}
 	}
 	

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/Antharas.java

@@ -935,7 +935,7 @@ public final class Antharas extends AbstractNpcAI
 			int countMPHerb = getRandom(6, 18);
 			for (int i = 0; i < countHPHerb; i++)
 			{
-				((L2MonsterInstance) npc).dropItem(killer, 8602, 1);
+				npc.dropItem(killer, 8602, 1);
 			}
 			for (int i = 0; i < countMPHerb; i++)
 			{

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java

@@ -108,7 +108,7 @@ public final class FrightenedRagnaOrc extends AbstractNpcAI
 						npc.doCast(SKILL.getSkill());
 						for (int i = 0; i < 10; i++)
 						{
-							((L2Attackable) npc).dropItem(player, PcInventory.ADENA_ID, ADENA2);
+							npc.dropItem(player, PcInventory.ADENA_ID, ADENA2);
 						}
 					}
 					else if (getRandom(100000) < CHANCE)

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/hellbound/Quarry/Quarry.java

@@ -193,7 +193,7 @@ public class Quarry extends Quest
 					{
 						if (getRandom(10000) < i[1])
 						{
-							((L2Attackable) _npc).dropItem((L2PcInstance) _npc.getTarget(), i[0], (int) Config.RATE_DROP_ITEMS);
+							_npc.dropItem((L2PcInstance) _npc.getTarget(), i[0], (int) Config.RATE_DROP_ITEMS);
 							break;
 						}
 					}

+ 7 - 9
L2J_DataPack_BETA/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
@@ -569,32 +568,31 @@ public abstract class Chamber extends Quest
 		if (!npc.isBusy() && (npc.getCurrentHp() < (npc.getMaxHp() / 10)))
 		{
 			npc.setBusy(true);
-			final L2MonsterInstance box = (L2MonsterInstance) npc;
 			if (getRandom(100) < 25) // 25% chance to reward
 			{
 				if (getRandom(100) < 33)
 				{
-					box.dropItem(attacker, ENRIA, (int) (3 * Config.RATE_DROP_ITEMS));
+					npc.dropItem(attacker, ENRIA, (int) (3 * Config.RATE_DROP_ITEMS));
 				}
 				if (getRandom(100) < 50)
 				{
-					box.dropItem(attacker, THONS, (int) (4 * Config.RATE_DROP_ITEMS));
+					npc.dropItem(attacker, THONS, (int) (4 * Config.RATE_DROP_ITEMS));
 				}
 				if (getRandom(100) < 50)
 				{
-					box.dropItem(attacker, ASOFE, (int) (4 * Config.RATE_DROP_ITEMS));
+					npc.dropItem(attacker, ASOFE, (int) (4 * Config.RATE_DROP_ITEMS));
 				}
 				if (getRandom(100) < 16)
 				{
-					box.dropItem(attacker, LEONARD, (int) (2 * Config.RATE_DROP_ITEMS));
+					npc.dropItem(attacker, LEONARD, (int) (2 * Config.RATE_DROP_ITEMS));
 				}
 				
-				box.broadcastEvent("SCE_LUCKY", 2000, null);
-				box.doCast(SUCCESS_SKILL.getSkill());
+				npc.broadcastEvent("SCE_LUCKY", 2000, null);
+				npc.doCast(SUCCESS_SKILL.getSkill());
 			}
 			else
 			{
-				box.broadcastEvent("SCE_DREAM_FIRE_IN_THE_HOLE", 2000, null);
+				npc.broadcastEvent("SCE_DREAM_FIRE_IN_THE_HOLE", 2000, null);
 			}
 		}
 		

+ 2 - 3
L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java

@@ -39,7 +39,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TrapInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
@@ -2560,12 +2559,12 @@ public final class CrystalCaverns extends Quest
 			{
 				if (npc.getId() == GK1)
 				{
-					((L2MonsterInstance) npc).dropItem(player, 9698, 1);
+					npc.dropItem(player, 9698, 1);
 					runEmeraldSquare(world);
 				}
 				else if (npc.getId() == GK2)
 				{
-					((L2MonsterInstance) npc).dropItem(player, 9699, 1);
+					npc.dropItem(player, 9699, 1);
 					runSteamRooms(world, STEAM1_SPAWNS, 22);
 					L2Party party = player.getParty();
 					if (party != null)

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java

@@ -1549,7 +1549,7 @@ public final class FinalEmperialTomb extends Quest
 				{
 					if (getRandom(100) < 5)
 					{
-						((L2MonsterInstance) npc).dropItem(player, DEWDROP_OF_DESTRUCTION_ITEM_ID, 1);
+						npc.dropItem(player, DEWDROP_OF_DESTRUCTION_ITEM_ID, 1);
 					}
 				}
 				

+ 2 - 3
L2J_DataPack_BETA/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
@@ -187,7 +186,7 @@ public final class NornilsGarden extends Quest
 		{
 			if (chance < element[2])
 			{
-				((L2MonsterInstance) mob).dropItem(player, element[0], element[1]);
+				mob.dropItem(player, element[0], element[1]);
 			}
 		}
 	}
@@ -648,7 +647,7 @@ public final class NornilsGarden extends Quest
 			if (npc.getId() == _gk[0])
 			{
 				// Drop key
-				((L2MonsterInstance) npc).dropItem(player, _gk[1], 1);
+				npc.dropItem(player, _gk[1], 1);
 				
 				// Check if gatekeeper should open bridge, and open it
 				if (_gk[2] > 0)

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaDevilsLegacy.java

@@ -198,7 +198,7 @@ public final class PailakaDevilsLegacy extends Quest
 		{
 			if (chance < element[2])
 			{
-				((L2MonsterInstance) mob).dropItem(player, element[0], element[1]);
+				mob.dropItem(player, element[0], element[1]);
 				return;
 			}
 		}
@@ -214,7 +214,7 @@ public final class PailakaDevilsLegacy extends Quest
 			{
 				if (chance < drop[2])
 				{
-					((L2MonsterInstance) mob).dropItem(player, drop[1], getRandom(1, 6));
+					mob.dropItem(player, drop[1], getRandom(1, 6));
 					return;
 				}
 			}

+ 2 - 3
L2J_DataPack_BETA/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.enums.QuestSound;
 import com.l2jserver.gameserver.instancemanager.InstanceManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.Instance;
 import com.l2jserver.gameserver.model.instancezone.InstanceWorld;
@@ -215,7 +214,7 @@ public final class PailakaSongOfIceAndFire extends Quest
 		{
 			if (chance < element[2])
 			{
-				((L2MonsterInstance) mob).dropItem(player, element[0], element[1]);
+				mob.dropItem(player, element[0], element[1]);
 				return;
 			}
 		}
@@ -231,7 +230,7 @@ public final class PailakaSongOfIceAndFire extends Quest
 			{
 				if (chance < drop[2])
 				{
-					((L2MonsterInstance) mob).dropItem(player, drop[1], getRandom(1, 6));
+					mob.dropItem(player, drop[1], getRandom(1, 6));
 					return;
 				}
 			}

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodElpies/eventmodElpies.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Event;
 
@@ -238,7 +237,7 @@ public final class eventmodElpies extends Event
 		{
 			if (chance >= drop[1])
 			{
-				((L2MonsterInstance) mob).dropItem(player, drop[0], getRandom(drop[2], drop[3]));
+				mob.dropItem(player, drop[0], getRandom(drop[2], drop[3]));
 				break;
 			}
 		}

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/mods/eventmodRabbits/eventmodRabbits.java

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2EventChestInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Event;
 import com.l2jserver.gameserver.model.quest.QuestState;
@@ -284,7 +283,7 @@ public class eventmodRabbits extends Event
 		{
 			if (chance > drop[1])
 			{
-				((L2MonsterInstance) mob).dropItem(player, drop[0], getRandom(drop[2], drop[3]));
+				mob.dropItem(player, drop[0], getRandom(drop[2], drop[3]));
 				return;
 			}
 		}

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/quests/999_T1Tutorial/__init__.py

@@ -242,7 +242,7 @@ class Quest (JQuest) :
          st.showQuestionMark(3)
          qs.set("Ex","2")
       if Ex in [0,1,2] and st.getQuestItemsCount(6353) < 1 :
-         st.dropItem(npc,player,6353,1)
+         npc.dropItem(player, 6353, 1)
          st.playSound("ItemSound.quest_tutorial")
    return
 

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java

@@ -23,7 +23,6 @@ import java.util.Map;
 
 import com.l2jserver.gameserver.enums.QuestType;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -216,7 +215,7 @@ public class Q00464_Oath extends Quest
 	{
 		if (getRandom(1000) < MOBS.get(npc.getId()))
 		{
-			((L2MonsterInstance) npc).dropItem(killer, STRONGBOX, 1);
+			npc.dropItem(killer, STRONGBOX, 1);
 		}
 		
 		return super.onKill(npc, killer, isSummon);

+ 1 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java

@@ -22,7 +22,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -224,7 +223,7 @@ public final class Q00638_SeekersOfTheHolyGrail extends Quest
 			{
 				if ((info.getKeyId() > 0) && (getRandom(100) < info.getKeyChance()))
 				{
-					((L2MonsterInstance) npc).dropItem(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
+					npc.dropItem(qs.getPlayer(), info.getKeyId(), info.getKeyCount());
 				}
 			}
 		}