From 6746f4be3bfdf234005924d2a2dbd28711fd1fb3 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 21:09:30 +0100 Subject: [PATCH 1/9] Improve some color overrides and textures on The Great Conch --- .../rs117/hd/scene/model_overrides.json | 67 ++++++++++++++++--- 1 file changed, 56 insertions(+), 11 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 0d485cf2be..f587a17b2b 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -42891,9 +42891,22 @@ "uvScale": 0.4, "colorOverrides": [ { - "colors": [ "h == 6" ], + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientationX": 512 + }, + { + "colors": "h == 6", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", "uvType": "BOX" + }, + { + "colors": "h == 4", + "baseMaterial": "ROPE_LIGHT", + "uvType": "BOX", + "uvScale": 0.3 } ] }, @@ -77237,7 +77250,7 @@ "description": "The Pandemonium - Palm Tree", "baseMaterial": "LEAF_VEINS_PALM_LIGHT", "uvType": "BOX", - "uvScale": 0.3, + "uvScale": 0.25, "objectIds": [ "PALM_UPDATE01", "PALM_UPDATE02", @@ -82140,7 +82153,7 @@ "description": "Tropical - Great Conch - Bromelia", "windDisplacementMode": "VERTEX", "baseMaterial": "GRUNGE_3", - "uvScale": 0.5, + "uvScale": 0.3, "uvType": "BOX", "colorOverrides": [ { @@ -82166,10 +82179,10 @@ "colorOverrides": [ { "description": "Stem and leaves", - "colors": "h == 20 || h == 24", + "colors": "h == 19 || h == 20 || h == 24", "windDisplacementMode": "VERTEX", "baseMaterial": "LEAF_VEINS", - "uvScale": 0.25, + "uvScale": 0.2, "uvType": "BOX" } ], @@ -82190,6 +82203,15 @@ "PLANT_TROPICAL_LEAFY07", "PLANT_TROPICAL_LEAFY08", "PLANT_TROPICAL_LEAFY09" + ], + "colorOverrides": [ + { + "colors": "h == 9", + "windDisplacementMode": "VERTEX", + "baseMaterial": "PLANT_GRUNGE_2", + "uvScale": 0.2, + "uvType": "BOX" + } ] }, { @@ -82206,17 +82228,34 @@ "PLANT_TROPICAL_FAN04_MEDIUM02", "PLANT_TROPICAL_FAN02_MEDIUM", "PLANT_TROPICAL_FAN04_MEDIUM01" + ], + "colorOverrides": [ + { + "colors": "h == 5 || h == 9", + "windDisplacementMode": "VERTEX", + "baseMaterial": "PLANT_GRUNGE_2", + "uvScale": 0.2, + "uvType": "BOX" + } ] }, { "description": "Tropical - Great Conch - Tropcial Palm - Purple and red", "windDisplacementMode": "VERTEX", "baseMaterial": "LEAF_VEINS_PALM", - "uvScale": 0.25, + "uvScale": 0.2, "uvType": "BOX", "uvOrientation": -313, "objectIds": [ "PLANT_TROPICAL_FAN01_SMALL" + ], + "colorOverrides": [ + { + "colors": "h == 58 && s > 3", + "baseMaterial": "PLANT_GRUNGE_2", + "uvScale": 0.4, + "uvType": "BOX" + } ] }, { @@ -82236,7 +82275,7 @@ "description": "Great Conch - Wooden - Rope - Rope Fence", "windDisplacementMode": "VERTEX", "baseMaterial": "WOOD_GRAIN_3", - "uvScale": 0.8, + "uvScale": 0.5, "uvType": "BOX", "colorOverrides": [ { @@ -82264,12 +82303,12 @@ "description": "Great Conch - Wooden - Shell - Wheelbarrow", "baseMaterial": "GRUNGE_2_MATTE", "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.3, "uvOrientation": 313, "colorOverrides": [ { "description": "Wood", - "colors": "h == 6", + "colors": "h == 6 && s == 5", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvOrientation": 512, @@ -82477,10 +82516,16 @@ "uvScale": 0.8, "colorOverrides": [ { - "colors": "h >= 10 || h <= 12", + "colors": "h >= 10 && h <= 15", "baseMaterial": "PLANT_GRUNGE_2", "uvType": "BOX", - "uvScale": 0.5 + "uvScale": 0.3 + }, + { + "colors": "h == 32", + "baseMaterial": "WATER_FOUNTAIN_FLAT", + "uvType": "BOX", + "uvScale": 0.35 } ], "objectIds": [ From 1fb7f2d90343cb6c847978c6865935aff8d3a4ba Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 21:48:54 +0100 Subject: [PATCH 2/9] Texture crates and piers on Red Rock, fix some color overrides on sailing benches --- .../rs117/hd/scene/model_overrides.json | 123 +++++++++++++++++- 1 file changed, 120 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 f587a17b2b..19c3f628df 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -29182,7 +29182,8 @@ "FAIRY_CHEST_BANK", "BARBASSAULT_BANK_CHEST", "TEMPOROSS_LOBBY_BANK_CHEST", - "LUNAR_BASIC_CHEST" + "LUNAR_BASIC_CHEST", + "BANK_CHEST_SMALL" ], "uvType": "BOX", "uvOrientation": 512, @@ -75886,7 +75887,9 @@ { "description": "Cloth", "colors": "h == 6", - "baseMaterial": "CARPET_LIGHT_SMOOTH" + "baseMaterial": "CARPET_LIGHT_SMOOTH", + "uvType": "BOX", + "uvScale": 0.2 }, { "description": "Seaweed", @@ -75910,7 +75913,7 @@ "colorOverrides": [ { "description": "Metal", - "colors": "h == 0", + "colors": "h == 0 || h == 5 && s == 0", "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", "uvScale": 0.1 @@ -82532,6 +82535,120 @@ "GREAT_CONCH_SHRINE" ] }, + { + "description": "Red Rock - Crate - Single", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "RED_ROCK_CRATE01_SINGLE01", + "RED_ROCK_CRATE03", + "RED_ROCK_PALLET01_BAG01" + ], + "uvType": "BOX", + "uvScale": 0.7, + "flatNormals": true, + "uvOrientationX": 512, + "uvOrientationZ": 512, + "colorOverrides": [ + { + "colors": "h < 2", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, + { + "description": "Red Rock - Crate - Stack", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "RED_ROCK_CRATE01_STACKED01" + ], + "uvType": "BOX", + "uvScale": 0.8, + "flatNormals": true, + "uvOrientationX": 512, + "uvOrientationZ": 512, + "uvOrientationY": 100, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, + { + "description": "Red Rock - Docks - Rotated", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "TRR_PIER_SUPPORT_STRAIGHT01A", + "TRR_PIER_SUPPORT_CORNER_OUTSIDE01A", + "SKEWSTEPS_WOOD01_REDROCK01", + "TRR_PIER_SUPPORT_CORNER_OUTSIDE01C", + "TRR_PIER_SUPPORT_STRAIGHT01C" + ], + "uvType": "BOX", + "uvOrientationY": 512 + }, + { + "description": "Red Rock - Docks", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "TRR_PIER_SUPPORT_CORNER_OUTSIDE01B", + "TRR_PIER_SUPPORT_STRAIGHT01B", + "TRR_PIER_SUPPORT_STRAIGHT01D", + "TRR_PIER_SUPPORT_CORNER_OUTSIDE01D" + ], + "uvType": "BOX" + }, + { + "description": "Red ROck - Dock Support - Rotated", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "TRR_PIER_SUPPORT_PILLAR01A", + "TRR_PIER_SUPPORT_PILLAR01C" + ], + "uvType": "BOX", + "uvOrientationY": 512, + "colorOverrides": [ + { + "description": "Metal", + "colors": "h == 32", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.1 + }, + { + "description": "Algae", + "colors": "h == 12", + "baseMaterial": "GRUNGE_2", + "uvType": "BOX", + "uvScale": 0.6 + } + ] + }, + { + "description": "Red ROck - Dock Support", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "TRR_PIER_SUPPORT_PILLAR01D", + "TRR_PIER_SUPPORT_PILLAR01B" + ], + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Metal", + "colors": "h == 32", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.1 + }, + { + "description": "Algae", + "colors": "h == 12", + "baseMaterial": "GRUNGE_2", + "uvType": "BOX", + "uvScale": 0.6 + } + ] + }, { "description": "Crandor - Stone walls", "baseMaterial": "STONE_NORMALED", From 5c483617fc4e64067e1c0dcf59ad0fe377552bc3 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 21:53:45 +0100 Subject: [PATCH 3/9] Texture sails on ships docked at Red Rock --- .../rs117/hd/scene/model_overrides.json | 46 ++++++++++++++++++- 1 file changed, 44 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 19c3f628df..8e92e4fd93 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -82545,7 +82545,6 @@ ], "uvType": "BOX", "uvScale": 0.7, - "flatNormals": true, "uvOrientationX": 512, "uvOrientationZ": 512, "colorOverrides": [ @@ -82563,7 +82562,6 @@ ], "uvType": "BOX", "uvScale": 0.8, - "flatNormals": true, "uvOrientationX": 512, "uvOrientationZ": 512, "uvOrientationY": 100, @@ -82649,6 +82647,50 @@ } ] }, + { + "description": "Red Rock - Ship - Wood with Sails or Metal - Rotated", + "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", + "objectIds": [ + "BOATKIT_MAST_MIDDLEMAST_HOISTED_RED_REEF" + ], + "colorOverrides": [ + { + "description": "Hull", + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65, + "uvOrientationY": 512 + }, + { + "description": "Sail", + "colors": "h == 0 && s == 3", + "baseMaterial": "CARPET_SUPER_LIGHT_SMOOTH" + } + ] + }, + { + "description": "Red Rock - Ship - Wood with Sails or Metal", + "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", + "objectIds": [ + "BOATKIT_MAST_FRONTMAST_HOISTED_RED_REEF" + ], + "colorOverrides": [ + { + "description": "Hull", + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65, + "uvOrientation": 512 + }, + { + "description": "Sail", + "colors": "h == 0 && s == 3", + "baseMaterial": "CARPET_LIGHT_SMOOTH" + } + ] + }, { "description": "Crandor - Stone walls", "baseMaterial": "STONE_NORMALED", From d20ae32d05632d9c8a765c33233a1e43fb4013f6 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 22:04:05 +0100 Subject: [PATCH 4/9] Texture building walls on Red Rock --- .../rs117/hd/scene/model_overrides.json | 59 +++++++++++++++++-- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 8e92e4fd93..39849a36f3 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -82597,7 +82597,7 @@ "uvType": "BOX" }, { - "description": "Red ROck - Dock Support - Rotated", + "description": "Red Rock - Dock Support - Rotated", "baseMaterial": "WOOD_GRAIN_3_LIGHT", "objectIds": [ "TRR_PIER_SUPPORT_PILLAR01A", @@ -82623,7 +82623,7 @@ ] }, { - "description": "Red ROck - Dock Support", + "description": "Red Rock - Dock Support", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "TRR_PIER_SUPPORT_PILLAR01D", @@ -82648,7 +82648,7 @@ ] }, { - "description": "Red Rock - Ship - Wood with Sails or Metal - Rotated", + "description": "Red Rock - Ship - Wood with Sails - Hoisted", "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ "BOATKIT_MAST_MIDDLEMAST_HOISTED_RED_REEF" @@ -82670,7 +82670,7 @@ ] }, { - "description": "Red Rock - Ship - Wood with Sails or Metal", + "description": "Red Rock - Ship - Bowsprit", "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ "BOATKIT_MAST_FRONTMAST_HOISTED_RED_REEF" @@ -82691,6 +82691,57 @@ } ] }, + { + "description": "Red Rock - Building Walls and Doors", + "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", + "objectIds": [ + "WALLKIT_RED_ROCK_INTERNAL01_WALL01", + "WALLKIT_RED_ROCK_WINDOW01", + "WALLKIT_RED_ROCK_WALL01", + "WALLKIT_RED_ROCK_WALL01_RESIZE01", + "WALLKIT_RED_ROCK_DOOR01_OPEN_R_NOOP", + "WALLKIT_RED_ROCK_DOOR01_OPEN_L_NOOP", + "WALLKIT_RED_ROCK_DOOR01_OPEN_NOOP", + "WALLKIT_RED_ROCK_DOOR01_LOCKED", + "WALLKIT_RED_ROCK_DOOR01_OPEN_L", + "WALLKIT_RED_ROCK_DOOR01_OPEN_R", + "WALLKIT_RED_ROCK_DOOR01_CLOSED_L", + "WALLKIT_RED_ROCK_DOOR01_CLOSED_R" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 512 + }, + { + "colors": "h == 1 && s == 3", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX" + }, + { + "colors": "a < 255", + "baseMaterial": "NONE" + } + ] + }, + { + "description": "Red Rock - Pully", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "objectIds": [ + "WALLKIT_RED_ROCK_PULLEY01" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + } + ] + }, { "description": "Crandor - Stone walls", "baseMaterial": "STONE_NORMALED", From c2fa9836fd8ad3428a02af617443fb26b3063731 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 22:58:45 +0100 Subject: [PATCH 5/9] Texture tables, bookshelves and various objects in Red Rocks building --- .../rs117/hd/scene/model_overrides.json | 111 ++++++++++++++++-- 1 file changed, 104 insertions(+), 7 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 39849a36f3..353ea3820d 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -32971,6 +32971,7 @@ "FAI_VARROCK_SHELVES1", "FAI_VARROCK_SHELVES2", "FAI_VARROCK_SHELVES3", + "FAI_VARROCK_SHELVES4_MIRROR", "FAI_VARROCK_SINGLE_SHELF_FLOWERS", "FAI_VARROCK_SHELF_TANKARDS" ], @@ -49718,7 +49719,8 @@ "SARIM_BOOKCASE2_OFFSET_WESTFACING", "BOOKCASE_POLYBOOKS", "CANAFIS_BOOKSHELF_OLD_SHORT", - "CANAFIS_BOOKSHELF_OLD_SHORT3" + "CANAFIS_BOOKSHELF_OLD_SHORT3", + "FAI_VARROCK_BOOKCASE_NOOP" ], "uvType": "BOX", "colorOverrides": [ @@ -51277,7 +51279,8 @@ } ], "objectIds": [ - "FAI_VARROCK_APOTHECARY_CABINET_TWO" + "FAI_VARROCK_APOTHECARY_CABINET_TWO", + "FAI_VARROCK_APOTHECARY_CABINET_ALT" ] }, { @@ -82535,13 +82538,33 @@ "GREAT_CONCH_SHRINE" ] }, + { + "description": "Red Rock - Pallet Leaning on Wall", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "RED_ROCK_PALLET02_LEANING01", + "RED_ROCK_PALLET02_LEANING01_OFFSET_X" + ], + "uvType": "BOX", + "uvScale": 0.7, + "uvOrientationY": 650, + "uvOrientationZ": 512, + "colorOverrides": [ + { + "colors": "h < 2", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, { "description": "Red Rock - Crate - Single", "baseMaterial": "WOOD_GRAIN_3_LIGHT", "objectIds": [ "RED_ROCK_CRATE01_SINGLE01", "RED_ROCK_CRATE03", - "RED_ROCK_PALLET01_BAG01" + "RED_ROCK_CRATE02", + "RED_ROCK_PALLET01_BAG01", + "RED_ROCK_PALLET02_BAG01" ], "uvType": "BOX", "uvScale": 0.7, @@ -82692,13 +82715,37 @@ ] }, { - "description": "Red Rock - Building Walls and Doors", + "description": "Red Rock - Building Walls", "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ "WALLKIT_RED_ROCK_INTERNAL01_WALL01", "WALLKIT_RED_ROCK_WINDOW01", "WALLKIT_RED_ROCK_WALL01", - "WALLKIT_RED_ROCK_WALL01_RESIZE01", + "WALLKIT_RED_ROCK_WALL01_RESIZE01" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65, + "uvOrientation": 512 + }, + { + "colors": "h == 1 && s == 3", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX" + }, + { + "colors": "a < 255", + "baseMaterial": "NONE" + } + ] + }, + { + "description": "Red Rock - Doors", + "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", + "objectIds": [ "WALLKIT_RED_ROCK_DOOR01_OPEN_R_NOOP", "WALLKIT_RED_ROCK_DOOR01_OPEN_L_NOOP", "WALLKIT_RED_ROCK_DOOR01_OPEN_NOOP", @@ -82713,8 +82760,7 @@ "colors": "h == 5", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.5, - "uvOrientation": 512 + "uvScale": 0.8 }, { "colors": "h == 1 && s == 3", @@ -82742,6 +82788,57 @@ } ] }, + { + "description": "Red Rock - Tables with Various Items", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "RED_ROCK_TABLE01_1X1", + "RED_ROCK_TABLE01_2X3", + "RED_ROCK_TABLE01_1X3", + "RED_ROCK_TABLE01_1X2" + ], + "uvType": "BOX", + "uvScale": 0.3, + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.7, + "uvOrientationY": 512 + } + ] + }, + { + "description": "Red Rock - Display Cases", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "TRR_DISPLAY_CASE_1", + "TRR_DISPLAY_CASE_2", + "TRR_DISPLAY_CASE_3", + "TRR_DISPLAY_CASE_4" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.7, + "uvOrientation": 512 + }, + { + "colors": "h == 7", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientation": 512 + }, + { + "colors": "a < 255", + "baseMaterial": "GRAY_75" + } + ] + }, { "description": "Crandor - Stone walls", "baseMaterial": "STONE_NORMALED", From 7bd802f37011118a56646df91595bb1286375964 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 23:15:42 +0100 Subject: [PATCH 6/9] Texture pirate sloops --- .../rs117/hd/scene/model_overrides.json | 64 ++++++++++++++++++- 1 file changed, 63 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 353ea3820d..155dd8582a 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -76363,6 +76363,25 @@ "SAILING_BOAT_HULL_KANDARIN_3X8_ROSEWOOD" ] }, + { + "description": "Sailing - Sloop - Hull - Pirate", + "baseMaterial": "WOOD_GRAIN_3_SEMILIGHT", + "uvType": "BOX", + "uvOrientationX": 512, + "uvOrientationZ": 512, + "objectIds": [ + "SAILING_BOAT_HULL_KANDARIN_3X8_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_PORT_MIDSHIPS_DOWN_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_PORT_MIDSHIPS_UP_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_PORT_STERN_DOWN_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_PORT_STERN_UP_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_STARBOARD_MIDSHIPS_DOWN_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_STARBOARD_MIDSHIPS_UP_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_STARBOARD_STERN_DOWN_PIRATE", + "SAILING_BOAT_HULL_GUNPORTS_KANDARIN_3X8_STARBOARD_STERN_UP_PIRATE", + "SAILING_BOAT_SLOOP_TRIM_PIRATE" + ] + }, { "description": "Sailing - Skiff and Sloop - Sail - Bronze", "baseMaterial": "WOOD_GRAIN_3", @@ -76447,6 +76466,31 @@ } ] }, + { + "description": "Sailing - Sloop - Sail - Pirate", + "objectIds": [ + "SAILING_BOAT_SAIL_KANDARIN_3X8_PIRATE" + ], + "disableDetailCulling": true, + "colorOverrides": [ + { + "description": "Rope", + "colors": "h == 8", + "baseMaterial": "CARPET_VERY_LIGHT_SMOOTH", + "undoVanillaShading": false + }, + { + "description": "Metal", + "colors": "h == 5", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH" + }, + { + "description": "Metal", + "colors": "h > 15", + "baseMaterial": "CARPET_LIGHT_SMOOTH" + } + ] + }, { "description": "Sailing - Skiff and Sloop - Keel & Metallic Trims", "baseMaterial": "METALLIC_1_LIGHT", @@ -76529,7 +76573,8 @@ "SAILING_KEG_KRAKEN_INK_STOUT", "SAILING_KEG_PERILDANCE_BITTER", "SAILING_KEG_TRAWLERS_TRUST", - "SAILING_KEG_HORIZONS_LURE" + "SAILING_KEG_HORIZONS_LURE", + "SAILING_BOAT_STEERING_KANDARIN_3X8_PIRATE" ], "colorOverrides": [ { @@ -76715,6 +76760,23 @@ } ] }, + { + "description": "Sailing - Facility - Cannon - Pirate", + "baseMaterial": "WOOD_GRAIN_3_SEMILIGHT", + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientation": 512, + "objectIds": [ + "SAILING_PIRATE_CANNON" + ], + "colorOverrides": [ + { + "description": "Metal", + "colors": "h == 5 && s != 0", + "baseMaterial": "METALLIC_1_LIGHTER_SMOOTH" + } + ] + }, { "description": "Sailing - Facility - Cooking Range", "baseMaterial": "METALLIC_1_VERY_LIGHT", From d54831883ab2ebe225f76a2ee0719293ac9352a0 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 23:40:53 +0100 Subject: [PATCH 7/9] Texture parts of the Zenith --- .../rs117/hd/scene/model_overrides.json | 27 ++++++++++++++++--- 1 file changed, 24 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 155dd8582a..209705ea33 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -75435,6 +75435,7 @@ "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ "BOATKIT_SHIPHULL_FIGUREHEAD01", + "BOATKIT_SHIPHULL_FIGUREHEAD01_INACTIVE", "BOATKIT_SHIPHULL_PORTHOLE01", "BOATKIT_MAST_FRONTMAST_HOISTED", "BOATKIT_SHIPHULL_RAILING01", @@ -75735,7 +75736,8 @@ "SLUG2_ROTTEN_BARREL_HALF_BURRIED_UPRIGHT", "SEASLUG_CRATE_IN_WATER2", "SEASLUG_CRATE_IN_WATER", - "SEASLUG_MESSGAE_BOTTLE" + "SEASLUG_MESSGAE_BOTTLE", + "LOTR_MINE_CRATE_IN_WATER" ], "colorOverrides": [ { @@ -76143,6 +76145,7 @@ "objectIds": [ "SAILING_MOORING_EMBARK", "SAILING_MOORING_DISEMBARK", + "SAILING_MOORING_LAST_LIGHT_ESCAPE", "TT_PEARL_MOORING_POINT_FIGHT" ], "uvType": "BOX", @@ -82733,10 +82736,12 @@ ] }, { - "description": "Red Rock - Ship - Wood with Sails - Hoisted", + "description": "Red Rock - Ship - Wood with Sails", + "disableDetailCulling": true, "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ - "BOATKIT_MAST_MIDDLEMAST_HOISTED_RED_REEF" + "BOATKIT_MAST_MIDDLEMAST_HOISTED_RED_REEF", + "BOATKIT_MAST_MIDDLEMAST_FULL_RED_REEF" ], "colorOverrides": [ { @@ -82756,6 +82761,7 @@ }, { "description": "Red Rock - Ship - Bowsprit", + "disableDetailCulling": true, "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", "objectIds": [ "BOATKIT_MAST_FRONTMAST_HOISTED_RED_REEF" @@ -82776,6 +82782,21 @@ } ] }, + { + "description": "Red Rock - Ship - Diving Bell Crane", + "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", + "objectIds": [ + "TRR_DIVING_BELL_CRANE" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65 + } + ] + }, { "description": "Red Rock - Building Walls", "baseMaterial": "METALLIC_1_VERY_LIGHT_SMOOTH", From 0406ca1e1076e52bbe94578e662d94b7bd4e0b81 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 5 Jun 2026 23:49:05 +0100 Subject: [PATCH 8/9] Add environment for Red Reef underwater area --- src/main/resources/rs117/hd/scene/areas.json | 6 ++++++ .../resources/rs117/hd/scene/environments.json | 14 ++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index ab0b40f433..e9d6cdaef7 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -11725,6 +11725,12 @@ [ 11046, 11047 ] ] }, + { + "name": "RED_REEF_UNDERWATER", + "regions": [ + 11403 + ] + }, { "name": "ISLE_OF_BONES", "regions": [ 10023 ] diff --git a/src/main/resources/rs117/hd/scene/environments.json b/src/main/resources/rs117/hd/scene/environments.json index 6b5ee71a98..2b30e09e97 100644 --- a/src/main/resources/rs117/hd/scene/environments.json +++ b/src/main/resources/rs117/hd/scene/environments.json @@ -1538,6 +1538,20 @@ "groundFogOpacity": 0.65, "waterCausticsStrength": 4 }, + { + "area": "RED_REEF_UNDERWATER", + "isUnderwater": true, + "ambientColor": "#255590", + "ambientStrength": 9, + "directionalColor": "#71a3d0", + "directionalStrength": 0.6, + "fogColor": "#133156", + "fogDepth": 35, + "groundFogStart": -50, + "groundFogEnd": -700, + "groundFogOpacity": 0.5, + "waterCausticsStrength": 42 + }, { "area": "LUNAR_DREAM_WORLD", "allowSkyOverride": false, From 7b559db75e9286808d9119f6cf52d2d669c1c205 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Sat, 6 Jun 2026 17:34:17 +0100 Subject: [PATCH 9/9] Texture rocks and coral, fix tiles being bricks underwater --- .../rs117/hd/scene/model_overrides.json | 105 +++++++++++++++++- .../rs117/hd/scene/tile_overrides.json | 8 ++ 2 files changed, 107 insertions(+), 6 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 209705ea33..f019168733 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -56340,23 +56340,76 @@ "_100_CORAL_TUBE_TOP2", "_100_CORAL_TUBE_TOP3", "_100_CORAL_TUBE_ROCK1", - "_100_CORAL_TUBE_ROCK2" + "_100_CORAL_TUBE_ROCK2", + "_100_CORAL_LACE_SIDE1_PURPLE", + "_100_CORAL_LACE_CORNER2_PURPLE", + "_100_CORAL_LACE_INVERSE_PURPLE", + "_100_CORAL_LACE_SIDE2_PURPLE", + "_100_CORAL_LACE_CORNER1_PURPLE", + "_100_CORAL_LACE_ROCK2_PURPLE", + "_100_CORAL_LACE_TOP3_PURPLE", + "_100_CORAL_LACE_ROCK1_PURPLE", + "_100_CORAL_LACE_TOP2_PURPLE" ], "colorOverrides": [ { "colors": "h == 7 && s == 1 || h == 8 && s == 1 || h == 9 && s == 2", "baseMaterial": "DIRT_1", "uvType": "BOX", - "uvScale": 0.75 + "uvScale": 0.6 }, { - "colors": "h == 6 && s == 7 || h == 7 && s == 7 || h == 8 && s == 7", - "baseMaterial": "PLANT_GRUNGE_2", - "uvType": "BOX", - "uvScale": 0.75 + "colors": "h == 6 && s == 7 || h == 7 && s == 7 || h == 8 && s == 7 || h > 20", + "baseMaterial": "GRUNGE_1" } ] }, + { + "description": "Red Reef Coral", + "baseMaterial": "ROCK_2", + "areas": [ "RED_REEF_UNDERWATER" ], + "undoVanillaShading": false, + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "RED_CORAL01_2X2", + "RED_CORAL01_1X1", + "RED_CORAL01_3X2" + ], + "colorOverrides": [ + { + "colors": "h == 0 && s != 0", + "baseMaterial": "GRUNGE_1_VERY_LIGHT" + } + ] + }, + { + "description": "Red Reef Rocks", + "baseMaterial": "ROCK_2", + "areas": [ "RED_REEF_UNDERWATER" ], + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "DI2_CAVE_ROCKS_SMALL1_ICE", + "DI2_CAVE_ROCKS_BIG3_ICE", + "TRR_ROCKS_BIG02", + "DI2_CAVE_ROCKS_BIG1_ICE", + "DI2_CAVE_ROCKS_BIG2_ICE", + "TRR_ROCKS_BIG01" + ] + }, + { + "description": "Underwater Ocean Rocks", + "baseMaterial": "ROCK_2", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "OCEAN_OUTCROP_UNDERWATER01", + "OCEAN_OUTCROP_UNDERWATER02", + "OCEAN_OUTCROP_UNDERWATER03", + "OCEAN_OUTCROP_UNDERWATER04" + ] + }, { "description": "Anchor", "baseMaterial": "METALLIC_1_SEMIGLOSS", @@ -82922,6 +82975,46 @@ } ] }, + { + "description": "Red Reef - Diving Bell", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "TRR_DIVING_BELL" + ], + "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.7 + } + ] + }, + { + "description": "Red Reef - Dredger", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "TRR_CORAL_DREDGER_FIXED", + "TRR_CORAL_DREDGER_BROKEN", + "TRR_CORAL_DREDGER_BROKEN_OP" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.3 + } + ] + }, + { + "description": "Red Reef - Cliff", + "baseMaterial": "DIRT_1", + "uvType": "BOX", + "objectIds": [ + "CORAL_SEABED_LOW_WALL" + ] + }, { "description": "Crandor - Stone walls", "baseMaterial": "STONE_NORMALED", diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 5aeab58d09..b6665ba80f 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -10620,6 +10620,14 @@ "blended": false, "shiftLightness": 6 }, + { + "name": "RED_REEF_GRAVEL", + "area": "RED_REEF_UNDERWATER", + "overlayIds": [ + 137 + ], + "groundMaterial": "VARIED_DIRT" + }, { "name": "TAG - CLIMATE - START" },