From 48c4b137a4fd5e16f56349480013c1880fd19410 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 21 Feb 2026 15:37:00 -0500 Subject: [PATCH 01/22] Add a lighter sand option to brightness match TOA --- src/main/resources/rs117/hd/scene/materials.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index acc1eaed37..a91171041e 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -1390,6 +1390,11 @@ "specularStrength": 0.2, "specularGloss": 10.0 }, + { + "name": "SAND_1_TOA", + "parent": "SAND_1", + "brightness": 1.25 + }, { "name": "SAND_2_N" }, From dbdc8afc692ce257ff62db740b55ee0b07d9256a Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 21 Feb 2026 15:37:55 -0500 Subject: [PATCH 02/22] Remove some unneeded overrides, added new ones for ground materials within TOA and it's puzzle rooms. does not touch boss rooms --- .../rs117/hd/scene/tile_overrides.json | 187 ++++++++++++++++-- 1 file changed, 171 insertions(+), 16 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 39bfb7a307..8337260400 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5830,14 +5830,6 @@ ], "blended": false }, - { - "name": "TOA_DISABLE_BLENDING_N18", - "area": "TOA_PATH_OF_APMEKEN_PUZZLE", - "overlayIds": [ - 238 - ], - "blended": false - }, { "name": "TOA_DISABLE_BLENDING_30", "area": "TOA_PATH_OF_APMEKEN_BOSS", @@ -5846,14 +5838,6 @@ ], "blended": false }, - { - "name": "TOA_DISABLE_BLENDING_N16", - "area": "TOA_PATH_OF_HET_PUZZLE", - "overlayIds": [ - 240 - ], - "blended": false - }, { "name": "TOA_DISABLE_BLENDING_N62", "area": "TOA_PATH_OF_CRONDIS_BOSS", @@ -5913,6 +5897,177 @@ "waterType": "SWAMP_WATER", "blended": false }, + { + "name": "TOA_AMASCUT_FLOOR_SAND_BLEND", + "groundMaterial": "SAND", + "maxLightness": 32 + }, + { + "name": "TOA_KEPHRI_FLOOR", + "area": "TOMBS_OF_AMASCUT", + "underlayIds": [ + 90, 124 + ], + "blended": false + }, + { + "name": "TOA_APMEKEN_FLOOR_OVERLAY_TILE_SAND", + "area": "TOA_PATH_OF_APMEKEN_PUZZLE", + "groundMaterial": "SAND", + "shiftLightness": 7, + "overlayIds": [ + 119 + ], + "blended": false + }, + { + "name": "TOA_APMEKEN_FLOOR_OVERLAY", + "area": "TOA_PATH_OF_APMEKEN_PUZZLE", + "groundMaterial": "SAND", + "shiftLightness": 9, + "overlayIds": [ + 238 + ], + "blended": false + }, + { + "name": "TOA_APMEKEN_PUZZLE_FLOOR", + "area": "TOA_PATH_OF_APMEKEN_PUZZLE", + "groundMaterial": "TERRACOTTA_FLOOR", + "uvScale": 1.40, + "overlayIds": [ 239 ], + "underlayIds": [ + 110, + 117 + ] + }, + { + "name": "TOA_CRONDIS_PUZZLE_FLOOR", + "area": "TOA_PATH_OF_CRONDIS_PUZZLE", + "groundMaterial": "TERRACOTTA_FLOOR", + "uvScale": 1.40, + "underlayIds": [ + 109, + 117 + ] + }, + { + "name": "TOA_CRONDIS_PUZZLE_FLOOR_HIDDEN", + "area": "TOA_PATH_OF_CRONDIS_PUZZLE", + "overlayIds": [ 185 ], + "blended": false + }, + { + "name": "TOA_CRONDIS_PUZZLE_FLOOR_OVERLAY", + "area": "TOA_PATH_OF_CRONDIS_PUZZLE", + "groundMaterial": "DIRT", + "uvScale": 1.40, + "overlayIds": [ + 185, 186, 238 + ] + }, + { + "name": "TOA_CRONDIS_PUZZLE_FLOOR_HIDDEN", + "area": "TOA_PATH_OF_HET_PUZZLE", + "underlayIds": [ 141 ], + "blended": false + }, + { + "name": "TOA_HET_PUZZLE_FLOOR", + "area": "TOA_PATH_OF_HET_PUZZLE", + "groundMaterial": "TERRACOTTA_FLOOR", + "uvScale": 1.40, + "underlayIds": [ + 127 + ] + }, + { + "name": "TOA_AMASCUT_FLOOR_SAND", + "area": "TOMBS_OF_AMASCUT", + "groundMaterial": "SAND", + "maxLightness": 32, + "shiftLightness": 10, + "overlayIds": [ + 222, + 238, + 239, + 240, + 242, + 253 + ], + "underlayIds": [ + 109, + 110, + 117, + 127, + 128, + 132 + ], + "replacements": { + "TOA_AMASCUT_FLOOR_SAND_BLEND": "blending" + } + }, + { + "name": "TOA_AMASCUT_FLOOR_GRAVEL", + "area": "TOMBS_OF_AMASCUT", + "uvScale": 1.5, + "groundMaterial": "GRAVEL", + "underlayIds": [ + 156 + ] + }, + { + "name": "TOA_AMASCUT_FLOOR_STONE_UNDERLAY", + "area": "TOMBS_OF_AMASCUT", + "uvOrientation": -256, + "uvScale": 1.5, + "groundMaterial": "STONE", + "maxLightness": 18, + "shiftLightness": 1, + "maxSaturation": 1, + "underlayIds": [ + 104, 105 + ] + }, + { + "name": "TOA_AMASCUT_FLOOR_STONE_RED", + "area": "TOMBS_OF_AMASCUT", + "uvOrientation": 256, + "uvScale": 1.3, + "groundMaterial": "STONE", + "maxLightness": 13, + "minSaturation": 2, + "maxSaturation": 3, + "setHue": 39, + "overlayIds": [ + 72, + 194 + ] + }, + { + "name": "TOA_AMASCUT_FLOOR_STONE", + "area": "TOMBS_OF_AMASCUT", + "uvOrientation": 256, + "uvScale": 1.3, + "groundMaterial": "STONE", + "maxLightness": 15, + "minSaturation": 2, + "overlayIds": [ + 232, 233, 233, 236, 237 + ], + "blended": false + }, + { + "name": "TOA_AMASCUT_FLOOR_STONE_TILES", + "area": "TOMBS_OF_AMASCUT", + "uvOrientation": 256, + "uvScale": 1.3, + "groundMaterial": "STONE", + "overlayIds": [ + 139, 228 + ], + "blended": false + }, { "name": "THE_SCAR_WATER", "area": "THE_SCAR", From 93f134669f1a740972982b9cdf098ab5f09e82ff Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 21 Feb 2026 15:39:13 -0500 Subject: [PATCH 03/22] Add moels for sand objects as well as some rubble in the sand --- .../rs117/hd/scene/model_overrides.json | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 7a8e7b0ae1..10e62233e5 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80675,5 +80675,60 @@ "uvScale": 0.3 } ] + }, + { + "description": "TOA Sand Blending Models", + "baseMaterial": "SAND_1_TOA", + "uvType": "WORLD_XZ", + "objectIds": [ + "DECAL_SAND01_CRACKS01", + "DECAL_SAND01_CRACKS02", + "DECAL_SAND01_CRACKS03", + "DECAL_SAND01_CRACKS04", + "DECAL_SAND01_CRACKS01_MIRROR", + "DECAL_SAND01_CRACKS02_MIRROR", + "DECAL_SAND01_CRACKS03_MIRROR", + "DECAL_SAND01_CRACKS04_MIRROR" + ] + }, + { + "description": "TOA Wall sand light", + "baseMaterial": "SAND_1", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + "TOA_LOBBY_WALL01_SAND01" + ] + }, + { + "description": "TOA wall sand dark", + "baseMaterial": "SAND_1_TOA", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + "TOA_LOBBY_WALL01_SAND01_MIRROR" + ] + }, + { + "description": "TOA Rock rubble with sand", + "baseMaterial": "SAND_1_TOA", + "uvType": "WORLD_XZ", + "terrainVertexSnap": true, + "terrainVertexSnapThreshold": 0.1, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 39", + "uvScale": 1.2, + "baseMaterial": "ROCK_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "TOA_LOBBY_RUBBLE01_STONE01", + "TOA_LOBBY_RUBBLE01_STONE02", + "TOA_LOBBY_RUBBLE01_STONE03" + ] } ] From 813018021b5d152ae9bf52e92bc071a6ee71d013 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 21 Feb 2026 16:04:51 -0500 Subject: [PATCH 04/22] update overrides based on feedback to dirt --- src/main/resources/rs117/hd/scene/materials.json | 10 +++++----- src/main/resources/rs117/hd/scene/model_overrides.json | 10 +++++----- src/main/resources/rs117/hd/scene/tile_overrides.json | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index a91171041e..c344a1ae01 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -1342,6 +1342,11 @@ "parent": "GRAVEL", "brightness": 1.194 }, + { + "name": "GRAVEL_TOA", + "parent": "GRAVEL", + "brightness": 1.20 + }, { "name": "DIRT_1_SHINY", "parent": "DIRT_1", @@ -1390,11 +1395,6 @@ "specularStrength": 0.2, "specularGloss": 10.0 }, - { - "name": "SAND_1_TOA", - "parent": "SAND_1", - "brightness": 1.25 - }, { "name": "SAND_2_N" }, diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 10e62233e5..c54b7cf05d 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80677,8 +80677,8 @@ ] }, { - "description": "TOA Sand Blending Models", - "baseMaterial": "SAND_1_TOA", + "description": "TOA Ground Blending Models", + "baseMaterial": "GRAVEL_TOA", "uvType": "WORLD_XZ", "objectIds": [ "DECAL_SAND01_CRACKS01", @@ -80693,7 +80693,7 @@ }, { "description": "TOA Wall sand light", - "baseMaterial": "SAND_1", + "baseMaterial": "GRAVEL", "uvType": "BOX", "uvOrientation": 256, "objectIds": [ @@ -80702,7 +80702,7 @@ }, { "description": "TOA wall sand dark", - "baseMaterial": "SAND_1_TOA", + "baseMaterial": "GRAVEL_TOA", "uvType": "BOX", "uvOrientation": 256, "objectIds": [ @@ -80711,7 +80711,7 @@ }, { "description": "TOA Rock rubble with sand", - "baseMaterial": "SAND_1_TOA", + "baseMaterial": "GRAVEL_TOA", "uvType": "WORLD_XZ", "terrainVertexSnap": true, "terrainVertexSnapThreshold": 0.1, diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 8337260400..2c5d62a906 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5899,7 +5899,7 @@ }, { "name": "TOA_AMASCUT_FLOOR_SAND_BLEND", - "groundMaterial": "SAND", + "groundMaterial": "VARIED_DIRT", "maxLightness": 32 }, { @@ -5913,7 +5913,7 @@ { "name": "TOA_APMEKEN_FLOOR_OVERLAY_TILE_SAND", "area": "TOA_PATH_OF_APMEKEN_PUZZLE", - "groundMaterial": "SAND", + "groundMaterial": "VARIED_DIRT", "shiftLightness": 7, "overlayIds": [ 119 @@ -5923,7 +5923,7 @@ { "name": "TOA_APMEKEN_FLOOR_OVERLAY", "area": "TOA_PATH_OF_APMEKEN_PUZZLE", - "groundMaterial": "SAND", + "groundMaterial": "VARIED_DIRT", "shiftLightness": 9, "overlayIds": [ 238 @@ -5984,7 +5984,7 @@ { "name": "TOA_AMASCUT_FLOOR_SAND", "area": "TOMBS_OF_AMASCUT", - "groundMaterial": "SAND", + "groundMaterial": "VARIED_DIRT", "maxLightness": 32, "shiftLightness": 10, "overlayIds": [ From 73afacacdbaae7b7a85f7fe7a3249ded3c2a9e45 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Feb 2026 17:35:38 -0500 Subject: [PATCH 05/22] push incomplete walls --- .../rs117/hd/scene/model_overrides.json | 137 ++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index c54b7cf05d..22128b3d9b 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80730,5 +80730,142 @@ "TOA_LOBBY_RUBBLE01_STONE02", "TOA_LOBBY_RUBBLE01_STONE03" ] + }, + { + "description": "TOA Baba stone brick wall", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "objectIds": [ + "TOA_WALL_BABA05_TRIM01", + "TOA_WALL_BABA05_TRIM02" + ] + }, + { + "description": "TOA Baba stone brick wall - incomplete", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 6", + "uvScale": 1.2, + "baseMaterial": "ROCK_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -256 + } + ], + "objectIds": [ + "TOA_WALL_BABA04" + ] + }, + { + "description": "TOA Kehpri wall", + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 1.2, + "objectIds": [ + "TOA_WALL_TOMB03_VARIANT01_KEPHRI01" + ] + }, + { + "description": "TOA Kehpri wall Stone Bricks", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "objectIds": [ + "TOA_WALL_TOMB01_VARIANT01_GREY01", + "TOA_WALL_TOMB01_VARIANT01_GREY02", + "TOA_WALL_TOMB01_VARIANT01_GREY03", + "TOA_WALL_TOMB01_VARIANT01_GREY04", + "TOA_WALL_TOMB01_VARIANT01_GREY05" + ] + }, + { + "description": "TOA Zebek stone brick wall - incomplete", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "objectIds": [ + "TOA_ZEBAK_WALL01_BASIC01B", + "TOA_ZEBAK_WALL01_BASIC01C", + "TOA_ZEBAK_WALL01_BASIC01D", + "WALLKIT_TOMB01_SMASHED01", + "WALLKIT_TOMB01_SMASHED02", + "WALLKIT_TOMB01_SMASHED03", + "WALLKIT_TOMB01_SMASHED04", + "WALLKIT_TOMB01_SMASHED05", + "WALLKIT_TOMB01_SMASHED06", + "WALLKIT_TOMB01_SMASHED07", + "WALLKIT_TOMB01_SMASHED08", + "WALLKIT_TOMB01_SMASHED09", + "WALLKIT_TOMB01_SMASHED10", + "WALLKIT_TOMB01_SMASHED01_MIRROR", + "WALLKIT_TOMB01_SMASHED02_MIRROR", + "WALLKIT_TOMB01_SMASHED03_MIRROR", + "WALLKIT_TOMB01_SMASHED04_MIRROR", + "WALLKIT_TOMB01_SMASHED05_MIRROR", + "WALLKIT_TOMB01_SMASHED06_MIRROR", + "WALLKIT_TOMB01_SMASHED07_MIRROR" + ] + }, + { + "description": "TOA lobby wooden wall", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientation": 512, + "objectIds": [ + "TOA_LOBBY_WALL_RETAINING01" + ] + }, + { + "description": "TOA Akkah Wall with sand and grunge - incomplete - Perf hit?", + "baseMaterial": "GRAVEL_TOA", + "uvType": "WORLD_XZ", + "colorOverrides": [ + { + "description": "Stone", + "colors": "h >= 35", + "uvScale": 1.2, + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256 + }, + { + "description": "Stone", + "colors": "h == 0", + "uvScale": 1.2, + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL2_35", + "AKKHA_ARENA_OUTER_LVL2_38", + "AKKHA_ARENA_OUTER_LVL2_39", + "AKKHA_ARENA_OUTER_LVL2_41", + "AKKHA_ARENA_OUTER_LVL2_42", + "AKKHA_ARENA_OUTER_LVL2_43", + "AKKHA_ARENA_OUTER_LVL2_44", + "AKKHA_ARENA_OUTER_LVL2_45", + "AKKHA_ARENA_OUTER_LVL2_46", + "AKKHA_ARENA_OUTER_LVL2_47", + "AKKHA_ARENA_OUTER_LVL2_48", + "AKKHA_ARENA_OUTER_LVL2_49", + "AKKHA_ARENA_OUTER_LVL2_50", + "AKKHA_ARENA_OUTER_LVL2_54", + "AKKHA_ARENA_OUTER_LVL2_55", + "AKKHA_ARENA_OUTER_LVL2_60", + "AKKHA_ARENA_OUTER_LVL2_65", + "AKKHA_ARENA_OUTER_LVL2_66" + ] } ] From 46f0ef02035d7c86407a0cedb7dac284f2955822 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Feb 2026 17:43:05 -0500 Subject: [PATCH 06/22] move incomplete items for easy removal if need --- .../rs117/hd/scene/model_overrides.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 22128b3d9b..0484881740 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80742,26 +80742,6 @@ "TOA_WALL_BABA05_TRIM02" ] }, - { - "description": "TOA Baba stone brick wall - incomplete", - "baseMaterial": "STONE_NORMALED", - "uvType": "BOX", - "uvOrientation": -256, - "uvScale": 1.2, - "colorOverrides": [ - { - "description": "Stone", - "colors": "h == 6", - "uvScale": 1.2, - "baseMaterial": "ROCK_3_LIGHT", - "uvType": "BOX", - "uvOrientation": -256 - } - ], - "objectIds": [ - "TOA_WALL_BABA04" - ] - }, { "description": "TOA Kehpri wall", "baseMaterial": "GRUNGE_3_LIGHT", @@ -80786,6 +80766,36 @@ "TOA_WALL_TOMB01_VARIANT01_GREY05" ] }, + { + "description": "TOA lobby wooden wall", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientation": 512, + "objectIds": [ + "TOA_LOBBY_WALL_RETAINING01" + ] + }, + { + "description": "TOA Baba stone brick wall - incomplete", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 6", + "uvScale": 1.2, + "baseMaterial": "ROCK_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -256 + } + ], + "objectIds": [ + "TOA_WALL_BABA04" + ] + }, { "description": "TOA Zebek stone brick wall - incomplete", "baseMaterial": "STONE_NORMALED", @@ -80815,16 +80825,6 @@ "WALLKIT_TOMB01_SMASHED07_MIRROR" ] }, - { - "description": "TOA lobby wooden wall", - "baseMaterial": "WOOD_GRAIN_3", - "uvType": "BOX", - "uvScale": 0.8, - "uvOrientation": 512, - "objectIds": [ - "TOA_LOBBY_WALL_RETAINING01" - ] - }, { "description": "TOA Akkah Wall with sand and grunge - incomplete - Perf hit?", "baseMaterial": "GRAVEL_TOA", From bf672a1401b41af25becf42c3edf9dd03c91e0da Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Feb 2026 17:53:42 -0500 Subject: [PATCH 07/22] fix typo --- src/main/resources/rs117/hd/scene/tile_overrides.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 2c5d62a906..ceb7197290 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5967,7 +5967,7 @@ ] }, { - "name": "TOA_CRONDIS_PUZZLE_FLOOR_HIDDEN", + "name": "TOA_HET_PUZZLE_FLOOR_HIDDEN", "area": "TOA_PATH_OF_HET_PUZZLE", "underlayIds": [ 141 ], "blended": false From a9b321381a3967ca4966a0efce442ccdfb2412fc Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Feb 2026 18:26:34 -0500 Subject: [PATCH 08/22] add light to exit --- src/main/resources/rs117/hd/scene/lights.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index cd83822d94..db71d63e2e 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -46098,5 +46098,22 @@ "DRAGON_SLAYER_QIP_FIRE_2X2", "ZORGOTH_FIRE" ] + }, + { + "description": "TOA_LOBBY_EXIT", + "offset": [ 0, 215, -35 ], + "radius": 450, + "strength": 15, + "color": [ + 255, + 255, + 255 + ], + "type": "STATIC", + "duration": 0, + "range": 0, + "objectIds": [ + "TOA_LOBBY_EXIT" + ] } ] From 3fe3bbeb8a017141ef07cf0ce0474aaa529493ff Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Feb 2026 18:27:18 -0500 Subject: [PATCH 09/22] texture nexus and lobby walls --- .../rs117/hd/scene/model_overrides.json | 127 ++++++++++++++++-- 1 file changed, 119 insertions(+), 8 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 0484881740..a963311437 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80704,13 +80704,13 @@ "description": "TOA wall sand dark", "baseMaterial": "GRAVEL_TOA", "uvType": "BOX", - "uvOrientation": 256, + "uvOrientation": -228, "objectIds": [ "TOA_LOBBY_WALL01_SAND01_MIRROR" ] }, { - "description": "TOA Rock rubble with sand", + "description": "ToA - Lobby - Rock rubble with sand", "baseMaterial": "GRAVEL_TOA", "uvType": "WORLD_XZ", "terrainVertexSnap": true, @@ -80720,7 +80720,7 @@ "description": "Stone", "colors": "h == 39", "uvScale": 1.2, - "baseMaterial": "ROCK_3_LIGHT", + "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -128 } @@ -80732,8 +80732,119 @@ ] }, { - "description": "TOA Baba stone brick wall", - "baseMaterial": "STONE_NORMALED", + "description": "ToA - Lobby Stone Brick Wall with Sand", + "baseMaterial": "GRAVEL_TOA", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 39", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "TOA_LOBBY_WALL01_SAND02" + ] + }, + { + "description": "ToA - Lobby and Nexus Area - Stone Brick Wall", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "objectIds": [ + "TOA_LOBBY_WALL01", + "TOA_LOBBY_WALL02", + "TOA_LOBBY_WALL02_TRANSITION01", + "TOA_WALL_LOBBY01_DAMAGED01", + "TOA_LOBBY_WALL01_BROKEN02", + "TOA_LOBBY_WALL01_BROKEN02_MIRROR", + "TOA_LOBBY_WALL02_CAVITY_01", + "TOA_WALL_TOMB01_VARIANT01", + "TOA_NEXUS_WALL_ALT_MIRROR", + "TOA_NEXUS_TALLWALL", + "TOA_NEXUS_WALL_ALT" + ] + }, + { + "description": "ToA - Lobby Invocation Board - Stone Brick", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "colorOverrides": [ + { + "description": "Symbols - Emissive", + "colors": "h == 0", + "baseMaterial": "NONE" + }, + { + "description": "Wooden frame", + "colors": "h == 4", + "uvScale": 0.8, + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX" + } + ], + "objectIds": [ + "TOA_INVOCATION_BOARD" + ] + }, + { + "description": "ToA - Lobby Scoreboard - Stone Brick", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "colorOverrides": [ + { + "description": "Wooden frame", + "colors": "h == 4", + "uvScale": 0.8, + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX" + }, + { + "description": "Tablet", + "colors": "h == 0", + "baseMaterial": "STONE_NORMALED", + "uvType": "MODEL_YZ" + }, + { + "description": "Golden", + "colors": "h == 6", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "MODEL_YZ", + "uvOrientation": 117 + } + ], + "objectIds": [ + "TOA_SCOREBOARD" + ] + }, + { + "description": "ToA - Lobby Exit", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "colorOverrides": [ + { + "description": "Outside", + "colors": "h == 7", + "baseMaterial": "NONE" + } + ], + "objectIds": [ + "TOA_LOBBY_EXIT" + ] + }, + { + "description": "ToA - Baba stone brick wall", + "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -256, "uvScale": 1.2, @@ -80754,7 +80865,7 @@ }, { "description": "TOA Kehpri wall Stone Bricks", - "baseMaterial": "STONE_NORMALED", + "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -256, "uvScale": 1.2, @@ -80798,7 +80909,7 @@ }, { "description": "TOA Zebek stone brick wall - incomplete", - "baseMaterial": "STONE_NORMALED", + "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -256, "uvScale": 1.2, @@ -80834,7 +80945,7 @@ "description": "Stone", "colors": "h >= 35", "uvScale": 1.2, - "baseMaterial": "STONE_NORMALED", + "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -256 }, From d519dfc530dd3fc0e5105dd03ca00e66e809ea6d Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 27 Feb 2026 20:47:56 -0500 Subject: [PATCH 10/22] remove unneeded override --- src/main/resources/rs117/hd/scene/tile_overrides.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index ceb7197290..22b363367b 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -9556,12 +9556,6 @@ "waterType": "POISON_WASTE", "blended": false }, - { - "name": "TOA_CRONDIS_WATER_BLUE", - "area": "TOA_CRONDIS_WATER", - "waterType": "WATER", - "blended": false - }, { "name": "MAGE_ARENA_BANK_FLOOR", "area": "MAGE_ARENA_BANK", From 410b7375879d38133d27ea81b417b5ab0ab7903b Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 28 Feb 2026 08:27:19 -0500 Subject: [PATCH 11/22] more akkha room textures --- .../resources/rs117/hd/scene/model_overrides.json | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index a963311437..d027db79ff 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80976,7 +80976,16 @@ "AKKHA_ARENA_OUTER_LVL2_55", "AKKHA_ARENA_OUTER_LVL2_60", "AKKHA_ARENA_OUTER_LVL2_65", - "AKKHA_ARENA_OUTER_LVL2_66" + "AKKHA_ARENA_OUTER_LVL2_66", + "AKKHA_ARENA_OUTER_LVL2_67", + "AKKHA_ARENA_OUTER_LVL2_68", + "AKKHA_ARENA_OUTER_LVL2_70", + "AKKHA_ARENA_OUTER_LVL2_71", + "AKKHA_ARENA_OUTER_LVL2_72", + "AKKHA_ARENA_OUTER_LVL2_73", + "AKKHA_ARENA_OUTER_LVL2_74", + "AKKHA_ARENA_OUTER_LVL2_75", + "AKKHA_ARENA_OUTER_LVL2_76" ] } ] From e7417e00e3625bef8141e7894e270189e0a72bf8 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 6 Mar 2026 17:39:55 -0500 Subject: [PATCH 12/22] Fix entrance by adding it's own environment and move the sun direction accordingly --- src/main/resources/rs117/hd/scene/environments.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/environments.json b/src/main/resources/rs117/hd/scene/environments.json index 5e0dc5caa7..0db1378478 100644 --- a/src/main/resources/rs117/hd/scene/environments.json +++ b/src/main/resources/rs117/hd/scene/environments.json @@ -419,6 +419,16 @@ "fogColor": "#050505", "fogDepth": 20 }, + { + "area": "TOA_ENTRANCE_LOBBY", + "directionalStrength": 0.75, + "fogColor": "#050505", + "sunAngles": [ + 125, + 180 + ], + "fogDepth": 20 + }, { "area": "TOMBS_OF_AMASCUT", "directionalStrength": 0.75, From 9a6cb5b09cf451f1614099b7ea0824d47616bf63 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 6 Mar 2026 17:50:14 -0500 Subject: [PATCH 13/22] clean up overrides, add pillar --- .../rs117/hd/scene/model_overrides.json | 52 +++++++++++++------ 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index d027db79ff..04300619ae 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23395,21 +23395,6 @@ "NECROPOLIS_TILE_07" ] }, - { - "description": "Tombs of Amascut invocation board", - "objectIds": [ - "TOA_INVOCATION_BOARD" - ] - }, - { - "description": "Tombs of Amascut exit doorway", - "objectIds": [ - "TOA_LOBBY_EXIT", - "TOA_LOBBY_EXIT_NOOP" - ], - "flatNormals": true, - "receiveShadows": false - }, { "description": "Goblin - Walls - Wooden - Planks", "baseMaterial": "WOOD_GRAIN_2", @@ -80825,12 +80810,46 @@ "TOA_SCOREBOARD" ] }, + { + "description": "ToA - Lobby - Marble - Paper - Sand - Group Pillar", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "colorOverrides": [ + { + "description": "Fake shadow", + "colors": "a < 145", + "baseMaterial": "TRANSPARENT" + }, + { + "description": "Sand", + "colors": "a >= 145 && a < 255", + "uvType": "BOX", + "baseMaterial": "GRAVEL" + }, + { + "description": "Paper", + "colors": "h >= 2 && h <= 5", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": 187 + } + ], + "objectIds": [ + "TOA_GROUPING_BOARD", + "TOA_GROUPING_BOARD_TOP" + ] + }, { "description": "ToA - Lobby Exit", "uvScale": 1.2, "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -128, + "flatNormals": true, + "castShadows": false, "colorOverrides": [ { "description": "Outside", @@ -80839,7 +80858,8 @@ } ], "objectIds": [ - "TOA_LOBBY_EXIT" + "TOA_LOBBY_EXIT", + "TOA_LOBBY_EXIT_NOOP" ] }, { From 41a6d6ac0d785981e8c5b28b80a5c6ba8de4ddfd Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Tue, 10 Mar 2026 16:29:11 -0400 Subject: [PATCH 14/22] Rock model --- .../rs117/hd/scene/model_overrides.json | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 04300619ae..37b72a5970 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -15280,7 +15280,10 @@ "MOTD_CRATE", "DARKM_MIDDLE_CRATE_SINGLE", "EAA_LARGE_CRATE", - "EAA_LARGE_CRATES" + "EAA_LARGE_CRATES", + "TOA_LOBBY_LAMP_CRATE_OP", + "TOA_LOBBY_CRATE01_DEFAULT01", + "TOA_LOBBY_CRATE01_STACK01" ], "uvType": "BOX", "flatNormals": true @@ -23382,6 +23385,17 @@ "DECOKIT_SAND01_PILE01" ] }, + { + "description": "Necropolis - Sandy-Gravel objects", + "baseMaterial": "GRAVEL_LIGHT", + "uvType": "MODEL_XZ", + "castShadows": false, + "objectIds": [ + "TOA_DUGUPSOIL_SAND_1", + "TOA_DUGUPSOIL_SAND_2", + "TOA_DUGUPSOIL_SAND_3" + ] + }, { "description": "Necropolis - Stone Tiles", "baseMaterial": "MARBLE_3", @@ -80862,6 +80876,27 @@ "TOA_LOBBY_EXIT_NOOP" ] }, + { + "description": "TOA Lobby - Wooden - Rope - Angled Supports with Rope", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.7, + "uvOrientation": -128, + "colorOverrides": [ + { + "description": "ROPE", + "colors": "h == 7", + "uvScale": 0.6, + "baseMaterial": "ROPE", + "uvType": "BOX" + } + ], + "objectIds": [ + "TOA_WALL_SUPPORT03", + "TOA_WALL_SUPPORT04", + "TOA_WALL_SUPPORT05" + ] + }, { "description": "ToA - Baba stone brick wall", "baseMaterial": "MARBLE_3", From 48cace3bff4dc3d0660f56d1374a043dd19d8670 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 20 Mar 2026 22:33:14 -0400 Subject: [PATCH 15/22] More Akkah --- .../rs117/hd/scene/model_overrides.json | 145 +++++++++++++++++- 1 file changed, 143 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 37b72a5970..a1d9cd1203 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -81014,7 +81014,94 @@ } ], "objectIds": [ + "AKKHA_ARENA_OUTER_LVL1_01", + "AKKHA_ARENA_OUTER_LVL1_02", + "AKKHA_ARENA_OUTER_LVL1_03", + "AKKHA_ARENA_OUTER_LVL1_04", + "AKKHA_ARENA_OUTER_LVL1_05", + "AKKHA_ARENA_OUTER_LVL1_06", + "AKKHA_ARENA_OUTER_LVL1_07", + "AKKHA_ARENA_OUTER_LVL1_08", + "AKKHA_ARENA_OUTER_LVL1_09", + "AKKHA_ARENA_OUTER_LVL1_10", + "AKKHA_ARENA_OUTER_LVL1_11", + "AKKHA_ARENA_OUTER_LVL1_12", + "AKKHA_ARENA_OUTER_LVL1_13", + "AKKHA_ARENA_OUTER_LVL1_14", + "AKKHA_ARENA_OUTER_LVL1_15", + "AKKHA_ARENA_OUTER_LVL1_16", + "AKKHA_ARENA_OUTER_LVL1_17", + "AKKHA_ARENA_OUTER_LVL1_18", + "AKKHA_ARENA_OUTER_LVL1_19", + "AKKHA_ARENA_OUTER_LVL1_20", + "AKKHA_ARENA_OUTER_LVL1_21", + "AKKHA_ARENA_OUTER_LVL1_22", + "AKKHA_ARENA_OUTER_LVL1_23", + "AKKHA_ARENA_OUTER_LVL1_24", + "AKKHA_ARENA_OUTER_LVL1_25", + "AKKHA_ARENA_OUTER_LVL1_26", + "AKKHA_ARENA_OUTER_LVL1_27", + "AKKHA_ARENA_OUTER_LVL1_28", + "AKKHA_ARENA_OUTER_LVL1_29", + "AKKHA_ARENA_OUTER_LVL1_30", + "AKKHA_ARENA_OUTER_LVL1_31", + "AKKHA_ARENA_OUTER_LVL1_32", + "AKKHA_ARENA_OUTER_LVL1_33", + "AKKHA_ARENA_OUTER_LVL1_34", + "AKKHA_ARENA_OUTER_LVL1_35", + "AKKHA_ARENA_OUTER_LVL1_36", + "AKKHA_ARENA_OUTER_LVL1_37", + "AKKHA_ARENA_OUTER_LVL1_38", + "AKKHA_ARENA_OUTER_LVL1_39", + "AKKHA_ARENA_OUTER_LVL1_40", + "AKKHA_ARENA_OUTER_LVL1_41", + "AKKHA_ARENA_OUTER_LVL1_42", + "AKKHA_ARENA_OUTER_LVL1_43", + "AKKHA_ARENA_OUTER_LVL1_44", + "AKKHA_ARENA_OUTER_LVL1_45", + "AKKHA_ARENA_OUTER_LVL1_46", + "AKKHA_ARENA_OUTER_LVL1_47", + "AKKHA_ARENA_OUTER_LVL1_50", + "AKKHA_ARENA_OUTER_LVL1_48", + "AKKHA_ARENA_OUTER_LVL1_49", + "AKKHA_ARENA_OUTER_LVL1_49", + "AKKHA_ARENA_OUTER_LVL1_51", + "AKKHA_ARENA_OUTER_LVL1_52", + "AKKHA_ARENA_OUTER_LVL1_53", + "AKKHA_ARENA_OUTER_LVL1_54", + "AKKHA_ARENA_OUTER_LVL1_55", + "AKKHA_ARENA_OUTER_LVL1_56", + "AKKHA_ARENA_OUTER_LVL1_57", + "AKKHA_ARENA_OUTER_LVL1_58", + "AKKHA_ARENA_OUTER_LVL1_59", + "AKKHA_ARENA_OUTER_LVL1_60", + "AKKHA_ARENA_OUTER_LVL1_61", + "AKKHA_ARENA_OUTER_LVL1_62", + "AKKHA_ARENA_OUTER_LVL1_63", + "AKKHA_ARENA_OUTER_LVL1_64", + "AKKHA_ARENA_OUTER_LVL2_01", + "AKKHA_ARENA_OUTER_LVL2_02", + "AKKHA_ARENA_OUTER_LVL2_04", + "AKKHA_ARENA_OUTER_LVL2_05", + "AKKHA_ARENA_OUTER_LVL2_09", + "AKKHA_ARENA_OUTER_LVL2_12", + "AKKHA_ARENA_OUTER_LVL2_13", + "AKKHA_ARENA_OUTER_LVL2_14", + "AKKHA_ARENA_OUTER_LVL2_15", + "AKKHA_ARENA_OUTER_LVL2_16", + "AKKHA_ARENA_OUTER_LVL2_17", + "AKKHA_ARENA_OUTER_LVL2_21", + "AKKHA_ARENA_OUTER_LVL2_24", + "AKKHA_ARENA_OUTER_LVL2_26", + "AKKHA_ARENA_OUTER_LVL2_27", + "AKKHA_ARENA_OUTER_LVL2_28", + "AKKHA_ARENA_OUTER_LVL2_29", + "AKKHA_ARENA_OUTER_LVL2_32", + "AKKHA_ARENA_OUTER_LVL2_33", + "AKKHA_ARENA_OUTER_LVL2_34", "AKKHA_ARENA_OUTER_LVL2_35", + "AKKHA_ARENA_OUTER_LVL2_36", + "AKKHA_ARENA_OUTER_LVL2_37", "AKKHA_ARENA_OUTER_LVL2_38", "AKKHA_ARENA_OUTER_LVL2_39", "AKKHA_ARENA_OUTER_LVL2_41", @@ -81027,20 +81114,74 @@ "AKKHA_ARENA_OUTER_LVL2_48", "AKKHA_ARENA_OUTER_LVL2_49", "AKKHA_ARENA_OUTER_LVL2_50", + "AKKHA_ARENA_OUTER_LVL2_52", + "AKKHA_ARENA_OUTER_LVL2_53", "AKKHA_ARENA_OUTER_LVL2_54", "AKKHA_ARENA_OUTER_LVL2_55", + "AKKHA_ARENA_OUTER_LVL2_59", "AKKHA_ARENA_OUTER_LVL2_60", + "AKKHA_ARENA_OUTER_LVL2_63", + "AKKHA_ARENA_OUTER_LVL2_64", "AKKHA_ARENA_OUTER_LVL2_65", "AKKHA_ARENA_OUTER_LVL2_66", "AKKHA_ARENA_OUTER_LVL2_67", "AKKHA_ARENA_OUTER_LVL2_68", - "AKKHA_ARENA_OUTER_LVL2_70", "AKKHA_ARENA_OUTER_LVL2_71", "AKKHA_ARENA_OUTER_LVL2_72", "AKKHA_ARENA_OUTER_LVL2_73", - "AKKHA_ARENA_OUTER_LVL2_74", "AKKHA_ARENA_OUTER_LVL2_75", "AKKHA_ARENA_OUTER_LVL2_76" ] + }, + { + "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Stone", + "colors": "h >= 35", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -256 + }, + { + "description": "Stone", + "colors": "h == 0", + "uvScale": 1.2, + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL2_3", + "AKKHA_ARENA_OUTER_LVL2_74" + ] + }, + { + "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", + "baseMaterial": "MARBLE_3", + "uvType": "WORLD_XZ", + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL2_06", + "AKKHA_ARENA_OUTER_LVL2_07", + "AKKHA_ARENA_OUTER_LVL2_08", + "AKKHA_ARENA_OUTER_LVL2_10", + "AKKHA_ARENA_OUTER_LVL2_11", + "AKKHA_ARENA_OUTER_LVL2_18", + "AKKHA_ARENA_OUTER_LVL2_19", + "AKKHA_ARENA_OUTER_LVL2_20", + "AKKHA_ARENA_OUTER_LVL2_25", + "AKKHA_ARENA_OUTER_LVL2_51", + "AKKHA_ARENA_OUTER_LVL2_56", + "AKKHA_ARENA_OUTER_LVL2_61", + "AKKHA_ARENA_OUTER_LVL2_62", + "AKKHA_ARENA_OUTER_LVL2_69", + "AKKHA_ARENA_OUTER_LVL2_70", + "AKKHA_ARENA_OUTER_LVL2_77", + "AKKHA_ARENA_OUTER_LVL2_78" + ] } ] From 48892f0ec3e645f6fb3efe30c6c98ba0a232b0ed Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 20 Mar 2026 22:45:37 -0400 Subject: [PATCH 16/22] fix typo --- src/main/resources/rs117/hd/scene/model_overrides.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index a1d9cd1203..262f9fc474 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -81156,7 +81156,7 @@ } ], "objectIds": [ - "AKKHA_ARENA_OUTER_LVL2_3", + "AKKHA_ARENA_OUTER_LVL2_03", "AKKHA_ARENA_OUTER_LVL2_74" ] }, From 517a795176063f9a7ba5f4a9ed86a5468f09d9b0 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Mar 2026 10:27:52 -0400 Subject: [PATCH 17/22] Roll back unstable changes --- .../rs117/hd/scene/model_overrides.json | 242 ------------------ 1 file changed, 242 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 262f9fc474..62eba84f2c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80941,247 +80941,5 @@ "objectIds": [ "TOA_LOBBY_WALL_RETAINING01" ] - }, - { - "description": "TOA Baba stone brick wall - incomplete", - "baseMaterial": "STONE_NORMALED", - "uvType": "BOX", - "uvOrientation": -256, - "uvScale": 1.2, - "colorOverrides": [ - { - "description": "Stone", - "colors": "h == 6", - "uvScale": 1.2, - "baseMaterial": "ROCK_3_LIGHT", - "uvType": "BOX", - "uvOrientation": -256 - } - ], - "objectIds": [ - "TOA_WALL_BABA04" - ] - }, - { - "description": "TOA Zebek stone brick wall - incomplete", - "baseMaterial": "MARBLE_3", - "uvType": "BOX", - "uvOrientation": -256, - "uvScale": 1.2, - "objectIds": [ - "TOA_ZEBAK_WALL01_BASIC01B", - "TOA_ZEBAK_WALL01_BASIC01C", - "TOA_ZEBAK_WALL01_BASIC01D", - "WALLKIT_TOMB01_SMASHED01", - "WALLKIT_TOMB01_SMASHED02", - "WALLKIT_TOMB01_SMASHED03", - "WALLKIT_TOMB01_SMASHED04", - "WALLKIT_TOMB01_SMASHED05", - "WALLKIT_TOMB01_SMASHED06", - "WALLKIT_TOMB01_SMASHED07", - "WALLKIT_TOMB01_SMASHED08", - "WALLKIT_TOMB01_SMASHED09", - "WALLKIT_TOMB01_SMASHED10", - "WALLKIT_TOMB01_SMASHED01_MIRROR", - "WALLKIT_TOMB01_SMASHED02_MIRROR", - "WALLKIT_TOMB01_SMASHED03_MIRROR", - "WALLKIT_TOMB01_SMASHED04_MIRROR", - "WALLKIT_TOMB01_SMASHED05_MIRROR", - "WALLKIT_TOMB01_SMASHED06_MIRROR", - "WALLKIT_TOMB01_SMASHED07_MIRROR" - ] - }, - { - "description": "TOA Akkah Wall with sand and grunge - incomplete - Perf hit?", - "baseMaterial": "GRAVEL_TOA", - "uvType": "WORLD_XZ", - "colorOverrides": [ - { - "description": "Stone", - "colors": "h >= 35", - "uvScale": 1.2, - "baseMaterial": "MARBLE_3", - "uvType": "BOX", - "uvOrientation": -256 - }, - { - "description": "Stone", - "colors": "h == 0", - "uvScale": 1.2, - "baseMaterial": "GRUNGE_3_LIGHT", - "uvType": "BOX", - "uvOrientation": -128 - } - ], - "objectIds": [ - "AKKHA_ARENA_OUTER_LVL1_01", - "AKKHA_ARENA_OUTER_LVL1_02", - "AKKHA_ARENA_OUTER_LVL1_03", - "AKKHA_ARENA_OUTER_LVL1_04", - "AKKHA_ARENA_OUTER_LVL1_05", - "AKKHA_ARENA_OUTER_LVL1_06", - "AKKHA_ARENA_OUTER_LVL1_07", - "AKKHA_ARENA_OUTER_LVL1_08", - "AKKHA_ARENA_OUTER_LVL1_09", - "AKKHA_ARENA_OUTER_LVL1_10", - "AKKHA_ARENA_OUTER_LVL1_11", - "AKKHA_ARENA_OUTER_LVL1_12", - "AKKHA_ARENA_OUTER_LVL1_13", - "AKKHA_ARENA_OUTER_LVL1_14", - "AKKHA_ARENA_OUTER_LVL1_15", - "AKKHA_ARENA_OUTER_LVL1_16", - "AKKHA_ARENA_OUTER_LVL1_17", - "AKKHA_ARENA_OUTER_LVL1_18", - "AKKHA_ARENA_OUTER_LVL1_19", - "AKKHA_ARENA_OUTER_LVL1_20", - "AKKHA_ARENA_OUTER_LVL1_21", - "AKKHA_ARENA_OUTER_LVL1_22", - "AKKHA_ARENA_OUTER_LVL1_23", - "AKKHA_ARENA_OUTER_LVL1_24", - "AKKHA_ARENA_OUTER_LVL1_25", - "AKKHA_ARENA_OUTER_LVL1_26", - "AKKHA_ARENA_OUTER_LVL1_27", - "AKKHA_ARENA_OUTER_LVL1_28", - "AKKHA_ARENA_OUTER_LVL1_29", - "AKKHA_ARENA_OUTER_LVL1_30", - "AKKHA_ARENA_OUTER_LVL1_31", - "AKKHA_ARENA_OUTER_LVL1_32", - "AKKHA_ARENA_OUTER_LVL1_33", - "AKKHA_ARENA_OUTER_LVL1_34", - "AKKHA_ARENA_OUTER_LVL1_35", - "AKKHA_ARENA_OUTER_LVL1_36", - "AKKHA_ARENA_OUTER_LVL1_37", - "AKKHA_ARENA_OUTER_LVL1_38", - "AKKHA_ARENA_OUTER_LVL1_39", - "AKKHA_ARENA_OUTER_LVL1_40", - "AKKHA_ARENA_OUTER_LVL1_41", - "AKKHA_ARENA_OUTER_LVL1_42", - "AKKHA_ARENA_OUTER_LVL1_43", - "AKKHA_ARENA_OUTER_LVL1_44", - "AKKHA_ARENA_OUTER_LVL1_45", - "AKKHA_ARENA_OUTER_LVL1_46", - "AKKHA_ARENA_OUTER_LVL1_47", - "AKKHA_ARENA_OUTER_LVL1_50", - "AKKHA_ARENA_OUTER_LVL1_48", - "AKKHA_ARENA_OUTER_LVL1_49", - "AKKHA_ARENA_OUTER_LVL1_49", - "AKKHA_ARENA_OUTER_LVL1_51", - "AKKHA_ARENA_OUTER_LVL1_52", - "AKKHA_ARENA_OUTER_LVL1_53", - "AKKHA_ARENA_OUTER_LVL1_54", - "AKKHA_ARENA_OUTER_LVL1_55", - "AKKHA_ARENA_OUTER_LVL1_56", - "AKKHA_ARENA_OUTER_LVL1_57", - "AKKHA_ARENA_OUTER_LVL1_58", - "AKKHA_ARENA_OUTER_LVL1_59", - "AKKHA_ARENA_OUTER_LVL1_60", - "AKKHA_ARENA_OUTER_LVL1_61", - "AKKHA_ARENA_OUTER_LVL1_62", - "AKKHA_ARENA_OUTER_LVL1_63", - "AKKHA_ARENA_OUTER_LVL1_64", - "AKKHA_ARENA_OUTER_LVL2_01", - "AKKHA_ARENA_OUTER_LVL2_02", - "AKKHA_ARENA_OUTER_LVL2_04", - "AKKHA_ARENA_OUTER_LVL2_05", - "AKKHA_ARENA_OUTER_LVL2_09", - "AKKHA_ARENA_OUTER_LVL2_12", - "AKKHA_ARENA_OUTER_LVL2_13", - "AKKHA_ARENA_OUTER_LVL2_14", - "AKKHA_ARENA_OUTER_LVL2_15", - "AKKHA_ARENA_OUTER_LVL2_16", - "AKKHA_ARENA_OUTER_LVL2_17", - "AKKHA_ARENA_OUTER_LVL2_21", - "AKKHA_ARENA_OUTER_LVL2_24", - "AKKHA_ARENA_OUTER_LVL2_26", - "AKKHA_ARENA_OUTER_LVL2_27", - "AKKHA_ARENA_OUTER_LVL2_28", - "AKKHA_ARENA_OUTER_LVL2_29", - "AKKHA_ARENA_OUTER_LVL2_32", - "AKKHA_ARENA_OUTER_LVL2_33", - "AKKHA_ARENA_OUTER_LVL2_34", - "AKKHA_ARENA_OUTER_LVL2_35", - "AKKHA_ARENA_OUTER_LVL2_36", - "AKKHA_ARENA_OUTER_LVL2_37", - "AKKHA_ARENA_OUTER_LVL2_38", - "AKKHA_ARENA_OUTER_LVL2_39", - "AKKHA_ARENA_OUTER_LVL2_41", - "AKKHA_ARENA_OUTER_LVL2_42", - "AKKHA_ARENA_OUTER_LVL2_43", - "AKKHA_ARENA_OUTER_LVL2_44", - "AKKHA_ARENA_OUTER_LVL2_45", - "AKKHA_ARENA_OUTER_LVL2_46", - "AKKHA_ARENA_OUTER_LVL2_47", - "AKKHA_ARENA_OUTER_LVL2_48", - "AKKHA_ARENA_OUTER_LVL2_49", - "AKKHA_ARENA_OUTER_LVL2_50", - "AKKHA_ARENA_OUTER_LVL2_52", - "AKKHA_ARENA_OUTER_LVL2_53", - "AKKHA_ARENA_OUTER_LVL2_54", - "AKKHA_ARENA_OUTER_LVL2_55", - "AKKHA_ARENA_OUTER_LVL2_59", - "AKKHA_ARENA_OUTER_LVL2_60", - "AKKHA_ARENA_OUTER_LVL2_63", - "AKKHA_ARENA_OUTER_LVL2_64", - "AKKHA_ARENA_OUTER_LVL2_65", - "AKKHA_ARENA_OUTER_LVL2_66", - "AKKHA_ARENA_OUTER_LVL2_67", - "AKKHA_ARENA_OUTER_LVL2_68", - "AKKHA_ARENA_OUTER_LVL2_71", - "AKKHA_ARENA_OUTER_LVL2_72", - "AKKHA_ARENA_OUTER_LVL2_73", - "AKKHA_ARENA_OUTER_LVL2_75", - "AKKHA_ARENA_OUTER_LVL2_76" - ] - }, - { - "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", - "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", - "uvType": "BOX", - "colorOverrides": [ - { - "description": "Stone", - "colors": "h >= 35", - "uvScale": 1.2, - "baseMaterial": "MARBLE_3", - "uvType": "BOX", - "uvOrientation": -256 - }, - { - "description": "Stone", - "colors": "h == 0", - "uvScale": 1.2, - "baseMaterial": "GRUNGE_3_LIGHT", - "uvType": "BOX", - "uvOrientation": -128 - } - ], - "objectIds": [ - "AKKHA_ARENA_OUTER_LVL2_03", - "AKKHA_ARENA_OUTER_LVL2_74" - ] - }, - { - "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", - "baseMaterial": "MARBLE_3", - "uvType": "WORLD_XZ", - "objectIds": [ - "AKKHA_ARENA_OUTER_LVL2_06", - "AKKHA_ARENA_OUTER_LVL2_07", - "AKKHA_ARENA_OUTER_LVL2_08", - "AKKHA_ARENA_OUTER_LVL2_10", - "AKKHA_ARENA_OUTER_LVL2_11", - "AKKHA_ARENA_OUTER_LVL2_18", - "AKKHA_ARENA_OUTER_LVL2_19", - "AKKHA_ARENA_OUTER_LVL2_20", - "AKKHA_ARENA_OUTER_LVL2_25", - "AKKHA_ARENA_OUTER_LVL2_51", - "AKKHA_ARENA_OUTER_LVL2_56", - "AKKHA_ARENA_OUTER_LVL2_61", - "AKKHA_ARENA_OUTER_LVL2_62", - "AKKHA_ARENA_OUTER_LVL2_69", - "AKKHA_ARENA_OUTER_LVL2_70", - "AKKHA_ARENA_OUTER_LVL2_77", - "AKKHA_ARENA_OUTER_LVL2_78" - ] } ] From 903f2ac2af5370b741ff903d71fdd8560eedd481 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 22 Mar 2026 12:56:32 -0400 Subject: [PATCH 18/22] fix Zebek sand --- .../rs117/hd/scene/tile_overrides.json | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 22b363367b..6ce166d6a7 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5888,6 +5888,16 @@ "waterType": "SWAMP_WATER", "blended": false }, + { + "name": "TOA_CRONDIS_WATER_GREEN", + "area": "TOA_CRONDIS_WATER", + "underlayIds": [ + 133, + 134 + ], + "waterType": "POISON_WASTE", + "blended": false + }, { "name": "TOA_CRONDIS_WATER", "area": "TOA_CRONDIS_WATER", @@ -5941,6 +5951,15 @@ 117 ] }, + { + "name": "TOA_CRONDIS_ISLAND", + "area": "TOA_PATH_OF_CRONDIS_BOSS", + "underlayIds": [ + 109, + 117 + ], + "groundMaterial": "SAND" + }, { "name": "TOA_CRONDIS_PUZZLE_FLOOR", "area": "TOA_PATH_OF_CRONDIS_PUZZLE", @@ -9537,25 +9556,6 @@ ], "groundMaterial": "SNOW_2" }, - { - "name": "TOA_CRONDIS_ISLAND", - "area": "TOA_PATH_OF_CRONDIS_BOSS", - "underlayIds": [ - 109, - 117 - ], - "groundMaterial": "SAND" - }, - { - "name": "TOA_CRONDIS_WATER_GREEN", - "area": "TOA_CRONDIS_WATER", - "underlayIds": [ - 133, - 134 - ], - "waterType": "POISON_WASTE", - "blended": false - }, { "name": "MAGE_ARENA_BANK_FLOOR", "area": "MAGE_ARENA_BANK", From b9e50468bbcdb5f1dc37207e2e3219dbc5f272c7 Mon Sep 17 00:00:00 2001 From: Hooder Date: Sun, 22 Mar 2026 18:14:15 +0100 Subject: [PATCH 19/22] Change Crondis' island to use `VARIED_DIRT` --- src/main/resources/rs117/hd/scene/tile_overrides.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 6ce166d6a7..a97948690a 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5958,7 +5958,7 @@ 109, 117 ], - "groundMaterial": "SAND" + "groundMaterial": "VARIED_DIRT" }, { "name": "TOA_CRONDIS_PUZZLE_FLOOR", From 11e8da832723fb683fd6784cf0f60c54ed5fa271 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 23 Mar 2026 18:05:06 -0400 Subject: [PATCH 20/22] Lobby fixes, add bosses back in --- .../resources/rs117/hd/scene/materials.json | 2 +- .../rs117/hd/scene/model_overrides.json | 286 +++++++++++++++++- .../rs117/hd/scene/tile_overrides.json | 20 +- 3 files changed, 294 insertions(+), 14 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index c344a1ae01..20c8bac247 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -1345,7 +1345,7 @@ { "name": "GRAVEL_TOA", "parent": "GRAVEL", - "brightness": 1.20 + "brightness": 1.3 }, { "name": "DIRT_1_SHINY", diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 00e0a020b4..ab0030b5ae 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80827,7 +80827,7 @@ }, { "description": "TOA Wall sand light", - "baseMaterial": "GRAVEL", + "baseMaterial": "GRAVEL_LIGHT", "uvType": "BOX", "uvOrientation": 256, "objectIds": [ @@ -80896,11 +80896,49 @@ "TOA_WALL_LOBBY01_DAMAGED01", "TOA_LOBBY_WALL01_BROKEN02", "TOA_LOBBY_WALL01_BROKEN02_MIRROR", - "TOA_LOBBY_WALL02_CAVITY_01", "TOA_WALL_TOMB01_VARIANT01", "TOA_NEXUS_WALL_ALT_MIRROR", "TOA_NEXUS_TALLWALL", - "TOA_NEXUS_WALL_ALT" + "TOA_NEXUS_WALL_ALT", + "TOA_REWARDS_CHEST_LOBBY_CLOSED", + "TOA_LOBBY_RAID_ENTRY", + "TOA_GATEWAY_LOBBY03" + ] + }, + { + "description": "ToA - Lobby and Nexus Area - Stone Brick Pickaxe Wall ", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": -189, + "colorOverrides": [ + { + "description": "Wall", + "colors": "h == 39", + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "uvScale": 1.2 + } + ], + "objectIds": [ + "TOA_LOBBY_WALL02_CAVITY_01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_IRON01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_STEEL01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_BLACK01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_MITHRIL01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_ADAMANT01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_RUNE01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_GILDED01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_DRAGON01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_DRAGON02", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_DRAGON03", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_3RDAGE01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_INFERNAL01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_CRYSTAL01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_TRAILBLAZER01", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_LEAGUES", + "TOA_LOBBY_WALL02_CAVITY_PICKAXE_TRAILBLAZER_RELOADED" ] }, { @@ -81076,5 +81114,247 @@ "objectIds": [ "TOA_LOBBY_WALL_RETAINING01" ] + }, + { + "description": "TOA Baba stone brick wall - incomplete", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 6", + "uvScale": 1.2, + "baseMaterial": "ROCK_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -256 + } + ], + "objectIds": [ + "TOA_WALL_BABA04" + ] + }, + { + "description": "TOA Zebek stone brick wall - incomplete", + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "objectIds": [ + "TOA_ZEBAK_WALL01_BASIC01B", + "TOA_ZEBAK_WALL01_BASIC01C", + "TOA_ZEBAK_WALL01_BASIC01D", + "WALLKIT_TOMB01_SMASHED01", + "WALLKIT_TOMB01_SMASHED02", + "WALLKIT_TOMB01_SMASHED03", + "WALLKIT_TOMB01_SMASHED04", + "WALLKIT_TOMB01_SMASHED05", + "WALLKIT_TOMB01_SMASHED06", + "WALLKIT_TOMB01_SMASHED07", + "WALLKIT_TOMB01_SMASHED08", + "WALLKIT_TOMB01_SMASHED09", + "WALLKIT_TOMB01_SMASHED10", + "WALLKIT_TOMB01_SMASHED01_MIRROR", + "WALLKIT_TOMB01_SMASHED02_MIRROR", + "WALLKIT_TOMB01_SMASHED03_MIRROR", + "WALLKIT_TOMB01_SMASHED04_MIRROR", + "WALLKIT_TOMB01_SMASHED05_MIRROR", + "WALLKIT_TOMB01_SMASHED06_MIRROR", + "WALLKIT_TOMB01_SMASHED07_MIRROR" + ] + }, + { + "description": "TOA Akkah Wall with sand and grunge - incomplete - Perf hit?", + "baseMaterial": "GRAVEL_TOA", + "uvType": "WORLD_XZ", + "colorOverrides": [ + { + "description": "Stone", + "colors": "h >= 35", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -256 + }, + { + "description": "Stone", + "colors": "h == 0", + "uvScale": 1.2, + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL1_01", + "AKKHA_ARENA_OUTER_LVL1_02", + "AKKHA_ARENA_OUTER_LVL1_03", + "AKKHA_ARENA_OUTER_LVL1_04", + "AKKHA_ARENA_OUTER_LVL1_05", + "AKKHA_ARENA_OUTER_LVL1_06", + "AKKHA_ARENA_OUTER_LVL1_07", + "AKKHA_ARENA_OUTER_LVL1_08", + "AKKHA_ARENA_OUTER_LVL1_09", + "AKKHA_ARENA_OUTER_LVL1_10", + "AKKHA_ARENA_OUTER_LVL1_11", + "AKKHA_ARENA_OUTER_LVL1_12", + "AKKHA_ARENA_OUTER_LVL1_13", + "AKKHA_ARENA_OUTER_LVL1_14", + "AKKHA_ARENA_OUTER_LVL1_15", + "AKKHA_ARENA_OUTER_LVL1_16", + "AKKHA_ARENA_OUTER_LVL1_17", + "AKKHA_ARENA_OUTER_LVL1_18", + "AKKHA_ARENA_OUTER_LVL1_19", + "AKKHA_ARENA_OUTER_LVL1_20", + "AKKHA_ARENA_OUTER_LVL1_21", + "AKKHA_ARENA_OUTER_LVL1_22", + "AKKHA_ARENA_OUTER_LVL1_23", + "AKKHA_ARENA_OUTER_LVL1_24", + "AKKHA_ARENA_OUTER_LVL1_25", + "AKKHA_ARENA_OUTER_LVL1_26", + "AKKHA_ARENA_OUTER_LVL1_27", + "AKKHA_ARENA_OUTER_LVL1_28", + "AKKHA_ARENA_OUTER_LVL1_29", + "AKKHA_ARENA_OUTER_LVL1_30", + "AKKHA_ARENA_OUTER_LVL1_31", + "AKKHA_ARENA_OUTER_LVL1_32", + "AKKHA_ARENA_OUTER_LVL1_33", + "AKKHA_ARENA_OUTER_LVL1_34", + "AKKHA_ARENA_OUTER_LVL1_35", + "AKKHA_ARENA_OUTER_LVL1_36", + "AKKHA_ARENA_OUTER_LVL1_37", + "AKKHA_ARENA_OUTER_LVL1_38", + "AKKHA_ARENA_OUTER_LVL1_39", + "AKKHA_ARENA_OUTER_LVL1_40", + "AKKHA_ARENA_OUTER_LVL1_41", + "AKKHA_ARENA_OUTER_LVL1_42", + "AKKHA_ARENA_OUTER_LVL1_43", + "AKKHA_ARENA_OUTER_LVL1_44", + "AKKHA_ARENA_OUTER_LVL1_45", + "AKKHA_ARENA_OUTER_LVL1_46", + "AKKHA_ARENA_OUTER_LVL1_47", + "AKKHA_ARENA_OUTER_LVL1_50", + "AKKHA_ARENA_OUTER_LVL1_48", + "AKKHA_ARENA_OUTER_LVL1_49", + "AKKHA_ARENA_OUTER_LVL1_49", + "AKKHA_ARENA_OUTER_LVL1_51", + "AKKHA_ARENA_OUTER_LVL1_52", + "AKKHA_ARENA_OUTER_LVL1_53", + "AKKHA_ARENA_OUTER_LVL1_54", + "AKKHA_ARENA_OUTER_LVL1_55", + "AKKHA_ARENA_OUTER_LVL1_56", + "AKKHA_ARENA_OUTER_LVL1_57", + "AKKHA_ARENA_OUTER_LVL1_58", + "AKKHA_ARENA_OUTER_LVL1_59", + "AKKHA_ARENA_OUTER_LVL1_60", + "AKKHA_ARENA_OUTER_LVL1_61", + "AKKHA_ARENA_OUTER_LVL1_62", + "AKKHA_ARENA_OUTER_LVL1_63", + "AKKHA_ARENA_OUTER_LVL1_64", + "AKKHA_ARENA_OUTER_LVL2_01", + "AKKHA_ARENA_OUTER_LVL2_02", + "AKKHA_ARENA_OUTER_LVL2_04", + "AKKHA_ARENA_OUTER_LVL2_05", + "AKKHA_ARENA_OUTER_LVL2_09", + "AKKHA_ARENA_OUTER_LVL2_12", + "AKKHA_ARENA_OUTER_LVL2_13", + "AKKHA_ARENA_OUTER_LVL2_14", + "AKKHA_ARENA_OUTER_LVL2_15", + "AKKHA_ARENA_OUTER_LVL2_16", + "AKKHA_ARENA_OUTER_LVL2_17", + "AKKHA_ARENA_OUTER_LVL2_21", + "AKKHA_ARENA_OUTER_LVL2_24", + "AKKHA_ARENA_OUTER_LVL2_26", + "AKKHA_ARENA_OUTER_LVL2_27", + "AKKHA_ARENA_OUTER_LVL2_28", + "AKKHA_ARENA_OUTER_LVL2_29", + "AKKHA_ARENA_OUTER_LVL2_32", + "AKKHA_ARENA_OUTER_LVL2_33", + "AKKHA_ARENA_OUTER_LVL2_34", + "AKKHA_ARENA_OUTER_LVL2_35", + "AKKHA_ARENA_OUTER_LVL2_36", + "AKKHA_ARENA_OUTER_LVL2_37", + "AKKHA_ARENA_OUTER_LVL2_38", + "AKKHA_ARENA_OUTER_LVL2_39", + "AKKHA_ARENA_OUTER_LVL2_41", + "AKKHA_ARENA_OUTER_LVL2_42", + "AKKHA_ARENA_OUTER_LVL2_43", + "AKKHA_ARENA_OUTER_LVL2_44", + "AKKHA_ARENA_OUTER_LVL2_45", + "AKKHA_ARENA_OUTER_LVL2_46", + "AKKHA_ARENA_OUTER_LVL2_47", + "AKKHA_ARENA_OUTER_LVL2_48", + "AKKHA_ARENA_OUTER_LVL2_49", + "AKKHA_ARENA_OUTER_LVL2_50", + "AKKHA_ARENA_OUTER_LVL2_52", + "AKKHA_ARENA_OUTER_LVL2_53", + "AKKHA_ARENA_OUTER_LVL2_54", + "AKKHA_ARENA_OUTER_LVL2_55", + "AKKHA_ARENA_OUTER_LVL2_59", + "AKKHA_ARENA_OUTER_LVL2_60", + "AKKHA_ARENA_OUTER_LVL2_63", + "AKKHA_ARENA_OUTER_LVL2_64", + "AKKHA_ARENA_OUTER_LVL2_65", + "AKKHA_ARENA_OUTER_LVL2_66", + "AKKHA_ARENA_OUTER_LVL2_67", + "AKKHA_ARENA_OUTER_LVL2_68", + "AKKHA_ARENA_OUTER_LVL2_71", + "AKKHA_ARENA_OUTER_LVL2_72", + "AKKHA_ARENA_OUTER_LVL2_73", + "AKKHA_ARENA_OUTER_LVL2_75", + "AKKHA_ARENA_OUTER_LVL2_76" + ] + }, + { + "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Stone", + "colors": "h >= 35", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -256 + }, + { + "description": "Stone", + "colors": "h == 0", + "uvScale": 1.2, + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL2_03", + "AKKHA_ARENA_OUTER_LVL2_74" + ] + }, + { + "description": "TOA Akkah Wall with golden symbols - incomplete - Perf hit?", + "baseMaterial": "MARBLE_3", + "uvType": "WORLD_XZ", + "objectIds": [ + "AKKHA_ARENA_OUTER_LVL2_06", + "AKKHA_ARENA_OUTER_LVL2_07", + "AKKHA_ARENA_OUTER_LVL2_08", + "AKKHA_ARENA_OUTER_LVL2_10", + "AKKHA_ARENA_OUTER_LVL2_11", + "AKKHA_ARENA_OUTER_LVL2_18", + "AKKHA_ARENA_OUTER_LVL2_19", + "AKKHA_ARENA_OUTER_LVL2_20", + "AKKHA_ARENA_OUTER_LVL2_25", + "AKKHA_ARENA_OUTER_LVL2_51", + "AKKHA_ARENA_OUTER_LVL2_56", + "AKKHA_ARENA_OUTER_LVL2_61", + "AKKHA_ARENA_OUTER_LVL2_62", + "AKKHA_ARENA_OUTER_LVL2_69", + "AKKHA_ARENA_OUTER_LVL2_70", + "AKKHA_ARENA_OUTER_LVL2_77", + "AKKHA_ARENA_OUTER_LVL2_78" + ] } ] diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index a97948690a..f01bfec609 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -5910,7 +5910,8 @@ { "name": "TOA_AMASCUT_FLOOR_SAND_BLEND", "groundMaterial": "VARIED_DIRT", - "maxLightness": 32 + "maxLightness": 32, + "shiftLightness": -2 }, { "name": "TOA_KEPHRI_FLOOR", @@ -6040,7 +6041,7 @@ "area": "TOMBS_OF_AMASCUT", "uvOrientation": -256, "uvScale": 1.5, - "groundMaterial": "STONE", + "groundMaterial": "MARBLE_2", "maxLightness": 18, "shiftLightness": 1, "maxSaturation": 1, @@ -6053,22 +6054,21 @@ "area": "TOMBS_OF_AMASCUT", "uvOrientation": 256, "uvScale": 1.3, - "groundMaterial": "STONE", - "maxLightness": 13, - "minSaturation": 2, - "maxSaturation": 3, - "setHue": 39, + "groundMaterial": "MARBLE_2", + "setSaturation": 2, + "shiftHue": 39, "overlayIds": [ 72, 194 - ] + ], + "blended": false }, { "name": "TOA_AMASCUT_FLOOR_STONE", "area": "TOMBS_OF_AMASCUT", "uvOrientation": 256, "uvScale": 1.3, - "groundMaterial": "STONE", + "groundMaterial": "MARBLE_2", "maxLightness": 15, "minSaturation": 2, "overlayIds": [ @@ -6081,7 +6081,7 @@ "area": "TOMBS_OF_AMASCUT", "uvOrientation": 256, "uvScale": 1.3, - "groundMaterial": "STONE", + "groundMaterial": "MARBLE_2", "overlayIds": [ 139, 228 ], From 23815996b8e9ada81edb4e9f2f38582cd614917e Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 23 Mar 2026 18:56:43 -0400 Subject: [PATCH 21/22] kephri touch ups --- .../rs117/hd/scene/model_overrides.json | 149 ++++++++++++++---- 1 file changed, 120 insertions(+), 29 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index ab0030b5ae..017099e599 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80880,7 +80880,27 @@ } ], "objectIds": [ - "TOA_LOBBY_WALL01_SAND02" + "TOA_LOBBY_WALL01_SAND02", + "TOA_WALL_LOBBY01_DAMAGED01_2X2" + ] + }, + { + "description": "ToA - Brick Wall with Skulls", + "baseMaterial": "BONE", + "uvType": "BOX", + "uvScale": 0.7, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 39", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "TOA_WALL_TOMB01_SKULL01" ] }, { @@ -80897,12 +80917,18 @@ "TOA_LOBBY_WALL01_BROKEN02", "TOA_LOBBY_WALL01_BROKEN02_MIRROR", "TOA_WALL_TOMB01_VARIANT01", + "TOA_WALL_TOMB01_VARIANT02", + "TOA_WALL_TOMB01_VARIANT01_DARK01", + "TOA_SCABARAS_SPAWN_HOLE", "TOA_NEXUS_WALL_ALT_MIRROR", "TOA_NEXUS_TALLWALL", "TOA_NEXUS_WALL_ALT", "TOA_REWARDS_CHEST_LOBBY_CLOSED", "TOA_LOBBY_RAID_ENTRY", - "TOA_GATEWAY_LOBBY03" + "TOA_GATEWAY_LOBBY03", + "TOA_DOOR_EXIT", + "TOA_DOOR_TOP02", + "TOA_WALL_PILLAR02" ] }, { @@ -81070,6 +81096,16 @@ "TOA_WALL_SUPPORT05" ] }, + { + "description": "TOA lobby wooden wall", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientation": 512, + "objectIds": [ + "TOA_LOBBY_WALL_RETAINING01" + ] + }, { "description": "ToA - Baba stone brick wall", "baseMaterial": "MARBLE_3", @@ -81082,57 +81118,112 @@ ] }, { - "description": "TOA Kehpri wall", - "baseMaterial": "GRUNGE_3_LIGHT", + "description": "TOA Baba stone brick wall - incomplete", + "baseMaterial": "STONE_NORMALED", "uvType": "BOX", - "uvOrientation": 512, + "uvOrientation": -256, "uvScale": 1.2, + "colorOverrides": [ + { + "description": "Stone", + "colors": "h == 6", + "uvScale": 1.2, + "baseMaterial": "ROCK_3_LIGHT", + "uvType": "BOX", + "uvOrientation": -256 + } + ], "objectIds": [ - "TOA_WALL_TOMB03_VARIANT01_KEPHRI01" + "TOA_WALL_BABA04" ] }, { - "description": "TOA Kehpri wall Stone Bricks", - "baseMaterial": "MARBLE_3", + "description": "TOA Kephri wall", + "baseMaterial": "GRUNGE_3_LIGHT", "uvType": "BOX", - "uvOrientation": -256, + "uvOrientation": 512, "uvScale": 1.2, + "colorOverrides": [ + { + "description": "Gold", + "colors": "s >= 5", + "uvScale": 0.7, + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX" + } + ], "objectIds": [ - "TOA_WALL_TOMB01_VARIANT01_GREY01", - "TOA_WALL_TOMB01_VARIANT01_GREY02", - "TOA_WALL_TOMB01_VARIANT01_GREY03", - "TOA_WALL_TOMB01_VARIANT01_GREY04", - "TOA_WALL_TOMB01_VARIANT01_GREY05" + "TOA_WALL_KEPHRI01", + "TOA_WALL_TOMB03_VARIANT01_KEPHRI01", + "TOA_ENTRANCE_KEPHRI03", + "TOA_ENTRANCE_KEPHRI04", + "TOA_ENTRANCE_KEPHRI_MAIN" ] }, { - "description": "TOA lobby wooden wall", - "baseMaterial": "WOOD_GRAIN_3", + "description": "TOA Kephri Pillars", + "baseMaterial": "MARBLE_2", "uvType": "BOX", - "uvScale": 0.8, - "uvOrientation": 512, + "uvScale": 0.7, + "colorOverrides": [ + { + "description": "Gold", + "colors": "s >= 5", + "uvScale": 0.7, + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX" + }, + { + "description": "Green and red", + "colors": [ "h == 12", "h == 0 && s == 3" ], + "uvScale": 0.7, + "baseMaterial": "MARBLE_1", + "uvType": "BOX" + } + ], "objectIds": [ - "TOA_LOBBY_WALL_RETAINING01" + "TOA_WALL_PILLAR01", + "TOA_WALL_SCARAB01", + "TOA_WALL_LOW01" ] }, { - "description": "TOA Baba stone brick wall - incomplete", - "baseMaterial": "STONE_NORMALED", + "description": "TOA Kephri Scroll racks", + "baseMaterial": "GRUNGE_3", "uvType": "BOX", - "uvOrientation": -256, - "uvScale": 1.2, "colorOverrides": [ { - "description": "Stone", - "colors": "h == 6", - "uvScale": 1.2, - "baseMaterial": "ROCK_3_LIGHT", + "description": "Gold", + "colors": "s >= 5", + "uvScale": 0.7, + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX" + }, + { + "description": "Scroll", + "colors": [ "h == 4 && s >= 3" ], + "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvOrientation": -256 + "uvScale": 0.7 } ], "objectIds": [ - "TOA_WALL_BABA04" + "TOA_WALL_SCROLLS01", + "TOA_WALL_SCROLLS02" + ] + }, + { + "description": "TOA Kehpri wall Stone Bricks", + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -256, + "uvScale": 1.2, + "objectIds": [ + "TOA_WALL_TOMB01_VARIANT01_GREY01", + "TOA_WALL_TOMB01_VARIANT01_GREY02", + "TOA_WALL_TOMB01_VARIANT01_GREY03", + "TOA_WALL_TOMB01_VARIANT01_GREY04", + "TOA_WALL_TOMB01_VARIANT01_GREY05" ] }, { From 051d75b42f0a68188ceec3dd8ddd55046953566c Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 23 Mar 2026 20:27:43 -0400 Subject: [PATCH 22/22] Crondis puzzle --- .../rs117/hd/scene/model_overrides.json | 81 ++++++++++++++++++- 1 file changed, 78 insertions(+), 3 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 017099e599..026e050135 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -80919,6 +80919,7 @@ "TOA_WALL_TOMB01_VARIANT01", "TOA_WALL_TOMB01_VARIANT02", "TOA_WALL_TOMB01_VARIANT01_DARK01", + "TOA_WALL_TOMB01_VARIANT01_BRIGHT", "TOA_SCABARAS_SPAWN_HOLE", "TOA_NEXUS_WALL_ALT_MIRROR", "TOA_NEXUS_TALLWALL", @@ -80928,11 +80929,39 @@ "TOA_GATEWAY_LOBBY03", "TOA_DOOR_EXIT", "TOA_DOOR_TOP02", - "TOA_WALL_PILLAR02" + "TOA_NEXUS_PILLAR01", + "TOA_NEXUS_PILLAR_BROKEN01", + "TOA_NEXUS_PILLAR_BROKEN02", + "TOA_WALL_PILLAR02", + "TOA_CRONDIS_EXIT", + "TOA_CRONDIS_EXIT_TOP" ] }, { - "description": "ToA - Lobby and Nexus Area - Stone Brick Pickaxe Wall ", + "description": "ToA - Lobby and Nexus Area - Boss Doors", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": -189, + "colorOverrides": [ + { + "description": "Wall", + "colors": "h == 39", + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128, + "uvScale": 1.2 + } + ], + "objectIds": [ + "TOA_NEXUS_SCABARAS_DOOR_CLOSED", + "TOA_NEXUS_APMEKEN_DOOR_CLOSED", + "TOA_NEXUS_CRONDIS_DOOR_CLOSED", + "TOA_NEXUS_HET_DOOR_CLOSED" + ] + }, + { + "description": "ToA - Lobby and Nexus Area - Stone Brick Pickaxe Wall", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "uvType": "BOX", "uvScale": 0.6, @@ -81227,7 +81256,53 @@ ] }, { - "description": "TOA Zebek stone brick wall - incomplete", + "description": "TOA - Crondis Puzzle dirt decal", + "baseMaterial": "DIRT_1", + "uvType": "MODEL_XZ", + "objectIds": [ + "DECAL_SAND05_FLOOR01", + "DECAL_SAND05_FLOOR02", + "DECAL_SAND05_FLOOR03", + "DECAL_SAND05_FLOOR03_MIRROR", + "DECAL_SAND05_FLOOR04", + "DECAL_SAND05_FLOOR04_MIRROR", + "DECAL_SAND05_FLOOR05", + "DECAL_SAND05_FLOOR06" + ] + }, + { + "description": "TOA - Crondis Puzzle Room walls", + "baseMaterial": "GRUNGE_2", + "uvType": "BOX", + "uvScale": 1.2, + "uvOrientation": -512, + "colorOverrides": [ + { + "description": "Stone Bricks", + "colors": "h == 39", + "uvScale": 1.2, + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": -128 + } + ], + "objectIds": [ + "TOA_WALL_CRONDIS01", + "TOA_WALL02_CROCODILES01", + "TOA_WALL02_CROCODILES02", + "TOA_WALL02_CROCODILES03", + "TOA_WALL02_CROCODILES05" + ] + }, + { + "description": "TOA - Crondis Puzzle Room walls - ANIMATED - DYNAMIC", + "baseMaterial": "GRAY_80", + "objectIds": [ + "TOA_WALL02_CROCODILES04" + ] + }, + { + "description": "TOA Zebek stone brick wall", "baseMaterial": "MARBLE_3", "uvType": "BOX", "uvOrientation": -256,