summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/027-1_Graveyard/_mobs.txt10
-rw-r--r--npc/027-2_Caretakers_House/_import.txt1
-rw-r--r--npc/027-2_Caretakers_House/golbanez.txt11
-rw-r--r--npc/027-2_Caretakers_House/husband.txt9
-rw-r--r--npc/027-2_Caretakers_House/innkeeper.txt9
-rw-r--r--npc/027-2_Caretakers_House/lover.txt7
-rwxr-xr-xnpc/027-2_Caretakers_House/testnpcs.txt4
7 files changed, 21 insertions, 30 deletions
diff --git a/npc/027-1_Graveyard/_mobs.txt b/npc/027-1_Graveyard/_mobs.txt
index d0fa5ccd..bae992d0 100644
--- a/npc/027-1_Graveyard/_mobs.txt
+++ b/npc/027-1_Graveyard/_mobs.txt
@@ -85,10 +85,9 @@ _MOBCOUNT_ZOMBIES:
set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
if (@state != 1) return;
-// You have to kill 50?(or more?) zombies OR 50?(or more?) fallens. If you close the client, the @zombies count go back to zero.
- set @zombies, @zombies + 1;
+ set @bracelet, @bracelet + 1;
// TODO: set 1 to 10
- if (@zombies < 1) return;
+ if (@bracelet < 1) return;
// if (rand(8) != 0) return;
message strcharinfo(0), "You found a strange bracelet hidden in the zombie's rotten rags. Maybe this is what the Crying child was looking for...";
set @state, 2;
@@ -103,10 +102,9 @@ _MOBCOUNT_FALLENS:
set @state, ((QUEST_Graveyard_Inn & @Graveyard_Inn_MASK) >> @Graveyard_Inn_SHIFT);
if (@state != 1) return;
-// You have to kill 50?(or more?) fallens OR 50?(or more?) zombies. If you close the client, the @fallens count go back to zero.
- set @fallens, @fallens + 1;
+ set @bracelet, @bracelet + 1;
// TODO: set 1 to 10
- if (@fallens < 1) return;
+ if (@bracelet < 1) return;
// if (rand(8) != 0) return;
message strcharinfo(0), "You found a strange bracelet inside the fallen's broken helmet. Maybe this is what the Crying child was looking for...";
set @state, 2;
diff --git a/npc/027-2_Caretakers_House/_import.txt b/npc/027-2_Caretakers_House/_import.txt
index eb4196b3..bdea4bf2 100644
--- a/npc/027-2_Caretakers_House/_import.txt
+++ b/npc/027-2_Caretakers_House/_import.txt
@@ -4,6 +4,7 @@ npc: npc/027-2_Caretakers_House/_warps.txt
npc: npc/027-2_Caretakers_House/alacrius.txt
//npc: npc/027-2_Caretakers_House/alacrius2.txt
npc: npc/027-2_Caretakers_House/caretaker.txt
+npc: npc/027-2_Caretakers_House/evil_guard.txt
npc: npc/027-2_Caretakers_House/diary.txt
npc: npc/027-2_Caretakers_House/door.txt
npc: npc/027-2_Caretakers_House/golbanez.txt
diff --git a/npc/027-2_Caretakers_House/golbanez.txt b/npc/027-2_Caretakers_House/golbanez.txt
index b466bccf..36c68cac 100644
--- a/npc/027-2_Caretakers_House/golbanez.txt
+++ b/npc/027-2_Caretakers_House/golbanez.txt
@@ -20,13 +20,12 @@
set @husband, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Husband_MASK) >> @Graveyard_Inn_Husband_SHIFT);
- //TODO: determine sane values
set @ROTTENRAGS_AMOUNT, 50;
- set @ROTTENRAGS_EXP, 30000;
- set @UNDEADEAR_AMOUNT, 50;
- set @UNDEADEAR_EXP, 50000;
- set @UNDEADEYE_AMOUNT, 50;
- set @UNDEADEYE_EXP, 50000;
+ set @ROTTENRAGS_EXP, 100000;
+ set @UNDEADEAR_AMOUNT, 30;
+ set @UNDEADEAR_EXP, 150000;
+ set @UNDEADEYE_AMOUNT, 30;
+ set @UNDEADEYE_EXP, 150000;
if (@state >= 7) goto L_Done;
if (@state == 6) goto L_Soul;
diff --git a/npc/027-2_Caretakers_House/husband.txt b/npc/027-2_Caretakers_House/husband.txt
index 44b94f9f..9cfc3826 100644
--- a/npc/027-2_Caretakers_House/husband.txt
+++ b/npc/027-2_Caretakers_House/husband.txt
@@ -15,13 +15,12 @@
set @kidstate, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Kid_MASK) >> @Graveyard_Inn_Kid_SHIFT);
- //TODO: determine sane values
set @ICE_CUBE_AMOUNT, 100;
- set @ICE_CUBE_EXP, 10000;
+ set @ICE_CUBE_EXP, 75000;
set @BONE_AMOUNT, 100;
- set @SKULL_AMOUNT, 50;
- set @BONE_EXP, 30000;
- set @RUBY_AMOUNT, 20; // caution, this value needs to be the same as in the innkeepers script!
+ set @SKULL_AMOUNT, 75;
+ set @BONE_EXP, 100000;
+ set @RUBY_AMOUNT, 50; // caution, this value needs to be the same as in the innkeepers script!
if (@state >= 7) goto L_Thanks;
if (@state == 6) goto L_Apologize;
diff --git a/npc/027-2_Caretakers_House/innkeeper.txt b/npc/027-2_Caretakers_House/innkeeper.txt
index c0969998..1764da98 100644
--- a/npc/027-2_Caretakers_House/innkeeper.txt
+++ b/npc/027-2_Caretakers_House/innkeeper.txt
@@ -25,11 +25,10 @@
set @golbanez, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golbanez_MASK) >> @Graveyard_Inn_Golbanez_SHIFT);
- //TODO: determine sane values
- set @YETI_TEAR_AMOUNT, 10;
- set @YETI_TEAR_EXP, 60000;
- set @DIAMOND_AMOUNT, 10; // caution, this value needs to be the same as in the lovers script!
- set @RUBY_AMOUNT, 20; // caution, this value needs to be the same as in the husbands script!
+ set @YETI_TEAR_AMOUNT, 30;
+ set @YETI_TEAR_EXP, 100000;
+ set @DIAMOND_AMOUNT, 20; // caution, this value needs to be the same as in the lovers script!
+ set @RUBY_AMOUNT, 50; // caution, this value needs to be the same as in the husbands script!
if (@state >= 11) goto L_Happy;
if (@state == 10) goto L_Thanks;
diff --git a/npc/027-2_Caretakers_House/lover.txt b/npc/027-2_Caretakers_House/lover.txt
index c6d1d2ee..e11caf76 100644
--- a/npc/027-2_Caretakers_House/lover.txt
+++ b/npc/027-2_Caretakers_House/lover.txt
@@ -15,10 +15,9 @@
set @golbanez, ((QUEST_Graveyard_Inn & @Graveyard_Inn_Golbanez_MASK) >> @Graveyard_Inn_Golbanez_SHIFT);
- //TODO: determine sane values
- set @CRYSTAL_AMOUNT, 300; //200?
- set @CRYSTAL_EXP, 100000;
- set @DIAMOND_AMOUNT, 10; // caution, this value needs to be the same as in the innkeepers script!
+ set @CRYSTAL_AMOUNT, 500;
+ set @CRYSTAL_EXP, 200000;
+ set @DIAMOND_AMOUNT, 20; // caution, this value needs to be the same as in the innkeepers script!
if (@state >= 7) goto L_Have_Soul;
if (@state == 6) goto L_Want_Soul;
diff --git a/npc/027-2_Caretakers_House/testnpcs.txt b/npc/027-2_Caretakers_House/testnpcs.txt
index c126e58d..37421aa5 100755
--- a/npc/027-2_Caretakers_House/testnpcs.txt
+++ b/npc/027-2_Caretakers_House/testnpcs.txt
@@ -162,10 +162,6 @@ L_3:
close;
}
-027-2.gat,100,43,0 script Evil Guard 316,{
- end;
-}
-
027-2.gat,24,77,0 script Headless Man 318,{
end;
}