Restore gender to most npcs.

41 files changed, 138 insertions, 60 deletions

diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
index dc124c4d..63726637 100644
--- a/npc/000-0-0/q'onan.txt
+++ b/npc/000-0-0/q'onan.txt
@@ -5,8 +5,11 @@
 // Description:
 //    Sleeping and snoring NPC.
 
-// Gender = 1
 000-0-0,29,28,0	script	Q'Onan#000-0-0	402,{
-
     callfunc "Asleep";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 7c32c68c..b8ffae0b 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -6,7 +6,6 @@
 //    Introduction scene where two sailors talk about how the player was found on his raft.
 //    Elmo will handle dialogs between both NPCs.
 
-// Gender = 1
 000-0-0,26,23,0	script	Elmo#sailors	409,{
 
 OnTalk:
@@ -75,10 +74,17 @@ OnTalk:
     addtoskill 1, 1; // Add Emote skill.
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
 
-// Gender = 1
 000-0-0,25,23,0	script	Magic Arpan#sailors	407,{
     doevent "Elmo#sailors::OnTalk";
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 91553c1d..10a22d65 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -7,7 +7,6 @@
 // Description:
 //    Starting script of Evol Online.
 
-// Gender = 1
 000-0,23,20,0	script	Sailors	405,6,6,{
 
 OnTouch:
@@ -89,4 +88,8 @@ OnTouch:
 
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
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;
 }
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 3ab461e7..412cd1c1 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -5,9 +5,7 @@
 //    Drunk easteregg telling about the player's past.
 
 // Size = 3
-// Gender = 1
 000-2-0,20,23,0	script	Billy Bons	411,{
-
     if (rand(5) == 2) goto L_Hic;
 
     mesn;
@@ -90,4 +88,8 @@ L_Quit:
     mes col(l("The sailor turns his back to you."), 9);
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-0/doors.txt b/npc/000-2-0/doors.txt
index 1910137f..054164f4 100644
--- a/npc/000-2-0/doors.txt
+++ b/npc/000-2-0/doors.txt
@@ -16,7 +16,6 @@
 //    11   Need to see Julia
 //    12   Has been registered by Julia
 
-// Gender = 1
 000-2-0,20,28,0	script	AreaNPC#doors1	32767,0,0,{
 
 OnTouch:
@@ -55,7 +54,6 @@ L_End:
     close;
 }
 
-// Gender = 1
 000-2-0,33,28,0	script	AreaNPC#doors2	32767,0,0,{
 
 OnTouch:
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 13a8b9e6..75da4f2b 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -33,7 +33,6 @@
 //    25   Reward taken from the box.
 
 // Size = 10
-// Gender = 0
 000-2-0,27,24,0	script	Julia	404,2,10,{
     addtoskill 1, 1; // Add Emote skill.
 
@@ -272,6 +271,10 @@ L_Rumors:
 
     close;
 
+OnInit:
+    setnpcsex 0;
+    end;
+
 L_Quit:
     callfunc "GoodBye";
 }
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index c5abf1d3..e8736693 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -17,7 +17,6 @@
 //    2   Accept the task.
 //    3   Bring first food.
 
-// Gender = 1
 000-2-1,43,32,0	script	AligeTrigger	32767,1,1,{
 
 OnTouch:
@@ -49,7 +48,6 @@ OnTimer190:
 }
 
 // Size = 2
-// Gender = 1
 000-2-1,43,31,0	script	Alige	401,{
     set .@q, getq(ShipQuests_Alige);
     if (.@q > 1) goto L_AskForFood;
@@ -295,4 +293,8 @@ L_Quit:
     mesq l("Too bad... Come back when you have some choice food for me. Growl... grumble... grumble.");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 8bc60a4c..18e30094 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -16,7 +16,6 @@
 //    11   Need to see Julia
 //    12   Has been registered by Julia
 
-// Gender = 1
 000-2-1,49,36,0	script	LeftDoorCheck	32767,0,0,{
     set .@q, getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan::OnTalk";
@@ -24,7 +23,6 @@
     close;
 }
 
-// Gender = 1
 000-2-1,54,36,0	script	RightDoorCheck	32767,0,0,{
     set .@q, getq(ShipQuests_Arpan);
     if (.@q == 0) doevent "Magic Arpan::OnTalk";
@@ -32,7 +30,6 @@
     close;
 }
 
-// Gender = 1
 000-2-1,47,32,0	script	LeftBarrierCheck	32767,0,2,{
     set .@q, getq(ShipQuests_Arpan);
     if (.@q > 2) close;
@@ -60,7 +57,6 @@ L_EquipDone:
     close;
 }
 
-// Gender = 1
 000-2-1,56,32,0	script	RightBarrierCheck	32767,0,2,{
     set .@q, getq(ShipQuests_Arpan);
     if (.@q > 2) close;
@@ -89,7 +85,6 @@ L_EquipDone:
 }
 
 // Size = 5
-// Gender = 1
 000-2-1,49,33,0	script	Magic Arpan	407,{
     set .@q, getq(ShipQuests_Arpan);
     set .@q_julia, getq(ShipQuests_Julia);
@@ -231,4 +226,7 @@ L_EquipDone:
     setq ShipQuests_Arpan, 3;
     goto L_Menu;
 
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 8c7817e5..16a4405f 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -17,7 +17,6 @@
 //    6   Quest complete. Julia wins.
 
 // Size = 2
-// Gender = 1
 000-2-1,27,28,0	script	Chef Gado	418,{
     set .@q, getq(ShipQuests_ChefGado);
     set .@n, getq(ShipQuests_Nard);
@@ -208,4 +207,8 @@ L_QuestAborted:
 L_Quit:
     closedialog;
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index c751cd62..e74a7950 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -7,7 +7,6 @@
 //    Dan will randomly choose between a useless sentence, and a quest in Artis.
 
 // Size = 2
-// Gender = 1
 000-2-1,32,31,0	script	Dan	101,{
     mesn;
     set .@q, rand(3);
@@ -83,4 +82,8 @@ L_Quit2:
     mes col(l("Dan ends the conversation and resumes to write his letter."), 9);
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt
index 145bdd2a..ff7434da 100644
--- a/npc/000-2-1/devis.txt
+++ b/npc/000-2-1/devis.txt
@@ -7,8 +7,11 @@
 //    Sleeping and grumbling NPC.
 
 // Size = 2
-// Gender = 1
 000-2-1,32,38,0	script	Devis	410,{
-
     callfunc "Asleep";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index d9d25a74..aed6df6e 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -11,7 +11,6 @@
 //    1   Knife taken.
 
 // Size = 2
-// Gender = 2
 000-2-1,50,24,0	script	#knife	100,{
     set .@q, getq(ShipQuests_Knife);
     if (.@q) close;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index de3968d5..c17e1851 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -39,7 +39,6 @@
 // [9] = Shows how many seconds passed since the player started the quest.
 // [10] = Shows how many seconds passed since the player done the quest.
 
-// Gender = 1
 000-2-1,72,34,0	script	AreaNPC	32767,0,1,{
 
 OnTouch:
@@ -89,7 +88,6 @@ L_NoGoodTick:
 }
 
 // Size = 3
-// Gender = 1
 000-2-1,70,35,0	script	Peter	403,{
     if (BaseLevel < 5) goto OnTooWeak;
     if ($@RAT_SAILOR_COUNTDOWN == "") goto L_NoCountDown;
@@ -326,4 +324,8 @@ OnNoGoodTick:
     mesn;
     mesq l("I don't need your help right now, come back later.");
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
index debf5aec..c48d733f 100644
--- a/npc/000-2-1/q'onan.txt
+++ b/npc/000-2-1/q'onan.txt
@@ -6,8 +6,11 @@
 //    Sleeping and snoring NPC.
 
 // Size = 2
-// Gender = 1
 000-2-1,53,38,0	script	Q'Onan#000-2-1	402,{
-
     callfunc "Asleep";
+    close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt
index 25930a9a..47c96640 100644
--- a/npc/000-2-1/savepoint.txt
+++ b/npc/000-2-1/savepoint.txt
@@ -5,28 +5,24 @@
 //    Saves locations in 000-2-1 map.
 
 // Size = 2
-// Gender = 2
 000-2-1,40,37,0	script	#name1	901,{
     callfunc "SavePoint", "000-2-1.gat", 40, 37;
     close;
 }
 
 // Size = 2
-// Gender = 2
 000-2-1,46,37,0	script	#name2	901,{
     callfunc "SavePoint", "000-2-1.gat", 46, 37;
     close;
 }
 
 // Size = 2
-// Gender = 2
 000-2-1,50,38,0	script	#name3	901,{
     callfunc "SavePoint", "000-2-1.gat", 50, 38;
     close;
 }
 
 // Size = 2
-// Gender = 2
 000-2-1,55,40,0	script	#name4	901,{
     callfunc "SavePoint", "000-2-1.gat", 55, 40;
     close;
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 6f2f6c7e..7ce792e3 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -6,7 +6,6 @@
 // Description:
 //    Doors NPCs.
 
-// Gender = 1
 000-2-2,48,29,0	script	DoorUpwards	32767,0,0,{
 
 OnTouch:
@@ -36,7 +35,6 @@ L_Warp:
     close;
 }
 
-// Gender = 1
 000-2-2,24,31,0	script	LeftDoor	32767,0,0,{
 
 OnTouch:
diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt
index 1daca2e4..1c65fe40 100644
--- a/npc/000-2-2/ratto.txt
+++ b/npc/000-2-2/ratto.txt
@@ -17,7 +17,6 @@
 // [8] = Shows how many seconds passed since ratto number 4 died.
 // [9] = Shows how many seconds passed since the player started the quest.
 
-// Gender = 1
 000-2-2,47,30,0	script	RattosControl	32767,{
 
 OnSpawn:
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 89779294..d3ab8713 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -6,7 +6,6 @@
 //    Elmo's second dialog.
 
 // Size = 5
-// Gender = 1
 000-2-3,27,27,0	script	Elmo	409,{
     set .@q, getq(ShipQuests_ArpanMoney);
     if (.@q == 1) goto L_GotMoney;
@@ -63,4 +62,8 @@ L_GotMoney:
     mesq l("Other than that, I don't know much about what else is going on, so directly asking the Cap'tain about it could be a good idea.");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-3/hammock.txt b/npc/000-2-3/hammock.txt
index 1d94ffd5..1a1b90a6 100644
--- a/npc/000-2-3/hammock.txt
+++ b/npc/000-2-3/hammock.txt
@@ -4,7 +4,6 @@
 // Description:
 //    Animated hammock at the top level of the ship.
 
-// Gender = 2
 000-2-3,28,24,0	script	#name5	904,1,0,{
 
 OnTouchFirst:
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 968cfa35..5d44c658 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -24,7 +24,6 @@
 //    12   Gave all of the boxes to Gugli.
 
 // Size = 5
-// Gender = 1
 000-2-3,25,26,0	script	Nard	406,{
     set .@nard, getq(ShipQuests_Nard);
     set .@gugli, getq(ShipQuests_Gugli);
@@ -220,4 +219,8 @@ L_Already:
     mesq l("Sorry, I don't need any help right now. Come back later.");
 
     close;
+
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/000-2-3/piourocket.txt b/npc/000-2-3/piourocket.txt
index a1e82566..195407ae 100644
--- a/npc/000-2-3/piourocket.txt
+++ b/npc/000-2-3/piourocket.txt
@@ -5,7 +5,6 @@
 //    Jumping piou.
 
 // Size = 3
-// Gender = 2
 000-2-3,27,23,4	script	#piourocket	408,{
     setnpcdir 2;
     stopnpctimer;
diff --git a/npc/000-2-3/sailors.txt b/npc/000-2-3/sailors.txt
index c7205868..ea7f2ba4 100644
--- a/npc/000-2-3/sailors.txt
+++ b/npc/000-2-3/sailors.txt
@@ -6,7 +6,6 @@
 // Description:
 //    End of introduction with Nard and Elmo talking about the player.
 
-// Gender = 0
 000-2-3,21,28,0	script	AreaTop	32767,0,5,{
 
 OnTouch:
@@ -49,5 +48,4 @@ OnTouch:
     mesq l("Sure, cap'tain.");
 
     close;
-
 }
diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt
index 7eafe98c..c8142537 100644
--- a/npc/001-1/artaxe.txt
+++ b/npc/001-1/artaxe.txt
@@ -6,7 +6,6 @@
 //    Helping NPC.
 
 // Size = 2
-// Gender = 1
 000-1,27,55,0	script	Artaxe	109,{
     mesn;
     mesq l("Do you feel too weak even if trying to hit the surrounding wildlife?");
@@ -17,4 +16,7 @@
 
     close;
 
+OnInit:
+    setnpcsex 1;
+    end;
 }
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index f51c332e..8623760e 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -11,10 +11,9 @@
 //    1   Get a cookie.
 
 // Size = 2
-// Gender = 0
 001-1,39,38,0	script	Cookie Master	419,{
     if ((countitemcolor("DeliciousCookie") == 0) && (getq(General_Cookies) == 1))
-		goto L_LostCookie;
+        goto L_LostCookie;
     if (getq(General_Cookies) == 1)
         goto L_GetCookie;
 
@@ -255,4 +254,8 @@ L_Bye:
     npctalk3 l("See you later!");
 
     close;
+
+OnInit:
+    setnpcsex 0;
+    end;
 }
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index 583e334f..b8df8c26 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -5,10 +5,12 @@
 //    Light Armor shop keeper.
 
 // Size = 2
-// Gender = 0
 001-2-0,37,28,0	script	Resa	117,{
     mesn;
     mesq l("Hi.");
 
     close;
+OnInit:
+    setnpcsex 0;
+    end;
 }