From 279a4acb0a4a64a1e69154ef862b300473fd4145 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 28 Jul 2020 22:59:05 -0300
Subject: Iced Water can now be used and will give you a break on the Volcano.

---
 db/re/item_db.conf        | 26 +++++++++++++++++++-------
 npc/003-3/malindou.txt    |  9 +++++++++
 npc/functions/dungeon.txt |  9 +++++++--
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index eed2c1959..50ba4598f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4546,15 +4546,11 @@ item_db: (
 	Weight: 20
 	Refine: false
 },
+// ID 816 is free
 {
 	Id: 816
-	AegisName: "IcedBottle"
-	Name: "Iced Bottle"
-	Type: "IT_ETC"
-	Buy: 10000
-	Sell: 500
-	Weight: 20
-	Refine: false
+	AegisName: "Item816"
+	Name: "Item 816"
 },
 {
 	Id: 817
@@ -16312,6 +16308,22 @@ item_db: (
 		getitem .@r[.@n], 1;
 	">
 },
+{
+	Id: 8024
+	AegisName: "IcedBottle"
+	Name: "Iced Bottle"
+	Type: "IT_USABLE"
+	Buy: 10000
+	Sell: 500
+	Weight: 20
+	Refine: false
+	KeepAfterUse: false
+	Delay: 2000
+	Script: <"
+		// Gives you 5 extra minutes of cooldown
+		@coolio=max(gettimetick(2), @coolio)+300;
+	">
+},
 
 )
 
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index b96bbc943..270fa50f7 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -591,6 +591,15 @@ OnInit:
         debugmes "";
         $UPDATE=1590616575;
     }
+    // Current UPDATE value: Ter Jul 28 22:49:52 BRT 2020
+    // Tulimshar Volcano
+    if ($UPDATE < 1595987392) {
+        $UPDATE=1595987392;
+        ReplaceItemFromEveryPlayer(816, IcedBottle);
+        debugmes "";
+        debugmes "* Iced Water re-id";
+        debugmes "";
+    }
 
 
     // This mensures Contributors Credits, and changes only during updates.
diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt
index 0e83bed49..125420575 100644
--- a/npc/functions/dungeon.txt
+++ b/npc/functions/dungeon.txt
@@ -28,8 +28,13 @@ OnHeat:
     }
 
     // You are in a HEATMAP$, so suffer damage from heat
-    percentheal -5, 0;
-    addtimer2 5000, .name$+"::OnHeat";
+    if (@coolio > gettimetick(2))
+        percentheal -1, 0;
+    else
+        percentheal -5, 0;
+
+    // New tick (dies in 140~180 seconds)
+    addtimer2 rand2(7000, 9000), .name$+"::OnHeat";
     end;
 }
 
-- 
cgit v1.2.3-60-g2f50