diff options
| author | 4144 <andrei@karas> | 2018-02-16 00:57:29 -0200 |
|---|---|---|
| committer | jesusalva <cpntb1@ymail.com> | 2018-02-16 00:57:29 -0200 |
| commit | fd7101c1f06aab319b3e694bdfa17138311d5eda (patch) | |
| tree | 3bce14bb0cb49d1fe5f1c3d9db58cdb0754ac68c | |
| parent | bf4a97bb1d1194a6b27a48b7b27f81cde244dd79 (diff) | |
| download | serverdata-fd7101c1f06aab319b3e694bdfa17138311d5eda.tar.gz serverdata-fd7101c1f06aab319b3e694bdfa17138311d5eda.tar.bz2 serverdata-fd7101c1f06aab319b3e694bdfa17138311d5eda.tar.xz serverdata-fd7101c1f06aab319b3e694bdfa17138311d5eda.zip | |
Hercules update
| -rw-r--r-- | conf/messages.conf | 4 | ||||
| -rw-r--r-- | npc/test/npc1.txt | 51 |
2 files changed, 52 insertions, 3 deletions
diff --git a/conf/messages.conf b/conf/messages.conf index a6506e62a..e5b2528eb 100644 --- a/conf/messages.conf +++ b/conf/messages.conf @@ -150,7 +150,9 @@ 131: Unable to spawn clone. 132: Slave clone spawned. 133: Unable to spawn slave clone. -//134-138 FREE (possibly for other clone types) +//134-136 FREE (possibly for other clone types) +137: CvC: Off +138: CvC: On 139: CvC ON | 140: You can't join in a clan if you're in a guild. 141: CvC is already Off. 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; |