System-based EXP UP events are now compatible with GM calls.

GM calls still override system-based experience changes.
New syntax for how system-based EXP UP events are to be used. Cap is x2.

1 files changed, 10 insertions, 10 deletions

diff --git a/npc/functions/siege.txt b/npc/functions/siege.txt
index ef14e6e51..95d16ebc2 100644
--- a/npc/functions/siege.txt
+++ b/npc/functions/siege.txt
@@ -433,9 +433,9 @@ OnRespawn:
 OnSergeantDeath:
     if ($GAME_STORYLINE == 2)
         $MK_TEMPVAR+=1;
-    getitem StrangeCoin, rand(1,5);
+    getitem StrangeCoin, rand2(1,5);
     announce("##2The Monster Sergeant was defeated by "+strcharinfo(0)+"!", bc_all);
-    $@EXP_EVENT=rand2(101, 103);
+    $@EXP_EVENT=rand2(1, 3);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
     end;
@@ -443,9 +443,9 @@ OnSergeantDeath:
 OnLieutenantDeath:
     if ($GAME_STORYLINE == 2)
         $MK_TEMPVAR+=3;
-    getitem StrangeCoin, rand(5,10);
+    getitem StrangeCoin, rand2(5,10);
     announce("##2The Monster Lieutenant was defeated by "+strcharinfo(0)+"!", bc_all);
-    $@EXP_EVENT=rand2(104, 106);
+    $@EXP_EVENT=rand2(4, 6);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
     end;
@@ -453,9 +453,9 @@ OnLieutenantDeath:
 OnCaptainDeath:
     if ($GAME_STORYLINE == 2)
         $MK_TEMPVAR+=5;
-    getitem StrangeCoin, rand(10,15);
+    getitem StrangeCoin, rand2(10,15);
     announce("##2The Monster Captain was defeated by "+strcharinfo(0)+"!", bc_all);
-    $@EXP_EVENT=rand2(107, 109);
+    $@EXP_EVENT=rand2(7, 9);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
     end;
@@ -463,10 +463,10 @@ OnCaptainDeath:
 OnColonelDeath:
     if ($GAME_STORYLINE == 2)
         $MK_TEMPVAR+=7;
-    getitem StrangeCoin, rand(15,20);
+    getitem StrangeCoin, rand2(15,20);
     $MOST_HEROIC$=strcharinfo(0);
     announce("##2The Monster Colonel was defeated by "+strcharinfo(0)+"!", bc_all);
-    $@EXP_EVENT=rand2(110, 112);
+    $@EXP_EVENT=rand2(10, 12);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
     end;
@@ -474,10 +474,10 @@ OnColonelDeath:
 OnGeneralDeath:
     if ($GAME_STORYLINE == 2)
         $MK_TEMPVAR+=9;
-    getitem StrangeCoin, rand(20,25);
+    getitem StrangeCoin, rand2(20,25);
     $MOST_HEROIC$=strcharinfo(0);
     announce("##2The Monster General was defeated by "+strcharinfo(0)+"!", bc_all);
-    $@EXP_EVENT=rand2(113, 115);
+    $@EXP_EVENT=rand2(13, 15);
     $@EXP_EVENT_TIME=1;
     donpcevent "@exprate::OnPlayerCall";
     end;