From cf18ce071c79ae37e14ea38943e0b1d88da70a7b Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 9 Apr 2021 13:33:57 -0300 Subject: Override --- npc/000-1/exit.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 npc/000-1/exit.txt (limited to 'npc/000-1/exit.txt') diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt new file mode 100644 index 00000000..a3c4f6c7 --- /dev/null +++ b/npc/000-1/exit.txt @@ -0,0 +1,18 @@ +// TMW2 scripts. +// Author: +// Jesusalva +// Description: +// Special Soul Menhir which only allows leaving the map. + +000-1,22,22,0 script Emergency Exit NPC_NO_SPRITE,2,2,{ +OnTouch: +OnTalk: +OnTalkNearby: + if (Sex) + warp "029-2", 25, 24; + else + warp "029-2", 22, 24; + end; + +} + -- cgit v1.2.3-60-g2f50 From 2d3024a574858935aac4c4a4fa078b357498531a Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 13 Apr 2021 18:36:47 -0300 Subject: Add LOCATION$ support (but it is not being saved yet) --- db/constants.conf | 5 +- npc/000-1/exit.txt | 5 +- npc/commands/debug.txt | 2 +- npc/functions/location.txt | 143 +++++++++++++++++++++++++++++++++++++++++++++ npc/scripts.conf | 1 + 5 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 npc/functions/location.txt (limited to 'npc/000-1/exit.txt') diff --git a/db/constants.conf b/db/constants.conf index 21a6dc01..8a5a7aa0 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -5257,11 +5257,10 @@ more than one separator can be used in a row (so 12_3___456 is illegal). comment__: "Location Constants" TP_NONE: 0 - TP_ARTIS: 1 + TP_CANDOR: 1 TP_TULIM: 2 TP_HURNS: 4 - TP_CANDOR: 8 - TP_ARGAES: 16 + TP_NIVAL: 8 comment__: "Rossy Quest Constants" ROSSY_PROLOGUE: 1 diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt index a3c4f6c7..4c8f167e 100644 --- a/npc/000-1/exit.txt +++ b/npc/000-1/exit.txt @@ -8,11 +8,14 @@ OnTouch: OnTalk: OnTalkNearby: + if (LOCATION$ != "") goto L_ToLoc; if (Sex) warp "029-2", 25, 24; else warp "029-2", 22, 24; end; - +L_ToLoc: + ReturnTown(); + end; } diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt index a033fe67..269fdb60 100644 --- a/npc/commands/debug.txt +++ b/npc/commands/debug.txt @@ -592,7 +592,7 @@ OnSClear: dispbottom l("Status Condition Cleared"); end; -OnAllperms: +OnAllPerms: if (@allperms) end; charcommand("@addperm all_skill"); charcommand("@addperm all_equipment"); diff --git a/npc/functions/location.txt b/npc/functions/location.txt new file mode 100644 index 00000000..093764af --- /dev/null +++ b/npc/functions/location.txt @@ -0,0 +1,143 @@ +// TMW2 Script +// Author: Jesusalva +// Location Config + +- script loc_config 32767,{ + end; + +OnInit: + // TP_FORT TP_BOSSR + setarray $@LOCMASTER_TP, TP_CANDOR,TP_TULIM,TP_HURNS,TP_NIVAL; + setarray $@LOCMASTER_LOC$, "Candor", "Tulim", "Hurns", "Nival"; + setarray $@LOCMASTER_MAP$, "029-1", "001-1", "009-1", "020-1"; + setarray $@LOCMASTER_X, 46, 51, 52, 75; + setarray $@LOCMASTER_Y, 97, 78, 41, 85; + + //debugmes "Locmaster: Index 0: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[0], $@LOCMASTER_MAP$[0], $@LOCMASTER_X[0], $@LOCMASTER_Y[0]; + //debugmes "Locmaster: Index 2: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[2], $@LOCMASTER_MAP$[2], $@LOCMASTER_X[2], $@LOCMASTER_Y[2]; + //debugmes "Locmaster: Index 5: %s [%s.gat (%d, %d)]", $@LOCMASTER_LOC$[5], $@LOCMASTER_MAP$[5], $@LOCMASTER_X[5], $@LOCMASTER_Y[5]; + end; +} + +// Resaves your respawn point +function script ResaveRespawn { + .@i=array_find($@LOCMASTER_LOC$, LOCATION$); + savepoint $@LOCMASTER_MAP$[.@i], $@LOCMASTER_X[.@i], $@LOCMASTER_Y[.@i]; + return; +} + +// Warps you to last visited town +function script ReturnTown { + .@i=array_find($@LOCMASTER_LOC$, LOCATION$); + warp $@LOCMASTER_MAP$[.@i], $@LOCMASTER_X[.@i], $@LOCMASTER_Y[.@i]; + return; +} + +// Convert map name to location id +// LocToMap( LocName ) +function script LocToMap { + // Fill variable + .@v$=getarg(0); + + // Error code + if (playerattached()) + .@err=RB_DEFAULT; + else + .@err=RB_DEBUGMES; + + // Validade variable, see npc/config/location.txt first + .@lx=array_find($@LOCMASTER_LOC$, .@v$); + if (.@lx < 0) + return Exception("Invalid location passed to LocToMap: "+.@v$, .@err); + + return $@LOCMASTER_MAP$[.@lx]; +} + +// Convert map name to location id +// MapToLoc( MapName ) +function script MapToLoc { + // Fill variable + .@v$=getarg(0); + + // Error code + if (playerattached()) + .@err=RB_DEFAULT; + else + .@err=RB_DEBUGMES; + + // Validade variable, see npc/config/location.txt first + .@lx=array_find($@LOCMASTER_MAP$, .@v$); + if (.@lx < 0) + return Exception("Invalid map passed to MapToLoc: "+.@v$, .@err); + + return $@LOCMASTER_LOC$[.@lx]; +} + +// Gets the location code for TP code +function script TPToLoc { + .@i=array_find($@LOCMASTER_TP, getarg(0)); + return $@LOCMASTER_MAP$[.@i]; + return; +} + +// Convert LOC (uppercase) to a TP variable +// POL_LocToTP( {TOWNCODE} ) +function script POL_LocToTP { + .@tw$=strtoupper(getarg(0, LOCATION$)); + + if (.@tw$ == "TULIM") + return TP_TULIM; + + if (.@tw$ == "HALIN") + return TP_HALIN; + + if (.@tw$ == "HURNS") + return TP_HURNS; + + if (.@tw$ == "LOF") + return TP_LOF; + + if (.@tw$ == "NIVAL") + return TP_NIVAL; + + if (.@tw$ == "ARTIS") + return TP_ARTIS; + + if (.@tw$ == "CANDOR") + return TP_CANDOR; + + if (.@tw$ == "LILIT") + return TP_LILIT; + + // TODO: Change this to use npc/config/location.txt instead + if (.@tw$ == "FROSTIA") + return TP_FROST; + + return Exception("Invalid town requested / POL_LocToTP", RB_DEFAULT|RB_SPEECH, -1); +} + +// Upon entering a town +// EnterTown( LocName ) +function script EnterTown { + // Fill variable + .@v$=getarg(0); + + // Validade variable, see npc/config/location.txt first + if (array_find($@LOCMASTER_LOC$, .@v$) < 0) + return Exception("Invalid location passed to EnterTown: "+.@v$); + + LOCATION$=.@v$; + return; +} + +// Warps home and updates LOCATION$ +function script teleporthome { + warp "Save", 0, 0; + .@i=array_find($@LOCMASTER_MAP$, getmap()); + if (.@i >= 0) + EnterTown($@LOCMASTER_LOC$[.@i]); + else + debugmes("[ERROR] Invalid Town Map for Time Flask: %s", getmap()); + return; +} + diff --git a/npc/scripts.conf b/npc/scripts.conf index 26805df0..9c166fbb 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -47,6 +47,7 @@ "npc/functions/motdconfig.txt", "npc/functions/miriam.txt", "npc/functions/ghost.txt", +"npc/functions/location.txt", // Items "npc/items/purification_potion.txt", -- cgit v1.2.3-60-g2f50 From 6521897eeec144f47a65c5855829544b892368e2 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Sun, 18 Apr 2021 15:49:32 -0300 Subject: Update all mapflags - Remove weird nosaves, add Event and MMO zones. Permanent rain to 070-1 close #11 --- db/pre-re/map_zone_db.conf | 109 ++++++++++++++++++++++++++++++++++++++++----- npc/000-1/exit.txt | 1 + npc/001-3/mapflags.txt | 2 +- npc/009-5/mapflags.txt | 1 + npc/009-6/mapflags.txt | 1 + npc/013-1/sagatha.txt | 2 +- npc/015-3/mapflags.txt | 1 + npc/025-4/mapflags.txt | 2 +- npc/027-6/mapflags.txt | 2 +- npc/027-7/mapflags.txt | 2 +- npc/027-8/mapflags.txt | 2 +- npc/028-1/mapflags.txt | 2 +- npc/028-3/mapflags.txt | 2 +- npc/029-2/mapflags.txt | 2 +- npc/029-3/mapflags.txt | 2 +- npc/030-4/mapflags.txt | 2 +- npc/031-4/mapflags.txt | 2 +- npc/051-1/mapflags.txt | 2 +- npc/051-3/mapflags.txt | 2 +- npc/052-1/mapflags.txt | 2 +- npc/052-2/mapflags.txt | 2 +- npc/070-1/_import.txt | 1 + npc/070-1/mapflags.txt | 1 + npc/099-5/_import.txt | 1 + npc/099-5/mapflag.txt | 2 + npc/botcheck/mapflags.txt | 3 +- npc/items/warpTowels.txt | 14 +++--- 27 files changed, 134 insertions(+), 33 deletions(-) create mode 100644 npc/070-1/mapflags.txt create mode 100644 npc/099-5/mapflag.txt (limited to 'npc/000-1/exit.txt') diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf index 80f21c93..e5fdf71a 100644 --- a/db/pre-re/map_zone_db.conf +++ b/db/pre-re/map_zone_db.conf @@ -130,6 +130,7 @@ zones: ( ) }, { + /* Outside Zone is a mapflag alias */ name: "outside" disabled_skills: { @@ -139,6 +140,103 @@ zones: ( disabled_items: { } }, +{ + /* Event Zone is a mapflag alias */ + name: "Event" + + disabled_skills: { + } + + disabled_items: { + } + + mapflags: ( + "nopenalty", + "nosave 000-1,22,22", + "invincible_time_inc 5000", + ) + + /* "command:min-group-lv-to-override" e.g. "heal: 70" */ + disabled_commands: { + } + skill_damage_cap: { + } +}, +{ + /* Jail Zone is a special mapflag alias */ + name: "Jail" + + disabled_skills: { + TK_JUMPKICK: "PLAYER" + TK_HIGHJUMP: "PLAYER" + } + + disabled_items: { + } +}, +{ + /* MMO Zone is not the place for GMs to mess with */ + name: "MMO" + + disabled_skills: { + AL_WARP: "ALL" + AL_TELEPORT: "ALL" + WE_CALLPARTNER: "ALL" + WE_CALLPARENT: "ALL" + WE_CALLBABY: "ALL" + SC_DIMENSIONDOOR: "ALL" + GD_EMERGENCYCALL: "ALL" + } + + disabled_items: { + HitchhikersTowel: true + WhiteHitchhikersTowel: true + RedHitchhikersTowel: true + GreenHitchhikersTowel: true + BlueHitchhikersTowel: true + YellowHitchhikersTowel: true + PurpleHitchhikersTowel: true + OrangeHitchhikersTowel: true + PinkHitchhikersTowel: true + TealHitchhikersTowel: true + LimeHitchhikersTowel: true + } + + mapflags: ( + "nopenalty", + //"nosave 000-1,22,22", + ) + + /* "command:min-group-lv-to-override" e.g. "heal: 70" */ + disabled_commands: { + // Disabled (Should not ever be used) + recallall: 100 + save: 100 + // Admin Only (no CM on these map) + addwarp: 99 + mapflag: 99 + // Community Manager Only (no GM on these map) + recall: 80 + kill: 80 + nuke: 80 + skillon: 80 + skilloff: 80 + pvpon: 80 + pvpoff: 80 + cvcon: 80 + cvcoff: 80 + gvgon: 80 + gvgoff: 80 + // GM Only (no EVTC on these map) + monster: 60 + killmonster: 60 + killmonster2: 60 + raisemap: 60 + doommap: 60 + } + skill_damage_cap: { + } +}, { /* CvC zone is applied to all maps with a cvc mapflag */ name: "CvC" /* changing this name requires MAP_ZONE_CVC_NAME to also be changed in src/map/map.h file */ @@ -318,17 +416,6 @@ zones: ( disabled_items: { } }, -{ - name: "Jail" - - disabled_skills: { - TK_JUMPKICK: "PLAYER" - TK_HIGHJUMP: "PLAYER" - } - - disabled_items: { - } -}, { name: "Izlude Battle Arena" diff --git a/npc/000-1/exit.txt b/npc/000-1/exit.txt index 4c8f167e..d4a6821a 100644 --- a/npc/000-1/exit.txt +++ b/npc/000-1/exit.txt @@ -15,6 +15,7 @@ OnTalkNearby: warp "029-2", 22, 24; end; L_ToLoc: + // Possibly could warp to "Save" as well? ReturnTown(); end; } diff --git a/npc/001-3/mapflags.txt b/npc/001-3/mapflags.txt index 04479442..d86f50e1 100644 --- a/npc/001-3/mapflags.txt +++ b/npc/001-3/mapflags.txt @@ -1,2 +1,2 @@ 001-3 mapflag nosave 002-2,74,59 -//001-3 mapflag resave 002-2,74,59 +001-3 mapflag zone MMO diff --git a/npc/009-5/mapflags.txt b/npc/009-5/mapflags.txt index c27c167e..a1d35c0d 100644 --- a/npc/009-5/mapflags.txt +++ b/npc/009-5/mapflags.txt @@ -1 +1,2 @@ 009-5 mapflag nosave 009-3,162,82 +009-5 mapflag zone MMO diff --git a/npc/009-6/mapflags.txt b/npc/009-6/mapflags.txt index 9b247c8c..c6a65e72 100644 --- a/npc/009-6/mapflags.txt +++ b/npc/009-6/mapflags.txt @@ -1 +1,2 @@ 009-6 mapflag nosave 009-3,162,82 +009-6 mapflag zone MMO diff --git a/npc/013-1/sagatha.txt b/npc/013-1/sagatha.txt index a2f5ce7d..01171c14 100644 --- a/npc/013-1/sagatha.txt +++ b/npc/013-1/sagatha.txt @@ -217,7 +217,7 @@ L_Teach_N14: if (@mexp < 125 || getskilllv(SKILL_MAGIC) < 1) goto L_Teach_noexp; mesn .@n$; - mes "\"Some forest creatures sometimes overgrow their fur or hide. That makes them uncomfortable.\""; + mesq l("Some forest creatures sometimes overgrow their fur or hide. That makes them uncomfortable."); next; mesn .@n$; mesq l("You can help them with shearing magic. Press your hands together and say '%s'. Then touch them with your hands, and brush off any excess.", b("Chipchip")); diff --git a/npc/015-3/mapflags.txt b/npc/015-3/mapflags.txt index 049e6274..8d10f78e 100644 --- a/npc/015-3/mapflags.txt +++ b/npc/015-3/mapflags.txt @@ -1,2 +1,3 @@ 015-3 mapflag nosave 015-1,59,32 //015-3 mapflag resave 010-1,27,97 +015-3 mapflag zone MMO diff --git a/npc/025-4/mapflags.txt b/npc/025-4/mapflags.txt index a5a1cf62..8183383c 100644 --- a/npc/025-4/mapflags.txt +++ b/npc/025-4/mapflags.txt @@ -1,2 +1,2 @@ 025-4 mapflag nosave 025-1,33,50 -//025-4 mapflag resave 025-1,33,50 +025-4 mapflag zone MMO diff --git a/npc/027-6/mapflags.txt b/npc/027-6/mapflags.txt index 1f2249a1..71b31051 100644 --- a/npc/027-6/mapflags.txt +++ b/npc/027-6/mapflags.txt @@ -1,2 +1,2 @@ 027-6 mapflag nosave 027-3,82,90 -//027-6 mapflag resave 027-3,82,90 +027-6 mapflag zone MMO diff --git a/npc/027-7/mapflags.txt b/npc/027-7/mapflags.txt index 808ab063..5a798c1c 100644 --- a/npc/027-7/mapflags.txt +++ b/npc/027-7/mapflags.txt @@ -1,2 +1,2 @@ 027-7 mapflag nosave 027-4,73,78 -//027-7 mapflag resave 027-4,73,78 +027-7 mapflag zone MMO diff --git a/npc/027-8/mapflags.txt b/npc/027-8/mapflags.txt index 180a25be..f19c8671 100644 --- a/npc/027-8/mapflags.txt +++ b/npc/027-8/mapflags.txt @@ -1,2 +1,2 @@ 027-8 mapflag nosave 027-5,70,27 -//027-8 mapflag resave 027-5,70,27 +027-8 mapflag zone MMO diff --git a/npc/028-1/mapflags.txt b/npc/028-1/mapflags.txt index f0c74e5d..cadc40e9 100644 --- a/npc/028-1/mapflags.txt +++ b/npc/028-1/mapflags.txt @@ -1 +1 @@ -028-1 mapflag nosave 009-1,53,40 +028-1 mapflag zone Event diff --git a/npc/028-3/mapflags.txt b/npc/028-3/mapflags.txt index 62771987..7e4c34b6 100644 --- a/npc/028-3/mapflags.txt +++ b/npc/028-3/mapflags.txt @@ -1 +1 @@ -028-3 mapflag nosave 009-1,53,40 +028-3 mapflag zone Event diff --git a/npc/029-2/mapflags.txt b/npc/029-2/mapflags.txt index bfe50c0c..481d8ee5 100644 --- a/npc/029-2/mapflags.txt +++ b/npc/029-2/mapflags.txt @@ -1,3 +1,3 @@ -029-2 mapflag nosave 029-2,22,24 +//029-2 mapflag nosave 029-2,22,24 //029-2 mapflag resave 029-2,22,24 029-2 mapflag mask 1 diff --git a/npc/029-3/mapflags.txt b/npc/029-3/mapflags.txt index a161e111..f64a309a 100644 --- a/npc/029-3/mapflags.txt +++ b/npc/029-3/mapflags.txt @@ -1,2 +1,2 @@ 029-3 mapflag nosave 029-1,39,102 -//029-3 mapflag resave 029-1,39,102 +029-3 mapflag zone MMO diff --git a/npc/030-4/mapflags.txt b/npc/030-4/mapflags.txt index e9283539..72984c63 100644 --- a/npc/030-4/mapflags.txt +++ b/npc/030-4/mapflags.txt @@ -1,2 +1,2 @@ 030-4 mapflag nosave 030-2,151,25 -//030-4 mapflag resave 030-2,151,25 +030-4 mapflag zone MMO diff --git a/npc/031-4/mapflags.txt b/npc/031-4/mapflags.txt index 06a10489..7ce6a307 100644 --- a/npc/031-4/mapflags.txt +++ b/npc/031-4/mapflags.txt @@ -1,2 +1,2 @@ 031-4 mapflag nosave 031-3,46,26 -//031-4 mapflag resave 031-3,46,26 +031-4 mapflag zone MMO diff --git a/npc/051-1/mapflags.txt b/npc/051-1/mapflags.txt index 5ac6d06e..620a8d3c 100644 --- a/npc/051-1/mapflags.txt +++ b/npc/051-1/mapflags.txt @@ -1,2 +1,2 @@ 051-1 mapflag nosave 007-2,36,23 -//051-1 mapflag resave 007-2,36,23 +051-1 mapflag zone MMO diff --git a/npc/051-3/mapflags.txt b/npc/051-3/mapflags.txt index a3b3c49b..3a343f5a 100644 --- a/npc/051-3/mapflags.txt +++ b/npc/051-3/mapflags.txt @@ -1,2 +1,2 @@ 051-3 mapflag nosave 007-2,36,23 -//051-3 mapflag resave 007-2,36,23 +051-3 mapflag zone MMO diff --git a/npc/052-1/mapflags.txt b/npc/052-1/mapflags.txt index 0e8e3295..045801f7 100644 --- a/npc/052-1/mapflags.txt +++ b/npc/052-1/mapflags.txt @@ -1,2 +1,2 @@ 052-1 mapflag nosave 007-2,36,23 -//052-1 mapflag resave 007-2,36,23 +052-1 mapflag zone MMO diff --git a/npc/052-2/mapflags.txt b/npc/052-2/mapflags.txt index d4ce9d64..082d21b1 100644 --- a/npc/052-2/mapflags.txt +++ b/npc/052-2/mapflags.txt @@ -1,2 +1,2 @@ 052-2 mapflag nosave 007-2,36,23 -//052-2 mapflag resave 007-2,36,23 +052-2 mapflag zone MMO diff --git a/npc/070-1/_import.txt b/npc/070-1/_import.txt index 5dbdaa98..2a44f7d7 100644 --- a/npc/070-1/_import.txt +++ b/npc/070-1/_import.txt @@ -1,2 +1,3 @@ // Map 070-1: Underworld // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/070-1/mapflags.txt", diff --git a/npc/070-1/mapflags.txt b/npc/070-1/mapflags.txt new file mode 100644 index 00000000..fb393c84 --- /dev/null +++ b/npc/070-1/mapflags.txt @@ -0,0 +1 @@ +070-1 mapflag mask 17 diff --git a/npc/099-5/_import.txt b/npc/099-5/_import.txt index 7d086628..9276a379 100644 --- a/npc/099-5/_import.txt +++ b/npc/099-5/_import.txt @@ -1,2 +1,3 @@ // Map 099-5: ????? // This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/099-5/mapflag.txt", diff --git a/npc/099-5/mapflag.txt b/npc/099-5/mapflag.txt new file mode 100644 index 00000000..df97cc7c --- /dev/null +++ b/npc/099-5/mapflag.txt @@ -0,0 +1,2 @@ +099-5 mapflag zone MMO +099-6 mapflag zone MMO diff --git a/npc/botcheck/mapflags.txt b/npc/botcheck/mapflags.txt index 754c247c..6d36e10c 100644 --- a/npc/botcheck/mapflags.txt +++ b/npc/botcheck/mapflags.txt @@ -1,2 +1,3 @@ //botcheck mapflag resave botcheck,37,37 -botcheck mapflag nosave botcheck,37,37 +//botcheck mapflag nosave botcheck,37,37 +botcheck mapflag zone Jail diff --git a/npc/items/warpTowels.txt b/npc/items/warpTowels.txt index 35c7d55b..d90e5639 100644 --- a/npc/items/warpTowels.txt +++ b/npc/items/warpTowels.txt @@ -1,10 +1,14 @@ function script WarpTowel { @seconds = TowelLastUsed - (gettimetick(2) - 1200); - if (@seconds > 0 && GM < 1) + if (@seconds > 0 && !is_trusted()) goto L_DontPanic; - if (isin("botcheck",25,27,51,47)) + .@zone = getmapinfo(MAPINFO_ZONE); + if (.@zone == "Jail") goto L_Prison; - if (getmapflag(getmapname(), mf_nosave) || getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) + // Zone will never be MMO, though + if (.@zone == "MMO" || .@zone == "Event") + goto L_Forbid; + if (getmapflag(getmapname(), mf_noteleport) || getmapflag(getmapname(), mf_nowarp) || isin("009-7",$@fightclub_x1,$@fightclub_y1,$@fightclub_x2,$@fightclub_y2)) goto L_Forbid; if (@warpTowelName$ == "HitchhikersTowel") @@ -115,7 +119,7 @@ L_WarpPlayer: goto L_BreakChance; L_BreakChance: - if (rand(15)) + if (rand2(12)) goto L_Keep; getitem "HitchhikersTowel", 1; goto L_End; @@ -125,7 +129,7 @@ L_Forbid: goto L_Keep; L_Prison: - message strcharinfo(0), "Towel : You must be warped by a GM to leave the botcheck area."; + message strcharinfo(0), "Towel : You must be warped by a GM to leave this area."; goto L_Keep; L_DontPanic: -- cgit v1.2.3-60-g2f50