Motherlode Mine

src/main/java/rs117/hd/data/WaterType.java

@@ -51,6 +51,15 @@ public enum WaterType
 		.causticsStrength(0)
 		.duration(1.2f)
 		.fishingSpotRecolor(hsl("#04730d"))),
+	MLM_WATER(b -> b
+		.specularStrength(.1f)
+		.specularGloss(100)
+		.normalStrength(.05f)
+		.baseOpacity(.8f)
+		.fresnelAmount(.3f)
+		.surfaceColor(rgb("#617093"))
+		.causticsStrength(0)
+		.duration(1.2f)),
 	SWAMP_WATER_FLAT(SWAMP_WATER, true),
 	POISON_WASTE(b -> b
 		.specularStrength(.1f)

src/main/java/rs117/hd/data/materials/Material.java

@@ -342,6 +342,9 @@ public enum Material {
 		.setNormalMap(DIRT_2_N)
 		.setSpecular(0.25f, 18)),
 	DIRT_2_VERT(DIRT_2, p -> p.setNormalMap(null)),
+	DIRT_2_LIGHT(DIRT_2, p -> p
+		.setBrightness(1.2f)),
+
 	GRAVEL_N,
 	GRAVEL(p -> p
 		.setNormalMap(GRAVEL_N)
@@ -401,6 +404,13 @@ public enum Material {
 		.setFlowMapStrength(0.2f)
 		.setFlowMapDuration(new float[] { 12, -12 })
 	),
+	MOTHERLODE_MINE_WATER(WATER_FLAT, p -> p
+		.setFlowMap(UNDERWATER_FLOW_MAP)
+		.setFlowMapStrength(0.3f)
+		.setBrightness(0.45f)
+		.setScroll(0, 1.4f)
+		.setFlowMapDuration(new float[] { 10, -14 })
+	),
 	ROCK_1_N,
 	ROCK_1(p -> p
 		.setNormalMap(ROCK_1_N)

src/main/resources/rs117/hd/scene/areas.json

@@ -835,10 +835,44 @@
   {
     "name": "MOTHERLODE_MINE",
     "aabbs": [
-      [ 3680, 5600, 3808, 5727 ]
+      [ 3710, 5631, 3775, 5695 ]
     ],
     "hideOtherAreas": true
   },
+  {
+    "name": "Motherlode Mine Dark Wall Fix",
+    "aabbs": [
+      [ 3752, 5684, 3753, 5684],
+      [ 3756, 5684, 3757, 5684],
+      [ 3758, 5680, 3758, 5681],
+      [ 3760, 5680, 3762, 5680],
+      [ 3759, 5674, 3761, 5674],
+      [ 3762, 5670, 3762, 5673],
+      [ 3763, 5662, 3763, 5663],
+      [ 3754, 5682, 3754, 5683],
+      [ 3758, 5675],
+      [ 3754, 5681],
+      [ 3760, 5670],
+      [ 3764, 5671],
+      [ 3751, 5677],
+      [ 3753, 5680],
+      [ 3745, 5645],
+      [ 3744, 5642],
+      [ 3728, 5693],
+      [ 3717, 5678],
+      [ 3754, 5677]
+    ]
+  },
+  {
+    "name": "Motherlode Mine Dark Trough Fix",
+    "aabbs": [
+      [ 3747, 5671, 3747, 5673],
+      [ 3750, 5676],
+      [ 3745, 5661],
+      [ 3748, 5659, 3749, 5659],
+      [ 3749, 5660, 3749, 5673]
+    ]
+  },
   {
     "name": "EDGEVILLE_PATH_OVERLAY",
     "aabbs": [

src/main/resources/rs117/hd/scene/environments.json

@@ -530,9 +530,9 @@
     "area": "MOTHERLODE_MINE",
     "ambientColor": "#aaafb6",
     "ambientStrength": 4,
-    "directionalStrength": 1,
+    "directionalStrength": 0.5,
     "sunAngles": [
-      80,
+      75,
       190
     ],
     "fogColor": "#241809",

src/main/resources/rs117/hd/scene/model_overrides.json

@@ -4995,37 +4995,97 @@
     "uvScale": 0.5
   },
   {
-    "description": "Motherload mine walls",
+    "description": "Motherlode Mine Water Wheel",
+    "baseMaterial": "GRUNGE_1",
+    "objectIds": [
+      26671,
+      26672
+    ]
+  },
+  {
+    "description": "Motherlode Mine Water Wheel Support",
+    "baseMaterial": "GRUNGE_1",
+    "objectIds": [
+      26669,
+      26670
+    ],
+    "colorOverrides": [
+      {
+        "colors": "h == 7",
+        "baseMaterial": "METALLIC_1_LIGHT"
+      }
+    ]
+  },
+  {
+    "description": "Motherlode Mine Walls",
     "baseMaterial": "DIRT_2",
     "objectIds": [
-      10047,
-      26655,
       26656,
       26658,
       26659,
       26660,
       26661,
-      26662,
-      26663,
-      26664,
       26665,
       26666,
       26667,
       26668,
       30368,
       30369,
       30370,
-      30375
+      26662,
+      26663,
+      26664,
+      53244
     ],
     "uvType": "BOX",
-    "uvScale": 0.5
+    "uvScale": 0.7
+  },
+  {
+    "description": "Motherlode Mine Walls Lighten",
+    "baseMaterial": "DIRT_2_LIGHT",
+    "areas": [ "Motherlode Mine Dark Wall Fix" ],
+    "objectIds": [
+      26656,
+      26661,
+      26662,
+      26663,
+      26664,
+      26665,
+      26666,
+      26667,
+      30368
+    ],
+    "uvType": "BOX",
+    "uvScale": 0.7
+  },
+  {
+    "description": "Motherlode Mine Walls Lighten & Darken Caves",
+    "baseMaterial": "DIRT_2_LIGHT",
+    "areas": [ "Motherlode Mine Dark Wall Fix" ],
+    "objectIds": [
+      10047,
+      26655,
+      30375,
+      53244
+    ],
+    "uvType": "BOX",
+    "uvScale": 0.7,
+    "colorOverrides": [
+      {
+        "colors": "h == 0",
+        "baseMaterial": "PURE_BLACK"
+      }
+    ]
   },
   {
-    "description": "Motherload mine upper floor",
+    "description": "Motherlode Mine Upper Floor",
     "baseMaterial": "DIRT_2",
     "objectIds": [
       26657
-    ]
+    ],
+    "uvType": "MODEL_XZ",
+    "uvScale": 0.5,
+    "uvOrientation": 256
   },
   {
     "description": "Amathyst mine walls",
@@ -5039,7 +5099,7 @@
     "uvType": "BOX"
   },
   {
-    "description": "Motherload Mine Rockfall",
+    "description": "Motherlode Mine Rockfall",
     "baseMaterial": "STONE_NORMALED",
     "objectIds": [
       26679,
@@ -5049,6 +5109,75 @@
     "uvScale": 0.4,
     "uvOrientation": 400
   },
+  {
+    "description": "Motherlode Mine - Cogs",
+    "baseMaterial": "METALLIC_1_HIGHGLOSS",
+    "objectIds": [
+      13589
+    ],
+    "uvType": "MODEL_XZ"
+  },
+  {
+    "description": "Motherlode Mine - Ladder, area specific due to use in other places",
+    "baseMaterial": "METALLIC_1_LIGHT_GLOSS",
+    "areas": [ "MOTHERLODE_MINE" ],
+    "objectIds": [
+      19046,
+      19047,
+      19048,
+      19049,
+      19050
+    ],
+    "uvType": "BOX",
+    "uvScale": 0.5
+  },
+  {
+    "description": "Motherlode Mine - Machine",
+    "baseMaterial": "METALLIC_1_LIGHT_GLOSS",
+    "areas": [ "MOTHERLODE_MINE" ],
+    "objectIds": [
+      26681,
+      26682
+    ]
+  },
+  {
+    "description": "Motherlode Trough",
+    "baseMaterial": "METALLIC_1_LIGHT_HIGHGLOSS",
+    "objectIds": [
+      3428,
+      18606,
+      18607,
+      18609,
+      26683,
+      26684,
+      26685,
+      26686,
+      53243
+    ],
+    "uvType": "BOX",
+    "uvScale": 0.5
+  },
+  {
+    "description": "Motherlode Trough Darker",
+    "baseMaterial": "METALLIC_1_HIGHGLOSS",
+    "areas": [ "Motherlode Mine Dark Trough Fix" ],
+    "objectIds": [
+      3428,
+      26683,
+      26684,
+      26685,
+      26686
+    ],
+    "uvType": "BOX"
+  },
+  {
+    "description": "Motherlode Mine - Darken Mercy",
+    "baseMaterial": "GRAY_75",
+    "areas": [ "MOTHERLODE_MINE" ],
+    "npcIds": [
+      5562
+    ]
+  },
   {
     "description": "Mining Guild statue",
     "baseMaterial": "MARBLE_1_GLOSS",
@@ -13267,26 +13396,6 @@
     "uvOrientation": 1536,
     "uvScale": 0.66
   },
-  {
-    "description": "Motherload Trough",
-    "baseMaterial": "METALLIC_1_LIGHT_HIGHGLOSS",
-    "objectIds": [
-      3428,
-      26683,
-      26684,
-      26685,
-      26686
-    ],
-    "uvType": "BOX"
-  },
-  {
-    "description": "Motherload Mine - Cogs",
-    "baseMaterial": "METALLIC_1_LIGHT_HIGHGLOSS",
-    "objectIds": [
-      13589
-    ],
-    "uvType": "MODEL_XZ"
-  },
   {
     "description": "Blast Furnace",
     "baseMaterial": "METALLIC_1",
@@ -13322,13 +13431,13 @@
     "uvType": "BOX"
   },
   {
-    "description": "Motherload Furnace",
+    "description": "Motherload Hopper",
     "baseMaterial": "METALLIC_1_HIGHGLOSS",
     "objectIds": [
       26674
     ],
-    "uvType": "MODEL_XZ_MIRROR_A",
-    "uvScale": 0.7
+    "uvType": "BOX",
+    "uvScale": 0.5
   },
   {
     "description": "Objects - Stone - Giants Foundry - Moulds",
@@ -13499,6 +13608,12 @@
     "objectIds": [ 754, 10459, 18863 ],
     "hide": true
   },
+  {
+    "description": "Texture for water in Motherlode Mine troughs",
+    "objectIds": [ 754, 10459 ],
+    "areas": [ "MOTHERLODE_MINE"],
+    "textureMaterial": "MOTHERLODE_MINE_WATER"
+  },
   {
     "description": "Poison Waste dungeon flowing tar (TODO)",
     "objectIds": [
@@ -14114,6 +14229,15 @@
     "retainVanillaUvs": false,
     "uvScale": 0.65
   },
+  {
+    "description": "Motherlode Mine - Deposit Box",
+    "baseMaterial": "WOOD_GRAIN_3",
+    "objectIds": [
+      25937
+    ],
+    "uvType": "BOX",
+    "uvScale": 0.7
+  },
   {
     "description": "Objects - Textured Rocks - Rocks with Vines",
     "baseMaterial": "PLANT_GRUNGE_1",

src/main/resources/rs117/hd/scene/tile_overrides.json

@@ -1938,6 +1938,14 @@
     "groundMaterial": "DIRT",
     "uvScale": 1.15
   },
+  {
+    "name": "MOTHERLODE_MINE_WATER",
+    "area": "MOTHERLODE_MINE",
+    "overlayIds": [
+      6
+    ],
+    "waterType": "MLM_WATER"
+  },
   {
     "name": "CATHERBY_BEACH_OBELISK_WATER_FIX",
     "area": "CATHERBY_BEACH_OBELISK_WATER_FIX",