Merge branch 'master' of gitlab.com:TMW2/serverdata

11 files changed, 108 insertions, 91 deletions

diff --git a/npc/003-1/cyndala.txt b/npc/003-1/cyndala.txt
index 4b4571159..a11b06e6b 100644
--- a/npc/003-1/cyndala.txt
+++ b/npc/003-1/cyndala.txt
@@ -8,7 +8,7 @@ hello;
 OnInit:
     .@npcId = getnpcid(0, "Cyndala");
     //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1320);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
     setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 16);
diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index 19849edda..a444454e0 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -1,13 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,63,105,0	script	Gladys	NPC_MONA,{
+003-1,63,105,0	script	Gladys	NPC_FEMALE,{
 
 
 hello;
 
 OnInit:
-    .sex = G_MALE;
-    .distance = 3;
+    .@npcId = getnpcid(0, "Gladys");
+    setunitdata(.@npcId, UDT_HEADTOP, 2921);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
+    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 20);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 20);
+
+    .sex = G_FEMALE;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt
index c51aba60a..73e19c7c0 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -1,13 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,109,109,0	script	Inar	NPC_MONA,{
+003-1,109,109,0	script	Inar	NPC_PLAYER,{
 
 
 hello;
 
 OnInit:
+    .@npcId = getnpcid(0, "Inar");
+    setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
+    setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 4);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 1);
+
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index 7db081dbc..cc06fff59 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -1,13 +1,22 @@
 // Author:
 //    Saulc
 
-003-1,63,141,0	script	Itka	NPC_MONA,{
+003-1,63,141,0	script	Itka	NPC_FEMALE,{
 
 
 hello;
 
 OnInit:
-    .sex = G_MALE;
-    .distance = 3;
+    .@npcId = getnpcid(0, "Itka");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1311);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2202);
+    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 17);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 19);
+
+    .sex = G_FEMALE;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/jerican.txt b/npc/003-1/jerican.txt
index 1ec7d8b48..ff51601e2 100644
--- a/npc/003-1/jerican.txt
+++ b/npc/003-1/jerican.txt
@@ -1,13 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,93,125,0	script	Jerican	NPC_MONA,{
+003-1,93,125,0	script	Jerican	NPC_PLAYER,{
 
 
 hello;
 
 OnInit:
+    .@npcId = getnpcid(0, "Jerican");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1307);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
+    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 3);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 9);
+
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 0b79ebb68..77cafdb19 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -1,13 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,109,129,0	script	Luca	NPC_MONA,{
+003-1,109,129,0	script	Luca	NPC_PLAYER,{
 
 
 hello;
 
 OnInit:
+    .@npcId = getnpcid(0, "Luca");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1308);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
+    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 14);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 13);
+
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt
index 330fd03fc..37a6167f7 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -1,12 +1,20 @@
 // Author:
 //    Saulc
 
-003-1,103,106,0	script	Neko	NPC_MONA,{
+003-1,103,106,0	script	Neko	NPC_PLAYER,{
 
 hello;
 
 OnInit:
+    .@npcId = getnpcid(0, "Neko");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1314);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
+    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
+
     .sex = G_MALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index 921344691..b640dd6bd 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -1,80 +1,22 @@
 // Author:
 //    Saulc
 
-003-1,56,143,0	script	Nina The Traveler	NPC_MONA,{
+003-1,56,143,0	script	Nina The Traveler	NPC_FEMALE,{
 
-    .cake = CherryCake;
-    .reward = FancyHat;
-    
-    function quest_completed{
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("It was so tasty, I can't eat anything more... Thank you.");
-            close;
-    }
-
-    function quest_open {
-        if (countitem(.cake) > 0)
-        {
-            speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-                l("You brought me Cherry Cake! Here is your @@, as promised.",getitemlink(.reward));
-            delitem .cake,1;
-            getitem .reward,1;
-            setq TulimsharQuest_Sarah, 1;
-            close;
-        }
-        else 
-        {
-            speech S_FIRST_BLANK_LINE,
-                l("Sorry, that is not the cake I love.");
-            close;
-        }
-    }
-
-    function quest_started {
-        speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-            l("Oh, Welcome then.");
-        speech S_LAST_NEXT,
-            l("Can you bring me a piece of Cherry Cake? Pretty please?");
-        do
-        {
-        select
-            l("Here is it!"),
-            menuaction(l("Quit"));
-
-        switch (@menu)
-        {
-            case 1:
-                quest_open;
-                break;
-        }
-    } while (@menu != 2);
-    }
-   
-    do
-    {
-        .@chest = getq(TulimsharQuest_Sarah);
-        if (.@chest == 1)
-            goto quest_completed;
-        select
-            rif(.@chest == 0,
-            l("Hello, I'm new here! Can I help you?")),
-            menuaction(l("Quit"));
-
-        switch (@menu)
-        {
-            case 1:
-                quest_started;
-                break;
-        }
-    } while (@menu != 2);
-
-    closedialog;
     goodbye;
-    close;
 
 OnInit:
+    .@npcId = getnpcid(0, "Nina The Traveler");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1318);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
+    setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 27);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+
     .sex = G_FEMALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
 
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index c5c6e7def..76a285b80 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,90,144,0	script	Sarah	NPC_MONA,{
+003-1,90,144,0	script	Sarah	NPC_FEMALE,{
 
     .cake = CherryCake;
     .reward = FancyHat;
@@ -73,8 +73,17 @@
     close;
 
 OnInit:
+    .@npcId = getnpcid(0, "Sarah");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1311);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
+    setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 19);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 16);
+
     .sex = G_FEMALE;
-    .distance = 3;
+    .distance = 5;
     end;
 }
 
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 6acc4acb2..2424e9397 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -1,12 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,109,150,0	script	Silvia	NPC_MONA,{
+003-1,109,150,0	script	Silvia	NPC_FEMALE,{
 
 hello;
 
 OnInit:
-    .sex = G_MALE;
-    .distance = 3;
+    .@npcId = getnpcid(0, "Silvia");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2936);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
+    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
+
+    .sex = G_FEMALE;
+    .distance = 5;
     end;
 }
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 04e2dde0a..7119849c9 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -1,13 +1,21 @@
 // Author:
 //    Saulc
 
-003-1,70,100,0	script	Swezanne	NPC_MONA,{
+003-1,70,100,0	script	Swezanne	NPC_FEMALE,{
 
 
 hello;
 
 OnInit:
-    .sex = G_MALE;
+    .@npcId = getnpcid(0, "Swezanne");
+    //setunitdata(.@npcId, UDT_HEADTOP, 2929);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
+    setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 12);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 7);
+
+    .sex = G_FEMALE;
     .distance = 3;
     end;
 }