From 07403f5af4a0be125fddbe1dc40330d043309812 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 12 May 2020 08:57:06 -0300 Subject: Deprecation concerning "debug" constant (I have new plans for it) --- npc/003-1/lieutenantdausen.txt | 2 +- npc/005-1/ayasha.txt | 4 +-- npc/005-3/barrel.txt | 2 +- npc/007-1/torches.txt | 2 +- npc/015-2/contrabandist.txt | 2 ++ npc/018-6-1/main.txt | 2 +- npc/commands/debug-look.txt | 14 --------- npc/commands/debug.txt | 71 +++--------------------------------------- npc/commands/motd.txt | 15 +-------- npc/commands/super-menu.txt | 2 +- 10 files changed, 15 insertions(+), 101 deletions(-) diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 2216281fa..5593510d0 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -550,7 +550,7 @@ function script CheckGuard { .@guard_count = 0; .@count_tmp = 0; - if (debug) + if ($@GM_OVERRIDE) npctalk3 l("Hello, I am G-@@, of the @@ order.", .@guard_id, $@GuardBits[.@guard_id]); if (GUARDS_DONE_BITARRAY & $@GuardBits[.@guard_id]) diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index bbc0df0d5..f71f1726d 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -261,7 +261,7 @@ OnInit: function script CheckEnfant { @kids_count = 0; @count_tmp = 0; - if (debug) + if ($@GM_OVERRIDE) npctalk3 l("Hello, I am K-@@, of the @@ order.", @kids, $@KidsBits[@kids]); if (STARTAREA & $@KidsBits[@kids]) goto L_Already; @@ -270,7 +270,7 @@ function script CheckEnfant { goto L_Loop; L_KidsTally: - if (debug) + if (debug || $@GM_OVERRIDE) npctalk3 l("You found @@ out of @@ kids.", @kids_count, @count_tmp); if (@kids_count == 6) { diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt index fe0d70bc6..160e779e8 100644 --- a/npc/005-3/barrel.txt +++ b/npc/005-3/barrel.txt @@ -16,7 +16,7 @@ function script CheckBarrel { @barrel_count = 0; @count_tmp = 0; - if (debug) + if ($@GM_OVERRIDE) npctalk3 l("Hello, I am B-@@, of the @@ order.", @barrel, $@BarrelBits[@barrel]); if (STARTAREA & $@BarrelBits[@barrel]) goto L_Empty; diff --git a/npc/007-1/torches.txt b/npc/007-1/torches.txt index 0dff30ac1..5dd82e217 100644 --- a/npc/007-1/torches.txt +++ b/npc/007-1/torches.txt @@ -17,7 +17,7 @@ function script CheckTorch { @torch_count = 0; @count_tmp = 0; - if (debug) + if ($@GM_OVERRIDE) npctalk3 l("Hello, I am T-@@, of the @@ order.", @torch, $@TorchBits[@torch]); if (getq2(TulimsharQuest_DarkInvocator) & $@TorchBits[@torch]) goto L_Empty; diff --git a/npc/015-2/contrabandist.txt b/npc/015-2/contrabandist.txt index 42fc49f23..41f4a3c6c 100644 --- a/npc/015-2/contrabandist.txt +++ b/npc/015-2/contrabandist.txt @@ -104,10 +104,12 @@ OnInit: .sex = G_OTHER; .distance = 12; + /* if (debug) { setnpcdisplay .name$, NPC_KOGA; .active=1; } + */ end; } diff --git a/npc/018-6-1/main.txt b/npc/018-6-1/main.txt index 9eaa3e34e..b3cedbf38 100644 --- a/npc/018-6-1/main.txt +++ b/npc/018-6-1/main.txt @@ -182,7 +182,7 @@ OnInit: disablenpc .name$; end; OnInstanceInit: - if (debug) setnpcdisplay instance_npcname(.name$), NPC_WOUNDEDSOLDIER; + if ($@GM_OVERRIDE) setnpcdisplay instance_npcname(.name$), NPC_WOUNDEDSOLDIER; disablenpc instance_npcname(.name$); end; } diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt index 3fc2aac43..26e9ffff9 100644 --- a/npc/commands/debug-look.txt +++ b/npc/commands/debug-look.txt @@ -91,17 +91,3 @@ function script BarberDebug { } while (1); } - - -- script @look 32767,{ - end; - -OnCall: - if (!debug && !is_staff()) - { - end; - } - BarberDebug; - closedialog; - end; -} diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt index 5ffb409bb..5d628eca3 100644 --- a/npc/commands/debug.txt +++ b/npc/commands/debug.txt @@ -37,59 +37,6 @@ function script GlobalDebugMenu { return; } - function changeLevel { - clear; - setnpcdialogtitle l("Debug - Change level"); - mes l("To change your base level, use this command:"); - mes ""; - mes " " + col("@blvl <" + l("delta") + ">", 3); - next; - mes l("Example:"); - mes "@blvl 50"; - mes " " + l("Raises your base level by 50"); - mes "@blvl -50"; - mes " " + l("Reduces your base level by 50"); - next; - mes l("To change your job level, use this command:"); - mes ""; - mes " " + col("@jlvl <" + l("delta") + ">", 3); - next; - mes l("Example:"); - mes "@jlvl 50"; - mes " " + l("Raises your job level by 50"); - mes "@jlvl -50"; - mes " " + l("Reduces your job level by 50"); - next; - return; - } - function changeStats { - clear; - setnpcdialogtitle l("Debug - Change stats"); - mes l("To change your stats, use these commands:"); - mes ""; - mes " " + col("@str <" + l("delta") + ">", 3); - mes " " + col("@agi <" + l("delta") + ">", 3); - mes " " + col("@vit <" + l("delta") + ">", 3); - mes " " + col("@int <" + l("delta") + ">", 3); - mes " " + col("@dex <" + l("delta") + ">", 3); - mes " " + col("@luk <" + l("delta") + ">", 3); - next; - mes l("Example:"); - mes "@int 50"; - mes " " + l("Raises your Int by 50"); - mes "@int -50"; - mes " " + l("Reduces your Int by 50"); - next; - mes l("If you simply wish to get 99 in all stats:"); - mes ""; - mes " " + col("@allstats", 3); - next; - mes l("If you wish to reset your stats:"); - mes ""; - mes " " + col("@streset", 3); - next; - return; - } do { clear; @@ -98,11 +45,7 @@ function script GlobalDebugMenu { mes ""; mes l("What do you want to do?"); select - l("Change my level"), - l("Change my stats"), l("Change my appearance"), - l("Create items"), - l("Get money"), l("Change my quests"), l("Reset"), rif(getarg(0,0), l("Return to Super Menu")); @@ -111,14 +54,10 @@ function script GlobalDebugMenu { switch (@menu) { - case 1: changeLevel; break; - case 2: changeStats; break; - case 3: BarberDebug .@c; break; - case 4: closedialog; clientcommand "createitems"; end; - case 5: dispbottom l("Use ##B@zeny##b instead!"); break; - case 6: GlobalQuestDebug .@c; break; - case 7: resetAll; break; - case 8: return; + case 1: BarberDebug .@c; break; + case 4: GlobalQuestDebug .@c; break; + case 5: resetAll; break; + case 6: return; } } while(1); } @@ -129,7 +68,7 @@ function script GlobalDebugMenu { end; OnCall: - if (!debug && !is_admin()) { + if (!is_admin()) { end; } GlobalDebugMenu; diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt index dfd3f7242..b150b798e 100644 --- a/npc/commands/motd.txt +++ b/npc/commands/motd.txt @@ -1,17 +1,6 @@ // TMW2 Script function script displayMOTD { .@size = getvariableofnpc(.size, "@motd"); - .@dsize = getvariableofnpc(.dsize, "@motd"); - - // git stuff and such - if (debug) { - for (.@i = 0; .@i < .@dsize; ++.@i) { - dispbottom $@Debug_Messages$[.@i]; // FIXME: send this to the Debug tab instead - } - - if (.@dsize > 0) - dispbottom "---"; - } // generic MOTD for (.@i = 0; .@i < .@size; ++.@i) { @@ -181,9 +170,7 @@ OnInit: .login_ref=gettime(5); .daylength=(60*60*24); */ - MOTD_debug_text; .size = getarraysize($MOTD_Messages$); - .dsize = getarraysize($@Debug_Messages$); bindatcmd "motd", "@motd::OnCall", 99, 99, 1; } @@ -201,7 +188,7 @@ function script MOTDHandler { if (!$MOTD_Disabled) displayMOTD; if (debug) - dispbottom "##7<<##B @@help://test-server|" + col(l("Click here for instructions on how to use the test server."),6) + "@@ ##7>>"; + dispbottom "##7<<##B @@help://test-server|" + col(l("This is the test server."),6) + "@@ ##7>>"; return; } diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt index aafec9b63..11a92711f 100644 --- a/npc/commands/super-menu.txt +++ b/npc/commands/super-menu.txt @@ -56,7 +56,7 @@ function script SuperMenu { OnCall: - if (!debug && !is_gm()) { + if (!is_gm()) { dispbottom l("You do not have the required access privileges to use the Super Menu."); end; } -- cgit v1.2.3-60-g2f50