summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-01-26 00:59:38 -0300
committerJesusaves <cpntb1@ymail.com>2020-01-26 00:59:38 -0300
commita503be7ebdd9030406854c1d6f474cd001a112b9 (patch)
treeda0b735fd63f7cd5a9e8f0d4a9348c69955b0331
parentd7534c8fe946258a831b91ccf3099e4fcee5e688 (diff)
downloadserverdata-a503be7ebdd9030406854c1d6f474cd001a112b9.tar.gz
serverdata-a503be7ebdd9030406854c1d6f474cd001a112b9.tar.bz2
serverdata-a503be7ebdd9030406854c1d6f474cd001a112b9.tar.xz
serverdata-a503be7ebdd9030406854c1d6f474cd001a112b9.zip
Most immediate bugfixes needed
-rw-r--r--npc/002-3/nard.txt6
-rw-r--r--npc/commands/welcome.txt9
-rw-r--r--npc/magic/mpregen.txt (renamed from npc/magic/mpgen.txt)0
3 files changed, 14 insertions, 1 deletions
diff --git a/npc/002-3/nard.txt b/npc/002-3/nard.txt
index 9faca7429..46aedbbcd 100644
--- a/npc/002-3/nard.txt
+++ b/npc/002-3/nard.txt
@@ -94,6 +94,12 @@ L_Checker:
msObjective(Zeny >= .@price, l("* Collect @@/@@ GP", Zeny, .@price));
L_Referral:
+ // Welcome handling
+ if (!#REG_DATE) {
+ $@WELCOME_TIMER=gettimetick(2)+600; // 10 minutes
+ kamibroadcast("Hey, look, I've rescued \""+strcharinfo(0)+"\" from the sea! Who will @welcome them?!", "Nard");
+ #REG_DATE=gettimetick(2);
+ }
// Referral program
if (#REFERRAL_PROG == 0 && $REFERRAL_ENABLED) {
next;
diff --git a/npc/commands/welcome.txt b/npc/commands/welcome.txt
index fef83cc6b..44aa4bb9e 100644
--- a/npc/commands/welcome.txt
+++ b/npc/commands/welcome.txt
@@ -8,7 +8,13 @@
end;
OnCall:
- CMD_toevent();
+ if (!@toeventchk) {
+ @toeventval1=readparam(Hp);
+ @toeventval2=readparam(Sp);
+ @toeventchk=1;
+ specialeffect FX_CIRCLE, SELF, getcharid(3);
+ addtimer 4000, "@welcome::OnEffect";
+ }
end;
OnEffect:
@@ -35,6 +41,7 @@ OnEffect:
dispbottom l("You currently could not use GM MAGIC to visit Candor.");
atcommand "@refresh";
} else {
+ LOCATION$="Candor";
warp "005-1", 43, 99;
message strcharinfo(0), l("You are now at Candor.");
}
diff --git a/npc/magic/mpgen.txt b/npc/magic/mpregen.txt
index 1a45de552..1a45de552 100644
--- a/npc/magic/mpgen.txt
+++ b/npc/magic/mpregen.txt