summaryrefslogtreecommitdiff
path: root/world/map/npc/018-2
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc/018-2')
-rw-r--r--world/map/npc/018-2/_mobs.txt2
-rw-r--r--world/map/npc/018-2/angus.txt2
-rw-r--r--world/map/npc/018-2/books.txt2
-rw-r--r--world/map/npc/018-2/caul.txt14
-rw-r--r--world/map/npc/018-2/miners.txt2
-rw-r--r--world/map/npc/018-2/receptionist.txt2
6 files changed, 7 insertions, 17 deletions
diff --git a/world/map/npc/018-2/_mobs.txt b/world/map/npc/018-2/_mobs.txt
index 8ff2d064..fb451a92 100644
--- a/world/map/npc/018-2/_mobs.txt
+++ b/world/map/npc/018-2/_mobs.txt
@@ -4,7 +4,7 @@
018-2,114,21,4,3|monster|YellowSlime|1007,1,100000ms,30000ms,Mob018-2::On1007
-018-2,0,0,0|script|Mob018-2|-1
+018-2,0,0,0|script|Mob018-2|32767
{
end;
diff --git a/world/map/npc/018-2/angus.txt b/world/map/npc/018-2/angus.txt
index 5b7dda85..e49d91ae 100644
--- a/world/map/npc/018-2/angus.txt
+++ b/world/map/npc/018-2/angus.txt
@@ -5,8 +5,6 @@
set @honorific$, "lad";
if (Sex == 0) set @honorific$, "lass";
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
if (@inspector == 10) goto L_NohMask;
diff --git a/world/map/npc/018-2/books.txt b/world/map/npc/018-2/books.txt
index cd8148c0..24624762 100644
--- a/world/map/npc/018-2/books.txt
+++ b/world/map/npc/018-2/books.txt
@@ -2,8 +2,6 @@
018-2,112,19,0|script|#Bookcase38|400,0,1
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
if (@inspector == 11) goto L_NohMask;
diff --git a/world/map/npc/018-2/caul.txt b/world/map/npc/018-2/caul.txt
index 5d53ba48..4709cfc9 100644
--- a/world/map/npc/018-2/caul.txt
+++ b/world/map/npc/018-2/caul.txt
@@ -9,8 +9,6 @@
018-2,37,22,0|script|Caul|107
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
set @SETZER_INITIAL, 0;
@@ -140,7 +138,7 @@ L_brew:
goto L_CraftLoop;
L_CraftLoop:
- set @throw, rand(readparam(bInt));
+ set @throw, rand(Int);
set @result, 1;
if (@throw >= 5) set @result, 2;
if (@throw >= 15) set @result, 3;
@@ -428,7 +426,7 @@ L_mo_random_1: // mode 1: remove colour
return;
L_mo_pc_bad:
- if (rand(readparam(bInt) + 100) > 60)
+ if (rand(Int + 100) > 60)
goto L_mo_pc_bad_ok;
if (@bubble_mode)
mes "As your leaf dissolves, the intensity of the bubbling increases.";
@@ -448,7 +446,7 @@ L_mo_pc_bad_ok:
L_mo_auto_bad:
if (rand(3) == 0)
goto L_Return;
- if (rand(readparam(bInt) + 100) > 70)
+ if (rand(Int + 100) > 70)
goto L_Return;
mes "The brew begins to bubble more violently.";
set @bubble_mode, @bubble_mode + 1;
@@ -461,11 +459,11 @@ L_mo_auto_bad:
L_mo_explode:
mes "[Exploding monster oil]";
mes "Your brew explodes!";
- if (rand(readparam(bAgi)) > 40)
+ if (rand(Agi) > 40)
goto L_mo_explode_dodge;
mes "The burst of boiling monster brew hits you.";
next;
- heal (15 * rand(readparam(bVit))) - 1500, 0, 1;
+ heal (15 * rand(Vit)) - 1500, 0, 1;
close;
L_mo_explode_dodge:
@@ -715,7 +713,7 @@ L_mopox_failed_hard:
mes "Suddenly, the thick mass bends outwards, a huge bubble bursting open right in your face!";
next;
- if (rand(readparam(bVit)) < 40)
+ if (rand(Vit) < 40)
sc_start sc_poison, 1, 20;
mes "[Brewing Mopox Cure]";
diff --git a/world/map/npc/018-2/miners.txt b/world/map/npc/018-2/miners.txt
index e29f15f6..29192eec 100644
--- a/world/map/npc/018-2/miners.txt
+++ b/world/map/npc/018-2/miners.txt
@@ -3,8 +3,6 @@
018-2,85,23,0|script|Malek|109
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
set @MIN_GEM_AMOUNT, 7;
diff --git a/world/map/npc/018-2/receptionist.txt b/world/map/npc/018-2/receptionist.txt
index 50143f2c..efac07d9 100644
--- a/world/map/npc/018-2/receptionist.txt
+++ b/world/map/npc/018-2/receptionist.txt
@@ -2,8 +2,6 @@
018-2,50,24,0|script|Receptionist#mine|108
{
- callfunc "ClearVariables";
-
set @inspector, ((QUEST_Hurnscald & NIBBLE_3_MASK) >> NIBBLE_3_SHIFT);
mes "[Receptionist]";