summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/002-1/dan.txt4
-rw-r--r--npc/commands/event.txt4
2 files changed, 5 insertions, 3 deletions
diff --git a/npc/002-1/dan.txt b/npc/002-1/dan.txt
index 179deab5a..15dddf6e0 100644
--- a/npc/002-1/dan.txt
+++ b/npc/002-1/dan.txt
@@ -89,6 +89,8 @@ OnInit:
// TODO this code below is bad and should be entirely rewritten
002-1,0,0,0 script PiouSpwn NPC_HIDDEN,{
function DanCheck {
+ if (getq(ShipQuests_Dan) != 1)
+ end;
.@t=getq2(ShipQuests_Dan);
if (.@t+1 >= 12) setq ShipQuests_Dan, 2, 0;
if (.@t+1 < 12) setq ShipQuests_Dan, 1, .@t+1;
@@ -121,7 +123,7 @@ OnRespawnPiou4:
OnRespawnPiou5:
if (getq(ShipQuests_Dan) == 1) DanCheck();
sleep 60000;
- areamonster(instance_mapname("002-3"), 31, 26, 40, 31, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou4");
+ areamonster(instance_mapname("002-3"), 31, 26, 40, 31, "Piou", 1002, 1, instance_npcname("PiouSpwn")+"::OnRespawnPiou5");
end;
OnInstanceInit:
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index 5f8313ac9..9082317a2 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -104,7 +104,7 @@ function script GlobalEventMenu {
l("Enable Refeer Program"), -;
switch (@menu) {
- case 1: set $EVENT$, ""; logmes "Disabled events.", LOGMES_ATCOMMAND;
+ case 1: set $EVENT$, "";$REFERRAL_ENABLED=0; logmes "Disabled events.", LOGMES_ATCOMMAND;
break;
case 2: sEaster(); break;
case 3:
@@ -115,7 +115,7 @@ function script GlobalEventMenu {
debugmes "Snakes are now dropping Pearls.";
*/
break;
- case 4: $EVENT$="Refeer"; logmes "Enabled REFEER event.", LOGMES_ATCOMMAND;
+ case 4: $EVENT$="Refeer";$REFERRAL_ENABLED=1; logmes "Enabled REFEER event.", LOGMES_ATCOMMAND;
break;
}