Sit Estard (+ reversions due XML fixes)

5 files changed, 10 insertions, 9 deletions

diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index 0afa496e9..9de69948b 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -11,7 +11,7 @@ OnInit:
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1320); 
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
+    setunitdata(.@npcId, UDT_WEAPON, 1800); // I prefer 1801 but the short doesn't match
     setunitdata(.@npcId, UDT_HAIRSTYLE, 17);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 19);
 
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 7c6c4ad10..73cac9ef9 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -11,7 +11,7 @@ OnInit:
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1308);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
-    setunitdata(.@npcId, UDT_WEAPON, 1802); // FIXME: 1801 IS BROKEN!
+    setunitdata(.@npcId, UDT_WEAPON, 1802);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
 
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index e9d520ba5..6742a8391 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -11,7 +11,7 @@ OnInit:
     //setunitdata(.@npcId, UDT_HEADMIDDLE, 1314); // TODO 1314 is now BROKEN
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
+    setunitdata(.@npcId, UDT_WEAPON, 1801); // FIXME: 1801 IS BROKEN!
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
 
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 94fdaa4b4..faf298b65 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -6,11 +6,11 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Silvia");
+    .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
+    setunitdata(.@npcId, UDT_WEAPON, 1800);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
 
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index ceaebbeb4..bd11570dd 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -23,14 +23,14 @@
             l("Creating a party has some advantages, it's a pretty good choice!"),
             l("I remember when I created my first party, we were amazed to share some experience with a small group of adventurer..."),
             l("Oh! And our party chat was really entertaining, I do highly recommend you to share this fun as well."),
-            lg("The cost to create a party is @@ E, are you interested?",
-               "The cost to create a party is @@ E, are you interested?", .@party_price);
+            lg("The cost to create a party is @@ GP, are you interested?",
+               "The cost to create a party is @@ GP, are you interested?", .@party_price);
 
         if (askyesno() == 1)
         {
             if (Zeny < .@party_price)
             {
-                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring @@ E.", .@party_price);
+                speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("You don't have enough money, bring me @@ GP.", .@party_price);
             }
             else
             {
@@ -46,7 +46,7 @@
    
     function explain_service {
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("You are on the human resource wing of the Town Hall."),
+            l("Welcome to the Town Hall. I am @@, officer in charge of public associations.", .name$),
             l("We offer party and guild certifications and we can also teach you how to use some basic communication skills."),
             l("Do you know how to speak with people around you?");
 
@@ -126,6 +126,7 @@ OnInit:
     setunitdata(.@npcId, UDT_WEAPON, 1800);
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 0);
+    npcsit;
 
     .sex = G_MALE;
     .distance = 4;