diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index ab0b40f433..f2d1fbf394 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -11916,6 +11916,51 @@ 11583 ] }, + { + "name": "KRAKEN_COVE", + "regions": [ 9116 ] + }, + { + "name": "KRAKEN_COVE_HIDE_WATER_EDGE", + "aabbs": [ + [ 2289, 9988, 2303, 10023, 1 ], + [ 2263, 9985, 2274, 9992, 1 ], + [ 2244, 9997, 2260, 10007, 1 ], + [ 2252, 10008, 2257, 10010, 1 ], + [ 2240, 10022, 2248, 10030, 1 ] + + ] + }, + { + "name": "KRAKEN_COVE_WALL_FIX", + "aabbs": [ + [ 2290, 10020 ], + [ 2291, 10021 ], + [ 2293, 10022 ], + [ 2295, 10022 ], + [ 2296, 10021 ], + [ 2299, 10020 ], + [ 2300, 10019 ], + [ 2301, 10018 ], + [ 2245, 10029 ], + [ 2244, 10028 ], + [ 2243, 10026 ], + [ 2242, 10025 ], + [ 2246, 9998 ], + [ 2246, 10000 ], + [ 2247, 10002 ], + [ 2249, 10003 ], + [ 2266, 9990 ], + [ 2268, 9989 ], + [ 2269, 9987 ], + [ 2290, 9991 ], + [ 2291, 9990 ], + [ 2295, 9989 ], + [ 2300, 9998 ], + [ 2299, 10001 ], + [ 2256, 10004 ] + ] + }, { "name": "SNOWY_REGIONS", "areas": [ diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 0d485cf2be..dea249be4c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -2574,7 +2574,9 @@ "BRAIN_ROCK_POOL_BITS", "FAIRYTALE2_ROCK_POOL_SMALL", "STALKER_DEN_STEPPING_STONE", - "FRISD_IZSO_ROCK_POOL_SMALL" + "FRISD_IZSO_ROCK_POOL_SMALL", + "SLAYER_CAVE_POOLROCK_1", + "SLAYER_CAVE_POOLROCK_2" ], "uvType": "BOX", "colorOverrides": [ @@ -15157,8 +15159,6 @@ "SUROK_TUNNEL_ROCKS_SMALL_01", "SUROK_TUNNEL_ROCKS_SMALL_02", "SUROK_TUNNEL_ROCKS_SMALL_03", - "SLAYER_CAVE_POOLROCK_1", - "SLAYER_CAVE_POOLROCK_2", "ARCHEUUS_RUNESTONE_SHORTCUT_GREY_TOP", "ARCHEUUS_RUNESTONE_SHORTCUT_GREY_BOTTOM", "ARCHEUUS_RUNESTONE_SHORTCUT_GREY_MIDDLE", @@ -23053,11 +23053,18 @@ }, { "description": "Wall Decoration - Blood", - "baseMaterial": "GRAY_65", + "baseMaterial": "GRAY_55", "objectIds": [ "_100_DAVE_WALL_BLOOD" ] }, + { + "description": "Wall Decoration - Blood - Lighter", + "baseMaterial": "GRAY_75", + "objectIds": [ + "CAVE_BLOOD1" + ] + }, { "description": "Exercise Mats", "baseMaterial": "BURLAP", @@ -48148,6 +48155,18 @@ "uvType": "BOX", "uvScale": 1.25 }, + { + "description": "Kraken Cove - Wall Offset Fix", + "baseMaterial": "STONE_NORMALED", + "areas": [ "KRAKEN_COVE_WALL_FIX" ], + "modelOffset": [ 0, 16, 0 ], + "objectIds": [ + "ROYAL_CAVEWALL_FACE_GLOW", + "ROYAL_CAVEWALL_FACE" + ], + "uvType": "BOX", + "uvScale": 1.25 + }, { "description": "Kraken Cove - Stalagmites", "baseMaterial": "ROCK_3", @@ -48166,23 +48185,38 @@ "SLAYER_KRAKENCAVE_SHIPWRECK" ], "uvType": "BOX", - "uvScale": 0.44 + "uvScale": 0.6 }, { - "description": "Kraken Cove - Floating Body and Hole", - "baseMaterial": "GRUNGE_2", + "description": "Kraken Cove - Floating Body", + "baseMaterial": "DIRT_1", + "objectIds": [ + "GODWARS_UWATER_DEADGUY02" + ] + }, + { + "description": "Kraken Cove - Inaccessible Hole", + "baseMaterial": "DIRT_1", + "uvType": "BOX", + "uvScale": 0.5, + "depthBias": 200, "objectIds": [ - "GODWARS_UWATER_DEADGUY02", "SLAYER_CAVE_KRAKEN_HOLE" ] }, { "description": "Kraken Cove - Darken Whirlpools", - "baseMaterial": "GRAY_65", + "baseMaterial": "GRAY_70", "npcIds": [ "SLAYER_KRAKEN_SUB", "SLAYER_KRAKEN_BOSS_WHIRLPOOL", "SLAYER_KRAKEN_BOSS_TENTACLE_WHIRLPOOL" + ], + "colorOverrides": [ + { + "colors": "h == 32 || h == 37", + "baseMaterial": "GRAY_90" + } ] }, { diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 5aeab58d09..d3b937b9d9 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -10620,6 +10620,19 @@ "blended": false, "shiftLightness": 6 }, + { + "name": "KRAKEN_COVE_HIDE_WATER_EDGE", + "area": "KRAKEN_COVE_HIDE_WATER_EDGE", + "overlayIds": [ 7 ], + "waterType": "SWAMP_WATER", + "heightOffset": -150 + }, + { + "name": "KRAKEN_COVE_WATER_FIX", + "area": "KRAKEN_COVE_WALL_FIX", + "underlayIds": [ 53, 54 ], + "waterType": "SWAMP_WATER" + }, { "name": "TAG - CLIMATE - START" }, @@ -10942,6 +10955,17 @@ "waterType": "SWAMP_WATER", "blended": false }, + { + "name": "OVERLAY_SWAMP_WATER", + "area": "ALL", + "overlayIds": [ + 7, + 128, + 156 + ], + "waterType": "SWAMP_WATER", + "blended": false + }, { "name": "OVERLAY_WOOD_PLANKS", "area": "ALL", diff --git a/src/main/resources/rs117/hd/scene/water_types.json b/src/main/resources/rs117/hd/scene/water_types.json index 567e47b83c..d1124ee46c 100644 --- a/src/main/resources/rs117/hd/scene/water_types.json +++ b/src/main/resources/rs117/hd/scene/water_types.json @@ -4,6 +4,14 @@ "surfaceColor": "#69809C", "fresnelAmount": 0.85 }, + { + "name": "TRANSPARENT", + "baseOpacity": 0, + "specularStrength": 0, + "specularGloss": 0, + "normalStrength": 0, + "fresnelAmount": 0 + }, { "name": "WATER_FLAT", "surfaceColor": "#69809C",