summaryrefslogtreecommitdiff
path: root/npc/003-13
diff options
context:
space:
mode:
Diffstat (limited to 'npc/003-13')
-rw-r--r--npc/003-13/_import.txt1
-rw-r--r--npc/003-13/arnea.txt82
-rw-r--r--npc/003-13/mapflags.txt1
3 files changed, 21 insertions, 63 deletions
diff --git a/npc/003-13/_import.txt b/npc/003-13/_import.txt
index 484bc8b54..97f13c4dd 100644
--- a/npc/003-13/_import.txt
+++ b/npc/003-13/_import.txt
@@ -2,3 +2,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/003-13/_warps.txt",
"npc/003-13/arnea.txt",
+"npc/003-13/mapflags.txt",
diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt
index 9b2329a4e..f04972aa5 100644
--- a/npc/003-13/arnea.txt
+++ b/npc/003-13/arnea.txt
@@ -6,59 +6,40 @@
// Arena for Duels and PVP (temporary map)
003-13,29,29,0 script Arnea#003-13 NPC_ELF_F,{
- // FIXIT
- if (!is_staff()) {
- hello;
- end;
+ if (is_staff()) {
+ mes "npc name: " + .name$;
+ mes "npc ext name: " + .extname$;
+ mes "npc id: " + .id;
+ mes "npc parent id: " + .parent;
+ mes "npc src id: " + .srcId;
+ mes "char id 3: " + getcharid(3);
+ mes "instance id: " + instance_id();
+ mes "Map ID: " + instance_mapname("003-13");
}
-
- mes "npc name: " + .name$;
- mes "npc ext name: " + .extname$;
- mes "npc id: " + .id;
- mes "npc parent id: " + .parent;
- mes "npc src id: " + .srcId;
- mes "char id 3: " + getcharid(3);
- mes "instance id: " + instance_id();
- mes "Map ID: " + instance_mapname("003-13");
- if (instance_id() >= 0)
- {
- mes "npc in instance named: " + instance_npcname(.name$);
- next;
+ if (instance_id() >= 0) {
goto L_Manage;
- }
- else
- {
+ } else {
+ // Non staff and on 003-13? That's a bug!
+ if (!is_staff()) {
+ atcommand "@request Hey hey hey, player found in 003-13 - regular map! Report this to Jesusalva at once!";
+ warp "Save", 0, 0;
+ close;
+ }
mes "npc not in instance";
}
+
close;
L_Manage:
mesn;
switch (select(
"warp back",
- rif(getcharid(3) == $@ARENA_INSTANCES[replacestr(instance_mapname("003-13"), "003-13@a", "")] || is_gm(),"delete"),
"cancel"))
{
case 1:
- warp "003-5", 33, 40;
+ warp "003-10", 33, 40;
break;
case 2:
- if (instance_id() < 0)
- {
- mes "Error: not in an instance";
- break;
- }
- .@ArenaToFree=replacestr(instance_mapname("003-13"), "003-13@a", "");
- //mes .@ArenaToFree;
- //next;
- $@ARENA_INSTANCES[.@ArenaToFree]=-1;
- warp "003-5", 33, 40;
- DESTROY_ME=1;
- DESTROY_MY_ID=instance_id();
- //instance_detachmap("003-13");
- //instance_destroy(instance_id()); // TODO FIXME
- break;
- case 3:
break;
}
close;
@@ -73,10 +54,6 @@ OnInit:
.sex = G_FEMALE;
.distance = 9;
- // test instance id
-
- // Temporary fix
- disablenpc "Arnea#003-13";
end;
OnInstanceInit:
@@ -91,24 +68,3 @@ OnInstanceInit:
}
-
-/*
- .@ID=getcharid(0);
- .@MUNDANE_INSTID = instance_create("001-3-0@a"+(.@ID), 0, IOT_NONE);
- //debugmes "You are "+str(.@ID);
-
- //if (.@MUNDANE_INSTID < 0) debugmes "Error: No instance ID";
- //debugmes "new instance id: " + str(.@MUNDANE_INSTID);
-
- .@instanceMapName$ = instance_attachmap("001-3-0", .@MUNDANE_INSTID, 0, str(.@ID));
-
- //if (.@instanceMapName$ == "") debugmes "Error: Map 001-3-0 X failed";
- //debugmes "Created map: "+ str(.@instanceMapName$);
-
- instance_set_timeout(300000, 300000, .@MUNDANE_INSTID);
- instance_init(.@MUNDANE_INSTID);
-
- warp str(.@ID), 161,59;
- close;
-
-*/
diff --git a/npc/003-13/mapflags.txt b/npc/003-13/mapflags.txt
new file mode 100644
index 000000000..28143b5a8
--- /dev/null
+++ b/npc/003-13/mapflags.txt
@@ -0,0 +1 @@
+003-13 mapflag pvp