Dye Tulimshar NPCs in melanine because, well, we *do* have two suns.

And they weren't emitting enough UV rays.
And NetSysFire was bothered by it.

Related to evol-all#8

18 files changed, 21 insertions, 17 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 53e6dacc3..2db1b68f9 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1970,6 +1970,10 @@ constants_db: {
 	NPC_RAIJIN_F:           823
 	NPC_UKAR:               824
 	NPC_UKAR_F:             825
+	NPC_PLAYER_TONORI:      830
+	NPC_FEMALE_TONORI:      831
+	NPC_PLAYER_ARGAES:      832
+	NPC_FEMALE_ARGAES:      833
 
 	NPC_M_SHOPKEEPER:       811
 	NPC_F_SHOPKEEPER:       812
diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt
index 7ee4a85bb..39b882a28 100644
--- a/npc/003-1/aidan.txt
+++ b/npc/003-1/aidan.txt
@@ -2,7 +2,7 @@
 // Author: Crazyfefe, Jesusalva
 // Desc:   Originally a Tmw script
 
-003-1,95,97,0	script	Aidan	NPC_PLAYER,{
+003-1,95,97,0	script	Aidan	NPC_PLAYER_TONORI,{
 
     function Register
     {
diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt
index 0cdefe386..19c5505cd 100644
--- a/npc/003-1/ched.txt
+++ b/npc/003-1/ched.txt
@@ -6,7 +6,7 @@
 //    Ched is from a quest.
 //    But as he is now unused, he'll become someone else on summer.
 
-003-1,62,48,0	script	Ched	NPC_PLAYER,{
+003-1,62,48,0	script	Ched	NPC_PLAYER_TONORI,{
     function	ValidSSC {
         return countitem(CactusCocktail)+countitem(CherryCocktail)+countitem(AppleCocktail);
     }
diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt
index 800e46797..9951b45ae 100644
--- a/npc/003-1/gladys.txt
+++ b/npc/003-1/gladys.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Jesusalva
 
-003-1,63,105,0	script	Gladys	NPC_FEMALE,{
+003-1,63,105,0	script	Gladys	NPC_FEMALE_TONORI,{
 
     mesn;
     mesq l("Hello darling. The Alliance sucks, but don't tell anyone I told you that.");
diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt
index 51a267cdc..45cc335ae 100644
--- a/npc/003-1/inac.txt
+++ b/npc/003-1/inac.txt
@@ -5,7 +5,7 @@
 // Inac Give a sharp knife for 20 Piou Feathers to player over level 12,
 // before Tycoon give it but only bafter level 18 that was too high !
 
-003-1,55,82,0	script	Inac	NPC_PLAYER,{
+003-1,55,82,0	script	Inac	NPC_PLAYER_TONORI,{
 
     .@Inac = getq(TulimsharQuest_Inac);
     if (BaseLevel < 12) goto L_TooWeak;
diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt
index f80c8c52d..14a9840e3 100644
--- a/npc/003-1/inar.txt
+++ b/npc/003-1/inar.txt
@@ -2,7 +2,7 @@
 // Author:
 //    Saulc
 
-003-1,109,109,0	script	Inar	NPC_PLAYER,{
+003-1,109,109,0	script	Inar	NPC_PLAYER_TONORI,{
 
     mesn;
     mesq l("Only finest wares!");
diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt
index 64c6ecee3..5f1dbb99f 100644
--- a/npc/003-1/ishi.txt
+++ b/npc/003-1/ishi.txt
@@ -6,7 +6,7 @@
 // Do not add void items to array.
 // note : the rare item system suck.
 
-003-1,97,97,0	script	Ishi	NPC_PLAYER,{
+003-1,97,97,0	script	Ishi	NPC_PLAYER_ARGAES,{
 
     if (MPQUEST == 0) {
         mesn l("Ishi, the Rewards Master");
diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt
index 767fc6676..aa7edadfa 100644
--- a/npc/003-1/jakod.txt
+++ b/npc/003-1/jakod.txt
@@ -6,7 +6,7 @@
 //    Jakod replaces Luca. As there are no focus skills, Jakod teaches player about
 //    magic and is their tutor on the matters of the Mana Stone.
 
-003-1,109,129,0	script	Jakod	NPC_PLAYER,{
+003-1,109,129,0	script	Jakod	NPC_PLAYER_TONORI,{
 
 
     mesn;
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 28fc43f6f..2c6cf313d 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -14,7 +14,7 @@
 //    2 - completed
 //    3 - Reward given
 
-003-1,111,84,0	script	Lieutenant Dausen	NPC_PLAYER,{
+003-1,111,84,0	script	Lieutenant Dausen	NPC_PLAYER_TONORI,{
     function DausenMobTutorial;
 
     .@q = getq(TulimsharQuest_WaterForGuard);
diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt
index fda13576a..089b32b24 100644
--- a/npc/003-1/mahoud.txt
+++ b/npc/003-1/mahoud.txt
@@ -7,7 +7,7 @@
 // TODO: Chance to lose a bit of GP by getting water with money inside.
 // I think water should not be so OP, and some minor RNG would be nice here
 
-003-1,46,79,0	script	Mahoud	NPC_PLAYER,{
+003-1,46,79,0	script	Mahoud	NPC_PLAYER_TONORI,{
     mesn;
     mes l("I can fill your bottle with water for only @@ gp the bottle.", .COST_PER_BOTTLE);
     mes l("After all, I am the Well Master!");
diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt
index 7ae0d3679..f35653ada 100644
--- a/npc/003-1/malivox.txt
+++ b/npc/003-1/malivox.txt
@@ -1,7 +1,7 @@
 // Author:
 //    Saulc
 
-003-1,114,106,0	script	Malivox	NPC_PLAYER,{
+003-1,114,106,0	script	Malivox	NPC_PLAYER_TONORI,{
 
     speech S_LAST_NEXT,
         l("I am @@, an alchemist specialized in reset potions.", .name$);
diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt
index 4cea8e71e..47acfbcdb 100644
--- a/npc/003-1/sarah.txt
+++ b/npc/003-1/sarah.txt
@@ -7,7 +7,7 @@
 //    Random NPC without any purpose but to give SerfHat. Uh.
 // TODO: Could be repeatable quest (eg. 60 GP for a cake every day, so you can have a 10 GP profit selling cakes)
 
-003-1,90,144,0	script	Sarah	NPC_FEMALE,{
+003-1,90,144,0	script	Sarah	NPC_FEMALE_TONORI,{
     function quest_completed;
     function quest_open;
     function quest_started;
diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt
index 8060244e1..39ffa1280 100644
--- a/npc/003-1/silvia.txt
+++ b/npc/003-1/silvia.txt
@@ -3,7 +3,7 @@
 //    Saulc
 //    Jesusalva
 
-003-1,109,150,0	script	Silvia	NPC_FEMALE,{
+003-1,109,150,0	script	Silvia	NPC_FEMALE_ARGAES,{
 
     if (strcharinfo(0) == $MOST_HEROIC$) npctalk l("Oh my, the great @@ has come to talk to me!", $MOST_HEROIC$);
     if (getq(TulimsharQuest_Swezanne) == 4) goto L_Message;
diff --git a/npc/003-10/officer.txt b/npc/003-10/officer.txt
index 47b1a9cf3..e06afe04c 100644
--- a/npc/003-10/officer.txt
+++ b/npc/003-10/officer.txt
@@ -4,7 +4,7 @@
 // Description:
 //    Wooden Sword quest. Pays back earlier players
 
-003-10,30,79,4	script	Veteran Officer	NPC_PLAYER,{
+003-10,30,79,4	script	Veteran Officer	NPC_PLAYER_ARGAES,{
     .@q=getq(TulimsharQuest_WoodenSword);
     if (.@q >= 2 || BaseLevel < 18) {
         legiontalk;
diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt
index 4bb56a54b..86ef0946a 100644
--- a/npc/003-2/estard.txt
+++ b/npc/003-2/estard.txt
@@ -11,7 +11,7 @@
 // Author:
 //    Reid
 
-003-2,32,34,0	script	Estard	NPC_PLAYER,{
+003-2,32,34,0	script	Estard	NPC_PLAYER_ARGAES,{
 
     function create_party {
         .@party_price = 6500;
diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt
index 5b991cc18..c3195eb99 100644
--- a/npc/003-4/sorfina.txt
+++ b/npc/003-4/sorfina.txt
@@ -13,7 +13,7 @@
 //  4 - Player killed Murderer Scorpion
 //  5 - Quest is complete
 
-003-4,39,33,0	script	Sorfina	NPC_FEMALE,{
+003-4,39,33,0	script	Sorfina	NPC_FEMALE_ARGAES,{
     if (getq(TulimsharQuest_Hasan) == 2) goto L_Trouble;
     if (getq(TulimsharQuest_Hasan) == 3) goto L_Basement;
     if (getq(TulimsharQuest_Hasan) == 4) goto L_Finished;
diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt
index 35c002bed..65802d328 100644
--- a/npc/003-5/jeweler.txt
+++ b/npc/003-5/jeweler.txt
@@ -14,7 +14,7 @@
 //  All three rings can be swapped by a Light Ring (you will lose any gemstone on them!).
 //  Still pending discussion.
 
-003-5,33,37,0	script	Jeweler	NPC_FEMALE,{
+003-5,33,37,0	script	Jeweler	NPC_FEMALE_TONORI,{
     mesn l("Inya, the Jeweler");
     mesq l("Hello!");
     goto L_Menu;
diff --git a/npc/003-6/cyndala.txt b/npc/003-6/cyndala.txt
index 6207205bc..27199eac0 100644
--- a/npc/003-6/cyndala.txt
+++ b/npc/003-6/cyndala.txt
@@ -11,7 +11,7 @@
 // Authors:
 //    Reid
 
-003-6,33,30,0	script	Cyndala	NPC_FEMALE,{
+003-6,33,30,0	script	Cyndala	NPC_FEMALE_ARGAES,{
     function explain_dyes;
     function item_is_bleachable;
     function remove_cards_from_item;