Minor improvements to Arnea

2 files changed, 43 insertions, 41 deletions

diff --git a/npc/003-10/arnea.txt b/npc/003-10/arnea.txt
index d25996d5d..153eb258d 100644
--- a/npc/003-10/arnea.txt
+++ b/npc/003-10/arnea.txt
@@ -6,14 +6,16 @@
 //    Arena for Duels and PVP (003-13,31,31)
 
 003-10,26,60,0	script	Arnea	NPC_ELF_F,{
-    // FIXIT code
-    if (!is_staff()) goto L_Incomplete;
+    npctalk3 l("Hello!");
 
+L_Menu:
+    mes "";
     mesn;
     mesq l("Welcome to the Arena. Select your action");
     menu
         l("Create new arena"), L_NewArena,
         l("Join existing arena"), L_JoinArena,
+        rif(is_staff(), l("Debug Information")), L_Debug,
         l("Information"), L_Info,
         l("Leave"), L_Quit;
 
@@ -37,6 +39,14 @@ L_NewArena:
     .@ID=getcharid(0);
     .@MAP$="AREN@"+str(.@ID);
 
+    // Check if arena was already created
+    if(has_instance2("003-10@"+.@ID)) {
+        mesn;
+        mesq l("You already purchased an arena, and password is @@", .@PASSWORD);
+        next;
+        goto L_Menu;
+    }
+
     // Create the arena
     .@INSTID = instance_create("003-10@"+(.@ID), getcharid(3), IOT_CHAR);
     .@instanceMapName$ = instance_attachmap("003-13", .@INSTID, 0, .@MAP$);
@@ -45,20 +55,9 @@ L_NewArena:
     dispbottom l("Arena created, it can be used for 10 minutes.");
     dispbottom l("Room password: @@", .@PASSWORD);
 
-    goto L_Quit;
+    goto L_Menu;
 
 
-L_Info:
-    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);
-    if (instance_id() >= 0)
-        mes "instance id: " + instance_id();
-    close;
-
 L_JoinArena:
     mes "";
     mesn;
@@ -78,28 +77,41 @@ L_JoinArena:
             mesq l("All arenas stay open for only 30 minutes after being purchased.");
         }
     }
-
     close;
 
 
-L_Quit:
-    close;
+L_Debug:
+    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);
+    if (instance_id() >= 0)
+        mes "instance id: " + instance_id();
+    goto L_Menu;
 
-L_Incomplete:
+L_Info:
     mesn;
     mesq lg("Hello darling.");
     next;
     mesq l("I am @@, and I take care of the Arena.", .name$);
     next;
-    mesq l("At the moment, we must wait authorization from Tulimshar's government to re-open doors.");
+    mesq l("Guards use it to spar against each other on friendly matches, to see who is stronger.");
+    next;
+    mesq l("We arranged a small underground room for that, while the Colliseum doesn't get done.");
+    next;
+    goto L_Menu;
+
+L_Quit:
     close;
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 2907);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
-    setunitdata(.@npcId, UDT_WEAPON, 3509);
+    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
+    setunitdata(.@npcId, UDT_WEAPON, RockKnife);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
 
@@ -112,16 +124,6 @@ OnInit:
     $@ARENAS = htnew();
     end;
 
-OnInstanceInit:
-    .@npcId = getnpcid(0, instance_npcname(.name$));
-    setunitdata(.@npcId, UDT_HEADTOP, 2907);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
-    setunitdata(.@npcId, UDT_WEAPON, 3509);
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
-    end;
-
 }
 
 
diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt
index f04972aa5..b6ca6cb46 100644
--- a/npc/003-13/arnea.txt
+++ b/npc/003-13/arnea.txt
@@ -45,10 +45,10 @@ L_Manage:
     close;
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, 2907);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
-    setunitdata(.@npcId, UDT_WEAPON, 3509);
+    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
+    setunitdata(.@npcId, UDT_WEAPON, RockKnife);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
 
@@ -58,10 +58,10 @@ OnInit:
 
 OnInstanceInit:
     .@npcId = getnpcid(0, instance_npcname(.name$));
-    setunitdata(.@npcId, UDT_HEADTOP, 2907);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1305);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
-    setunitdata(.@npcId, UDT_WEAPON, 3509);
+    setunitdata(.@npcId, UDT_HEADTOP, Darkelm);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps);
+    setunitdata(.@npcId, UDT_WEAPON, RockKnife);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 18);
     end;