From 4af18cb0cc0b4c3930faa3f521b30b6a93a9dbaa Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 24 May 2019 00:53:36 -0300 Subject: More alpha bugs --- npc/commands/grantpower.txt | 2 +- npc/functions/main.txt | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'npc') diff --git a/npc/commands/grantpower.txt b/npc/commands/grantpower.txt index 0e678657c..ac48c10b7 100644 --- a/npc/commands/grantpower.txt +++ b/npc/commands/grantpower.txt @@ -11,7 +11,7 @@ OnCall: .@request$ = ""; .@request$ += implode(.@atcmd_parameters$, " "); if (is_admin()) { - if (.@request$ == "" && !$LEGENDARYINIT) { + if (!$LEGENDARYINIT) { inventoryplace Lightbringer, 3; // Script Handled: LB and AS getitembound DemureAxe, 1, 1; getitembound Tyranny, 1, 1; diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 3ac90ac61..6ebaf0e96 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -347,11 +347,13 @@ function script Exception { if (.@gf & RB_GLOBALANNOUNCE) announce("Error in script: "+.@msg$, bc_all); - if (.@gf & RB_PLEASEREPORT|RB_DISPBOTTOM) - dispbottom("Please take a screenshot and report this bug, explaining how it happened."); + if (.@gf & RB_PLEASEREPORT) { + if (.@gf & RB_DISPBOTTOM) + dispbottom("Please take a screenshot and report this bug, explaining how it happened."); - if (.@gf & RB_PLEASEREPORT|RB_SPEECH) - mesc("Please take a screenshot and report this bug, explaining how it happened."), 1; + if (.@gf & RB_SPEECH) + mesc("Please take a screenshot and report this bug, explaining how it happened."), 1; + } if (.@gf & RB_ISFATAL) { if (.@gf & RB_SPEECH) { -- cgit v1.2.3-70-g09d2