Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java (modified) (9 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java

@@ -29 +29 @@
 
 import com.l2jserver.Config;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
@@ -36 +35 @@
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
@@ -125 +125 @@
         {
                 for (int i = 4629; i < 4665; i++)
-                        if (st.getQuestItemsCount(i) > 0)
+                        if (st.hasQuestItems(i))
                                 return true;
                 return false;
@@ -363 +363 @@
                 else if (check(st))
                         htmltext = npc.getNpcId() + "-03.htm";
-                else if (st.getQuestItemsCount(RED_SOUL_CRYSTAL0_ID) == 0
-                                && st.getQuestItemsCount(GREEN_SOUL_CRYSTAL0_ID) == 0
-                                && st.getQuestItemsCount(BLUE_SOUL_CRYSTAL0_ID) == 0)
+                else if (!st.hasQuestItems(RED_SOUL_CRYSTAL0_ID) && !st.hasQuestItems(GREEN_SOUL_CRYSTAL0_ID) && !st.hasQuestItems(BLUE_SOUL_CRYSTAL0_ID))
                         htmltext = npc.getNpcId() + "-21.htm";
                 return htmltext;
@@ -377 +375 @@
         /**
          * Calculate the leveling chance of Soul Crystals based on the attacker that killed this L2Attackable
-         *
-         * @param attacker The player that last killed this L2Attackable
+         * @param mob 
+         * @param killer The player that last killed this L2Attackable
          * $ Rewrite 06.12.06 - Yesod
          * $ Rewrite 08.01.10 - Gigiikun
@@ -527 +525 @@
                         if (ret != null)
                                 return null;
-                        else
-                                ret = _soulCrystals.get(itemId);
+                        ret = _soulCrystals.get(itemId);
                 }
                 return ret;
@@ -541 +538 @@
                 if (!_npcLevelingInfos.get(mob.getNpcId()).containsKey(sc.getLevel()))
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_REFUSED));
+                        player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_REFUSED);
                         return;
                 }
@@ -548 +545 @@
                         exchangeCrystal(player, mob, sc.getItemId(), sc.getLeveledItemId(), false);
                 else
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_FAILED));
+                        player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_FAILED);
         }
         
@@ -567 +564 @@
                         // Send a sound event and text message to the player
                         if (broke)
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_BROKE));
+                                player.sendPacket(SystemMessageId.SOUL_CRYSTAL_BROKE);
                         
                         else
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SOUL_CRYSTAL_ABSORBING_SUCCEEDED));
+                                player.sendPacket(SystemMessageId.SOUL_CRYSTAL_ABSORBING_SUCCEEDED);
                         
                         // Send system message