summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-29 02:35:07 -0300
committerJesusaves <cpntb1@ymail.com>2020-04-29 02:35:07 -0300
commit6c46e622c11a412d4083b78a62f557c24b8e2d03 (patch)
treebecdaf82b320d734ea506ad85f78f2dc9ca51fba
parentc079edf4b4fcdc64700ade996d9e88f6da26de70 (diff)
downloadserverdata-6c46e622c11a412d4083b78a62f557c24b8e2d03.tar.gz
serverdata-6c46e622c11a412d4083b78a62f557c24b8e2d03.tar.bz2
serverdata-6c46e622c11a412d4083b78a62f557c24b8e2d03.tar.xz
serverdata-6c46e622c11a412d4083b78a62f557c24b8e2d03.zip
It might be worth saving how many players a guild have in a variable.
This could also be manipulated. (Yes, we still need to catch guild formation changes D:)
-rw-r--r--npc/014-4/kamelot.txt1
-rw-r--r--npc/042-0/arthur.txt2
-rw-r--r--npc/042-1/door.txt4
-rw-r--r--npc/042-2/boss.txt4
4 files changed, 5 insertions, 6 deletions
diff --git a/npc/014-4/kamelot.txt b/npc/014-4/kamelot.txt
index d07df39c8..c2b0bf746 100644
--- a/npc/014-4/kamelot.txt
+++ b/npc/014-4/kamelot.txt
@@ -10,6 +10,7 @@
// $@KAMELOT_ID [ guild_id ] = instance id
// $@KAMELOT_WAVE [ guild_id ] = contains a temporary control value
// $KAMELOT_MX [ guild_id ] = player average level - difficulty record
+// $KAMELOT_PC [ guild_id ] = total members in guild
// $KAMELOT_QUEST [ guild_id ] = quest status (bitmask)
// 0 - Not started
// 1 - Quest Assigned by Arthur (new players cannot enter anymore)
diff --git a/npc/042-0/arthur.txt b/npc/042-0/arthur.txt
index f6cb6d64c..f2a7e870b 100644
--- a/npc/042-0/arthur.txt
+++ b/npc/042-0/arthur.txt
@@ -71,8 +71,10 @@ L_Quest:
mes l("Be careful! ")+col(l("AFTER THEM!!"), 9);
next;
// Be sure the quest only starts now, and destroy any eventual artifact
+ getguildmember(.@g, 2); // 2 = count by account IDs
$KAMELOT_QUEST[.@g]=1;
$KAMELOT_MX[.@g]=getguildavg(.@g);
+ $KAMELOT_PC[.@g]=$@guildmembercount;
$KAMELOT_KEYMASK[.@g]=any(1,2,4,8);
if (!is_admin()) // FIXME: This should be unconditional
$KAMELOT_COOLDOWN[.@g] = gettimeparam(GETTIME_WEEKDAY);
diff --git a/npc/042-1/door.txt b/npc/042-1/door.txt
index c3fe14602..c6d21551b 100644
--- a/npc/042-1/door.txt
+++ b/npc/042-1/door.txt
@@ -76,9 +76,7 @@ OnKillMob:
// Configure the wave
.@avg=$KAMELOT_MX[.@g];
- // 2 is meaningless, as we're not using their acc ids, but sounded faster
- getguildmember(.@g, 2);
- .@gcount=$@guildmembercount;
+ .@gcount=$KAMELOT_PC[.@g];
.@m$=getmap();
sleep2(800); // Give ~1 second before respawn
diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index 49219e9c5..e32a70491 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -42,9 +42,7 @@ OnTimer1000:
.@m$=instance_mapname("042-2");
.@n$=instance_npcname(.name$);
mapannounce .@m$, "??? : Where's Micksha? WHRE IS ARTHUR MICKSHA", 0;
- // 2 is meaningless, as we're not using their acc ids, but sounded faster
- getguildmember(.@g, 2);
- .@gcount=$@guildmembercount;
+ .@gcount=$KAMELOT_PC[.@g];
kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
end;