Restore gender to most npcs.

16 files changed, 65 insertions, 17 deletions

diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 34124929..dfa9265b 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -7,7 +7,6 @@
 //    Aquada box.
 
 // Size = 2
-// Gender = 1
 000-1,55,23,0	script	Ale	105,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -112,4 +111,8 @@ L_TaskDone:
 L_Quit:
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index 1280ea99..02df4e13 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -8,7 +8,6 @@
 //    Croconut box.
 
 // Size = 2
-// Gender = 1
 000-1,22,50,0	script	Astapolos	107,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -156,4 +155,7 @@ L_Whyning:
     closedialog;
     close;
 
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/cookiemaster.txt b/npc/000-1/cookiemaster.txt
index 09eac339..8668de14 100644
--- a/npc/000-1/cookiemaster.txt
+++ b/npc/000-1/cookiemaster.txt
@@ -7,7 +7,6 @@
 //    Cookie NPC, beware, if you don't take your cookie, she'll keep it!
 
 // Size = 2
-// Gender = 0
 000-1,97,50,0	script	Cookie Master	419,{
     if (getq(General_Cookies) == 1)
         goto L_GetCookie;
@@ -229,4 +228,8 @@ L_Bye:
     npctalk3 l("See you later!");
 
     close;
+
+OnInit:
+    setnpcsex 0;
+    end;
 }
diff --git a/npc/000-1/couwan.txt b/npc/000-1/couwan.txt
index db1c0cc1..d2e09c12 100644
--- a/npc/000-1/couwan.txt
+++ b/npc/000-1/couwan.txt
@@ -13,7 +13,6 @@
 //    2   Done quest scam.
 
 // Size = 2
-// Gender = 1
 000-1,89,36,0	script	Couwan	111,{
     set .@q, getq(ShipQuests_Couwan);
     if (.@q == 1) goto L_QuestGiven;
@@ -87,4 +86,8 @@ L_QuestDone:
     mesq l("Yeye gave my box to Gugli? Nice, nice yeye!");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 7e445588..4ffe6dc9 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -12,7 +12,6 @@
 
 
 // Size = 14
-// Gender = 1
 000-1,89,95,0	script	Darlin	103,{
     set .@q, getq(ShipQuests_TreasureChest);
 
@@ -141,4 +140,8 @@ L_DangerAround:
 L_Quit:
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index 825d6bc3..cc5c3aba 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -5,7 +5,6 @@
 //    Newbie merchant.
 
 // Size = 2
-// Gender = 1
 000-1,83,98,0	script	Fexil	108,{
     mesn;
     mesq lg("Greetings traveler.");
@@ -34,4 +33,8 @@ L_Accepted:
 
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index 07388b50..fcf6156b 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -23,7 +23,6 @@
 //    22   Gave all of the box to Gugli.
 
 // Size = 2
-// Gender = 1
 000-1,85,108,0	script	Gugli	413,{
 
 OnTalk:
@@ -229,9 +228,11 @@ L_Quit:
     closedialog;
     close;
 
+OnInit:
+    setnpcsex 1;
+    end;
 }
 
-// Gender = 1
 000-1,83,107,0	script	GugliBarrierCheck	32767,2,0,{
     set .@gugli, getq(ShipQuests_Gugli);
     if (.@gugli > 0) close;
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 3d18835d..6b208128 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -8,7 +8,6 @@
 //    Croconut box.
 
 // Size = 2
-// Gender = 1
 000-1,54,90,0	script	Gulukan	113,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -161,4 +160,8 @@ L_TaskDone:
 L_Quit:
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 980d587b..f99fb24d 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -8,7 +8,6 @@
 //    Plushroom box.
 
 // Size = 2
-// Gender = 1
 000-1,46,35,0	script	Jalad	112,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -120,4 +119,9 @@ L_TaskDone:
 
 L_Close:
     callfunc "GoodBye";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/lean.txt b/npc/000-1/lean.txt
index f21d7840..ee993a47 100644
--- a/npc/000-1/lean.txt
+++ b/npc/000-1/lean.txt
@@ -7,7 +7,6 @@
 //    Sailor who gives some informations to the player.
 
 // Size = 2
-// Gender = 1
 000-1,79,108,0	script	Lean	106,{
     set .@gugli, getq(ShipQuests_Gugli);
 
@@ -62,4 +61,9 @@ L_Sailors:
 
 L_Close:
     callfunc "GoodBye";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/max.txt b/npc/000-1/max.txt
index 42304ce0..a2fc855d 100644
--- a/npc/000-1/max.txt
+++ b/npc/000-1/max.txt
@@ -7,7 +7,6 @@
 //    Friend of Sapartan, he gives some information on how to find Gulukan, Astapolos and Q-Muller.
 
 // Size = 2
-// Gender = 1
 000-1,72,110,0	script	Max	115,{
     set .@gugli, getq(ShipQuests_Gugli);
     set .@knife, getq(ShipQuests_Knife);
@@ -99,6 +98,10 @@ L_Secrets:
 
     close;
 
+OnInit:
+    setnpcsex 1;
+    end;
+
 L_Quit:
     callfunc "GoodBye";
 }
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 451214b7..d26b57ca 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -7,7 +7,6 @@
 //    Plushroom box.
 
 // Size = 2
-// Gender = 1
 000-1,35,69,0	script	Q'Muller	104,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -121,4 +120,8 @@ L_TaskDone:
 L_Quit:
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/sapartan.txt b/npc/000-1/sapartan.txt
index 7250d252..7ef963c3 100644
--- a/npc/000-1/sapartan.txt
+++ b/npc/000-1/sapartan.txt
@@ -6,7 +6,6 @@
 //    Friend of Max, he gives some information on combat system.
 
 // Size = 2
-// Gender = 1
 000-1,74,111,0	script	Sapartan	414,{
     mesn;
     mesq l("Hey Max, it's @@!", strcharinfo(0));
@@ -94,6 +93,10 @@
     mesq l("You're welcome. If you can't remember something, just come back here!");
     next;
 
+OnInit:
+    setnpcsex 1;
+    end;
+
 L_Quit:
     callfunc "GoodBye";
 }
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 12799d95..77ba8524 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -6,7 +6,6 @@
 //    Pervert and arrogant sailor.
 
 // Size = 2
-// Gender = 1
 000-1,86,99,0	script	Silvio	412,{
     mesn;
     mesq l("Hey!");
@@ -188,4 +187,8 @@ L_Quit:
     npctalk3 l("Give me a kiss before you say goodbye!");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index a5a061e8..935a7821 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -5,7 +5,6 @@
 //    Sailor hitting a crocotree, then being struck by a falling croconut.
 
 // Size = 2
-// Gender = 1
 000-1,33,37,0	script	Tarlan	415,{
     setnpcdir 2;
 
@@ -59,4 +58,8 @@ L_DoYou:
 L_Quit:
     setnpcdir 4;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-1/tibbo.txt b/npc/000-1/tibbo.txt
index b5dc6d6d..445b2f93 100644
--- a/npc/000-1/tibbo.txt
+++ b/npc/000-1/tibbo.txt
@@ -8,7 +8,6 @@
 //    Aquada box.
 
 // Size = 2
-// Gender = 1
 000-1,34,111,0	script	Tibbo	110,{
     set .@g, getq(ShipQuests_Gugli);
     if (.@g == 0) goto L_NoTask;
@@ -112,4 +111,9 @@ L_TaskDone:
 
 L_Close:
     callfunc "GoodBye";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }