diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 8921db1eed..0a69280754 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -3613,10 +3613,22 @@ ] }, { - "name": "MORYTANIA_SPIDER_CAVES", + "name": "ARAXYTE_SPIDER_CAVES", + "aabbs": [ + [ 3652, 9792, 3711, 9871 ] + ] + }, + { + "name": "ARAXXOR_ARENA", "aabbs": [ - [ 3648, 9792, 3711, 9871 ], - [ 3602, 9792, 3647, 9855 ] + [ 3602, 9792, 3651, 9855 ] + ] + }, + { + "name": "MORYTANIA_SPIDER_CAVES", + "areas": [ + "ARAXYTE_SPIDER_CAVES", + "ARAXXOR_ARENA" ], "hideOtherAreas": true }, diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index b077abd145..4933ae6e47 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -21868,7 +21868,10 @@ { "description": "PHASMATYS_ENERGY_BARRIER__1", "offset": [ 0, 175, 0 ], - "objectIds": [ "AHOY_TOWN_BARRIER" ], + "objectIds": [ + "AHOY_TOWN_BARRIER", + "AHOY_TOWN_BARRIER_POST_QUEST" + ], "radius": 800, "strength": 4.5, "color": [ @@ -21883,7 +21886,10 @@ { "description": "PHASMATYS_ENERGY_BARRIER_2", "offset": [ -120, 175, 0 ], - "objectIds": [ "AHOY_TOWN_BARRIER" ], + "objectIds": [ + "AHOY_TOWN_BARRIER", + "AHOY_TOWN_BARRIER_POST_QUEST" + ], "radius": 800, "strength": 4.5, "color": [ @@ -43922,5 +43928,92 @@ "objectIds": [ "GRIMSTONE_FURNACE" ] + }, + { + "description": "ARAXXOR_VENOM_POOL_EDGE", + "offset": [ -100, 250, 0 ], + "alignment": "CENTER", + "radius": 500, + "strength": 3, + "color": [ + 0, + 255, + 0 + ], + "type": "STATIC", + "objectIds": [ + "FLOORKIT_GRADIENT04_CORNER01" + ] + }, + { + "description": "ARAXXOR_VENOM_POOL_MIDDLE1", + "offset": [ 75, 250, 0 ], + "worldX": 3616, + "worldY": 9818, + "radius": 550, + "strength": 3, + "color": [ + 0, + 242, + 0 + ], + "type": "STATIC" + }, + { + "description": "ARAXXOR_VENOM_POOL_MIDDLE2", + "offset": [ 0, 250, 0 ], + "worldX": 3615, + "worldY": 9814, + "radius": 550, + "strength": 3, + "color": [ + 0, + 242, + 0 + ], + "type": "STATIC" + }, + { + "description": "ARAXXOR_VENOM_POOL_MIDDLE3", + "offset": [ 0, 250, 0 ], + "worldX": 3617, + "worldY": 9811, + "radius": 450, + "strength": 3, + "color": [ + 0, + 242, + 0 + ], + "type": "STATIC" + }, + { + "description": "ARAXXOR_VENOM_POOL_MIDDLE4", + "offset": [ 25, 250, 0 ], + "worldX": 3617, + "worldY": 9822, + "radius": 550, + "strength": 3, + "color": [ + 0, + 242, + 0 + ], + "type": "STATIC" + }, + { + "description": "ARAXYTE_SPIDER_CAVE_EXIT", + "offset": [ 0, 125, 0 ], + "radius": 750, + "strength": 3.5, + "color": [ + 255, + 255, + 255 + ], + "type": "STATIC", + "objectIds": [ + "ARAXYTE_CAVE_EXIT" + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index f3cf92a233..5ab1e0c616 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -49768,26 +49768,65 @@ "description": "Morytania Spider Cave wall topper", "baseMaterial": "ROCK_1", "uvOrientation": 256, - "uvScale": 1.2, + "uvScale": 0.85, "uvType": "BOX", "objectIds": [ "ARAXYTE_CAVE_WALL_TOP", - "ARAXYTE_CAVE_WALL_TOP02", "CAVEKIT_ARAXXOR_CAVETOP" + ], + "colorOverrides": [ + { + "colors": "h == 0 && l == 2", + "baseMaterial": "PURE_BLACK" + } ] }, { - "description": "Morytania Spider Cave wall topper edges with black", - "baseMaterial": "ROCK_1", + "description": "Morytania Spider Cave wall topper edges with black - Lighter", + "baseMaterial": "ROCK_1_LIGHT", "uvOrientation": 256, + "uvScale": 0.85, "uvType": "BOX", "objectIds": [ + "ARAXYTE_CAVE_WALL_TOP02", "ARAXYTE_CAVE_WALL_TOP03", - "ARAXYTE_CAVE_WALL_TOP04", - "ARAXYTE_CAVE_WALL_TOP05", + "ARAXYTE_CAVE_WALL_TOP04" + ], + "colorOverrides": [ + { + "colors": "h == 0 && l == 2", + "baseMaterial": "PURE_BLACK" + } + ] + }, + { + "description": "Morytania Spider Cave wall topper edges with black - Darker", + "baseMaterial": "ROCK_1", + "uvOrientation": 256, + "uvScale": 0.85, + "uvType": "BOX", + "objectIds": [ "CAVEKIT_ARAXXOR_CAVETOP_WALLTOP02", "CAVEKIT_ARAXXOR_CAVETOP_WALLTOP03", - "CAVEKIT_ARAXXOR_CAVETOP_WALLTOP04" + "CAVEKIT_ARAXXOR_CAVETOP_WALLTOP04", + "CAVEKIT_ARAXXOR_CAVETOP03_WALLTOP04", + "CAVEKIT_ARAXXOR_CAVETOP03_WALLTOP02", + "CAVEKIT_ARAXXOR_CAVETOP03_WALLTOP03" + ], + "colorOverrides": [ + { + "colors": "h == 0 && l == 2", + "baseMaterial": "PURE_BLACK" + } + ] + }, + { + "description": "Morytania Spider Cave wall topper edges with black", + "baseMaterial": "PURE_BLACK", + "castShadows": false, + "receiveShadows": false, + "objectIds": [ + "ARAXYTE_CAVE_WALL_TOP05" ] }, { @@ -49797,14 +49836,15 @@ "uvType": "BOX", "colorOverrides": [ { - "description": "Web backing", - "colors": "h == 10", - "baseMaterial": "NONE" + "colors": "h == 0 && l == 2", + "baseMaterial": "BLACK" }, { - "description": "Web", - "colors": "h == 0", - "baseMaterial": "NONE" + "description": "Web backing", + "colors": "a < 255", + "baseMaterial": "NONE", + "castShadows": false, + "receiveShadows": false } ], "objectIds": [ @@ -49813,7 +49853,22 @@ "CAVEKIT_WEB01_STRAND01", "CAVEKIT_WEB01_STRAND02", "CAVEKIT_WEB04_BLOOD01", - "CAVEKIT_WEB03_STRAND01_BLOOD01" + "CAVEKIT_WEB03_STRAND01_BLOOD01", + "CAVEKIT_WEB03_BLOOD01", + "CAVEKIT_WEB02_STRAND01_BLOOD01", + "CAVEKIT_WEB02_STRAND02_BLOOD01", + "CAVEKIT_WEB03_DEFAULT01", + "CAVEKIT_WEB02_STRAND01", + "CAVEKIT_WEB05_DEFAULT01", + "CAVEKIT_WEB03_STRAND01", + "CAVEKIT_ARAXXOR_CAVETOP03", + "CAVEKIT_WEB04_VENOM01", + "CAVEKIT_WEB04_VENOM02", + "CAVEKIT_WEB04_DEFAULT01", + "CAVEKIT_WEB04_DEFAULT01A", + "CAVEKIT_WEB03_STRAND02_BLOOD01", + "CAVEKIT_WEB02_STRAND02", + "CAVEKIT_WEB03_STRAND02" ] }, { @@ -49824,13 +49879,13 @@ "colorOverrides": [ { "description": "Web backing", - "colors": "h == 10", + "colors": "a < 255", "baseMaterial": "GROUND_WEB_2_LIGHT" }, { "description": "Exit", "colors": "h == 0", - "baseMaterial": "NONE" + "baseMaterial": "GRAY_90" } ], "objectIds": [ @@ -49841,35 +49896,37 @@ "description": "Morytania Spider Cave web tunnel", "baseMaterial": "ROCK_1", "uvOrientation": 343, + "uvScale": 0.85, "uvType": "BOX", "colorOverrides": [ { "description": "Web backing", - "colors": "h == 10", + "colors": "a < 255", "baseMaterial": "GROUND_WEB_2_LIGHT" }, { - "description": "Web", - "colors": "h == 0", - "baseMaterial": "NONE" + "colors": "h == 0 && l == 2", + "baseMaterial": "PURE_BLACK" } ], "objectIds": [ "ARAXXOR_CAVE_OUTER_TUNNEL_OP", "ARAXXOR_CAVE_OUTER_TUNNEL_NOOP", - "ARAXXOR_CAVE_OUTER_TUNNEL_OP_4" + "ARAXXOR_CAVE_OUTER_TUNNEL_OP_4", + "ARAXXOR_CAVE_OUTER_TUNNEL_OP_2", + "ARAXXOR_CAVE_OUTER_TUNNEL_OP_3" ] }, { "description": "Morytania Spider Cave webbed stalagmite", - "baseMaterial": "ROCK_4", + "baseMaterial": "ROCK_3", "uvOrientation": 343, "uvType": "BOX", "uvScale": 0.8, "colorOverrides": [ { "description": "Web backing", - "colors": "h == 10", + "colors": "h == 10 || h == 13", "baseMaterial": "GROUND_WEB_2_LIGHT" } ], @@ -49877,16 +49934,76 @@ "DECOKIT_WEB01_HANGING01", "ARAXXOR_STALAGMITE02_WEBBED01", "ARAXXOR_STALAGMITE02_WEBBED02", - "ARAXXOR_WEBSACK02_STALAGMITE01" + "ARAXXOR_WEBSACK02_STALAGMITE01", + "ARAXXOR_STALAGMITE01_WEBBED02", + "ARAXXOR_STALAGMITE01_WEBBED01", + "ARAXXOR_STALAGMITE01_WEBBED03", + "ARAXXOR_WEB01_HANGING01", + "ARAXXOR_WEB01_HANGING02", + "ARAXXOR_WEBSACK01_STALAGMITE01", + "DECOKIT_WEB02_HANGING03", + "DECOKIT_WEB02_HANGING02", + "DECOKIT_WEB03_LAYING01", + "DECOKIT_WEB03_LAYING02" + ] + }, + { + "description": "Morytania Spider Cave Araxxor Venom Pool Rocks", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "objectIds": [ + "ROCK_ACID01_MEDIUM03", + "ROCK_ACID01_SMALL01", + "ROCK_ACID01_LARGE02", + "ROCK_ACID01_LARGE01", + "ROCK_ACID01_LARGE03", + "ROCK_ACID01_MEDIUM02", + "ROCK_ACID01_SMALL02" + ] + }, + { + "description": "Morytania Spider Cave Araxxor Pool Ripples", + "baseMaterial": "GRAY_150", + "uvType": "BOX", + "objectIds": [ + "ARAXXOR_RIPPLE_SMALL01", + "ARAXXOR_RIPPLE_LARGE01" + ] + }, + { + "description": "Morytania Spider Cave Large Egg Sack", + "baseMaterial": "STONE_NORMALED", + "uvOrientation": 343, + "uvScale": 1.25, + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Web backing", + "colors": "h < 10", + "baseMaterial": "NONE" + }, + { + "description": "Web backing", + "colors": "a < 255", + "baseMaterial": "GROUND_WEB_2_LIGHT" + } + ], + "objectIds": [ + "TOBQUEST_EGG_SAC_FULL_NOOP" ] }, { "description": "Morytania Spider Cave webbed stalagmite and scroll", - "baseMaterial": "ROCK_4", + "baseMaterial": "ROCK_3", "uvOrientation": 343, "uvType": "BOX", "uvScale": 0.8, "colorOverrides": [ + { + "description": "Scroll", + "colors": "h == 7", + "baseMaterial": "GRUNGE_3_SMOOTH" + }, { "description": "Web backing", "colors": "h != 26", @@ -49894,7 +50011,8 @@ } ], "objectIds": [ - "ARAXXOR_SCOREBOARD_DISABLED" + "ARAXXOR_SCOREBOARD_DISABLED", + "ARAXXOR_SCOREBOARD" ] }, { diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 80229fb89d..c2c533e982 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -8455,19 +8455,35 @@ }, { "name": "ARAXXOR_WEB_OVERLAY", - "area": "MORYTANIA_SPIDER_CAVES", + "area": "ARAXXOR_ARENA", "overlayIds": [ 370 ], "groundMaterial": "GROUND_WEBS", "blended": false, - "uvScale": 3, + "uvScale": 2, "uvOrientation": 89, - "shiftLightness": 14 + "shiftLightness": 16, + + "replacements": { + "NONE": "!textures" + } + }, + { + "name": "ARAXXOR_DIRT", + "area": "ARAXXOR_ARENA", + "underlayIds": [ + 80 + ], + "groundMaterial": "VARIED_DIRT", + "minLightness": 16, + "replacements": { + "NONE": "!textures" + } }, { "name": "ARAXXOR_WASTE_WATER", - "area": "MORYTANIA_SPIDER_CAVES", + "area": "ARAXXOR_ARENA", "overlayIds": [ 364 ], @@ -8475,7 +8491,7 @@ }, { "name": "MORYTANIA_SPIDER_CAVES_WEB_1", - "area": "MORYTANIA_SPIDER_CAVES", + "area": "ARAXYTE_SPIDER_CAVES", "overlayIds": [ 191 ], @@ -8486,29 +8502,33 @@ 84 ], "groundMaterial": "GROUND_WEBS", - "uvScale": 2, + "uvScale": 3, "uvOrientation": 90, "shiftLightness": 7, "replacements": { - "DEFAULT_PACKED_EARTH": "h < 10" + "DEFAULT_PACKED_EARTH": "h < 8 || !blending", + "NONE": "!textures" } }, { "name": "MORYTANIA_SPIDER_CAVES_WEB_2", - "area": "MORYTANIA_SPIDER_CAVES", + "area": "ARAXYTE_SPIDER_CAVES", "underlayIds": [ + 10, 39, 62, 80, 85, + 118, 138 ], "groundMaterial": "GROUND_WEBS", - "uvScale": 2, + "uvScale": 3, "uvOrientation": 32, "shiftLightness": 7, "replacements": { - "DEFAULT_PACKED_EARTH": "h < 10" + "DEFAULT_PACKED_EARTH": "h < 8 || !blending", + "NONE": "!textures" } }, {