sp/xp reward fixes fo quests: 138/141/142

added misiing pvp bonus for Divine Pain - Focus, fixes #2278

datapack_development/data/scripts/quests/138_TempleChampionPart2/__init__.py

@@ -42,7 +42,7 @@ class Quest (JQuest) :
        st.playSound("ItemSound.quest_finish")
        st.exitQuest(False)
        if st.getPlayer().getLevel() >= 36 and st.getPlayer().getLevel() <= 41:
-          st.addExpAndSp(219975,13047)
+          st.addExpAndSp(187062,11307)
     elif event == "30070-03.htm" :
        st.set("cond","2")
        st.playSound("ItemSound.quest_middle")

datapack_development/data/scripts/quests/141_ShadowFoxPart3/__init__.py

@@ -43,7 +43,7 @@ class Quest (JQuest) :
        st.exitQuest(False)
        st.giveItems(57, 88888)
        if st.getPlayer().getLevel() >= 37 and st.getPlayer().getLevel() <= 42:
-          st.addExpAndSp(219975,13047)
+          st.addExpAndSp(278005,17058)
        qs = player.getQuestState("998_FallenAngelSelect")
        if not qs:
            q = QuestManager.getInstance().getQuest("998_FallenAngelSelect")

datapack_development/data/scripts/quests/142_FallenAngelRequestOfDawn/__init__.py

@@ -89,7 +89,7 @@ class Quest (JQuest) :
           st.giveItems(57, 92676)
           st.takeItems(BLOOD, -1)
           if st.getPlayer().getLevel() >= 38 and st.getPlayer().getLevel() <= 43:
-             st.addExpAndSp(219975,13047)
+             st.addExpAndSp(223036,13091)
     elif npcId == CASIAN :
        if cond == 3 :
           htmltext = "30612-01.htm"

datapack_development/data/stats/weapon/9300-9399.xml

@@ -484,6 +484,8 @@
    <set val='350' order='0x08' stat='pAtkSpd'/>
    <enchant val='0' order='0x0C' stat='pAtk'/>
    <enchant val='0' order='0x0C' stat='mAtk'/>
+   <mul val='1.05' order='0x30' stat='pvpPhysDmg'/>
+   <mul val='1.05' order='0x30' stat='pvpMagicalDmg'/>
   </for>
 </item>
 

datapack_development/sql/etcitem.sql

@@ -7418,23 +7418,31 @@ INSERT INTO `etcitem` VALUES
 (10328,"Stolen Cargo", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10329,"Hate Crystal", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10330,"Old Treasure Map", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10331,"Sonin\'s Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10332,"Pano\'s Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10333,"Alex\'s Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10331,"Sonin's Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10332,"Pano's Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10333,"Alex's Credentials", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10334,"Badge - Temple Executor", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10335,"Giants\' Experimental Tool Fragment", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10336,"Giants\' Experimental Tool", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10337,"Giants\' Technology Report", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10338,"Rouke\'s Report", "false", "quest", 0, "stackable", "paper", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10335,"Giants' Experimental Tool Fragment", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10336,"Giants' Experimental Tool", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10337,"Giants' Technology Report", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10338,"Rouke's Report", "false", "quest", 0, "stackable", "paper", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10339,"Badge - Temple Missionary", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10340,"Report Fragment", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10341,"Temple Manifesto", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10342,"Relics of the Dark Elf Trainee", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10343,"Angus\' Recommendation", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10344,"Pupina\'s Recommendation", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10343,"Angus' Recommendation", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10344,"Pupina's Recommendation", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10345,"Records Chest Key Fragment", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10346,"Records Chest", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10347,"Dark Crystal", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10348,"Dark Oxide", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
 (10349,"Cryptogram of the Goddess Sword", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
-(10350,"Predecessor\'s Report", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", "");
+(10350,"Predecessor\'s Report", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10351,"Cryptogram of the Angel Search", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10352,"Prophecy Fragment", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10353,"Fallen Angel Blood", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10354,"Sealed Prophecy - Path of the God", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10355,"Prophecy - Path of the God", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10356,"Empty Sound Crystal", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10357,"Angel Medicine", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", ""),
+(10358,"Angel\'s Message", "false", "quest", 0, "stackable", "wood", "none", -1, 0, NULL, "true", "true", "true", "true", "", "");

datapack_development/sql/npc.sql

@@ -6690,7 +6690,8 @@ INSERT INTO `npc` VALUES
 (32363, 32363, "Hellios Insurgent", 0, "", 0, "LineageNPC.a_common_peopleC_Mhuman", 8, 17, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (32364, 32364, "Hellios Traitor", 0, "", 0, "LineageNPC.a_common_peopleC_Mhuman", 8, 17, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 253, 0, 253, 0, 0, NULL, 80, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
 (32365, 32365, "Snow", 0, "Event Manager", 0, "LineageNPC2.TP_game_staff", 5, 12.5, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 0, 0, NULL, 75, 120, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
-(32368, 32365, "Weathered Rock", 0, "", 0, "LineageNpcEV.stone_q0236_p", 60.0, 25.0, 1, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 0, 0, NULL, 1, 1, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced");
+(32368, 32368, "Weathered Rock", 0, "", 0, "LineageNpcEV.stone_q0236_p", 60.0, 25.0, 70, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 0, 0, NULL, 1, 1, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced"),
+(32369, 32369, "Fallen Angel", 0, "", 0, "LineageMonster2.apostle_warrior", 6.0, 21.5, 70, "male", "L2Npc", 40, 2444, 2444, 0, 0, 10, 10, 10, 10, 10, 10, 0, 0, 500, 500, 500, 500, 278, 0, 333, 6717, 0, NULL, 1, 1, "", 0, 0, 0, "LAST_HIT", 0, 0, 0, "balanced");
 
 INSERT INTO `npc` VALUES
 (35010, 35010, "Mercenary", 0, "", 0, "NPC.a_guard_MHuman", 8, 24, 50, "male", "L2SiegeGuard", 40, 2317, 830, 3.32, 2.14, 40, 43, 30, 21, 20, 10, 250, 1, 683, 287, 546, 233, 416, 0, 333, 128, 628, 0, 55, 214, "mercenary_siege_clan", 1200, 1, 0, "LAST_HIT", 0, 0, 0, "balanced"),