Browse Source

Bunch of quest fixes: [642,643,688] (gigikun)
Kamael race starting spawn points (Fabian)

DrLecter 17 years ago
parent
commit
d22582b5d4

+ 2 - 2
datapack_development/data/scripts/quests/642_APowerfulPrimevalCreature/__init__.py

@@ -98,7 +98,7 @@ class Quest (JQuest) :
              if st.getRandom(100) < chance : 
                 numItems += 1
              if numItems :
-                if count + numItems >= 150 and itemId == DINOSAUR_TISSUE :
+                if int(count + numItems)/150 > int(count)/150 and itemId == DINOSAUR_TISSUE :
                    st.playSound("ItemSound.quest_middle")
                 else :
                    st.playSound("ItemSound.quest_itemget")
@@ -112,4 +112,4 @@ QUEST.addStartNpc(32105)
 QUEST.addTalkId(32105)
 
 for mob in DINOSAURS :
-   QUEST.addKillId(mob)
+   QUEST.addKillId(mob)

+ 3 - 3
datapack_development/data/scripts/quests/643_RiseandFalloftheElrokiTribe/__init__.py

@@ -32,7 +32,7 @@ class Quest (JQuest) :
     elif event == "32117-03.htm" :
        if count >= 300 :
           st.takeItems(BONES_OF_A_PLAINS_DINOSAUR,300)
-          st.giveItems(REWARDS[st.getRandom(len(REWARDS))],5)
+          st.giveItems(REWARDS[st.getRandom(len(REWARDS))],int(5*Config.RATE_QUESTS_REWARD))
        else :
           htmltext = "32117-04.htm"
     elif event == "Quit" :
@@ -81,7 +81,7 @@ class Quest (JQuest) :
              if st.getRandom(100) < chance : 
                 numItems += 1
              if numItems :
-                if count + numItems >= 300 :
+                if int(count + numItems)/300 > int(count)/300 :
                    st.playSound("ItemSound.quest_middle")
                 else :
                    st.playSound("ItemSound.quest_itemget")
@@ -96,4 +96,4 @@ QUEST.addTalkId(32106)
 QUEST.addTalkId(32117)
 
 for mob in PLAIN_DINOSAURS :
-   QUEST.addKillId(mob)
+   QUEST.addKillId(mob)

+ 2 - 2
datapack_development/data/scripts/quests/688_DefeatTheElrokianRaiders/__init__.py

@@ -77,7 +77,7 @@ class Quest (JQuest) :
              if st.getRandom(100) < chance : 
                 numItems += 1
              if numItems :
-                if count + numItems >= 100 :
+                if int(count + numItems)/100 > int(count)/100 :
                    st.playSound("ItemSound.quest_middle")
                 else :
                    st.playSound("ItemSound.quest_itemget")
@@ -90,4 +90,4 @@ QUEST.addStartNpc(32105)
 
 QUEST.addTalkId(32105)
 
-QUEST.addKillId(22214)
+QUEST.addKillId(22214)

+ 2 - 2
datapack_development/sql/char_templates.sql

@@ -137,8 +137,8 @@ INSERT INTO `char_templates` VALUES (115, 'Dominator', 3, 27, 31, 24, 31, 15, 42
 INSERT INTO `char_templates` VALUES (116, 'Doomcryer', 3, 27, 31, 24, 31, 15, 42, 3, 54, 6, 41, 300, 333, 30, 41, 30, 121, 68000, -56682, -113730, -690, 0, 1.04, 0.898560, 7.0, 27.5, 1.04, 0.898560, 8.0, 25.5, 425, 461, 2368, 5588, 0);
 INSERT INTO `char_templates` VALUES (117, 'Fortune Seeker', 4, 39, 45, 29, 20, 10, 27, 4, 80, 6, 41, 300, 333, 33, 43, 33, 115, 83000, 108512, -174026, -400, 1, 1.09, 1.487196, 9.0, 18.0, 1.09, 1.487196, 5.0, 19.0, 1147, 1146, 10, 2370, 5588);
 INSERT INTO `char_templates` VALUES (118, 'Maestro', 4, 39, 45, 29, 20, 10, 27, 4, 80, 6, 41, 300, 333, 33, 43, 33, 115, 83000, 108512, -174026, -400, 1, 1.09, 1.487196, 9.0, 18.0, 1.09, 1.487196, 5.0, 19.0, 1147, 1146, 10, 2370, 5588);
-INSERT INTO `char_templates` VALUES (123, 'Male Soldier', 5, 41, 31, 33, 29, 11, 25, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125533, 38114, 1142, 0, 1.14, 1.231200, 7.5, 24.0, 1.14, 1.231200, 7.0, 23.5, 1147, 1146, 10, 2369, 5588);
-INSERT INTO `char_templates` VALUES (124, 'Female Soldier', 5, 39, 30, 35, 28, 11, 27, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125533, 38114, 1142, 0, 1.14, 1.231200, 7.5, 24.0, 1.14, 1.231200, 7.0, 23.5, 1147, 1146, 10, 2369, 5588);
+INSERT INTO `char_templates` VALUES (123, 'Male Soldier', 5, 41, 31, 33, 29, 11, 25, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125464, 37776, 1176, 0, 1.14, 1.2312, 7.5, 24, 1.14, 1.2312, 7, 23.0, 1147, 1146, 10, 2369, 5588);
+INSERT INTO `char_templates` VALUES (124, 'Female Soldier', 5, 39, 30, 35, 28, 11, 27, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125517, 38267, 1176, 0, 1.14, 1.2312, 7.5, 23, 1.14, 1.2312, 7, 22.0, 1147, 1146, 10, 2369, 5588); 
 INSERT INTO `char_templates` VALUES (125, 'Trooper', 5, 41, 31, 33, 29, 11, 25, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125533, 38114, 1142, 0, 1.14, 1.231200, 7.5, 24.0, 1.14, 1.231200, 7.0, 23.5, 1147, 1146, 10, 2369, 5588);
 INSERT INTO `char_templates` VALUES (126, 'Warder', 5, 39, 30, 35, 28, 11, 27, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125533, 38114, 1142, 0, 1.14, 1.231200, 7.5, 24.0, 1.14, 1.231200, 7.0, 23.5, 1147, 1146, 10, 2369, 5588);
 INSERT INTO `char_templates` VALUES (127, 'Berserker', 5, 41, 31, 33, 29, 11, 25, 4, 72, 3, 47, 342, 226, 35, 45, 35, 122, 87000, -125533, 38114, 1142, 0, 1.14, 1.231200, 7.5, 24.0, 1.14, 1.231200, 7.0, 23.5, 1147, 1146, 10, 2369, 5588);