Bladeren bron

BETA: Updated Exp/Sp/Adena Reward of 2nd Class Transfer Quests.

MELERIX 13 jaren geleden
bovenliggende
commit
dec51d36c4
26 gewijzigde bestanden met toevoegingen van 92 en 91 verwijderingen
  1. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py
  2. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py
  3. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py
  4. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/214_TrialOfScholar/__init__.py
  5. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/215_TrialOfPilgrim/__init__.py
  6. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py
  7. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py
  8. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/218_TestimonyOfLife/__init__.py
  9. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py
  10. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py
  11. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/221_TestimonyOfProsperity/__init__.py
  12. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py
  13. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py
  14. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py
  15. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py
  16. 5 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py
  17. 7 7
      L2J_DataPack_BETA/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py
  18. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py
  19. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py
  20. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py
  21. 4 4
      L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py
  22. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/232_TestOfLord/__init__.py
  23. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py
  24. 2 2
      L2J_DataPack_BETA/dist/game/data/scripts/quests/64_CertifiedBerserker/__init__.py
  25. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py
  26. 3 3
      L2J_DataPack_BETA/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/211_TrialOfChallenger/__init__.py

@@ -149,12 +149,12 @@ class Quest (JQuest) :
    elif npcId == 30646 and cond == 7 :
       htmltext = "30646-06a.htm"
    elif npcId == 30646 and cond == 10 :
-      st.addExpAndSp(533803,34621)
-      st.giveItems(57,97278)
-      st.giveItems(7562,8)
-      htmltext = "30646-07.htm"
       st.takeItems(BROKEN_KEY,1)
+      st.addExpAndSp(1067606,69242)
+      st.giveItems(57,194556)
+      st.giveItems(7562,8)
       st.giveItems(MARK_OF_CHALLENGER,1)
+      htmltext = "30646-07.htm"
       st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("cond","0")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/212_TrialOfDuty/__init__.py

@@ -79,12 +79,12 @@ class Quest (JQuest) :
       htmltext = Quest.getAlreadyCompletedMsg(player)
 
    elif npcId == 30109 and cond == 18  and st.getQuestItemsCount(LETTER_OF_DUSTIN):
-      st.addExpAndSp(381288,24729)
-      st.giveItems(57,69484)
-      st.giveItems(7562,8)
-      htmltext = "30109-05.htm"
       st.takeItems(LETTER_OF_DUSTIN,1)
+      st.addExpAndSp(762576,49458)
+      st.giveItems(57,138968)
+      st.giveItems(7562,8)
       st.giveItems(MARK_OF_DUTY,1)
+      htmltext = "30109-05.htm"
       st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
       st.set("onlyone","1")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/213_TrialOfSeeker/__init__.py

@@ -141,17 +141,17 @@ class Quest (JQuest) :
           elif cond >= 1 and st.getInt("id") != 18 :
             htmltext = "30106-07.htm"
           elif cond == 17 and st.getInt("id") == 18 :
-              st.addExpAndSp(514739,33384)
-              st.giveItems(57,93803)
+              st.takeItems(TERYS_REPORT_ID,1)
+              st.addExpAndSp(1029478,66768)
+              st.giveItems(57,187606)
               st.giveItems(7562,8)
+              st.giveItems(MARK_OF_SEEKER_ID,1)
               htmltext = "30106-08.htm"
               st.set("cond","0")
               st.set("onlyone","1")
               st.set("id","0")
               st.exitQuest(False)
               st.playSound("ItemSound.quest_finish")
-              st.takeItems(TERYS_REPORT_ID,1)
-              st.giveItems(MARK_OF_SEEKER_ID,1)
    elif npcId == 30064 and st.getQuestItemsCount(TERYS_ORDER3_ID)==1 :
       if player.getLevel()<35 :
         htmltext = "30064-20.htm"

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/214_TrialOfScholar/__init__.py

@@ -284,8 +284,8 @@ class Quest (JQuest) :
             htmltext = "30461-14.htm"
             st.takeItems(MIRIENS_SIGIL3_ID,-1)
             st.takeItems(SYMBOL_OF_CRONOS_ID,-1)
-            st.addExpAndSp(876963,56877)
-            st.giveItems(57,159814)
+            st.addExpAndSp(1753926,113754)
+            st.giveItems(57,319628)
             st.giveItems(7562,8)
             st.giveItems(MARK_OF_SCHOLAR_ID,1)
             st.set("cond","0")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/215_TrialOfPilgrim/__init__.py

@@ -113,13 +113,13 @@ class Quest (JQuest) :
    elif npcId == 30648 and cond==1 and st.hasQuestItems(VOUCHER_OF_TRIAL) :
       htmltext = "30648-09.htm"
    elif npcId == 30648 and cond==17 and st.hasQuestItems(BOOK_OF_SAGE) :
-      st.addExpAndSp(629125,40803)
+      st.takeItems(BOOK_OF_SAGE,1)
+      st.addExpAndSp(1258250,81606)
+      st.giveAdena(229298,True)
       st.giveItems(7562,49)
-      st.giveAdena(114649,True)
+      st.giveItems(MARK_OF_PILGRIM,1)
       player.sendPacket(SocialAction(player.getObjectId(),3))
       htmltext = "30648-10.htm"
-      st.giveItems(MARK_OF_PILGRIM,1)
-      st.takeItems(BOOK_OF_SAGE,1)
       st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")
    elif npcId == 30571 and cond==1 and st.hasQuestItems(VOUCHER_OF_TRIAL) :

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/216_TrialOfGuildsman/__init__.py

@@ -67,12 +67,12 @@ class Quest (JQuest) :
         st.set("onlyone","1")
         st.exitQuest(False)
         st.playSound("ItemSound.quest_finish")
-        st.addExpAndSp(514739,33384)
-        st.giveItems(57,93803)
-        st.giveItems(7562,85)
         st.takeItems(JOURNEYMAN_RING_ID,-1)
         st.takeItems(ALLTRANS_INSTRUCTIONS_ID,1)
         st.takeItems(RP_JOURNEYMAN_RING_ID,1)
+        st.addExpAndSp(1029478,66768)
+        st.giveItems(57,187606)
+        st.giveItems(7562,85)
         st.giveItems(MARK_OF_GUILDSMAN_ID,1)
         st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
     elif event == "30103_4" :

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/217_TestimonyOfTrust/__init__.py

@@ -253,12 +253,12 @@ class Quest (JQuest) :
          if npcId == 30191 :
            htmltext = "30191-07.htm"
          elif npcId == 30031 and st.getQuestItemsCount(RECOMMENDATION_OF_HOLLIN_ID) :
-           st.giveItems(ADENA,126106)
-           st.addExpAndSp(659149,46391)
-           st.giveItems(7562,96)
-           htmltext = "30031-01.htm"
            st.takeItems(RECOMMENDATION_OF_HOLLIN_ID,1)
+           st.addExpAndSp(1390298,92782)
+           st.giveItems(ADENA,252212)
+           st.giveItems(7562,96)
            st.giveItems(MARK_OF_TRUST_ID,1)
+           htmltext = "30031-01.htm"
            st.unset("cond")
            st.unset("id")
            st.exitQuest(False)

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/218_TestimonyOfLife/__init__.py

@@ -168,8 +168,8 @@ class Quest(JQuest):
 			elif st.getQuestItemsCount(CAMOMILE_CHARM_ID):
 				if self.getGameTicks() != st.getInt("id"):
 					st.set("id",str(self.getGameTicks())) # TODO should it really be like this?
-					st.addExpAndSp(943416,62959)
-					st.giveItems(57,171144)
+					st.addExpAndSp(1886832,125918)
+					st.giveItems(57,342288)
 					st.giveItems(7562,16)
 					st.giveItems(MARK_OF_LIFE_ID,1)
 					st.takeItems(CAMOMILE_CHARM_ID,1)

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/219_TestimonyOfFate/__init__.py

@@ -221,12 +221,12 @@ class Quest (JQuest) :
       htmltext = "30358-03.htm"
    elif npcId == 30358 and st.getInt("cond")>=1 and st.getQuestItemsCount(PALUS_CHARM_ID) and st.getQuestItemsCount(ARKENIAS_LETTER_ID) :
       htmltext = "30358-04.htm"
-      st.giveItems(MARK_OF_FATE_ID,1)
-      st.giveItems(7562,16)
-      st.addExpAndSp(682735,45562)
-      st.giveItems(57,123854)
       st.takeItems(ARKENIAS_LETTER_ID,1)
       st.takeItems(PALUS_CHARM_ID,1)
+      st.addExpAndSp(1365470,91124)
+      st.giveItems(57,247708)
+      st.giveItems(7562,16)
+      st.giveItems(MARK_OF_FATE_ID,1)
       st.set("cond","0")
       st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/220_TestimonyOfGlory/__init__.py

@@ -425,12 +425,12 @@ class Quest (JQuest) :
          htmltext = "30571-06.htm"
        elif npcId == 30565 and st.getQuestItemsCount(RITUAL_BOX) :
          player.sendPacket(SocialAction(player.getObjectId(),3))
-         st.addExpAndSp(724113,48324)
-         st.giveItems(57,131360)
+         st.takeItems(RITUAL_BOX,1)
+         st.addExpAndSp(1448226,96648)
+         st.giveItems(57,262720)
          st.giveItems(7562,109)
-         htmltext = "30565-02.htm"
          st.giveItems(MARK_OF_GLORY,1)
-         st.takeItems(RITUAL_BOX,1)
+         htmltext = "30565-02.htm"
          st.set("cond","0")
          st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/221_TestimonyOfProsperity/__init__.py

@@ -217,12 +217,12 @@ class Quest (JQuest) :
    elif npcId == 30104 and st.getInt("cond")>=1 and (st.getQuestItemsCount(CLAY_DOUGH_ID) or st.getQuestItemsCount(PATTERN_OF_KEYHOLE_ID) or st.getQuestItemsCount(NIKOLAS_LIST_ID)) and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID)==1 :
         htmltext = "30104-12.htm"
    elif npcId == 30104 and st.getInt("cond")>=1 and st.getQuestItemsCount(RING_OF_TESTIMONY2_ID) and st.getQuestItemsCount(MAPHR_TABLET_FRAGMENT_ID) :
-          st.addExpAndSp(599979,40040)
-          st.giveItems(57,108841)
-          st.giveItems(7562,50)
           st.takeItems(RING_OF_TESTIMONY2_ID,1)
-          st.giveItems(MARK_OF_PROSPERITY_ID,1)
           st.takeItems(MAPHR_TABLET_FRAGMENT_ID,1)
+          st.addExpAndSp(1199958,80080)
+          st.giveItems(57,217682)
+          st.giveItems(7562,50)
+          st.giveItems(MARK_OF_PROSPERITY_ID,1)
           htmltext = "30104-13.htm"
           st.set("cond","0")
           st.set("onlyone","1")

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/222_TestOfDuelist/__init__.py

@@ -127,11 +127,11 @@ class Quest (JQuest) :
             st.takeItems(GRANDIS_SKIN,-1)
             st.takeItems(TIMAK_ORCS_BELT,-1)
             st.takeItems(RAKINS_MACE,-1)
-            st.addExpAndSp(4474444,30704)
-            st.giveItems(57,80903)
+            st.takeItems(FINAL_ORDER,1)
+            st.addExpAndSp(594888,61408)
+            st.giveItems(57,161806)
             st.giveItems(MARK_OF_DUELIST,1)
             st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-            st.takeItems(FINAL_ORDER,1)
             htmltext = "30623-18.htm"
             st.unset("step")
             st.set("cond","0")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/223_TestOfChampion/__init__.py

@@ -148,12 +148,12 @@ class Quest (JQuest) :
    elif npcId == 30624 and st.getInt("cond") == 9 and st.getQuestItemsCount(ASCALONS_LETTER3) :
       htmltext = "30624-15.htm"
    elif npcId == 30624 and st.getInt("cond") == 14 and st.getQuestItemsCount(MOUENS_LETTER) :
-      st.addExpAndSp(635371,43600)
-      st.giveItems(57,114882)
-      htmltext = "30624-17.htm"
+      st.takeItems(MOUENS_LETTER,1)
+      st.addExpAndSp(1270742,87200)
+      st.giveItems(57,229764)
       st.giveItems(MARK_OF_CHAMPION,1)
       st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-      st.takeItems(MOUENS_LETTER,1)
+      htmltext = "30624-17.htm"
       st.set("cond","0")
       st.exitQuest(False)
       st.playSound("ItemSound.quest_finish")

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/224_TestOfSagittarius/__init__.py

@@ -177,13 +177,13 @@ class Quest (JQuest) :
       htmltext = "30626-12.htm"
    elif npcId == 30626 and step==14 :
       htmltext = "30626-13.htm"
-      st.giveItems(MARK_OF_SAGITTARIUS,1)
-      st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
       st.takeItems(CRESCENT_MOON_BOW,1)
       st.takeItems(TALISMAN_OF_KADESH,1)
       st.takeItems(BLOOD_OF_LIZARDMAN,st.getQuestItemsCount(BLOOD_OF_LIZARDMAN))
-      st.addExpAndSp(447444,30704)
-      st.giveItems(57,80903)
+      st.addExpAndSp(894888,61408)
+      st.giveItems(57,161806)
+      st.giveItems(MARK_OF_SAGITTARIUS,1)
+      st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
       st.unset("step")
       st.set("cond","0")
       st.exitQuest(False)

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/225_TestOfSearcher/__init__.py

@@ -117,15 +117,15 @@ class Quest (JQuest) :
        elif cond>1 and cond<19 :
          htmltext = "30690-07.htm"
        elif cond==19 :
-         st.addExpAndSp(447444,30704)
-         st.giveItems(57,80903)
+         st.takeItems(ALANKELLS_RECOMMEND,1)
+         st.addExpAndSp(894888,61408)
+         st.giveItems(57,161806)
          st.giveItems(7562,82)
+         st.giveItems(MARK_OF_SEARCHER,1)
          htmltext = "30690-08.htm"
          st.set("cond","0")
          st.exitQuest(False)
          st.playSound("ItemSound.quest_finish")
-         st.takeItems(ALANKELLS_RECOMMEND,1)
-         st.giveItems(MARK_OF_SEARCHER,1)
          st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
      elif npcId == NPC[0] :
       if cond==1 :

+ 5 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/226_TestOfHealer/__init__.py

@@ -82,15 +82,16 @@ class Quest (JQuest) :
           htmltext = "30473-08.htm"
     elif event == "30473_2" :
           htmltext = "30473-09.htm"
+          st.takeItems(GOLDEN_STATUE,1)
           if st.getQuestItemsCount(GOLDEN_STATUE):
-            st.addExpAndSp(738283,50662)
+            st.addExpAndSp(1476566,101324)
           else:
-            st.addExpAndSp(118304,26250)
+            st.addExpAndSp(1476566,101324)
           st.giveItems(MARK_OF_HEALER,1)
-          st.giveItems(ADENA,133490)
+          st.giveItems(ADENA,266980)
           st.giveItems(7562,60)
           st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-          st.takeItems(GOLDEN_STATUE,1)
+          
           st.set("cond","0")
           st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")

+ 7 - 7
L2J_DataPack_BETA/dist/game/data/scripts/quests/227_TestOfReformer/__init__.py

@@ -117,20 +117,20 @@ class Quest (JQuest) :
         st.takeItems(OLMAHUMS_MONEY,1)
         st.giveItems(GREETINGS,3)
    elif npcId == 30666 and st.getInt("cond")==20 and st.getQuestItemsCount(KATARIS_LETTER)>0 and st.getQuestItemsCount(KAKANS_LETTER)>0 and st.getQuestItemsCount(NYAKURIS_LETTER)>0 and st.getQuestItemsCount(RAMUSS_LETTER)>0 :
-          st.giveItems(MARK_OF_REFORMER,1)
+          st.takeItems(KATARIS_LETTER,1)
+          st.takeItems(KAKANS_LETTER,1)
+          st.takeItems(NYAKURIS_LETTER,1)
+          st.takeItems(RAMUSS_LETTER,1)
+          st.addExpAndSp(1252844,85972)
+          st.giveItems(ADENA,226528)
           st.giveItems(7562,60)
-          st.giveItems(ADENA,113246)
+          st.giveItems(MARK_OF_REFORMER,1)
           st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-          st.addExpAndSp(626422,42986)
           htmltext = "30666-07.htm"
           st.set("cond","0")
           st.set("onlyone","1")
           st.exitQuest(False)
           st.playSound("ItemSound.quest_finish")
-          st.takeItems(KATARIS_LETTER,1)
-          st.takeItems(KAKANS_LETTER,1)
-          st.takeItems(NYAKURIS_LETTER,1)
-          st.takeItems(RAMUSS_LETTER,1)
    elif npcId == 30668 and (st.getInt("cond")==5 or st.getInt("cond")==6) :
         htmltext = "30668-01.htm"
         st.set("cond","6")

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/228_TestOfMagus/__init__.py

@@ -145,10 +145,10 @@ class Quest (JQuest) :
             st.takeItems(TONE_OF_FIRE,1)
             st.takeItems(TONE_OF_WIND,1)
             st.takeItems(TONE_OF_EARTH,1)
+            st.addExpAndSp(2058244,141240)
+            st.giveItems(57,372154)
             st.giveItems(MARK_OF_MAGUS,1)
             st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-            st.addExpAndSp(1029122,70620)
-            st.giveItems(57,186077)
             htmltext = "30629-12.htm"
             st.set("cond","0")
             st.set("onlyone","1")

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/229_TestOfWitchcraft/__init__.py

@@ -121,8 +121,8 @@ class Quest (JQuest) :
       st.takeItems(SWORD_OF_BINDING,1)
       st.takeItems(IKERS_AMULET,1)
       st.takeItems(ORIMS_INSTRUCTIONS,1)
-      st.addExpAndSp(1029122,70620)
-      st.giveItems(57,186077)
+      st.addExpAndSp(2058244,141240)
+      st.giveItems(57,372154)
       st.giveItems(MARK_OF_WITCHCRAFT,1)
       st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
       htmltext = "30630-22.htm"

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/230_TestOfSummoner/__init__.py

@@ -231,14 +231,14 @@ class Quest (JQuest) :
             elif step == 2 :              # step 2 means already talkd with lara
                if Arcanas == 6:           # finished all battles... the player is able to earn the marks
                   htmltext = "30634-12.htm"
-                  st.addExpAndSp(832247,57110)
-                  st.giveItems(57,150480)
+                  st.addExpAndSp(1664494,114220)
+                  st.giveItems(57,300960)
+                  st.giveItems(MARK_OF_SUMMONER,1)
+                  st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
                   for var in STATS:
                      st.unset(var)
                   st.exitQuest(False)
                   st.playSound("ItemSound.quest_finish")
-                  st.giveItems(MARK_OF_SUMMONER,1)
-                  st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
                   for item in [LARS_LIST1,LARS_LIST2,LARS_LIST3,LARS_LIST4,LARS_LIST5,ALMORS_ARCANA,BASILLIA_ARCANA,CAMONIELL_ARCANA,CELESTIEL_ARCANA,BELTHUS_ARCANA,BRYNTHEA_ARCANA]:
                      st.takeItems(item,-1)
                else:                # he lost something :) or didnt finished

+ 4 - 4
L2J_DataPack_BETA/dist/game/data/scripts/quests/231_TestOfMaestro/__init__.py

@@ -118,13 +118,13 @@ class Quest (JQuest) :
      elif progress>0 and progress<17 :
        htmltext = "30531-05.htm"
      elif progress==17 :
-       st.addExpAndSp(1029122,70620)
-       st.giveItems(57,186077)
-       htmltext = "30531-06.htm"
-       st.giveItems(MARK_OF_MAESTRO,1)
        st.takeItems(RECOMMENDATION_OF_BALANKI,1)
        st.takeItems(RECOMMENDATION_OF_FILAUR,1)
        st.takeItems(RECOMMENDATION_OF_ARIN,1)
+       st.addExpAndSp(2058244,141240)
+       st.giveItems(57,372154)
+       st.giveItems(MARK_OF_MAESTRO,1)
+       htmltext = "30531-06.htm"
        st.unset("progress")
        st.exitQuest(False)
        st.playSound("ItemSound.quest_finish")

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/232_TestOfLord/__init__.py

@@ -123,11 +123,11 @@ class Quest (JQuest) :
     elif st.getInt("phase")==2:
       if event == "30565_2":
         htmltext = "30565-12.htm"
-        st.addExpAndSp(447444,30704)
-        st.giveItems(57,80903)
+        st.takeItems(IMMORTAL_FLAME,1)
+        st.addExpAndSp(894888,61408)
+        st.giveItems(57,161806)
         st.giveItems(MARK_OF_LORD,1)
         st.giveItems(SHADOW_WEAPON_COUPON_CGRADE,15)
-        st.takeItems(IMMORTAL_FLAME,1)
         st.playSound("ItemSound.quest_finish")
         for var in STATS[0]:
           st.unset(var)

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/233_TestOfWarspirit/__init__.py

@@ -128,12 +128,12 @@ class Quest (JQuest) :
       st.takeItems(BRAKIS_REMAINS2,-1)
       st.takeItems(HERMODTS_REMAINS2,-1)
       st.takeItems(KIRUNAS_REMAINS2,-1)
-      st.addExpAndSp(447444,30704)
-      st.giveItems(57,80903)
       st.takeItems(TONARS_REMAINS2,-1)
+      st.addExpAndSp(894888,61408)
+      st.giveItems(57,161806)
       st.giveItems(MARK_OF_WARSPIRIT,1)
-      st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
       st.giveItems(7562,92)
+      st.getPlayer().sendPacket(SocialAction(st.getPlayer().getObjectId(),3))
       htmltext = "30649-03.htm"
       for var in STATS:
         st.unset(var)

+ 2 - 2
L2J_DataPack_BETA/dist/game/data/scripts/quests/64_CertifiedBerserker/__init__.py

@@ -57,9 +57,9 @@ class Quest (JQuest) :
             st.takeItems(Tenain_Rec,-1)
             st.exitQuest(False)
             st.playSound("ItemSound.quest_finish")
+            st.addExpAndSp(349006,23948)
+            st.giveItems(57,63104)
             st.giveItems(Orkurus_Rec,1)
-            st.giveItems(57,31552)
-            st.addExpAndSp(174503,11974)
             st.unset("cond")
             st.unset("kills")
             st.unset("spawned")

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/65_CertifiedSoulBreaker/__init__.py

@@ -134,11 +134,11 @@ class Quest (JQuest) :
                 htmltext = "32213-06.htm"
                 player.sendPacket(SocialAction(player.getObjectId(),3))
                 st.takeItems(Recommend,-1)
-                st.giveItems(certificate,1)
                 st.exitQuest(False)
                 st.playSound("ItemSound.quest_finish")
-                st.giveItems(57,35597)
-                st.addExpAndSp(196875,13510)
+                st.addExpAndSp(393750,27020)
+                st.giveItems(57,71194)
+                st.giveItems(certificate,1)
         elif npcId == Kekropus :
             if cond == 1 :
                 htmltext = "32138-00.htm"

+ 3 - 3
L2J_DataPack_BETA/dist/game/data/scripts/quests/66_CertifiedArbalester/__init__.py

@@ -156,11 +156,11 @@ class Quest (JQuest) :
             elif cond == 20 :
                 htmltext = "32220-20.htm"
                 st.takeItems(Research,-1)
-                st.giveItems(Mark,1)
                 st.exitQuest(False)
                 st.playSound("ItemSound.quest_finish")
-                st.giveItems(57,38833)
-                st.addExpAndSp(214773,14738)
+                st.addExpAndSp(429546,29476)
+                st.giveItems(57,77666)
+                st.giveItems(Mark,1)
                 st.unset("cond")
         elif npcId == Gaius :
             if cond == 13 :