Remove some spurious maps

3 files changed, 13 insertions, 50 deletions

diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt
index 641d00d..8fa119b 100644
--- a/npc/functions/dungeon.txt
+++ b/npc/functions/dungeon.txt
@@ -9,9 +9,9 @@
 
 // Main initialization
 OnInit:
-    setarray .heatmap$, "007-2";
+    setarray .heatmap$, "011-1";
     setarray .cursemap$, "006-4", "006-4-1", "025-1";
-    setarray .sickmap$, "029-5";
+    setarray .sickmap$, "018-2";
     setarray .bleedmap$, "006-9";
     end;
 
@@ -152,11 +152,11 @@ OnBleed:
 
 
 //////////////////////////////
-007-2	mapflag	nosave	007-1,99,189
-006-4	mapflag	nosave	006-3,54,36
-006-4-1	mapflag	nosave	006-3,54,36
-029-5	mapflag	nosave	029-4,21,97
-006-9	mapflag	nosave	006-6,46,27
+//007-2	mapflag	nosave	033-1,72,191
+006-4	mapflag	nosave	033-1,72,191
+006-4-1	mapflag	nosave	033-1,72,191
+//029-5	mapflag	nosave	033-1,72,191
+006-9	mapflag	nosave	033-1,72,191
 
 
 
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index dc41128..048e649 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -95,15 +95,9 @@ function	script	sChristmas	{
     addmonsterdrop(AzulSlime,           XmasGift,            2*.@m);
     }
 
-    // Change maps for Christmas Season (Specially LoF maps)
-    addmapmask "003-1", MASK_CHRISTMAS;
-    addmapmask "005-1", MASK_CHRISTMAS;
-    addmapmask "009-1", MASK_CHRISTMAS;
-    addmapmask "012-1", MASK_CHRISTMAS;
-    addmapmask "017-2", MASK_CHRISTMAS;
-    addmapmask "017-2-1", MASK_CHRISTMAS;
-    addmapmask "017-3", MASK_CHRISTMAS;
-    addmapmask "020-2", MASK_CHRISTMAS;
+    // Change maps for Christmas Season
+    //addmapmask "031-1", MASK_CHRISTMAS;
+    //addmapmask "033-1", MASK_CHRISTMAS;
 
     // Enable event
     set $EVENT$, "Christmas";
@@ -297,9 +291,6 @@ OnSummerEnd:
     end;
 
 OnAutumnStart:
-    // Fancy trees
-    addmapmask "012-1", MASK_AUTUMN;
-
     // Autumn's Drop
     addmonsterdrop(FafiDragon,          PumpkandySeed,     10000);
     addmonsterdrop(BlackMamba,          PumpkandySeed,      8000);
@@ -327,7 +318,6 @@ OnAutumnEnd:
     }
 
 
-    removemapmask "012-1", MASK_AUTUMN;
     delmonsterdrop(FafiDragon,          PumpkandySeed);
     delmonsterdrop(Mouboo,              PumpkandySeed);
     delmonsterdrop(AlphaMouboo,         PumpkandySeed);
diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt
index 5c369e1..711497d 100644
--- a/npc/functions/weather.txt
+++ b/npc/functions/weather.txt
@@ -67,47 +67,20 @@ OnInit:
     .wcore = htnew;
 
     // Deserts
-    htput(.wcore, "003-1", "desert");
-    htput(.wcore, "004-1", "desert");
-    htput(.wcore, "004-2", "desert");
-    htput(.wcore, "009-1", "desert");
-    htput(.wcore, "010-1", "desert");
-    htput(.wcore, "010-2", "desert");
-    htput(.wcore, "032-1", "desert");
+    //htput(.wcore, "032-1", "desert");
 
     // Woodlands
     htput(.wcore, "001-4", "woodland");
     htput(.wcore, "001-11", "woodland");
     htput(.wcore, "001-12", "woodland");
-    htput(.wcore, "005-1", "woodland");
-    htput(.wcore, "012-1", "woodland");
-    htput(.wcore, "014-1", "woodland");
-    htput(.wcore, "014-2", "woodland");
-    htput(.wcore, "014-3", "woodland");
-    htput(.wcore, "014-4", "woodland");
-    htput(.wcore, "014-5", "woodland");
-    htput(.wcore, "017-1", "woodland");
-    htput(.wcore, "018-1", "woodland");
     htput(.wcore, "018-2", "woodland");
-    htput(.wcore, "018-4", "woodland");
-    htput(.wcore, "018-5", "woodland");
-    htput(.wcore, "027-1", "woodland");
 
     // Icelands
-    htput(.wcore, "001-7", "iceland");
-    htput(.wcore, "019-1", "iceland");
-    htput(.wcore, "019-2", "iceland");
-    htput(.wcore, "019-3", "iceland");
-    htput(.wcore, "019-4", "iceland");
-    htput(.wcore, "019-5", "iceland");
-    htput(.wcore, "019-6", "iceland");
-    htput(.wcore, "020-1", "iceland");
-    htput(.wcore, "022-1", "iceland");
-    htput(.wcore, "024-1", "iceland");
     htput(.wcore, "031-1", "iceland");
+    htput(.wcore, "033-1", "iceland");
 
     // Special
-    htput(.wcore, "011-3", "special");
+    //htput(.wcore, "011-3", "special");
 
 
     consoleinfo "[Weather.sys] Total Maps = " + htsize(.wcore);