diff options
31 files changed, 68 insertions, 54 deletions
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt index a53970771..3a315b107 100644 --- a/npc/000-0/sailors.txt +++ b/npc/000-0/sailors.txt @@ -153,7 +153,7 @@ OnForceReset: freeloop(false); setq ShipQuests_Arpan, 5; setq General_Narrator, 21; - debugmes "New account: %d (%s)", getcharid(3), getcharip(); + consoleinfo "New account: %d (%s)", getcharid(3), getcharip(); if (array_find($@IPBLIST$, getcharip()) >= 0) #TUTORIAL_DONE=true; else diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt index 99e25102b..b5525ec17 100644 --- a/npc/003-2/lua.txt +++ b/npc/003-2/lua.txt @@ -74,6 +74,7 @@ L_GMItems: getitembound GMCap, 1, 1; logmes(strcharinfo(0)+" just took a GM set."); logmes(strcharinfo(0)+" just took a GM set.", LOGMES_ATCOMMAND); + consoleinfo("%s retrieved a GM set.", strcharinfo(0)); mes ""; mesn; mesq lg("Here they are, miss.", "Here they are, mister."); @@ -163,6 +164,7 @@ L_NewHero: input .@MH$; logmes "Changing hero from "+$MOST_HEROIC$+" to "+.@MH$; logmes(strcharinfo(0)+" changed the world's hero ("+$MOST_HEROIC$+"->"+.@MH$+")", LOGMES_ATCOMMAND); + consoleinfo("%s changed the world hero.", strcharinfo(0)); $MOST_HEROIC$ = .@MH$; goto L_Menu; diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt index f03e23977..e9977201d 100644 --- a/npc/003-4/sorfina.txt +++ b/npc/003-4/sorfina.txt @@ -65,7 +65,7 @@ L_OpenDoors: setq TulimsharQuest_Hasan, 3, .@INSTID, santime()+300; // Debug - if (.@instanceMapName$ == "") debugmes "Error: Map 003-4-1 X failed"; + if (.@instanceMapName$ == "") consolewarn "Error: Map 003-4-1 X failed"; debugmes "Created map: "+ str(.@instanceMapName$); // You have 5 minutes to complete the quest. diff --git a/npc/003-8/craft.txt b/npc/003-8/craft.txt index fc1c2acc4..f5bd7a49a 100644 --- a/npc/003-8/craft.txt +++ b/npc/003-8/craft.txt @@ -16,6 +16,7 @@ mesc l("WARNING, you have been detected cheating and thus, violating Tulimshar Anti-Theft Policy."), 1; mesc l("You were jailed and now need a GM to get you out of there."), 1; logmes "WARNING, "+strcharinfo(0)+" found out cheating, only had "+Zeny+"/600 GP for craft table. Jailed.", LOGMES_ATCOMMAND; + consoleinfo("%s jailed - no money when crafting.", strcharinfo(0)); atcommand("@jail "+strcharinfo(0)); // Apply a more realistic penalty Zeny=0; diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt index 9e5b1882f..04c80a2ae 100644 --- a/npc/014-4/kamelot.txt +++ b/npc/014-4/kamelot.txt @@ -213,7 +213,7 @@ OnDebug: setpcblock(PCBLOCK_HARD, false); } else { unitwarp(getcharid(3), .@t$, .@x[.@v], .@y[.@v]); // And good luck D: - debugmes "FATAL: Could not attach: %d", getcharid(3); + consolebug "FATAL: Could not attach: %d", getcharid(3); } break; } diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt index 8cddb6f34..d1273a87b 100644 --- a/npc/016-6/main.txt +++ b/npc/016-6/main.txt @@ -39,7 +39,7 @@ L_Nival: goto L_CleanUp; L_Error: - debugmes "ERROR: PLAYER INVALID PC_DEST ON #MarineShip: " + PC_DEST$; + consolebug "ERROR: PLAYER INVALID PC_DEST ON #MarineShip: " + PC_DEST$; PC_DEST$ = ""; @timer_navio_running = 0; warp "000-1", 22, 22; diff --git a/npc/018-7-1/demure.txt b/npc/018-7-1/demure.txt index 0cf6f8bec..112c820cf 100644 --- a/npc/018-7-1/demure.txt +++ b/npc/018-7-1/demure.txt @@ -126,7 +126,7 @@ OnBeet: OnYeti: OnDem2: if (!playerattached()) { - debugmes "ERROR - PLAYER NOT ATTACHED, INVALID KILL, CANNOT RESOLVE MAP."; + consolebug "ERROR - PLAYER NOT ATTACHED, INVALID KILL, CANNOT RESOLVE MAP."; end; } .@m$ = getmap(); @@ -154,7 +154,7 @@ OnBye: // FIXME: @d_* might not be set OnDem1: if (!playerattached()) { - debugmes "ERROR - PLAYER NOT ATTACHED, INVALID KILL, CANNOT RESOLVE MAP."; + consolebug "ERROR - PLAYER NOT ATTACHED, INVALID KILL, CANNOT RESOLVE MAP."; end; } getmapxy(.@m$, .@x, .@y, 0); diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt index 2d6084b34..d257c3e16 100644 --- a/npc/042-10/ctrl.txt +++ b/npc/042-10/ctrl.txt @@ -307,7 +307,7 @@ OnTimer60000: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to recharge katazuli for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to recharge katazuli for Kamelot %s", .map$; .@g=0; } @@ -390,7 +390,7 @@ OnTimer60000: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to recharge katazuli for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to recharge katazuli for Kamelot %s", .map$; .@g=0; } @@ -604,7 +604,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } KamelotCaveSpawn(1, 20, 20, 160, 140, $KAMELOT_MX[.@g]+10, .@map$[0]); @@ -614,7 +614,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; .@g=0; } .@pc=$KAMELOT_PC[.@g]+1; diff --git a/npc/042-11/boss.txt b/npc/042-11/boss.txt index 6346693f8..5457d6804 100644 --- a/npc/042-11/boss.txt +++ b/npc/042-11/boss.txt @@ -111,7 +111,7 @@ OnTimer5000: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to find Terogan - Kamelot %s", .map$; + consolebug "[ERROR] [KAMELOT] Unable to find Terogan - Kamelot %s", .map$; .@g=0; } @@ -165,7 +165,7 @@ OnKillBoss: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to find Terogan Death %s", .map$; + consolebug "[ERROR] [KAMELOT] Unable to find Terogan Death %s", .map$; .@g=0; } .@m$=.map$; diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt index 524cdb99d..b3adb1257 100644 --- a/npc/042-2/boss.txt +++ b/npc/042-2/boss.txt @@ -303,7 +303,7 @@ OnTimer1015000: setpcblock(PCBLOCK_HARD, false); } else { unitwarp(.@unt[.@i], .@t$, .@x[.@v], .@y[.@v]); // And good luck D: - debugmes "FATAL: Could not attach: %d", .@unt[.@i]; + consolebug "FATAL: Could not attach: %d", .@unt[.@i]; } } $KAMELOT_QUEST[.@g]=$KAMELOT_QUEST[.@g]|4; // This part is complete diff --git a/npc/042-3/jail.txt b/npc/042-3/jail.txt index 89cab955b..d41c33e67 100644 --- a/npc/042-3/jail.txt +++ b/npc/042-3/jail.txt @@ -12,7 +12,7 @@ OnKillSlime: debugmes "Slime slain"; if (!playerattached()) { - debugmes "[ERROR] Player not Attached on Slime Death D:"; + consolewarn "[ERROR] Player not Attached on Slime Death D:"; debugmes "[ERROR] Cannot retrieve coordinates!!"; } if (@lockpicks) @@ -30,7 +30,7 @@ OnFirstSlime: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -38,7 +38,7 @@ OnFirstSlime: // let's not trust .name$ .@label$="#KSlimeSpawn::OnKillSlime"; if (!playerattached()) { - debugmes "[ERROR] Player not Attached on Slime Spawn D:"; + consolewarn "[ERROR] Player not Attached on Slime Spawn D:"; debugmes "[ERROR] Cannot retrieve coordinates!!"; } getmapxy(.@m$, .@x, .@y, 0); diff --git a/npc/042-4/ctrl.txt b/npc/042-4/ctrl.txt index 8be05eb17..4bea94407 100644 --- a/npc/042-4/ctrl.txt +++ b/npc/042-4/ctrl.txt @@ -25,7 +25,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -63,7 +63,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } monster0424(1, 20, 20, 115, 100, $KAMELOT_MX[.@g]); diff --git a/npc/042-5/ctrl.txt b/npc/042-5/ctrl.txt index e81476d17..b0e301913 100644 --- a/npc/042-5/ctrl.txt +++ b/npc/042-5/ctrl.txt @@ -18,7 +18,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -57,7 +57,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } monster0425(1, 20, 20, 80, 120, $KAMELOT_MX[.@g]); diff --git a/npc/042-6/ctrl.txt b/npc/042-6/ctrl.txt index 5ae91ade2..819d8d808 100644 --- a/npc/042-6/ctrl.txt +++ b/npc/042-6/ctrl.txt @@ -23,7 +23,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -88,7 +88,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } KamelotCaveSpawn(1, 20, 20, 115, 100, $KAMELOT_MX[.@g], "042-6"); diff --git a/npc/042-7/ctrl.txt b/npc/042-7/ctrl.txt index d9df13dac..66f211a8d 100644 --- a/npc/042-7/ctrl.txt +++ b/npc/042-7/ctrl.txt @@ -23,7 +23,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -88,7 +88,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } KamelotCaveSpawn(1, 20, 20, 115, 100, $KAMELOT_MX[.@g], "042-7"); diff --git a/npc/042-8/ctrl.txt b/npc/042-8/ctrl.txt index fd46570ea..380092c2e 100644 --- a/npc/042-8/ctrl.txt +++ b/npc/042-8/ctrl.txt @@ -23,7 +23,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -88,7 +88,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } KamelotCaveSpawn(1, 20, 20, 115, 100, $KAMELOT_MX[.@g], "042-8"); diff --git a/npc/042-9/ctrl.txt b/npc/042-9/ctrl.txt index 0cb83c9cc..403c159dc 100644 --- a/npc/042-9/ctrl.txt +++ b/npc/042-9/ctrl.txt @@ -23,7 +23,7 @@ OnInstanceInit: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to spawn for Kamelot %s", .map$; debugmes "[ERROR] [KAMELOT] Using dummy data (returned: %d)", .@g; .@g=0; } @@ -87,7 +87,7 @@ OnRespawn: explode(.@map$, .map$, "@"); .@g=atoi(.@map$[1]); if (.@g < 1) { - debugmes "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; + consolewarn "[ERROR] [KAMELOT] Unable to respawn for Kamelot %s", .map$; .@g=0; } KamelotCaveSpawn(1, 20, 20, 115, 100, $KAMELOT_MX[.@g], "042-9"); diff --git a/npc/commands/discord.txt b/npc/commands/discord.txt index 9e65fab81..0de4b9ca0 100644 --- a/npc/commands/discord.txt +++ b/npc/commands/discord.txt @@ -101,11 +101,12 @@ OnCall: // Send to API and update cache api_send(API_DISCORD, .@p$); htput(.discmem, str(getcharid(3)), .@discord$); + consoleinfo("%s linked discord account \"%s\".", strcharinfo(0), .@discord$); // Prevent changing for the next 3 days - DISCTRL=gettimeparam(GETTIME_DAYOFMONTH)+3; + DISCTRL=gettimeparam(GETTIME_DAYOFMONTH)+2; mesc l("Linking requested."), 1; - mesc l("This setting can only be changed every %d days.", 3), 1; + mesc l("This setting can only be changed every %d days.", 2), 1; break; ///////////////////////////////////////////////////////////////////// case 2: @@ -117,6 +118,7 @@ OnCall: htput(.discmem, str(getcharid(3)), ""); // TODO: Remove Adventurer role? logmes(sprintf("User %d \"%s\" unlinked Discord account!", getcharid(3), strcharinfo(0))); + consoleinfo("%s removed Discord account.", strcharinfo(0)); break; } diff --git a/npc/commands/grantpower.txt b/npc/commands/grantpower.txt index 1f867f6e4..2141495d6 100644 --- a/npc/commands/grantpower.txt +++ b/npc/commands/grantpower.txt @@ -57,6 +57,7 @@ OnCall: if (attachrid(.@id)) { getitembound .@ite, 1, 1; // Account bound or char bound? (1 or 4) dispbottom l("You received the @@ from @@.", getitemlink(.@ite), strcharinfo(0, "someone", .@ori)); + consoleinfo("%s is the new owner for the %s.", strcharinfo(0), getitemname(.@ite)); detachrid(); attachrid(.@ori); delitem .@ite, 1; @@ -89,6 +90,7 @@ function legendaryAPIWarning { .@nb = query_sql("SELECT email FROM `login` WHERE `account_id` == "+.@aid+" LIMIT 1", .@email$); .@msg$=sprintf("[\"%s\", \"Good evening!\nYou have been inactive for a week on Moubootaur Legends.\n\nYou are currently possessing a Legendary Weapon.\nIf you do not login within seven days, your legendary weapon will be returned so the player community can obtain it again.\n\nYour TMW2 Team\", \"Legendary item expiration notice\"]", .@email$); debugmes .@msg$; + consoleinfo("%d notified for Legendary weapon inactivity. (L:2)", .@aid); api_send(API_SENDMAIL, .@msg$); return; } @@ -96,6 +98,7 @@ function legendaryAPIWarning { function legendaryRodexWarning { .@cid=getarg(0); rodex_sendmail(.@cid, "Legendary Weapon", "Inactivity Warning", "You have not logged in the past 2 days. Shall you fail to login for 15 days, the weapon will be destroyed!"); + consoleinfo("%d notified for Legendary weapon inactivity. (L:1)", .@cid); return; } diff --git a/npc/commands/ipcheck.txt b/npc/commands/ipcheck.txt index 8928474d9..f24acf010 100644 --- a/npc/commands/ipcheck.txt +++ b/npc/commands/ipcheck.txt @@ -32,6 +32,7 @@ OnBan: sleep2(200); query_sql "INSERT INTO ipbanlist (list,btime,rtime,reason) VALUES ('"+getcharip(.@target$)+"','"+gettime(7)+"-"+gettime(6)+"-"+gettime(5)+" "+gettime(3)+":"+gettime(2)+":"+gettime(1)+"','2030-01-01 00:00:00','"+.@reason$+"')"; logmes("was IP-Blocked, and will never connect again."), LOGMES_ATCOMMAND; + consoleinfo("%s was IP-Banned from the server. (R: %s)", .@target$, .@reason$); sleep2(2000); charcommand("@kick "+.@target$); end; diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt index ba01743b3..e20d4501c 100644 --- a/npc/commands/super-menu.txt +++ b/npc/commands/super-menu.txt @@ -101,6 +101,7 @@ OnGM: if (.@auth) { announce strcharinfo(0)+" has just logged in services.", bc_all; logmes strcharinfo(0)+" : GM login.", LOGMES_ATCOMMAND; + consoleinfo("%s changed from PC to GM.", strcharinfo(0)); } else { logmes strcharinfo(0)+" : GM Authentication failed.", LOGMES_ATCOMMAND; } @@ -109,6 +110,7 @@ OnGM: OnGMOff: if (is_staff()) { logmes strcharinfo(0)+" : GM logout.", LOGMES_ATCOMMAND; + consoleinfo("%s changed from GM to PC.", strcharinfo(0)); setgroupid(1); } end; diff --git a/npc/commands/ucp.txt b/npc/commands/ucp.txt index 40f8ebaf3..c7f92d906 100644 --- a/npc/commands/ucp.txt +++ b/npc/commands/ucp.txt @@ -59,6 +59,7 @@ function script UserCtrlPanel { "accid", getcharid(3), "pin", rand2(10000)); debugmes .@msg$; + consoleinfo("%s requested a PinCode.", strcharinfo(0)); api_send(API_PINCODE, .@msg$); #FIRST_TIME=2; mesc l("PinCode created, an email should arrive within 15 minutes."), 3; diff --git a/npc/config/magic.txt b/npc/config/magic.txt index 9a0001bb7..c0d0fe0a2 100644 --- a/npc/config/magic.txt +++ b/npc/config/magic.txt @@ -109,7 +109,7 @@ function script SummonMagic { .@lv=getarg(3,getskilllv(.@sk)); if (.@adj < 1) { - debugmes "\033[31mInvalid MobPerSkillLevel for SummonMagic (.@adj): "+.@adj+"\033[0m"; + consolewarn "\033[31mInvalid MobPerSkillLevel for SummonMagic (.@adj): "+.@adj+"\033[0m"; dispbottom l("Invalid parameter specified, blame saulc."); end; } diff --git a/npc/craft/recipes.txt b/npc/craft/recipes.txt index 357fd363c..0f8278a06 100644 --- a/npc/craft/recipes.txt +++ b/npc/craft/recipes.txt @@ -58,7 +58,7 @@ function showRecipe { if (.@item <= 0) { // target item not found - debugmes("ERROR, INVALID ITEM ID DETECTED at showRecipe"); + consolebug("ERROR, INVALID ITEM ID DETECTED at showRecipe"); continue; } diff --git a/npc/functions/estate.txt b/npc/functions/estate.txt index 6f8c2acfd..445f672ff 100644 --- a/npc/functions/estate.txt +++ b/npc/functions/estate.txt @@ -88,7 +88,7 @@ function script realestate_hasmobilia { case 6: return $ESTATE_MOBILIA_2[getarg(0)] & getarg(2); default: - debugmes("[ERROR] [CRITICAL] [REAL ESTATE]: Object %d have Invalid Collision Type: %d (must range 1~6)", getarg(2), getarg(1)); + consolebug("[ERROR] [CRITICAL] [REAL ESTATE]: Object %d have Invalid Collision Type: %d (must range 1~6)", getarg(2), getarg(1)); return false; } return false; diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 3e0086371..9efcd68e8 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -467,7 +467,7 @@ OnClock0000: .@d=$@DEBUG_OD; if ($@DEBUG_OM) .@m=$@DEBUG_OM; - debugmes "EVENT CORE, the %02d/%02d", .@d, .@m; + consoleinfo "EVENT CORE, the %02d/%02d", .@d, .@m; // Is there another event this week? if (!$HARDCORE && .@o == MONDAY && !.@isinit) { diff --git a/npc/functions/main.txt b/npc/functions/main.txt index e28de3b8d..787c230a1 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -439,7 +439,8 @@ function script Exception { dispbottom("ERROR: "+.@msg$); if (.@gf & RB_DEBUGMES) - debugmes("[Warning] "+.@msg$); + consolewarn(.@msg$); + //debugmes("[Warning] "+.@msg$); if (.@gf & RB_SPEECH) mesc("ERROR, REPORT ME! "+.@msg$, 1); @@ -463,7 +464,8 @@ function script Exception { dispbottom("This error is fatal, we stop execution."); if (.@gf & RB_DEBUGMES) - debugmes("[Error] The error is fatal."); + consolebug("Previous warning was fatal, halting execution."); + //debugmes("[Error] The error is fatal."); if (.@gf & RB_SPEECH) { mesc l("This error is fatal, we stop execution."), 1; diff --git a/npc/functions/npcmovegraph.txt b/npc/functions/npcmovegraph.txt index 0877b7487..1391e0d72 100644 --- a/npc/functions/npcmovegraph.txt +++ b/npc/functions/npcmovegraph.txt @@ -35,12 +35,12 @@ function script initmovegraph { function script findmovegraphlabel { if (!getargcount()) { - debugmes "findmovegraphlabel: no argument"; + consolebug "findmovegraphlabel: no argument"; return -1; } if (!isstr(getarg(0))) { - debugmes "findmovegraphlabel: need string argument"; + consolebug "findmovegraphlabel: need string argument"; return -1; } @@ -144,7 +144,7 @@ function script execmovecmd { } else { - debugmes "execmovecmd: unknown WARP destination label: " + .@cmd$[1]; + consolewarn "execmovecmd: unknown WARP destination label: " + .@cmd$[1]; } } else if (.@cmd$[0] == "call") @@ -152,7 +152,7 @@ function script execmovecmd { switch (getarraysize(.@cmd$)) { case 1: - debugmes "execmovecmd: CALL command needs some parameters"; + consolewarn "execmovecmd: CALL command needs some parameters"; return 0; case 2: return callfunc(.@cmd$[1]); @@ -175,7 +175,7 @@ function script execmovecmd { if (.@msg$ != "" && .@msg$ != " ") npctalk .@msg$; else - debugmes "Invalid message passed to execmovecmd/npctalk"; + consolewarn "Invalid message passed to execmovecmd/npctalk"; } else if (.@cmd$[0] == "debugmes") { @@ -200,7 +200,7 @@ function script execmovecmd { } else { - debugmes "Unknown move graph cmd: " + .@cmd$[0]; + consolebug "Unknown move graph cmd: " + .@cmd$[0]; } return 0; } @@ -230,7 +230,7 @@ function script getnextmovecmd { function script getrandompoint { if (getargcount() < 4) { - debugmes "error: getrandompoint(x1, y1, x2, y2) takes 4 arguments"; + consolebug "error: getrandompoint(x1, y1, x2, y2) takes 4 arguments"; return -1; } @@ -268,7 +268,7 @@ function script getrandompoint { goto L_Found; // finally, if we don't find anything - debugmes "error: getrandompoint: cannot find walkable cell in rectangle [(" + .@x1 + "," + .@y1 + ") , (" + .@x2 + "," + .@y2 + ")]"; + consolebug "error: getrandompoint: cannot find walkable cell in rectangle [(" + .@x1 + "," + .@y1 + ") , (" + .@x2 + "," + .@y2 + ")]"; return -1; L_Found: @@ -286,7 +286,7 @@ L_Found: function script mg_npcwalkto { if (getargcount() < 2) { - debugmes "usage: mg_npcwalkto(x1,y1[,x2,y2])"; + consolebug "usage: mg_npcwalkto(x1,y1[,x2,y2])"; return -1; } diff --git a/npc/functions/util.txt b/npc/functions/util.txt index 420c856f2..a276cd541 100644 --- a/npc/functions/util.txt +++ b/npc/functions/util.txt @@ -18,7 +18,7 @@ function script DelItemFromEveryPlayer { query_sql("DELETE FROM `guild_storage` WHERE `nameid`="+getarg(0)); query_sql("DELETE FROM `rodex_items` WHERE `nameid`="+getarg(0)); query_sql("DELETE FROM `auction` WHERE `nameid`="+getarg(0)); - debugmes "Deleting item %d", getarg(0); + consolewarn "Deleting item %d", getarg(0); // Del items which SQL can't reach .@c = getunits(BL_PC, .@players, MAX_CYCLE_PC); @@ -105,7 +105,7 @@ function script DelQuestFromEveryPlayer { function script ReplaceItemFromEveryPlayer { if (getarg(0, -1) < 0) return; - debugmes("* Server update: %d item was replaced by %d", getarg(0), getarg(1)); + consoleinfo("* Server update: %d item was replaced by %d", getarg(0), getarg(1)); query_sql("UPDATE `inventory` SET `nameid`='"+getarg(1)+"' WHERE `nameid`="+getarg(0)); query_sql("UPDATE `cart_inventory` SET `nameid`='"+getarg(1)+"' WHERE `nameid`="+getarg(0)); query_sql("UPDATE `storage` SET `nameid`='"+getarg(1)+"' WHERE `nameid`="+getarg(0)); @@ -120,7 +120,7 @@ function script ReplaceItemFromEveryPlayer { function script ReplaceSkillFromEveryPlayer { if (getarg(0, -1) < 0) return; - debugmes("* Server update: skill %d was replaced by %d", getarg(0), getarg(1)); + consoleinfo("* Server update: skill %d was replaced by %d", getarg(0), getarg(1)); // If new ID already exists, it will skip query_sql("UPDATE IGNORE `skill` SET `id`='"+getarg(1)+"' WHERE `id`="+getarg(0)); return; @@ -625,8 +625,8 @@ function script nard_time { } // Error - debugmes "ERROR, INVALID LOCATION AND DESTINATION"; - debugmes l("@@ -> @@", LOCATION$, getarg(0)); + consolewarn "ERROR, INVALID LOCATION AND DESTINATION"; + consolewarn("%s -> %s", LOCATION$, getarg(0)); dispbottom l("An error on your travel time happened. Please report."); return INT_MAX; } @@ -1110,7 +1110,7 @@ function script teleporthome { if (.@i >= 0) EnterTown($@LOCMASTER_LOC$[.@i]); else - debugmes("[ERROR] Invalid Town Map for Time Flask: %s", getmap()); + consolewarn("[ERROR] Invalid Town Map for Time Flask: %s", getmap()); return; } diff --git a/npc/functions/vault.txt b/npc/functions/vault.txt index 2911a47c1..78eb5e7db 100644 --- a/npc/functions/vault.txt +++ b/npc/functions/vault.txt @@ -19,7 +19,7 @@ function script getvaultexp { RB_DEBUGMES | RB_IRCBROADCAST | RB_GLOBALANNOUNCE | RB_ISFATAL); if (getvaultid()) { ##VAULT_EXP+=.@exp; - debugmes("Granting %d Soul Exp to %d under the Moubootaur's authority.", + consoleinfo("Granting %d Soul Exp to %d under the Moubootaur's authority.", .@exp, ##VAULT); } return; diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 596f1bde1..91e9bfe5e 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -104,7 +104,7 @@ OnInit: htput(.wcore, "011-3", "special"); - debugmes "[Weather.sys] Total Maps = " + htsize(.wcore); + consoleinfo "[Weather.sys] Total Maps = " + htsize(.wcore); // No "end" here, so server starts with weather OnMinute00: OnMinute15: @@ -178,7 +178,7 @@ OnMinute45: .@mk=.@mk|MASK_MATTACK; } else { - debugmes "Warning warning, blame Saulc! Weather system error on map "+.@key$; + consolebug "Warning warning, blame Saulc! Weather system error on map "+.@key$; announce("ERROR BLAME SAULC! WEATHER SYSTEM CORRUPTED.", bc_all); } |