Advertisement
CostyKiller

Fix for Q10813 rewards in COC and OLY

Mar 25th, 2020
550
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.55 KB | None | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P L2J_Mobius_6.0_Fafurion
  3. Index: java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java
  4. ===================================================================
  5. --- java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java   (revision 7038)
  6. +++ java/org/l2jmobius/gameserver/model/ceremonyofchaos/CeremonyOfChaosEvent.java   (working copy)
  7. @@ -28,6 +28,7 @@
  8.  
  9.  import org.l2jmobius.commons.util.Rnd;
  10.  import org.l2jmobius.gameserver.enums.CeremonyOfChaosResult;
  11. +import org.l2jmobius.gameserver.enums.QuestSound;
  12.  import org.l2jmobius.gameserver.instancemanager.CeremonyOfChaosManager;
  13.  import org.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
  14.  import org.l2jmobius.gameserver.instancemanager.InstanceManager;
  15. @@ -51,6 +52,7 @@
  16.  import org.l2jmobius.gameserver.model.holders.SkillHolder;
  17.  import org.l2jmobius.gameserver.model.instancezone.Instance;
  18.  import org.l2jmobius.gameserver.model.instancezone.InstanceTemplate;
  19. +import org.l2jmobius.gameserver.model.quest.QuestState;
  20.  import org.l2jmobius.gameserver.model.skills.Skill;
  21.  import org.l2jmobius.gameserver.model.variables.PlayerVariables;
  22.  import org.l2jmobius.gameserver.network.SystemMessageId;
  23. @@ -395,6 +397,19 @@
  24.                 // Send result
  25.                 player.sendPacket(new ExCuriousHouseResult(member.getResultType(), this));
  26.                 members.add(member);
  27. +              
  28. +               // Reward For Glory quest
  29. +               final QuestState qs = player.getQuestState("Q10813_ForGlory");
  30. +               final int PROOF_OF_BATTLE = 45872;
  31. +               if ((qs.isCond(1)))
  32. +               {
  33. +                   giveItems(player, PROOF_OF_BATTLE, 1);
  34. +                   playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  35. +                   if (getQuestItemsCount(player, PROOF_OF_BATTLE) >= 80)
  36. +                   {
  37. +                       qs.setCond(2, true);
  38. +                   }
  39. +               }
  40.             }
  41.         }
  42.         getTimers().cancelTimer("update", null, null);
  43. Index: java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java
  44. ===================================================================
  45. --- java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java    (revision 7038)
  46. +++ java/org/l2jmobius/gameserver/model/olympiad/OlympiadGameNormal.java    (working copy)
  47. @@ -458,6 +458,7 @@
  48.                     winside = 1;
  49.                    
  50.                     rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
  51. +                   rewardQ10813(_playerOne.getPlayer());
  52.                    
  53.                     if (Config.ALT_OLY_LOG_FIGHTS)
  54.                     {
  55. @@ -484,6 +485,7 @@
  56.                     winside = 2;
  57.                    
  58.                     rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
  59. +                   rewardQ10813(_playerTwo.getPlayer());
  60.                    
  61.                     if (Config.ALT_OLY_LOG_FIGHTS)
  62.                     {
  63. @@ -600,6 +602,8 @@
  64.                
  65.                 rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
  66.                 rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_LOSER_REWARD); // Loser
  67. +               rewardQ10813(_playerOne.getPlayer());
  68. +               rewardQ10813(_playerTwo.getPlayer());
  69.                
  70.                 // Notify to scripts
  71.                 EventDispatcher.getInstance().notifyEventAsync(new OnOlympiadMatchResult(_playerOne, _playerTwo, getType()), Olympiad.getInstance());
  72. @@ -627,6 +631,8 @@
  73.                
  74.                 rewardParticipant(_playerTwo.getPlayer(), Config.ALT_OLY_WINNER_REWARD); // Winner
  75.                 rewardParticipant(_playerOne.getPlayer(), Config.ALT_OLY_LOSER_REWARD); // Loser
  76. +               rewardQ10813(_playerOne.getPlayer());
  77. +               rewardQ10813(_playerTwo.getPlayer());
  78.                
  79.                 // Notify to scripts
  80.                 EventDispatcher.getInstance().notifyEventAsync(new OnOlympiadMatchResult(_playerTwo, _playerOne, getType()), Olympiad.getInstance());
  81. Index: java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
  82. ===================================================================
  83. --- java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java  (revision 7038)
  84. +++ java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java  (working copy)
  85. @@ -22,6 +22,7 @@
  86.  
  87.  import org.l2jmobius.Config;
  88.  import org.l2jmobius.gameserver.ai.CtrlIntention;
  89. +import org.l2jmobius.gameserver.enums.QuestSound;
  90.  import org.l2jmobius.gameserver.instancemanager.AntiFeedManager;
  91.  import org.l2jmobius.gameserver.instancemanager.CastleManager;
  92.  import org.l2jmobius.gameserver.instancemanager.FortManager;
  93. @@ -31,9 +32,11 @@
  94.  import org.l2jmobius.gameserver.model.actor.Creature;
  95.  import org.l2jmobius.gameserver.model.actor.Summon;
  96.  import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
  97. +import org.l2jmobius.gameserver.model.events.AbstractScript;
  98.  import org.l2jmobius.gameserver.model.holders.ItemHolder;
  99.  import org.l2jmobius.gameserver.model.instancezone.Instance;
  100.  import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
  101. +import org.l2jmobius.gameserver.model.quest.QuestState;
  102.  import org.l2jmobius.gameserver.model.skills.Skill;
  103.  import org.l2jmobius.gameserver.network.SystemMessageId;
  104.  import org.l2jmobius.gameserver.network.serverpackets.ExOlympiadMode;
  105. @@ -406,6 +409,22 @@
  106.         }
  107.     }
  108.    
  109. +   public static void rewardQ10813(PlayerInstance player)
  110. +   {
  111. +       // Reward For Glory quest
  112. +       final QuestState qs = player.getQuestState("Q10813_ForGlory");
  113. +       final int PROOF_OF_BATTLE = 45872;
  114. +       if ((qs.isCond(1)))
  115. +       {
  116. +           AbstractScript.giveItems(player, PROOF_OF_BATTLE, 1);
  117. +           AbstractScript.playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
  118. +           if (AbstractScript.getQuestItemsCount(player, PROOF_OF_BATTLE) >= 80)
  119. +           {
  120. +               qs.setCond(2, true);
  121. +           }
  122. +       }
  123. +   }
  124. +  
  125.     public static void rewardParticipant(PlayerInstance player, List<ItemHolder> list)
  126.     {
  127.         if ((player == null) || !player.isOnline() || (list == null))
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement