Rework the Weaver fight

data/json/field_type.json

@@ -161,14 +161,16 @@
     "intensity_levels": [
       {
         "name": "starlit webs",
-        "transparent": false,
+        "sym": "}",
+        "color": "white",
+        "transparent": true,
         "effects": [
           { "effect_id": "webbed", "intensity": 1, "min_duration": "1 m", "immune_in_vehicle": true, "is_environmental": false }
         ]
       },
       {
         "name": "starlit webs",
-        "transparent": false,
+        "transparent": true,
         "effects": [
           { "effect_id": "webbed", "intensity": 2, "min_duration": "1 m", "immune_in_vehicle": true, "is_environmental": false }
         ]
@@ -182,7 +184,7 @@
       }
     ],
     "description_affix": "covered_in",
-    "immune_mtypes": [ "mon_void_spider", "mon_void_spider_spiderling" ],
+    "immune_mtypes": [ "mon_void_spider", "mon_void_spider_spiderling", "mon_void_spider_maw", "mon_void_spider_limb" ],
     "decrease_intensity_on_contact": true,
     "priority": 2,
     "phase": "solid",

data/json/furniture_and_terrain/terrain-nether.json

@@ -23,11 +23,12 @@
   {
     "type": "terrain",
     "id": "t_nether_glass_floor_basalt",
-    "name": "black glass",
-    "description": "An endless expanse of black glass.  It perfectly reflects the darkness around it.",
-    "symbol": " ",
-    "color": "black",
-    "move_cost": 2,
+    "name": "basalt floor",
+    "looks_like": "t_rock_floor",
+    "description": "Flat hexagonal stone plates tile perfectly across the ground, each an exact copy of the next.",
+    "symbol": ".",
+    "color": "dark_gray",
+    "move_cost": 1,
     "flags": [ "TRANSPARENT", "FLAT", "ROAD" ]
   },
   {
@@ -46,7 +47,7 @@
     "type": "terrain",
     "id": "t_nether_basalt",
     "name": "perfect basalt wall",
-    "description": "Hexagonal columns of basalt spring from the dark floor.  Each a perfect copy of the next.",
+    "description": "Hexagonal columns of basalt spring from the dark floor, each an exact copy of the next.",
     "symbol": "#",
     "color": "dark_gray",
     "move_cost": 0,

data/json/items/armor/hats.json

@@ -1691,6 +1691,14 @@
       }
     ]
   },
+  {
+    "id": "golden_hat",
+    "type": "ITEM",
+    "copy-from": "wizard_hat_costume",
+    "name": "golden hat",
+    "material": [ "leather" ],
+    "description": "An incredibly tall hat made from leather covered in gold leaf.  Its crown in divided into several segments, with patterns  describing the phases of the moon, the seasons and the movements of strange constellations."
+  },
   {
     "id": "hijab",
     "type": "ITEM",

data/json/items/melee/swords_and_blades.json

@@ -2747,7 +2747,7 @@
   {
     "id": "jade_nagamaki",
     "type": "ITEM",
-    "subtypes": [ "TOOL" ],
+    "subtypes": [ "TOOL", "ARTIFACT" ],
     "copy-from": "qt_katana",
     "name": { "str_sp": "jade nagamaki" },
     "description": "A master smith painstakingly flaked its flowing blade from meteoric sea-green stone.  The hilt's cordage is speckled by gold flakes from the tumultuous waters where the blade was whet, and the chosen tsuba depicts an all-devouring snake.",
@@ -2759,6 +2759,7 @@
     "flags": [ "SPEAR", "REACH_ATTACK", "UNBREAKABLE_MELEE", "SHEATH_SWORD", "NONCONDUCTIVE" ],
     "techniques": [ "WBLOCK_1", "WIDE", "SPIN" ],
     "to_hit": { "grip": "weapon", "length": "long", "surface": "line", "balance": "uneven" },
+    "passive_effects": [ { "has": "WIELD", "values": [ { "value": "MELEE_STAMINA_CONSUMPTION", "multiply": -0.67 } ] } ],
     "melee_damage": { "bash": 10, "cut": 32 }
   },
   {

data/json/mapgen/map_extras/spider.json

@@ -44,7 +44,7 @@
       "monsters": { "X": { "monster": "GROUP_SPIDER", "chance": 1, "density": 0.5 } },
       "nested": {
         "X": { "chunks": [ "spider_webs" ] },
-        "x": { "chunks": [ "spider_webs" ] },
+        "x": { "chunks": [ [ "spider_webs", 800 ], [ "void_spider_webs", 1 ] ] },
         "o": { "chunks": [ [ "spider_webs", 2 ], [ "spider_webs_weak", 2 ], [ "null", 1 ] ] },
         ",": { "chunks": [ "spider_webs", "spider_webs_weak", "null" ] },
         ".": { "chunks": [ [ "spider_webs_weak", 1 ], [ "null", 2 ] ] }

data/json/mapgen/map_extras/wilderness.json

@@ -675,7 +675,9 @@
         "]": [ [ "t_water_sh", 8 ], "t_dirt", "t_grass" ],
         "~": "t_water_dp"
       },
-      "place_nested": [ { "chunks": [ [ "null", 30 ], [ "mx_pond_forest_fruit_patch", 1 ] ], "x": 16, "y": 16 } ],
+      "place_nested": [
+        { "chunks": [ [ "null", 3000 ], [ "mx_pond_forest_fruit_patch", 1000 ], [ "void_spider_webs", 1 ] ], "x": 16, "y": 16 }
+      ],
       "place_monsters": [
         { "monster": "GROUP_SAFE", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 5, "density": 0.5 },
         { "monster": "GROUP_FISH", "x": [ 0, 23 ], "y": [ 0, 23 ], "chance": 1, "repeat": [ 1, 2 ], "density": 0.5 },

data/json/mapgen/standing_stones.json

@@ -43,7 +43,7 @@
         " ..........ss...O.....  ",
         " ........ossssss....... ",
         "     ..sssssssss.....   ",
-        "   ..Ossss#sOsss.o..... ",
+        "   ..Ossss#!Osss.o..... ",
         " ......sssssssss.....o. ",
         " .o.....ossssssO....... ",
         " .......ss..ss.......   ",
@@ -62,13 +62,15 @@
         ".": [ "t_region_soil", "t_region_groundcover" ],
         "O": "t_region_soil",
         "o": "t_region_soil",
-        "s": "t_region_soil"
+        "s": "t_region_soil",
+        "!": "t_region_soil"
       },
       "furniture": { "#": "f_brazier", "O": "f_boulder_large", "o": "f_boulder_small" },
       "place_items": [
         { "item": "standing_stones_accident", "x": [ 9, 14 ], "y": [ 13, 15 ], "chance": 50, "repeat": [ 3, 6 ] },
         { "item": "standing_stones_libation", "x": 11, "y": 11, "chance": 100 }
       ],
+      "nested": { "!": { "chunks": [ [ "void_spider_webs", 1 ], [ "null", 19 ] ] } },
       "items": { "#": { "item": "fireplace_fill", "repeat": [ 1, 3 ] } }
     }
   },
@@ -90,7 +92,7 @@
         " ..........ss...O.....  ",
         " ........ossssss....... ",
         "     ..sssssssss.....   ",
-        "   ..OssssssOsss.o..... ",
+        "   ..Osssss!Osss.o..... ",
         " ......sssssssss.....o. ",
         " .o.....ossssssO....... ",
         " .......ss..ss.......   ",
@@ -104,8 +106,16 @@
         "                        "
       ],
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
-      "terrain": { "#": "t_dirt", ".": [ "t_dirt", "t_highland_groundcover" ], "O": "t_dirt", "o": "t_dirt", "s": "t_dirt" },
-      "furniture": { "O": "f_boulder_large", "o": "f_boulder_small" }
+      "terrain": {
+        "#": "t_dirt",
+        ".": [ "t_dirt", "t_highland_groundcover" ],
+        "O": "t_dirt",
+        "o": "t_dirt",
+        "s": "t_dirt",
+        "!": "t_dirt"
+      },
+      "furniture": { "O": "f_boulder_large", "o": "f_boulder_small" },
+      "nested": { "!": { "chunks": [ [ "void_spider_webs", 1 ] ] } }
     }
   }
 ]