summaryrefslogtreecommitdiff
path: root/npc/test/npc1.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/test/npc1.txt')
-rw-r--r--npc/test/npc1.txt51
1 files changed, 49 insertions, 2 deletions
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index a9d15958b..f6777f489 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -27,7 +27,22 @@ test,10,10,0 script npc1 NPC_TEST1,3,3,{
}
L_Start:
- switch (select("show area", "map", "pc", "change npc direction", "quest test", "cart", "items", "chat", "wall", "craft", "hashtable", "instance", "mercenary", "npc"))
+ switch (select(
+ "show area",
+ "map",
+ "pc",
+ "change npc direction",
+ "quest test",
+ "cart",
+ "items",
+ "chat",
+ "wall",
+ "craft",
+ "hashtable",
+ "instance",
+ "mercenary",
+ "npc",
+ "clan"))
{
case 1:
areatest;
@@ -520,7 +535,7 @@ L_Start:
switch (select("create", "warp", "info", "warp back", "delete", "back"))
{
case 1:
- if (.instid >= 0)
+ if (.instid >= 0 && isinstance(.instid))
{
mes "Error: test instance already created";
break;
@@ -627,6 +642,38 @@ L_Start:
}
}
break;
+ case 15:
+ while(1)
+ {
+ switch (select(
+ "join sword clan",
+ "join arc wand clan",
+ "join golden mace clan",
+ "join crossbox clan",
+ "leave clan",
+ "back"))
+ {
+ case 1:
+ mes(str(clan_join(1)));
+ break;
+ case 2:
+ mes(str(clan_join(2)));
+ break;
+ case 3:
+ mes(str(clan_join(3)));
+ break;
+ case 4:
+ mes(str(clan_join(4)));
+ break;
+ case 5:
+ mes(str(clan_leave()));
+ break;
+ case 6:
+ goto L_Start;
+ break;
+ }
+ }
+ break;
}
close;