From a73632485658b2c0b88e6f46f80ac8dff092a3a8 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 23 Jun 2018 23:31:25 -0300
Subject: Weather is broken? Also, bugfixes

---
 npc/009-4/yumi.txt        |  7 ++++---
 npc/009-5/joaquim.txt     |  2 +-
 npc/functions/weather.txt | 12 ++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'npc')

diff --git a/npc/009-4/yumi.txt b/npc/009-4/yumi.txt
index 4ee996626..ccc904d80 100644
--- a/npc/009-4/yumi.txt
+++ b/npc/009-4/yumi.txt
@@ -1,9 +1,10 @@
 // TMW2 Script
 // Author: Jesusalva
 //  Description:
-//    Joaquim's wife
+//    Joaquim's wife.
+//    TODO sprite on the bed
 
-009-4,36,33,4	script	Yumi	NPC_FEMALE,{
+009-4,36,33,0	script	Yumi	NPC_FEMALE,{
     .@q=getq(HalinarzoQuest_SickWife);
     if (.@q > 3) goto L_PostAid;
     if (.@q == 3) goto L_DoIt;
@@ -49,7 +50,7 @@ OnInit:
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
-    setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
+    setunitdata(.@npcId, UDT_WEAPON, CottonGloves); // Do not use boots when lying on the bed
     setunitdata(.@npcId, UDT_HAIRSTYLE, 10);
     setunitdata(.@npcId, UDT_HAIRCOLOR, 15);
 
diff --git a/npc/009-5/joaquim.txt b/npc/009-5/joaquim.txt
index b128168a6..ae71ab0fd 100644
--- a/npc/009-5/joaquim.txt
+++ b/npc/009-5/joaquim.txt
@@ -165,7 +165,7 @@ L_Missing:
 
 OnInit:
     .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
     setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper);
     setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers);
     setunitdata(.@npcId, UDT_WEAPON, LousyMoccasins); // Boots
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 30af46010..4adb172ef 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -130,7 +130,7 @@ OnMinute45:
     function WeatherSwitch {
         // Get map
         getmapxy(.@key$,.@a,.@b,0);
-        if (getarg(1,0) != 0)
+        if (getarg(1,"0") != "0")
             .@key$=getarg(1,.@key$);
 
         // Sanitize
@@ -146,23 +146,23 @@ OnMinute45:
 
 // Some commands, for GMs manually override weather
 OnRain:
-    WeatherSwitch(MASK_RAIN, getarg(0,0));
+    WeatherSwitch(MASK_RAIN, getarg(0,"0"));
     end;
 
 OnSand:
-    WeatherSwitch(MASK_SANDSTORM, getarg(0,0));
+    WeatherSwitch(MASK_SANDSTORM, getarg(0,"0"));
     end;
 
 OnSnow:
-    WeatherSwitch(MASK_SNOW, getarg(0,0));
+    WeatherSwitch(MASK_SNOW, getarg(0,"0"));
     end;
 
 OnNight:
-    WeatherSwitch(MASK_NIGHT, getarg(0,0));
+    WeatherSwitch(MASK_NIGHT, getarg(0,"0"));
     end;
 
 OnEvil:
-    WeatherSwitch(MASK_EVILSANCTUM, getarg(0,0));
+    WeatherSwitch(MASK_EVILSANCTUM, getarg(0,"0"));
     end;
 
 // Clear works on any map
-- 
cgit v1.2.3-60-g2f50