Modify how exp/drop rate bonuses are applied on weather change.

Objective: Have day/night bonuses persist GM modifications

2 files changed, 14 insertions, 12 deletions

diff --git a/db/constants.conf b/db/constants.conf
index f299b2ef0..2bc3649f4 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4441,14 +4441,16 @@ constants_db: {
 
 	comment__: "Configuration constants"
 	MAX_CYCLE_PC:   40
-    BCONFN_SPAWN: 70
-    BCONFD_SPAWN: 100
-    BCONFN_MOBHP: 100
-    BCONFD_MOBHP: 90
-    BCONFN_EXPR: 104
-    BCONFD_EXPR: 100
-    BCONFN_DROP: 107
-    BCONFD_DROP: 100
+	BCONFN_SPAWN: 70
+	BCONFD_SPAWN: 100
+	BCONFN_MOBHP: 100
+	BCONFD_MOBHP: 90
+	BCONFB_EXPR: 100
+	BCONFN_EXPR: 4
+	BCONFD_EXPR: 0
+	BCONFB_DROP: 100
+	BCONFN_DROP: 7
+	BCONFD_DROP: 0
 
 	comment__: "Maze Generator constants"
 	MAZEMAPTYPE_NULL:       0
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt
index a8df73380..a777bdc2b 100644
--- a/npc/commands/rate-management.txt
+++ b/npc/commands/rate-management.txt
@@ -4,9 +4,9 @@
 
     function expRateReal {
         if (is_night())
-            return BCONFN_EXPR;
+            return BCONFB_EXPR+BCONFN_EXPR;
         else
-            return BCONFD_EXPR;
+            return BCONFB_EXPR+BCONFD_EXPR;
     }
 
     function rateCleanUp {
@@ -177,9 +177,9 @@ OnReload:
 
     function dropRateReal {
         if (is_night())
-            return BCONFN_DROP;
+            return BCONFB_DROP+BCONFN_DROP;
         else
-            return BCONFD_DROP;
+            return BCONFB_DROP+BCONFD_DROP;
     }
 
     function rateCleanUp {