diff options
Diffstat (limited to 'npc/001-2-34')
| -rw-r--r-- | npc/001-2-34/_import.txt | 2 | ||||
| -rw-r--r-- | npc/001-2-34/_warps.txt | 2 | ||||
| -rw-r--r-- | npc/001-2-34/doors.txt | 34 | ||||
| -rw-r--r-- | npc/001-2-34/samantha.txt | 4 |
4 files changed, 19 insertions, 23 deletions
diff --git a/npc/001-2-34/_import.txt b/npc/001-2-34/_import.txt index 326973e6..9ec74d40 100644 --- a/npc/001-2-34/_import.txt +++ b/npc/001-2-34/_import.txt @@ -1,4 +1,4 @@ -// Map 001-2-34: unnamed +// Map 001-2-34: Training Room Lobby // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/001-2-34/_warps.txt", "npc/001-2-34/doors.txt", diff --git a/npc/001-2-34/_warps.txt b/npc/001-2-34/_warps.txt index 1311f071..06f74a95 100644 --- a/npc/001-2-34/_warps.txt +++ b/npc/001-2-34/_warps.txt @@ -1,3 +1,3 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. -// Map 001-2-34: unnamed warps +// Map 001-2-34: Training Room Lobby warps 001-2-34,29,33,0 warp #001-2-34_29_33 0,0,001-2-33,29,33 diff --git a/npc/001-2-34/doors.txt b/npc/001-2-34/doors.txt index ca513945..e2ffee1f 100644 --- a/npc/001-2-34/doors.txt +++ b/npc/001-2-34/doors.txt @@ -1,29 +1,29 @@ // Evol scripts. // Author: // Reid +// Omatt +// Toams +// Jesus // Description: // Doors NPCs. 001-2-34,23,29,0 script ToTrainingRoom#001-2-34 NPC_HIDDEN,0,0,{ - OnTouch: - if ((getmapusers($@MAP_NAME$) == 0) && ($@FightingIsActive > 0)) - { - set $@FightingIsActive, 0; - killmonsterall "001-2-36"; - } - if (mobcount("001-2-36","all") > 0 && $@FightingIsActive > 0) - { - narrator - l("You hear some sound behind the door."), - l("Somebody is probably training, better wait for him to finish."); - } - else - { - warp "001-2-36", 36, 30; + .@q2=getq2(ArtisQuests_TrainingLegion); + // Map name limit: 4 chars (atl1) + .@mapn$="atl1@"+getcharid(0); + if (isinstance(.@q2) && .@q2 > 0) { + warp .@mapn$, 36, 30; + } else { + .@inst = instance_create("Training Room "+getcharid(0), getcharid(3), IOT_CHAR); + instance_attachmap("001-2-36", .@inst, false, .@mapn$); + // 30 minutes (1800s) inside, or 5 minutes (300s) outside + instance_set_timeout(1800, 300, .@inst); + instance_init(.@inst); + setq2 ArtisQuests_TrainingLegion, .@inst; + warp .@mapn$, 36, 30; } - closeclientdialog; - close; + end; } diff --git a/npc/001-2-34/samantha.txt b/npc/001-2-34/samantha.txt index f49e15aa..a571ccf6 100644 --- a/npc/001-2-34/samantha.txt +++ b/npc/001-2-34/samantha.txt @@ -7,10 +7,6 @@ 001-2-34,29,27,0 script Samantha NPC_SAMANTHA,{ mesn; mesq lg("Look who we have here, did you come for a training session?"); - - goto L_Close; - -L_Close: close; OnInit: |