Rewrite entirely, Peter Script (along the quest)

1 files changed, 24 insertions, 18 deletions

diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 1a1d64f7a..8f50e7c59 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -153,10 +153,7 @@ OnInit:
     // Current UPDATE value: Sab Dez 15 21:45:15 -02 2018
     // Upgrade every Wooden Sword in a Bug Slayer
     if ($UPDATE < 1544917515) {
-        query_sql("UPDATE `inventory` SET `nameid` = '"+BugSlayer+"' WHERE `inventory`.`nameid`='"+WoodenSword+"'");
-        query_sql("UPDATE `storage` SET `nameid` = '"+BugSlayer+"' WHERE `storage`.`nameid`='"+WoodenSword+"'");
-        query_sql("UPDATE `cart_inventory` SET `nameid` = '"+BugSlayer+"' WHERE `cart_inventory`.`nameid`='"+WoodenSword+"'");
-        query_sql("UPDATE `guild_storage` SET `nameid` = '"+BugSlayer+"' WHERE `guild_storage`.`nameid`='"+WoodenSword+"'");
+        ReplaceItemFromEveryPlayer(WoodenSword, BugSlayer);
         $UPDATE=1544917515;
         debugmes "";
         debugmes "* Replaced Wooden Swords with Bug Slayer";
@@ -167,16 +164,8 @@ OnInit:
     if ($UPDATE < 1545061974) {
         //query_sql("UPDATE `quest` SET `count1` = '3' WHERE `quest`.`quest_id`='0' AND `quest`.`count1` = '2' AND `quest`.`char_id` IN (SELECT `quest`.`char_id` WHERE  `quest`.`quest_id` = '12' AND  `quest`.`count1`>='1')");
 
-        query_sql("UPDATE `inventory` SET `nameid` = '"+LEGACY_MiereCleaver+"' WHERE `inventory`.`nameid`='"+MiereCleaver+"'");
-        query_sql("UPDATE `storage` SET `nameid` = '"+LEGACY_MiereCleaver+"' WHERE `storage`.`nameid`='"+MiereCleaver+"'");
-        query_sql("UPDATE `cart_inventory` SET `nameid` = '"+LEGACY_MiereCleaver+"' WHERE `cart_inventory`.`nameid`='"+MiereCleaver+"'");
-        query_sql("UPDATE `guild_storage` SET `nameid` = '"+LEGACY_MiereCleaver+"' WHERE `guild_storage`.`nameid`='"+MiereCleaver+"'");
-
-        query_sql("UPDATE `inventory` SET `nameid` = '"+LEGACY_Broadsword+"' WHERE `inventory`.`nameid`='"+Broadsword+"'");
-        query_sql("UPDATE `storage` SET `nameid` = '"+LEGACY_Broadsword+"' WHERE `storage`.`nameid`='"+Broadsword+"'");
-        query_sql("UPDATE `cart_inventory` SET `nameid` = '"+LEGACY_Broadsword+"' WHERE `cart_inventory`.`nameid`='"+Broadsword+"'");
-        query_sql("UPDATE `guild_storage` SET `nameid` = '"+LEGACY_Broadsword+"' WHERE `guild_storage`.`nameid`='"+Broadsword+"'");
-
+        ReplaceItemFromEveryPlayer(MiereCleaver, LEGACY_MiereCleaver);
+        ReplaceItemFromEveryPlayer(Broadsword, LEGACY_Broadsword);
         $UPDATE=1545061974;
         debugmes "";
         debugmes "* Replaced Miere Cleaver and Broad Sword with a special version specific for old players";
@@ -201,6 +190,23 @@ OnInit:
         debugmes "* Update Bows IDs";
         debugmes "";
     }
+    // Current UPDATE value: Seg Dez 31 11:45:35 -02 2018
+    // Update players position (002-x). Update Peter Quest
+    if ($UPDATE < 1546263935) {
+        query_sql("UPDATE `char` SET `last_x` = '53' WHERE `char`.`last_map`='002-1'");
+        query_sql("UPDATE `char` SET `last_y` = '38' WHERE `char`.`last_map`='002-1'");
+        query_sql("UPDATE `char` SET `last_x` = '53' WHERE `char`.`last_map`='002-3'");
+        query_sql("UPDATE `char` SET `last_y` = '38' WHERE `char`.`last_map`='002-3'");
+        query_sql("UPDATE `char` SET `last_x` = '53' WHERE `char`.`last_map`='002-4'");
+        query_sql("UPDATE `char` SET `last_y` = '38' WHERE `char`.`last_map`='002-4'");
+
+        query_sql("UPDATE `quest` SET `count1` = `2` WHERE `quest`.`quest_id`="+ShipQuests_Peter+" AND `count1` >= '3'");
+        $UPDATE=1546263935;
+        debugmes "";
+        debugmes "* Update players position (Nard's Ship)";
+        debugmes "* Update Peter Quest";
+        debugmes "";
+    }
 
 
 
@@ -221,15 +227,14 @@ OnInit:
     htput($@CONTRIBUTORS, "polaczka",   700);
     htput($@CONTRIBUTORS, "crazyfefe",  641);
     htput($@CONTRIBUTORS, "4144",       550);
-    htput($@CONTRIBUTORS, "mishana",    500); // Rather magic number based on precedents, tweak if needed.
+    htput($@CONTRIBUTORS, "mishana",    500);
     htput($@CONTRIBUTORS, "soren",      450);
     htput($@CONTRIBUTORS, "rakinorf",   400);
     htput($@CONTRIBUTORS, "pookie",     360);
     htput($@CONTRIBUTORS, "ayruss",     210);
     htput($@CONTRIBUTORS, "dustman",    175);
-    htput($@CONTRIBUTORS, "acsvln",     150);
+    htput($@CONTRIBUTORS, "acsvln",     250);
     htput($@CONTRIBUTORS, "ichigoblack",100);
-    htput($@CONTRIBUTORS, "acsvln",     100);
     htput($@CONTRIBUTORS, "gnulinux",   80);
     htput($@CONTRIBUTORS, "skydragon",  75);
     htput($@CONTRIBUTORS, "guy of lieutnant dausen", 70);
@@ -237,10 +242,11 @@ OnInit:
     htput($@CONTRIBUTORS, "msawis",     30);
     htput($@CONTRIBUTORS, "dragonstar", 26);
     htput($@CONTRIBUTORS, "demure",     12);
+    htput($@CONTRIBUTORS, "xtreem",     10);
     htput($@CONTRIBUTORS, "aisen",      8);
-    htput($@CONTRIBUTORS, "xtreem",     8);
     htput($@CONTRIBUTORS, "john h",     2);
     htput($@CONTRIBUTORS, "krists",     2);
+    htput($@CONTRIBUTORS, "filhote",    1);
     //htput($@CONTRIBUTORS, "", 1);
     end;