Rebirth Season now improves Call of Dusty rewards

3 files changed, 16 insertions, 7 deletions

diff --git a/npc/001-10-1/scripts.txt b/npc/001-10-1/scripts.txt
index 080cae7c9..c23ba30af 100644
--- a/npc/001-10-1/scripts.txt
+++ b/npc/001-10-1/scripts.txt
@@ -46,6 +46,8 @@ OnReward2:
         setq2 LoFQuest_COD, getq2(LoFQuest_COD) + 1;
         getitem BottledDust, 1;
     }
+    if ($EVENT$ == "Rebirth")
+        getitem BottledDust, rand2(1,2);
     warp "018-2-1", 24, 29;
     specialeffect(FX_FANFARE, SELF, getcharid(3));
     end;
diff --git a/npc/001-10/scripts.txt b/npc/001-10/scripts.txt
index 305b29887..143f6b837 100644
--- a/npc/001-10/scripts.txt
+++ b/npc/001-10/scripts.txt
@@ -73,7 +73,7 @@ OnTouch:
 // Death handlers
 OnWLDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 20)
+        if (rand2(0,1000) <= (.chance/2))
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnWLDeath", 0, 0, 200, 150, 1, 1);
@@ -81,7 +81,7 @@ OnWLDeath:
 
 OnNDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnNDeath", 0, 10, 200, 25);
@@ -89,7 +89,7 @@ OnNDeath:
 
 OnSDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnSDeath", 0, 129, 200, 150);
@@ -97,7 +97,7 @@ OnSDeath:
 
 OnCDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnCDeath", 73, 45, 132, 86);
@@ -105,7 +105,7 @@ OnCDeath:
 
 OnWDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnWDeath", 10, 25, 72, 122);
@@ -113,7 +113,7 @@ OnWDeath:
 
 OnEDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnEDeath", 160, 45, 190, 130);
@@ -121,7 +121,7 @@ OnEDeath:
 
 OnDeath:
     if (playerattached()) {
-        if (rand2(0,1000) <= 40)
+        if (rand2(0,1000) <= .chance)
             getitem BottledDust, 1;
     }
     spawner("#CODMASTER::OnDeath");
@@ -142,6 +142,11 @@ OnInit:
     spawner("#CODMASTER::OnWDeath", 10, 25, 72, 122, 5);
     spawner("#CODMASTER::OnEDeath", 160, 45, 190, 130, 4);
 
+OnClock0059:
+    if ($EVENT$ == "Rebirth")
+        .chance=60;
+    else
+        .chance=40;
     end;
 }
 
diff --git a/npc/functions/news.txt b/npc/functions/news.txt
index 38120537f..970b1e3df 100644
--- a/npc/functions/news.txt
+++ b/npc/functions/news.txt
@@ -305,6 +305,8 @@ function	script	EventHelp	{
         mes "";
         mes l("During this season, monster point gain is increased in %d%%!", 10);
         mes l("Not only that, but reborn characters will spawn at level %d!", 3);
+        if (getq(LoFQuest_COD))
+         mes l("Call of Dusty event, in Land of Fire, also outputs more rewards.");
         mes "";
         mes l("Also: You'll be able to rebirth at Tulimshar with Jakod. What are you waiting for?!");
         mesc l("Location: Not applicable"), 3;