De-hardcode the battle configuration flags (BCONF)

Reason: Automatize and protect the EXP Bonus on TMW2 Day Event.

2 files changed, 14 insertions, 8 deletions

diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 907997b81..0e4ccd621 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -54,6 +54,12 @@ function	script	sClear	{
             enablenpc "Demure#ValentineFinal";
         }
 
+        // Longer EXP rate controls
+        if ($EVENT$ == "Anniversary") {
+            $BCONFB_EXPR-=50;
+            kamibroadcast("EXP Rate changed from %d%% to %d%%", $BCONFB_EXPR+50, $BCONFB_EXPR);
+        }
+
         // Simpler events
         $PATRICK_DAYCTRL=0;
         $PATRICK_DAYMAX=0;
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt
index 0a0e531ec..a0a0ac2dc 100644
--- a/npc/commands/rate-management.txt
+++ b/npc/commands/rate-management.txt
@@ -4,17 +4,17 @@
 
     function expRateReal {
         if (is_night())
-            return BCONFB_EXPR+BCONFN_EXPR;
+            return $BCONFB_EXPR+$BCONFN_EXPR;
         else
-            return BCONFB_EXPR+BCONFD_EXPR;
+            return $BCONFB_EXPR+$BCONFD_EXPR;
     }
 
     function expRecalc {
         .@val=getarg(0);
         if (is_night())
-            return .@val+BCONFN_EXPR;
+            return .@val+$BCONFN_EXPR;
         else
-            return .@val+BCONFD_EXPR;
+            return .@val+$BCONFD_EXPR;
     }
 
     function rateCleanUp {
@@ -193,17 +193,17 @@ OnInheirtedReload:
 
     function dropRateReal {
         if (is_night())
-            return BCONFB_DROP+BCONFN_DROP;
+            return $BCONFB_DROP+$BCONFN_DROP;
         else
-            return BCONFB_DROP+BCONFD_DROP;
+            return $BCONFB_DROP+$BCONFD_DROP;
     }
 
     function dropRecalc {
         .@val=getarg(0);
         if (is_night())
-            return .@val+BCONFN_DROP;
+            return .@val+$BCONFN_DROP;
         else
-            return .@val+BCONFD_DROP;
+            return .@val+$BCONFD_DROP;
     }
 
     function rateCleanUp {