From ee5cfe47beaa845059109cb61045beba88a39dae Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 14 Feb 2018 23:20:28 -0200 Subject: Change all custom commands. Mostly logging and obfuscation. Remove some functions. --- npc/commands/debug-quest.txt | 2 +- npc/commands/debug-skill.txt | 2 +- npc/commands/debug.txt | 2 +- npc/commands/event.txt | 2 +- npc/commands/motd.txt | 5 +- npc/commands/music.txt | 2 +- npc/commands/rate-management.txt | 2 +- npc/commands/scheduled-broadcasts.txt | 3 +- npc/commands/super-menu.txt | 4 +- npc/commands/zeny.txt | 98 ----------------------------------- npc/scripts.conf | 2 +- 11 files changed, 15 insertions(+), 109 deletions(-) delete mode 100644 npc/commands/zeny.txt diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt index 15319fbc3..6042dcf57 100644 --- a/npc/commands/debug-quest.txt +++ b/npc/commands/debug-quest.txt @@ -165,5 +165,5 @@ OnCall: end; OnInit: - bindatcmd "qdebug", "@qdebug::OnCall", 0, 99, 1; + bindatcmd "qdebug", "@qdebug::OnCall", 99, 99, 1; } diff --git a/npc/commands/debug-skill.txt b/npc/commands/debug-skill.txt index 2e5393a49..2ad9859f7 100644 --- a/npc/commands/debug-skill.txt +++ b/npc/commands/debug-skill.txt @@ -77,5 +77,5 @@ OnCall: end; OnInit: - bindatcmd "sdebug", "@sdebug::OnCall", 0, 99, 0; + bindatcmd "sdebug", "@sdebug::OnCall", 0, 99, 1; } diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt index 193abb5b2..f65be4854 100644 --- a/npc/commands/debug.txt +++ b/npc/commands/debug.txt @@ -138,6 +138,6 @@ OnCall: end; OnInit: - bindatcmd "debug", "@debug::OnCall", 0, 99, 0; + bindatcmd "debug", "@debug::OnCall", 0, 99, 1; // TODO / FIXME: add a @test command that opens the help window for test-server } diff --git a/npc/commands/event.txt b/npc/commands/event.txt index db98bcf29..a78be0f83 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -53,5 +53,5 @@ OnCall: end; OnInit: - bindatcmd "event", "@event::OnCall", 0, 99, 0; + bindatcmd "event", "@event::OnCall", 99, 99, 0; } diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt index 9a9c702e1..6a6ba6123 100644 --- a/npc/commands/motd.txt +++ b/npc/commands/motd.txt @@ -40,6 +40,7 @@ function script MOTDConfig { .@size = getvariableofnpc(.size, "@motd"); $MOTD_Messages$[.@size] = .@s$; set getvariableofnpc(.size, "@motd"), getarraysize($MOTD_Messages$); + logmes "MOTD modified: line added"; // FIXME: log to GM log } } @@ -51,6 +52,7 @@ function script MOTDConfig { deletearray $MOTD_Messages$[.@l], 1; // remove and shift mes l("Line @@ has been removed.", .@l); set getvariableofnpc(.size, "@motd"), getarraysize($MOTD_Messages$); + logmes "MOTD modified: line removed"; // FIXME: log to GM log } @@ -83,6 +85,7 @@ function script MOTDConfig { if (.@s$ != "") { $MOTD_Messages$[.@l] = .@s$; + logmes "MOTD modified: line edited"; // FIXME: log to GM log } } @@ -189,5 +192,5 @@ OnInit: MOTD_debug_text; .size = getarraysize($MOTD_Messages$); .dsize = getarraysize($@Debug_Messages$); - bindatcmd "motd", "@motd::OnCall", 0, 99, 0; + bindatcmd "motd", "@motd::OnCall", 99, 99, 1; } diff --git a/npc/commands/music.txt b/npc/commands/music.txt index e794060fc..606b08ac7 100644 --- a/npc/commands/music.txt +++ b/npc/commands/music.txt @@ -35,7 +35,7 @@ OnCall: end; OnInit: - bindatcmd "music", "@music::OnCall", 0, 99, 1; + bindatcmd "music", "@music::OnCall", 80, 80, 1; .hash = htnew; // create hashtable htput(.hash, "forest", "bartk - in the forest of the birches"); diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt index 995ef940f..0928c576a 100644 --- a/npc/commands/rate-management.txt +++ b/npc/commands/rate-management.txt @@ -92,7 +92,7 @@ OnPCLoginEvent: end; OnInit: - bindatcmd "exprate", "@exprate::OnCall", 0, 99, 1; // change exp rate + bindatcmd "exprate", "@exprate::OnCall", 80, 80, 1; // change exp rate // WARNING: using @reloadscript will change the "original" value .original_exp_rate = getbattleflag("base_exp_rate"); diff --git a/npc/commands/scheduled-broadcasts.txt b/npc/commands/scheduled-broadcasts.txt index 6bfbf2935..38aa23b69 100644 --- a/npc/commands/scheduled-broadcasts.txt +++ b/npc/commands/scheduled-broadcasts.txt @@ -123,6 +123,7 @@ function script StoneBoard { { announce $@SCHED_Msg$, bc_all; } + logmes "Scheduled Broadcast: A new broadcast was added"; case 1: return; } @@ -221,5 +222,5 @@ OnPCLoginEvent: end; OnInit: - bindatcmd "sched", "@sched::OnCall", 0, 99, 0; + bindatcmd "sched", "@sched::OnCall", 80, 99, 1; } diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt index 5e5fb6f79..875111e38 100644 --- a/npc/commands/super-menu.txt +++ b/npc/commands/super-menu.txt @@ -61,6 +61,6 @@ OnPCLoginEvent: end; OnInit: - bindatcmd "super", "@super::OnCall", 0, 99, 0; - bindatcmd "numa", "@super::OnCall", 0, 99, 0; // alias for those used to TMW's @numa + bindatcmd "super", "@super::OnCall", 80, 99, 0; + bindatcmd "numa", "@super::OnCall", 80, 99, 0; // alias for those used to TMW's @numa } diff --git a/npc/commands/zeny.txt b/npc/commands/zeny.txt deleted file mode 100644 index 77f6d2dea..000000000 --- a/npc/commands/zeny.txt +++ /dev/null @@ -1,98 +0,0 @@ -// @esp atcommand -// changes the number of Esperin -// -// group lv: 3 -// group char lv: 99 -// log: True -// -// usage: -// @esp -// #esp "char" -// -// example: -// @esp +5 -// @esp -5 -// @esp +++ - -- script @esp 32767,{ - end; - -OnCall: - .@delta$ = .@atcmd_parameters$[0]; - - if (debug && startswith(.@delta$, "--")) - { - Zeny = 0; - if (.@delta$ == "---") - { - BankVault = 0; - } - } - else if (debug && (startswith(.@delta$, "++") || .@delta$ == "")) - { - Zeny = MAX_ZENY; - if (.@delta$ == "+++") - { - BankVault = MAX_BANK_ZENY; - } - } - else - { - .@d = atoi(.@delta$); - if (.@d < 0) - { - .@a = Zeny + .@d; // The amount of zeny remaining after - if (.@a < 0) // If we can't remove that much zeny, try removing from bank too - { - Zeny = 0; - .@b = BankVault + .@a; // amount remaining in bank after - if (.@b < 0) - { - BankVault = 0; - } - else - { - BankVault += .@a; - } - } - else // We can remove that much zeny - { - Zeny += .@d; - } - } - else - { - .@a = Zeny + .@d; // The amount of zeny after - if (.@a < 0 || .@a >= MAX_ZENY) // If we can't add that much zeny, try adding to bank - { - .@c = .@d - (.@a - Zeny); // the amount to put in bank - Zeny = MAX_ZENY; - .@b = BankVault + .@c; // amout in bank after - if (.@b < 0 || .@b == MAX_BANK_ZENY) - { - BankVault = MAX_BANK_ZENY; - } - else - { - BankVault += .@c; - } - } - else // We can add that much zeny - { - Zeny += .@d; - } - } - } - end; - -OnInit: - if (debug > 0) - { - bindatcmd "e", "@esp::OnCall", 0, 99, 0; - bindatcmd "esp", "@esp::OnCall", 0, 99, 0; - bindatcmd "money", "@esp::OnCall", 0, 99, 0; - end; - } - - bindatcmd "esp", "@esp::OnCall", 3, 99, 1; -} diff --git a/npc/scripts.conf b/npc/scripts.conf index 4dcf99a9a..830c121d1 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -90,7 +90,7 @@ // custom atcommands "npc/commands/music.txt", "npc/commands/warp.txt", -"npc/commands/zeny.txt", +//"npc/commands/zeny.txt", "npc/commands/motd-debug-text.txt", "npc/commands/motd.txt", "npc/commands/scheduled-broadcasts.txt", -- cgit v1.2.3-70-g09d2