due to [2307] (random quest part) removing this *hardcoded* feature from ketra/varka ally :)

and one fishing zone on hellbound isle

datapack_development/data/scripts/quests/605_AllianceWithKetraOrcs/__init__.py

@@ -51,24 +51,6 @@ Chance = {
   21373:649#Prophet
 }
 
-Chance_mane = {
-  21366:664,#General
-  21365:568,#Great Magus
-  21368:568,#Great Seer
-  21354:522,#Hunter
-  21360:539,#Medium
-  21362:568,#Officer
-  21357:529,#Priest
-  21350:500,#Recruit
-  21353:510,#Scout
-  21364:558,#Seer
-  21355:519,#Shaman
-  21358:529,#Warrior
-  21369:548,#Commander
-  21371:713,#Head magus
-  21373:738#Prophet
-}
-
 #Quest Items
 Varka_Badge_Soldier, Varka_Badge_Officer, Varka_Badge_Captain = [7216, 7217, 7218]
 Ketra_Alliance_One, Ketra_Alliance_Two, Ketra_Alliance_Three, \
@@ -346,7 +328,6 @@ class Quest (JQuest) :
           npcId = npc.getNpcId()
           cond = st.getInt("cond")
           id = st.getInt("id")
-          st2 = partyMember.getQuestState("606_WarWithVarkaSilenos")
           if not partyMember.isAlliedWithVarka() :
               if (npcId in Varka_One) or (npcId in Varka_Two) or (npcId in Varka_Three) :
                   item = 0
@@ -361,16 +342,6 @@ class Quest (JQuest) :
                     if st.getQuestItemsCount(drop) == MAX :
                       item = 0
                   chance = Chance[npcId]
-          #This is support for quest 606: War With Varka Silenos. Basically, if the person has both this quest and 606, then they only get one quest item, 50% chance for 606 quest item and 50% chance for this quest's item
-                  if st2 :
-                      if (st.getRandom(2) == 1 or item == 0) and npcId in Chance_mane.keys() :
-                          item = 57
-                          MAX = 100
-                          drop = Mane
-                          chance = Chance_mane[npcId]
-                          giveReward(st,item,chance,MAX,drop)
-                      elif id == 2 and item != 0 :
-                          giveReward(st,item,chance,MAX,drop)
                   elif id == 2 and item != 0 :
                       giveReward(st,item,chance,MAX,drop)
               elif npcId in Ketra_Orcs :

datapack_development/data/scripts/quests/606_WarWithVarkaSilenos/__init__.py

@@ -98,10 +98,7 @@ class Quest (JQuest) :
         if st.getState() == State.STARTED :
          npcId = npc.getNpcId()
          count = st.getQuestItemsCount(Mane)
-         st2 = partyMember.getQuestState("605_AllianceWithKetraOrcs")
          if npcId in Varka_Mobs and partyMember.getAllianceWithVarkaKetra() >= 1 :
-        #see comments in 605 : Alliance with Ketra Orcs for reason for doing st2 check
-            if not st2 :
                 numItems,chance = divmod(Chance[npcId]*Config.RATE_DROP_QUEST,1000)
                 if st.getRandom(1000) < chance :
                     numItems += 1

datapack_development/data/scripts/quests/611_AllianceWithVarkaSilenos/__init__.py

@@ -49,24 +49,6 @@ Chance = {
   21347:649
 }
 
-Chance_molar = {
-  21339:568,
-  21340:568,
-  21324:500,
-  21336:529,
-  21331:529,
-  21342:578,
-  21327:510,
-  21334:539,
-  21343:548,
-  21329:519,
-  21328:522,
-  21338:558,
-  21345:713,
-  21332:664,
-  21347:638
-}
-
 #Quest Items
 Varka_Badge_Soldier, Varka_Badge_Officer, Varka_Badge_Captain = [7216, 7217, 7218]
 Ketra_Alliance_One, Ketra_Alliance_Two, Ketra_Alliance_Three, \
@@ -343,7 +325,6 @@ class Quest (JQuest) :
           npcId = npc.getNpcId()
           cond = st.getInt("cond")
           id = st.getInt("id")
-          st2 = partyMember.getQuestState("612_WarWithKetraOrcs")
           if not partyMember.isAlliedWithKetra() :
               if (npcId in Ketra_One) or (npcId in Ketra_Two) or (npcId in Ketra_Three):
                   item = 0
@@ -358,16 +339,6 @@ class Quest (JQuest) :
                     if st.getQuestItemsCount(drop) == MAX :
                       item = 0
                   chance = Chance[npcId]
-      #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 or item == 0) and npcId in Chance_molar.keys() :
-                          item = 57
-                          MAX = 100
-                          drop = Molar
-                          chance = Chance_molar[npcId]
-                          giveReward(st,item,chance,MAX,drop)
-                      elif id == 2 and item != 0 :
-                          giveReward(st,item,chance,MAX,drop)
                   elif id == 2 and item != 0 :
                       giveReward(st,item,chance,MAX,drop)
               elif npcId in Varka_Silenos :

datapack_development/data/scripts/quests/612_WarWithKetraOrcs/__init__.py

@@ -96,10 +96,7 @@ class Quest (JQuest) :
      st = partyMember.getQuestState(qn)
      npcId = npc.getNpcId()
      count = st.getQuestItemsCount(Molar)
-     st2 = partyMember.getQuestState("611_AllianceWithVarkaSilenos")
      if npcId in Ketra_Orcs and partyMember.getAllianceWithVarkaKetra() <= -1 :
-    #see comments in 611 : Alliance with Varka Silenos for reason for doing st2 check
-       if not st2 :
          numItems,chance = divmod(Chance[npcId]*Config.RATE_DROP_QUEST,1000)
          if st.getRandom(1000) < chance :
            numItems += 1

datapack_development/data/zones/zone.xml

@@ -920,10 +920,10 @@
 	<zone id='11409' type='FishingZone' shape='NPoly' minZ='-1694' maxZ='-1651'/>
 	<zone id='11410' type='FishingZone' shape='NPoly' minZ='-1979' maxZ='-1906'/>
 	<zone id='11411' type='FishingZone' shape='NPoly' minZ='-2152' maxZ='-2113'/>
-	<zone id='11412' type='FishingZone' shape='NPoly' minZ='-4388' maxZ='-1388'/>
-	<zone id='11413' type='FishingZone' shape='NPoly' minZ='-4916' maxZ='-1916'/>
-	<zone id='11414' type='FishingZone' shape='NPoly' minZ='-4640' maxZ='-1640'/>
-	<zone id='11415' type='FishingZone' shape='NPoly' minZ='-4216' maxZ='-1216'/>
+	<zone id='11412' type='FishingZone' shape='NPoly' minZ='-4388' maxZ='-3763'/>
+	<zone id='11413' type='FishingZone' shape='NPoly' minZ='-4916' maxZ='-3793/>
+	<zone id='11414' type='FishingZone' shape='NPoly' minZ='-4640' maxZ='-3759'/>
+	<zone id='11415' type='FishingZone' shape='NPoly' minZ='-4216' maxZ='-3767'/>
 	<zone id='11416' type='FishingZone' shape='NPoly' minZ='-2568' maxZ='-1432'/>
 	<zone id='11417' type='FishingZone' shape='NPoly' minZ='-7356' maxZ='-1356'/>
 	<zone id='11418' type='FishingZone' shape='NPoly' minZ='-3892' maxZ='-892'/>
@@ -944,6 +944,7 @@
 	<zone id='11433' type='FishingZone' shape='NPoly' minZ='-4828' maxZ='-1828'/>
 	<zone id='11434' type='FishingZone' shape='NPoly' minZ='-3772' maxZ='-772'/>
 	<zone id='11435' type='FishingZone' shape='NPoly' minZ='-4892' maxZ='-1892'/>
+	<zone id='11436' type='FishingZone' shape='NPoly' minZ='-3600' maxZ='-3346'/>
 
 <!-- Water zones -->
 	<zone id='15000' type='WaterZone' shape='NPoly' minZ='-4810' maxZ='-3810'/> <!-- [16_21_1] water zone-->

datapack_development/sql/zone_vertices.sql

@@ -1030,10 +1030,45 @@ INSERT INTO `zone_vertices` (`id`,`order`,`x`,`y`) VALUES
 (11411,6,147723,-113074),
 (11411,7,147512,-112956),
 (11411,8,147258,-113048),
-(11412,0,35360,70052),
-(11412,1,54640,70780),
-(11412,2,58104,89528),
-(11412,3,38900,91644),
+(11412,0,38395,69064),
+(11412,1,39109,69890),
+(11412,2,39645,70559),
+(11412,3,39554,70713),
+(11412,4,39600,71083),
+(11412,5,40076,71669),
+(11412,6,40809,71988),
+(11412,7,41883,72147),
+(11412,8,43999,73471),
+(11412,9,45581,73484),
+(11412,10,45088,73080),
+(11412,11,45854,71875),
+(11412,12,46373,71580),
+(11412,13,46862,71592),
+(11412,14,47248,71773),
+(11412,15,47571,72864),
+(11412,16,47883,73184),
+(11412,17,48697,73427),
+(11412,18,49364,73489),
+(11412,19,49761,73314),
+(11412,20,50409,72693),
+(11412,21,51341,72445),
+(11412,22,52222,73860),
+(11412,23,52216,74253),
+(11412,24,51250,75218),
+(11412,25,51119,75594),
+(11412,26,51264,76466),
+(11412,27,51681,76999),
+(11412,28,52215,77109),
+(11412,29,54078,76930),
+(11412,30,54450,77899),
+(11412,31,54293,78108),
+(11412,32,53627,78599),
+(11412,33,53368,79076),
+(11412,34,53406,79582),
+(11412,35,53746,80087),
+(11412,36,55184,80991),
+(11412,37,55118,82009),
+(11412,38,54765,82654),
 (11413,0,-99139,207208),
 (11413,1,-65905,254858),
 (11413,2,-65905,261841),
@@ -1142,6 +1177,22 @@ INSERT INTO `zone_vertices` (`id`,`order`,`x`,`y`) VALUES
 (11435,1,-77020,67100),
 (11435,2,-65711,190964),
 (11435,3,-99937,150239),
+(11436,0,-22345,249596),
+(11436,1,-22362,249348),
+(11436,2,-22091,248888),
+(11436,3,-20643,248660),
+(11436,4,-20140,249091),
+(11436,5,-20118,249225),
+(11436,6,-20030,249344),
+(11436,7,-20026,249545),
+(11436,8,-20362,249912),
+(11436,9,-20825,250116),
+(11436,10,-20887,249977),
+(11436,11,-21108,250055),
+(11436,12,-21202,250152),
+(11436,13,-21423,250197),
+(11436,14,-21773,250154),
+(11436,15,-21899,250065),
 (11501,0,-56256,153728),
 (11501,1,-49536,159424),
 (11502,0,-26304,216576),