From 1eef2ac2ad2c1c9d9ef5872ed7508acf8e28fd92 Mon Sep 17 00:00:00 2001 From: wushin Date: Sun, 27 Apr 2014 18:08:13 -0500 Subject: Reordered Warp Towel Checks to disable using multiple towels early --- world/map/npc/items/warpTowels.txt | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/world/map/npc/items/warpTowels.txt b/world/map/npc/items/warpTowels.txt index 1a9c8bcd..c3045899 100644 --- a/world/map/npc/items/warpTowels.txt +++ b/world/map/npc/items/warpTowels.txt @@ -1,7 +1,15 @@ // See #TravelConfig function|script|WarpTowel|, { + if (TowelLastUsed > (gettimetick(2) - 1800)) + goto L_DontPanic; + if (isin("botcheck.gat",25,27,51,47)) + goto L_Prison; + if (getmapflag(getmap(), MF_NOSAVE)) + goto L_Forbid; + callfunc "MultiWarpTowel"; + if (@warpTowelName$ == "HitchhikersTowel") goto L_Save; if(@warpTowelName$ == "WhiteHitchhikersTowel") @@ -31,85 +39,76 @@ L_White: set @NextLocationMap$, "035-2.gat"; set @NextLocationX, 20; set @NextLocationY, 21; - goto L_WarpChecks; + goto L_WarpPlayer; L_Red: // Barbarians set @NextLocationMap$, "033-1.gat"; set @NextLocationX, 66; set @NextLocationY, 33; - goto L_WarpChecks; + goto L_WarpPlayer; L_Green: // Candor set @NextLocationMap$, "029-1.gat"; set @NextLocationX, 69; set @NextLocationY, 69; - goto L_WarpChecks; + goto L_WarpPlayer; L_Blue: // Blue Sages set @NextLocationMap$, "048-2.gat"; set @NextLocationX, 26; set @NextLocationY, 47; - goto L_WarpChecks; + goto L_WarpPlayer; L_Yellow: // Tulimshar Mines set @NextLocationMap$, "002-2.gat"; set @NextLocationX, 27; set @NextLocationY, 28; - goto L_WarpChecks; + goto L_WarpPlayer; L_Purple: // Dimonds Inn set @NextLocationMap$, "010-1.gat"; set @NextLocationX, 27; set @NextLocationY, 97; - goto L_WarpChecks; + goto L_WarpPlayer; L_Orange: // Graveyard set @NextLocationMap$, "027-1.gat"; set @NextLocationX, 70; set @NextLocationY, 100; - goto L_WarpChecks; + goto L_WarpPlayer; L_Pink: // Terranite Cave set @NextLocationMap$, "012-3.gat"; set @NextLocationX, 448; set @NextLocationY, 66; - goto L_WarpChecks; + goto L_WarpPlayer; L_Teal: // Mana Seed set @NextLocationMap$, "012-3.gat"; set @NextLocationX, 64; set @NextLocationY, 130; - goto L_WarpChecks; + goto L_WarpPlayer; L_Lime: // Pachua set @NextLocationMap$, "006-1.gat"; set @NextLocationX, 28; set @NextLocationY, 97; - goto L_WarpChecks; + goto L_WarpPlayer; L_Save: // Soul Menhir set @NextLocationMap$, getsavepoint(0); set @NextLocationX, getsavepoint(1); set @NextLocationY, getsavepoint(2); - goto L_WarpChecks; - -L_WarpChecks: - if (TowelLastUsed > (gettimetick(2) - 1800)) - goto L_DontPanic; - if (isin("botcheck.gat",25,27,51,47)) - goto L_Prison; - if (getmapflag(getmap(), MF_NOSAVE)) - goto L_Forbid; goto L_WarpPlayer; L_WarpPlayer: -- cgit v1.2.3-70-g09d2 From d1364f280efb3b0cd8e2c82884ffb1d6bb1894c9 Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 30 Apr 2014 07:27:21 -0500 Subject: Fix Buy/Sell Price of Towels to be Zero --- world/map/db/item_db.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt index 364ffb8e..df7b2f45 100644 --- a/world/map/db/item_db.txt +++ b/world/map/db/item_db.txt @@ -322,17 +322,17 @@ 806, ReedBundle, Reed Bundle, 3, 20, 10, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {} 807, GrassSeed, Grass Seed, 3, 20, 10, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {} //ID, Name___________________, Label__________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} -808, HitchhikersTowel, Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "HitchhikersTowel"; callfunc "WarpTowel";}, {} -809, WhiteHitchhikersTowel, White Hitchhiker's Towe, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "WhiteHitchhikersTowel"; callfunc "WarpTowel";}, {} -810, RedHitchhikersTowel, Red Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "RedHitchhikersTowel"; callfunc "WarpTowel";}, {} -811, GreenHitchhikersTowel, Green Hitchhiker's Towe, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "GreenHitchhikersTowel"; callfunc "WarpTowel";}, {} -812, BlueHitchhikersTowel, Blue Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "BlueHitchhikersTowel"; callfunc "WarpTowel";}, {} -813, YellowHitchhikersTowel, Yellow Hitchhiker's Tow, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "YellowHitchhikersTowel"; callfunc "WarpTowel";}, {} -814, PurpleHitchhikersTowel, Purple Hitchhiker's Tow, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "PurpleHitchhikersTowel"; callfunc "WarpTowel";}, {} -815, OrangeHitchhikersTowel, Orange Hitchhiker's Tow, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "OrangeHitchhikersTowel"; callfunc "WarpTowel";}, {} -816, PinkHitchhikersTowel, Pink Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "PinkHitchhikersTowel"; callfunc "WarpTowel";}, {} -817, TealHitchhikersTowel, Teal Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "TealHitchhikersTowel"; callfunc "WarpTowel";}, {} -818, LimeHitchhikersTowel, Lime Hitchhiker's Towel, 0, 10, 1, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "LimeHitchhikersTowel"; callfunc "WarpTowel";}, {} +808, HitchhikersTowel, Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "HitchhikersTowel"; callfunc "WarpTowel";}, {} +809, WhiteHitchhikersTowel, White Hitchhiker's Towe, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "WhiteHitchhikersTowel"; callfunc "WarpTowel";}, {} +810, RedHitchhikersTowel, Red Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "RedHitchhikersTowel"; callfunc "WarpTowel";}, {} +811, GreenHitchhikersTowel, Green Hitchhiker's Towe, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "GreenHitchhikersTowel"; callfunc "WarpTowel";}, {} +812, BlueHitchhikersTowel, Blue Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "BlueHitchhikersTowel"; callfunc "WarpTowel";}, {} +813, YellowHitchhikersTowel, Yellow Hitchhiker's Tow, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "YellowHitchhikersTowel"; callfunc "WarpTowel";}, {} +814, PurpleHitchhikersTowel, Purple Hitchhiker's Tow, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "PurpleHitchhikersTowel"; callfunc "WarpTowel";}, {} +815, OrangeHitchhikersTowel, Orange Hitchhiker's Tow, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "OrangeHitchhikersTowel"; callfunc "WarpTowel";}, {} +816, PinkHitchhikersTowel, Pink Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "PinkHitchhikersTowel"; callfunc "WarpTowel";}, {} +817, TealHitchhikersTowel, Teal Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "TealHitchhikersTowel"; callfunc "WarpTowel";}, {} +818, LimeHitchhikersTowel, Lime Hitchhiker's Towel, 0, 0, 0, 30, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {set @warpTowelName$, "LimeHitchhikersTowel"; callfunc "WarpTowel";}, {} 819, DiamondPowder, Diamond Powder, 3, 1000, 500, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 820, RubyPowder, Ruby Powder, 3, 1000, 500, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} 821, EmeraldPowder, Emerald Powder, 3, 1000, 500, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} -- cgit v1.2.3-70-g09d2 From 3f1f2c82708abe1393ab01f8124370d6c42d26be Mon Sep 17 00:00:00 2001 From: wushin Date: Thu, 1 May 2014 21:09:41 -0500 Subject: People will make towels for no reason other than to make towels... --- world/map/npc/functions/soul_menhir.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/world/map/npc/functions/soul_menhir.txt b/world/map/npc/functions/soul_menhir.txt index e5ec9f4a..0af50a74 100644 --- a/world/map/npc/functions/soul_menhir.txt +++ b/world/map/npc/functions/soul_menhir.txt @@ -10,7 +10,13 @@ function|script|SoulMenhir|, "I lost my towel...", L_Towel; L_Towel: + if (TowelLastUsed > (gettimetick(2) - 1800)) + goto L_DontPanic; callfunc "MultiWarpTowel"; + set TowelLastUsed, gettimetick(2); + mes "[Soul Menhir]"; + mes "(You touch the mysterious stone. Somehow it feels hard and soft at the same time.)"; + next; getitem "HitchhikersTowel", 1; goto L_Return; @@ -44,6 +50,10 @@ L_Save: goto L_FindPoint; goto L_Do_Save; +L_DontPanic: + message strcharinfo(0), "(A strange barrier keeps you from touching the stone at this time.)"; + goto L_Return; + L_Do_Save: savepoint @map$, @x, @y; goto L_Return; -- cgit v1.2.3-70-g09d2