From a462574856c4c9584948014a90da6a09acd2ba86 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 14 Jul 2021 00:41:17 -0300
Subject: Make GM Robe and GM Cap weightless (Big Crunch request) Also, minor
 code edits (no visible effects ingame)

---
 db/pre-re/item_db.conf |  4 ++--
 npc/099-2/logic.txt    |  2 +-
 npc/099-5/boss.txt     |  1 +
 npc/functions/main.txt | 12 ++++--------
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index ccdf7535..f4017060 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -4998,7 +4998,7 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 8000
 	Sell: 4000
-	Weight: 40
+	Weight: 0
 	Def: 5
 	Slots: 0
 	Loc: "EQP_HEAD_MID"
@@ -9115,7 +9115,7 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 2000
 	Sell: 500
-	Weight: 20
+	Weight: 0
 	Def: 5
 	Slots: 0
 	Loc: "EQP_HEAD_TOP"
diff --git a/npc/099-2/logic.txt b/npc/099-2/logic.txt
index 6376129d..5e8f0ee8 100644
--- a/npc/099-2/logic.txt
+++ b/npc/099-2/logic.txt
@@ -19,7 +19,7 @@ OnTrial1:
 OnTrial2:
     monster "099-1", 55, 42, "", 1143, 1, strnpcinfo(0)+"::OnTrial3";
     getexp 10000, 0;
-    getitem "DarkConcentrationPotion", 1;
+    getitem DarkConcentrationPotion, 1;
     end;
 
 OnTrial3:
diff --git a/npc/099-5/boss.txt b/npc/099-5/boss.txt
index 467c5295..f737b38c 100644
--- a/npc/099-5/boss.txt
+++ b/npc/099-5/boss.txt
@@ -1441,6 +1441,7 @@ L_MissionComplete:
 
 L_Winner:
     getitem SaviorArmor, 1;
+    getvaultexp(250); // This is TMW's main quest, worth 50% of the EXP bar
     $@DD5_TALLY$ = "";
     #DD5_TALLY = 1;
     mes "##2You were the MVP with "+$@DD5_TALLY_+" points!##0";
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 06b12a30..abdaa5dd 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -292,15 +292,11 @@ function	script	any_of	{
 }
 
 function	script	die	{
-    if ($HARDCORE) {
+    // Distinguish scripted deaths for perma-death mode
+    if ($HARDCORE)
         @grace=true;
-        addtimer 10, "#GlobalHandler::OnDie"; // Wait script execution to finish
-        //setparam(Hp, 1);
-        //warp "000-1", 22, 22;
-        //end; // MUST be end; to mimic official behavior
-    } else {
-        addtimer 10, "#GlobalHandler::OnDie"; // Wait script execution to finish
-    }
+    // Wait script execution to finish
+    addtimer 10, "#GlobalHandler::OnDie";
     return;
 }
 
-- 
cgit v1.2.3-60-g2f50