The Great Krists Experiment - let's hope it works...

6 files changed, 122 insertions, 6 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index e81a51033..a7e05909a 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -9525,10 +9525,10 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 1000
 	Sell: 90
-	Weight: 22
-	Def: 50
+	Weight: 30
+	Def: 5
 	Loc: "EQP_ACC_R"
-	EquipLv: 3
+	EquipLv: 23
 	Refine: false
 	ViewSprite: 3200
 },
diff --git a/npc/007-1/_import.txt b/npc/007-1/_import.txt
index aeedae88a..dfefea367 100644
--- a/npc/007-1/_import.txt
+++ b/npc/007-1/_import.txt
@@ -6,5 +6,6 @@
 "npc/007-1/dracoula.txt",
 "npc/007-1/pylon.txt",
 "npc/007-1/torches.txt",
+"npc/007-1/treasure.txt",
 "npc/007-1/tycoon.txt",
 "npc/007-1/zarkor.txt",
diff --git a/npc/007-1/treasure.txt b/npc/007-1/treasure.txt
new file mode 100644
index 000000000..6547ae8ee
--- /dev/null
+++ b/npc/007-1/treasure.txt
@@ -0,0 +1,115 @@
+// TMW2 scripts.
+// Author:
+//    Jesusalva
+// Description:
+//    Fishing and Treasure Box
+
+007-1,155,163,0	script	#fishing_00710	NPC_WATER_SPLASH,{
+
+    .@regen_time=200;
+    fishing(2, CommonCarp, RustyKnife,
+               ScorpionStinger, FatesPotion, GrassCarp); // begin or continue fishing
+    close;
+
+OnInit:
+    .sex = G_OTHER;
+    .distance = 4;
+    .cooldown = 200;
+    end;
+}
+
+/*
+007-1,87,73,0	duplicate(#fishing_00710)	#fishing_00711	NPC_WATER_SPLASH
+007-1,31,52,0	duplicate(#fishing_00710)	#fishing_00712	NPC_WATER_SPLASH
+007-1,30,63,0	duplicate(#fishing_00710)	#fishing_00713	NPC_WATER_SPLASH
+007-1,64,127,0	duplicate(#fishing_00710)	#fishing_00714	NPC_WATER_SPLASH
+*/
+
+// Animation code by Evol Team
+// 4144, gumi, Hal9000, Reid
+007-1,0,0,0	script	#chest_00710	NPC_CHEST,{
+
+   if (!.busy && !.empty) {
+        mesc l("Open the chest?");
+        mesc l("Cost: 1 @@", getitemlink(TreasureKey)), 1;
+        if (!countitem(TreasureKey))
+            close;
+        next;
+        if (askyesno() == ASK_NO)
+            close;
+
+        delitem TreasureKey, 1;
+        mesc l("You open the chest!");
+        if (!.empty) {
+            TREASURE_OPEN=TREASURE_OPEN+1;
+            .@t=TREASURE_OPEN;
+            .@r=rand(0,10000);
+
+            // Select treasure list
+            // You're warranted an ultra rare (0.1%) every 99 open chests
+            // You're warranted a super rare (1%) every 50 open chests
+            // There's also rares (10%), uncommons (40%) and commons (60%)
+            if (.@t % 99 == 0 || .@r < 10)
+                .@loot=any(AtroposMixture, GoldenApple, DivineApple, MercBoxA, PirateShorts, SilverGift, Shemagh, FluoPowder, IridiumOre, PlatinumOre);
+            else if (.@t % 50 == 0 || .@r < 100)
+                .@loot=any(Grenade, SnakeEgg, LachesisBrew, ArrowAmmoBox, Coal, CoinBag, BronzeGift, TerraniteOre, LeadOre, TinOre, SilverOre, GoldOre, TitaniumOre, EverburnPowder);
+            else if (.@r < 1000)
+                .@loot=any(MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, Dagger, StrangeCoin, IronOre, CopperOre);
+            else if (.@r < 4000)
+                .@loot=any(Croconut, Potatoz, MoubooSteak, ClothoLiquor, Coal, SmallMushroom, HastePotion, StrengthPotion, StrangeCoin);
+            else
+                .@loot=any(FatesPotion, ChocolateBar, Plushroom, Chagashroom, RawLog, LeatherPatch);
+
+
+            inventoryplace .@loot, 1;
+            mesc l("You find @@ inside!", getitemlink(.@loot));
+            getitem .@loot, 1;
+        } else {
+            mesc l("You find @@ inside!", l("nothing"));
+        }
+
+        .empty=true;
+        specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing
+        .dir = .dir == 0 ? 2 : 6; // closed ? opening : closing
+        .busy = true; // lock until available again
+        initnpctimer;
+    }
+    end;
+
+OnTimer160:
+    .dir = .dir == 6 ? 0 : 4; // closing ? closed : open
+    end;
+
+OnTimer500:
+    .busy = false; // unlock
+    if (.dir == 0 || .dir == 4)
+        stopnpctimer; // stop here if the chest is closed
+    end;
+
+OnInit:
+    .busy = false;
+    .distance = 2;
+    .empty = false;
+    end;
+
+OnClock0156:
+OnClock1356:
+    // Try to warp randomly to a walkable spot, up to 30 attempts
+    .@e=0; .@x=0; .@y=0;
+   while (!checkcell(.mp$, .@x, .@y, cell_chkpass))
+    {
+        if (.@e == 30) {
+            .@x=.x;
+            .@y=.y;
+            break;
+        }
+        // Remember the +20 -20 margin adjustment
+        .@x = rand(20, 185);
+        .@y = rand(20, 180);
+        ++.@e;
+    }
+    .busy=false;
+    .empty=false;
+    movenpc .name$, .@x, .@y, 0;
+    end;
+}
diff --git a/npc/011-2/_import.txt b/npc/011-2/_import.txt
index efbdd8858..e6b4c1d63 100644
--- a/npc/011-2/_import.txt
+++ b/npc/011-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 011-2: Canyon Caves
+// Map 011-2: Supreme Mana Cave
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/011-2/_mobs.txt",
 "npc/011-2/_warps.txt",
diff --git a/npc/011-2/_mobs.txt b/npc/011-2/_mobs.txt
index 0332f83ef..81fe46058 100644
--- a/npc/011-2/_mobs.txt
+++ b/npc/011-2/_mobs.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 011-2: Canyon Caves mobs
+// Map 011-2: Supreme Mana Cave mobs
 011-2,55,58,29,22	monster	Cave Snake	1035,12,35000,150000
 011-2,70,40,3,1	monster	Small Topaz Bif	1101,1,35000,150000
 011-2,54,54,54,54	monster	Cave Maggot	1027,20,40000,200000
diff --git a/npc/011-2/_warps.txt b/npc/011-2/_warps.txt
index efb5ea8fc..1d0b4e751 100644
--- a/npc/011-2/_warps.txt
+++ b/npc/011-2/_warps.txt
@@ -1,5 +1,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 011-2: Canyon Caves warps
+// Map 011-2: Supreme Mana Cave warps
 011-2,78,73,0	warp	#011-2_78_73	0,0,004-2,100,90
 011-2,26,86,0	warp	#011-2_26_86	0,0,004-2,84,78
 011-2,25,47,0	warp	#011-2_25_47	0,0,010-1,93,67