"Fix" sprites and add some lore dialog to Gladys (SAULC YOU BROKE ITEMS)

10 files changed, 100 insertions, 25 deletions

diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index a444454e0..60e9e1b6f 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -1,10 +1,88 @@
 // Author:
-//    Saulc
+//    Jesusalva
 
 003-1,63,105,0	script	Gladys	NPC_FEMALE,{
 
+    mesn;
+    mesq l("Hello darling. The Alliance sucks, but don't tell anyone I told you that.");
+    mes "";
+    menu
+        l("What is the Alliance?"), L_What,
+        l("Why it sucks?"), L_Why,
+        l("Well, too bad!"), L_Close;
 
-hello;
+L_What:
+    mes "";
+    mesn;
+    mesq l("What Alliance? The Alliance which rules over the World Of Mana!");
+    next;
+
+L_AllianceMenu:
+    mes "";
+    menu
+        l("Who composes the Alliance?"), L_Members,
+        l("What are the Alliance tasks?"), L_Tasks,
+        l("Do you think I could join the Alliance?"), L_Join,
+        l("I have to go. See you later."), L_Close;
+
+L_Why:
+    mes "";
+    mesn;
+    mesq l("Because they control everything! They even determine taxes!");
+    next;
+    mesq l("They also hold control over the Mana Stones, but this is not the problem.");
+    next;
+    mesq l("In the end, they decide the defensive measures, and they even set curfews!");
+    next;
+    mesq l("They also determine rules, and enforces them. We live under a disguised dictatorship.");
+    next;
+    mesq l("But what I really hate is that they forbid gossiping.");
+    next;
+    goto L_AllianceMenu;
+
+L_Members:
+    mes "";
+    mesn;
+    mesq l("Oh, every settlement is part of it. Candor, Tulimshar, Hurnscald, Frostia, Halinarzo, Artis, Esperia, Nivalis...");
+    next;
+    mesq l("Each settlement names a representative, which forms the Alliance Council. There is also the High Council, and the Magic Council.");
+    next;
+    mesq l("The Magic Council can be found at this city. They are the most powerful mages. If you have an impressive magical affinity, they may entitle you to have access to a Mana Stone.");
+    next;
+    mesq l("The Alliance Council rarely meets. It's thanks to them that the cities are well protected, if you want my opinion.");
+    next;
+    mesq l("The High Council acts in the Alliance stead, as it is not possible to reunite every city leader for all minor matters.");
+    next;
+    mesq l("Saulc, Crazyfefe and Jesus Saves are the three High Councillors. Don't do anything illegal while they're watching!");
+    next;
+    goto L_AllianceMenu;
+
+L_Tasks:
+    mes "";
+    mesn;
+    mesq l("Their main tasks are ensuring trade, protecting the cities from monster invasions, and guarding the Mana Stones.");
+    next;
+    mesq l("They also recently took over some city affairs. It's good they're protecting us, but I'm afraid of they creeping in our lives!");
+    next;
+    goto L_AllianceMenu;
+
+L_Join:
+    mes "";
+    mesn;
+    mesq l("Unless you are an exceptionally talented mage or an influentical politician, it is unlikely.");
+    next;
+    mesq l("The High Council's have some subordinates, but those are hand-picked by them.");
+    next;
+    mesq l("You could try getting into a city administration. If you can get a citizenship, you can try to elect for an office.");
+    next;
+    mesq l("Otherwise, you could ask the Constable. They act in the Alliance stead to enforce law and order, and may have... special arrangements for you.");
+    next;
+    goto L_AllianceMenu;
+
+L_Close:
+    mes "";
+    mesq l("Good bye, darling!");
+    close;
 
 OnInit:
     .@npcId = getnpcid(0, "Gladys");
diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt
index cc06fff59..0afa496e9 100644
--- a/npc/003-1/itka.txt
+++ b/npc/003-1/itka.txt
@@ -7,12 +7,11 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Itka");
+    .@npcId = getnpcid(0, .name$);
     //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_HEADMIDDLE, 1320); 
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
+    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
     setunitdata(.@npcId, UDT_HAIRSTYLE, 17);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 19);
 
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index cddecb667..be576cb16 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -7,9 +7,9 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Jakod");
+    .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1315);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
     setunitdata(.@npcId, UDT_WEAPON, 1800); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 24);
diff --git a/npc/003-1/jerican.txt b/npc/003-1/jerican.txt
index ff51601e2..903ed4f79 100644
--- a/npc/003-1/jerican.txt
+++ b/npc/003-1/jerican.txt
@@ -7,10 +7,10 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Jerican");
+    .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1307);
-    setunitdata(.@npcId, UDT_HEADBOTTOM, 2204);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1308); // FIXME: 1307 broken
+    setunitdata(.@npcId, UDT_HEADBOTTOM, 2205); // FIXME: 2204 broken
     setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 3);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 9);
diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt
index 4c98f166e..7c6c4ad10 100644
--- a/npc/003-1/luca.txt
+++ b/npc/003-1/luca.txt
@@ -7,11 +7,11 @@
 hello;
 
 OnInit:
-    .@npcId = getnpcid(0, "Luca");
+    .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
     setunitdata(.@npcId, UDT_HEADMIDDLE, 1308);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
-    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_WEAPON, 1802); // FIXME: 1801 IS BROKEN!
     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 37a6167f7..e9d520ba5 100644
--- a/npc/003-1/neko.txt
+++ b/npc/003-1/neko.txt
@@ -8,9 +8,10 @@ hello;
 OnInit:
     .@npcId = getnpcid(0, "Neko");
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1314);
+    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1314); // TODO 1314 is now BROKEN
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
     setunitdata(.@npcId, UDT_HAIRSTYLE, 26);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 2);
 
diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt
index b640dd6bd..2a8eef28b 100644
--- a/npc/003-1/ninathetraveler.txt
+++ b/npc/003-1/ninathetraveler.txt
@@ -6,10 +6,9 @@
     goodbye;
 
 OnInit:
-    .@npcId = getnpcid(0, "Nina The Traveler");
+    .@npcId = getnpcid(0, .name$);
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1318);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1318);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2212);
     setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 27);
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 76a285b80..ac6378a3c 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -75,8 +75,7 @@
 OnInit:
     .@npcId = getnpcid(0, "Sarah");
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1311);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1311);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2201);
     setunitdata(.@npcId, UDT_WEAPON, 1803); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 19);
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 2424e9397..94fdaa4b4 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -8,10 +8,9 @@ hello;
 OnInit:
     .@npcId = getnpcid(0, "Silvia");
     //setunitdata(.@npcId, UDT_HEADTOP, 2936);
-    //setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319); // TODO
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1316);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2213);
-    setunitdata(.@npcId, UDT_WEAPON, 1801); // Boots
+    setunitdata(.@npcId, UDT_WEAPON, 1800); // FIXME: 1801 IS BROKEN!
     setunitdata(.@npcId, UDT_HAIRSTYLE, 21);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 11);
 
diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt
index 7119849c9..84b745531 100644
--- a/npc/003-1/swezanne.txt
+++ b/npc/003-1/swezanne.txt
@@ -9,7 +9,7 @@ hello;
 OnInit:
     .@npcId = getnpcid(0, "Swezanne");
     //setunitdata(.@npcId, UDT_HEADTOP, 2929);
-    setunitdata(.@npcId, UDT_HEADMIDDLE, 1319);//TODO
+    setunitdata(.@npcId, UDT_HEADMIDDLE, 1307);
     setunitdata(.@npcId, UDT_HEADBOTTOM, 2207);
     setunitdata(.@npcId, UDT_WEAPON, 1802); // Boots
     setunitdata(.@npcId, UDT_HAIRSTYLE, 12);