rendered paste bodyIndex: C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/611_AllianceWithVarkaSilenos/__init__.py===================================================================--- C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/611_AllianceWithVarkaSilenos/__init__.py (revision 3109)+++ C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/611_AllianceWithVarkaSilenos/__init__.py (working copy)@@ -1,5 +1,6 @@ #Made by Emperorc import sys+from net.sf.l2j import Config from net.sf.l2j.gameserver.model.quest import State from net.sf.l2j.gameserver.model.quest import QuestState from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest@@ -24,6 +25,50 @@ Varka_Silenos = [ 21350, 21351, 21353, 21354, 21355, 21357, 21358, 21360, 21361, \ 21362, 21369, 21370, 21364, 21365, 21366, 21368, 21371, 21372, 21373, 21374, 21375 ] +Chance = {+ 21325:500,#War hound+ 21339:500,#Prefect+ 21340:500,#Officer+ 21324:500,#Footman+ 21336:500,#Captain+ 21331:500,#Warrior+ 21342:508,#Overseer+ 21327:509,#Trooper+ 21334:509,#Medium+ 21335:518,#Elite+ 21343:518,#Centurion+ 21329:519,#Shaman+ 21328:521,#Scout+ 21338:527,#Seer+ 21344:604,#Elite guard+ 21346:604,#High guard+ 21348:626,#Soothsayer guard+ 21349:626,#Soothsayer aide+ 21345:627,#High shaman+ 21332:628,#Legatus+ 21347:649#Soothsayer + }++#drop system - cond:[item_id,max,drop_id]+One ={+ 1:[57,100,Ketra_Badge_Soldier],+ 2:[Varka_Alliance_One,200,Ketra_Badge_Soldier],+ 3:[Varka_Alliance_Two,300,Ketra_Badge_Soldier],+ 4:[Varka_Alliance_Three,300,Ketra_Badge_Soldier],+ 5:[Varka_Alliance_Four,400,Ketra_Badge_Soldier]+ }+Two ={ + 2:[Varka_Alliance_One,100,Ketra_Badge_Officer],+ 3:[Varka_Alliance_Two,200,Ketra_Badge_Officer],+ 4:[Varka_Alliance_Three,300,Ketra_Badge_Officer],+ 5:[Varka_Alliance_Four,400,Ketra_Badge_Officer]+ }+Three ={ + 3:[Varka_Alliance_Two,100,Ketra_Badge_Captain],+ 4:[Varka_Alliance_Three,200,Ketra_Badge_Captain],+ 5:[Varka_Alliance_Four,200,Ketra_Badge_Captain]+ }+ #Quest Items Varka_Badge_Soldier, Varka_Badge_Officer, Varka_Badge_Captain = [7216, 7217, 7218] Ketra_Alliance_One, Ketra_Alliance_Two, Ketra_Alliance_Three, \@@ -32,7 +77,6 @@ Varka_Alliance_Four, Varka_Alliance_Five = [7221, 7222, 7223, 7224, 7225] Ketra_Badge_Soldier, Ketra_Badge_Officer, Ketra_Badge_Captain = [7226, 7227,7228] Valor_Feather, Wisdom_Feather = [ 7229, 7230 ]-Molar = 7234 def decreaseAlliance(st) : if st.getPlayer().isAlliedWithVarka() :@@ -76,105 +120,6 @@ st.takeItems(Varka_Alliance_Five,-1) st.giveItems(Varka_Alliance_Four,1) -def giveReward(st,npcId) :- cond = st.getInt("cond")- id = st.getInt("id")- KBadgeS = st.getQuestItemsCount(Ketra_Badge_Soldier)- KBadgeO = st.getQuestItemsCount(Ketra_Badge_Officer)- KBadgeC = st.getQuestItemsCount(Ketra_Badge_Captain)- VAlliance1 = st.getQuestItemsCount(Varka_Alliance_One)- VAlliance2 = st.getQuestItemsCount(Varka_Alliance_Two)- VAlliance3 = st.getQuestItemsCount(Varka_Alliance_Three)- VAlliance4 = st.getQuestItemsCount(Varka_Alliance_Four)- VAlliance5 = st.getQuestItemsCount(Varka_Alliance_Five)- if npcId in Ketra_One :- if cond == 1 and id == 2 :- if KBadgeS == 99 :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 2 and VAlliance1 and id == 2 :- if KBadgeS == 199 :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 3 and VAlliance2 and id == 2 :- if KBadgeS == 299 :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 4 and VAlliance3 and id == 2 :- if KBadgeS == 299 :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 5 and VAlliance4 and id == 2 :- if KBadgeS == 399 :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Soldier,1)- st.playSound("ItemSound.quest_itemget")- elif npcId in Ketra_Two :- if cond == 2 and VAlliance1 and id == 2 :- if KBadgeO == 99 :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 3 and VAlliance2 and id == 2 :- if KBadgeO == 199 :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 4 and VAlliance3 and id == 2 :- if KBadgeO == 299 :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 5 and VAlliance4 and id == 2 :- if KBadgeO == 399 :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Officer,1)- st.playSound("ItemSound.quest_itemget")- elif npcId in Ketra_Three :- if cond == 3 and VAlliance2 and id == 2 :- if KBadgeO == 99 :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 4 and VAlliance3 and id == 2 :- if KBadgeO == 199 :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_itemget")- elif cond == 5 and VAlliance4 and id == 2 :- if KBadgeO == 199 :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_middle")- else :- st.giveItems(Ketra_Badge_Captain,1)- st.playSound("ItemSound.quest_itemget")- class Quest (JQuest) : def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)@@ -358,33 +303,31 @@ npcId = npc.getNpcId() cond = st.getInt("cond") id = st.getInt("id")- KBadgeS = st.getQuestItemsCount(Ketra_Badge_Soldier)- KBadgeO = st.getQuestItemsCount(Ketra_Badge_Officer)- KBadgeC = st.getQuestItemsCount(Ketra_Badge_Captain)- VAlliance1 = st.getQuestItemsCount(Varka_Alliance_One)- VAlliance2 = st.getQuestItemsCount(Varka_Alliance_Two)- VAlliance3 = st.getQuestItemsCount(Varka_Alliance_Three)- VAlliance4 = st.getQuestItemsCount(Varka_Alliance_Four)- VAlliance5 = st.getQuestItemsCount(Varka_Alliance_Five)- st2 = st.getPlayer().getQuestState("612_WarWithKetraOrcs")- Molars = st.getQuestItemsCount(Molar) if not st.getPlayer().isAlliedWithKetra() : if (npcId in Ketra_One) or (npcId in Ketra_Two) or (npcId in Ketra_Three):- #This is support for quest 612: War With Ketra Orcs. Basically, if the person has both this quest and 612, then they only get one quest item, 50% chance for 612 quest item and 50% chance for this quest's item- if st2 :- if st.getRandom(2) == 1 :- if st.getRandom(2) == 1 :- st.giveItems(Molar,1)- if Molars == 100 :- st.playSound("ItemSound.quest_middle")- else :- st.playSound("ItemSound.quest_itemget")- else :- if st.getRandom(2) == 1 :- giveReward(st,npcId)- else :- if st.getRandom(2) == 1 :- giveReward(st,npcId)+ if id == 2 :+ item = 0+ if npcId in Ketra_One :+ item,MAX,drop = One[cond]+ elif npcId in Ketra_Two and cond > 1:+ item,MAX,drop = Two[cond]+ elif npcId in Ketra_Three and cond > 2 :+ item,MAX,drop = Three[cond]+ if item != 0 :+ if st.getQuestItemsCount(item) > 0 :+ count = st.getQuestItemsCount(drop)+ if count < MAX :+ numItems,chance = divmod(Chance[npcId]*Config.RATE_DROP_QUEST,1000)+ if st.getRandom(1000) < chance :+ numItems += 1+ numItems = int(numItems)+ if numItems != 0 :+ if count + numItems >= MAX :+ numItems = MAX - count+ st.playSound("ItemSound.quest_middle")+ else :+ st.playSound("ItemSound.quest_itemget")+ st.giveItems(Ketra_Badge_Soldier,numItems) elif npcId in Varka_Silenos : decreaseAlliance(st) party = st.getPlayer().getParty()Index: C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/612_WarWithKetraOrcs/__init__.py===================================================================--- C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/612_WarWithKetraOrcs/__init__.py (revision 3109)+++ C:/Documents and Settings/Sparrowhawk/workspace/interlude/data/jscript/quests/612_WarWithKetraOrcs/__init__.py (working copy)@@ -1,5 +1,6 @@ # Created by Emperorc import sys+from net.sf.l2j import Config from net.sf.l2j.gameserver.model.quest import State from net.sf.l2j.gameserver.model.quest import QuestState from net.sf.l2j.gameserver.model.quest.jython import QuestJython as JQuest@@ -12,9 +13,27 @@ #Mobs Varka_Mobs = [ 21350, 21351, 21353, 21354, 21355, 21357, 21358, 21360, 21361, \ 21362, 21369, 21370, 21364, 21365, 21366, 21368, 21371, 21372, 21373, 21374, 21375 ]-Ketra_Orcs = [ 21324, 21325, 21327, 21328, 21329, 21331, 21332, 21334, 21335, \-21336, 21338, 21339, 21340, 21342, 21343, 21344, 21345, 21346, 21347, 21348, 21349 ]+Ketra_Orcs = [ 21324, 21327, 21328, 21329, 21331, 21332, 21334, \+21336, 21338, 21339, 21340, 21342, 21343, 21345, 21347 ] +Chance = {+ 21339:568,#Prefect+ 21340:568,#Officer+ 21324:500,#Footman+ 21336:529,#Captain+ 21331:529,#Warrior+ 21342:578,#Overseer+ 21327:510,#Trooper+ 21334:539,#Medium+ 21343:548,#Centurion+ 21329:519,#Shaman+ 21328:522,#Scout+ 21338:558,#Seer+ 21345:713,#High shaman+ 21332:664,#Legatus+ 21347:638#Soothsayer+ }+ #Items Seed = 7187 Molar = 7234@@ -75,15 +94,17 @@ if not partyMember : return st = partyMember.getQuestState(qn) npcId = npc.getNpcId()- Molars = st.getQuestItemsCount(Molar)- st2 = st.getPlayer().getQuestState("611_AllianceWithVarkaSilenos") if npcId in Ketra_Orcs and st.getPlayer().getAllianceWithVarkaKetra() <= -1 :- #see comments in 611 : Alliance with Varka Silenos for reason for doing st2 check- if not st2 :- st.giveItems(Molar,1)- if Molars == 100 :+ numItems,chance = divmod(Chance[npcId]*Config.RATE_DROP_QUEST,1000)+ if st.getRandom(1000) < chance :+ numItems += 1+ numItems = int(numItems)+ if numItems != 0 :+ Molars = st.getQuestItemsCount(Molar)+ st.giveItems(Molar,numItems)+ if int((Molars+numItems)/100) > int((Molars)/100) : st.playSound("ItemSound.quest_middle")- else :+ else: st.playSound("ItemSound.quest_itemget") elif npcId in Varka_Mobs : st.unset("id")