summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-25 02:06:50 -0300
committerJesusaves <cpntb1@ymail.com>2020-04-25 02:06:50 -0300
commit9a5dbf071df9b07d2189f1ae7a7e6d268b2f0450 (patch)
tree06579cb267fe379aeb4259a41cd29639392d973a
parent4ec8af5bc61389b677b01a7f5db6addc6b2c5897 (diff)
downloadserverdata-9a5dbf071df9b07d2189f1ae7a7e6d268b2f0450.tar.gz
serverdata-9a5dbf071df9b07d2189f1ae7a7e6d268b2f0450.tar.bz2
serverdata-9a5dbf071df9b07d2189f1ae7a7e6d268b2f0450.tar.xz
serverdata-9a5dbf071df9b07d2189f1ae7a7e6d268b2f0450.zip
Instance ID resets with server, so make it temporary anyway
-rw-r--r--npc/014-4/kamelot.txt11
-rw-r--r--npc/042-0/arthur.txt4
2 files changed, 7 insertions, 8 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index 4c88c5206..700d52829 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -7,7 +7,7 @@
// Controls the weekly guild dungeon feature.
// Variable structure:
-// $KAMELOT_ID [ guild_id ] = instance id
+// $@KAMELOT_ID [ guild_id ] = instance id
// $KAMELOT_QUEST [ guild_id ] = quest status (bitmask)
// 0 - Not started
// 1 - Quest Assigned by Arthur (new players cannot enter anymore)
@@ -29,7 +29,7 @@
// KamelotCleanup(guildid)
function script KamelotCleanup {
.@g=getarg(0);
- //$KAMELOT_ID[.@g]=0;
+ //$@KAMELOT_ID[.@g]=0;
$KAMELOT_QUEST[.@g]=0;
$KAMELOT_KEYMASK[.@g]=0;
return;
@@ -65,7 +65,7 @@ OnTouch:
}
// Build instance if it doesn't exists or has been reallocated
- if (instanceowner($KAMELOT_ID[.@g]) != .@g) {
+ if (instanceowner($@KAMELOT_ID[.@g]) != .@g) {
debugmes "Creating Instance for guild %d", .@g;
.@inst=instance_create("Kamelot@"+.@g, .@g, IOT_GUILD);
if (.@inst < 0)
@@ -84,11 +84,10 @@ OnTouch:
instance_attachmap("042-11", .@inst, .@g, "042-11@"+.@g);
instance_set_timeout(0, 0, .@inst);
instance_init(.@inst);
- $KAMELOT_ID[.@g] = .@inst;
+ $@KAMELOT_ID[.@g] = .@inst;
}
- // You can enter in every other stage
- dispbottom l("Advised Raid Party: One Thief, one Mage");
+ // You can enter in every other state
if (is_admin())
warp "042-0@"+.@g, any(59, 60), 80;
end;
diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt
index 72f99f8f5..984f0b28c 100644
--- a/npc/042-0/arthur.txt
+++ b/npc/042-0/arthur.txt
@@ -12,6 +12,7 @@
if (.@pos > GPOS_VICELEADER) goto L_Refusal;
if (!$KAMELOT_COOLDOWN[.@g]) goto L_Tutorial;
if ($KAMELOT_QUEST[.@g] & 1) goto L_Progress;
+ // TODO: Curse lifted scene until next week
goto L_Prologue;
L_Prologue:
@@ -105,8 +106,7 @@ OnSmash:
//////////////////////////////////////////////////////////////////////////
L_Progress:
- // TODO: Victory
- // TODO: Cooldown | if ($KAMELOT_COOLDOWN[.@g] == gettimeparam(GETTIME_WEEKDAY))
+ // TODO: Victory Reward
npctalk l("What are you still doing here?! GO!!");
mes l("Read tutorial again?");
next;