From 1a5d1997a95411585ef4e07adc0acf3e774d4526 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:09:50 -0500 Subject: [PATCH 1/7] bench and desk in the temple --- .../rs117/hd/scene/model_overrides.json | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 6f80a85fa..19c193bb1 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23592,5 +23592,45 @@ "objectIds": [ 2783 ] + }, + { + "description": "Wooden pew bench with green cushion and saradomin symbol on the side", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Cushion", + "baseMaterial": "CARPET", + "uvType": "MODEL_XZ", + "colors": "h == 17" + }, + { + "description": "Saradomin Symbol", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "MODEL_YZ", + "colors": "h == 11", + "uvOrientation": 42, + "uvScale": 0.4 + } + ], + "objectIds": [ + 1112 + ] + }, + { + "description": "Wooden study desk with a green mat", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Desk mat", + "baseMaterial": "CARPET", + "uvType": "MODEL_XZ", + "colors": "h == 21" + } + ], + "objectIds": [ + 608 + ] } ] From 5babb5fdaac97a855a0dcafa04d73066c661435c Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:17:06 -0500 Subject: [PATCH 2/7] Temple top level gate --- .../resources/rs117/hd/scene/model_overrides.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 19c193bb1..c340bfcc1 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5802,6 +5802,21 @@ "uvType": "BOX", "uvOrientation": 463 }, + { + "description": "Metal Fence Gate with textured posts", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "retainVanillaUvs": false, + "uvOrientation": 512, + "objectIds": [ + 3460, + 3461, + 3462, + 3463, + 3464, + 3465 + ] + }, { "description": "Metal Fence", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", From 02f4605b058d6a6016de89b094e97d51e4188289 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:30:25 -0500 Subject: [PATCH 3/7] Basement walls, columns, and well --- .../rs117/hd/scene/model_overrides.json | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index c340bfcc1..48cee3cc6 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5760,6 +5760,8 @@ 2059, 2060, 2061, + 3444, + 3446, 3506, 3507, 5501, @@ -23647,5 +23649,46 @@ "objectIds": [ 608 ] + }, + { + "description": "Paterdomus Temple basement walls - textured", + "baseMaterial": "DIRT_1", + "uvType": "MODEL_XZ_MIRROR_B", + "objectIds": [ + 3442, + 3450, + 3451 + ] + }, + { + "description": "Paterdomus Temple basement wall tops", + "baseMaterial": "DIRT_1", + "uvType": "MODEL_XZ", + "uvScale": 1.15, + "uvOrientation": 42, + "objectIds": [ + 3447, + 3448 + ] + }, + { + "description": "Paterdomus Temple basement columns", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.6, + "objectIds": [ + 3486 + ] + }, + { + "description": "Paterdomus Temple basement well", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 42, + "uvScale": 0.6, + "objectIds": [ + 3485 + ] } ] From 5d01e480bce59a3b839159e9c8222da16165f92d Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:33:29 -0500 Subject: [PATCH 4/7] basement monuments --- .../rs117/hd/scene/model_overrides.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 48cee3cc6..fe58f7636 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23690,5 +23690,21 @@ "objectIds": [ 3485 ] + }, + { + "description": "Paterdomus Temple Basement Monument - DYNAMIC", + "baseMaterial": "MARBLE_3", + "uvType": "BOX", + "uvOrientation": 42, + "uvScale": 0.6, + "objectIds": [ + 3493, + 3494, + 3495, + 3496, + 3497, + 3498, + 3499 + ] } ] From 97868ef5b53de1cc89767982d329753a4803bbd8 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:53:29 -0500 Subject: [PATCH 5/7] basement touch ups --- src/main/resources/rs117/hd/scene/lights.json | 41 +++++++++++++++++++ .../rs117/hd/scene/model_overrides.json | 7 +++- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 12398c829..a9e6ee5ac 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35550,5 +35550,46 @@ "type": "FLICKER", "duration": 0, "range": 20 + }, + { + "description": "Paterdomus Temple Basement Monument lights", + "height": 160, + "alignment": "BACK", + "radius": 150, + "strength": 7.7, + "color": [ + 255, + 255, + 0 + ], + "type": "FLICKER", + "duration": 0, + "range": 10, + "objectIds": [ + 3493, + 3494, + 3495, + 3496 + ] + }, + { + "description": "Paterdomus Temple Basement Monument lights - Angled", + "height": 160, + "alignment": "BACKLEFT", + "radius": 150, + "strength": 7.7, + "color": [ + 255, + 255, + 0 + ], + "type": "FLICKER", + "duration": 0, + "range": 10, + "objectIds": [ + 3497, + 3498, + 3499 + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index fe58f7636..45804d437 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5761,6 +5761,7 @@ 2060, 2061, 3444, + 3445, 3446, 3506, 3507, @@ -14198,6 +14199,7 @@ }, { "description": "Objects - Concrete - Salve Tunnel Entrance", + "baseMaterial": "ROCK_3", "textureMaterial": "HD_CONCRETE", "objectIds": [ 3456, @@ -23657,7 +23659,8 @@ "objectIds": [ 3442, 3450, - 3451 + 3451, + 12765 ] }, { @@ -23693,7 +23696,7 @@ }, { "description": "Paterdomus Temple Basement Monument - DYNAMIC", - "baseMaterial": "MARBLE_3", + "baseMaterial": "MARBLE_3_SEMIGLOSS", "uvType": "BOX", "uvOrientation": 42, "uvScale": 0.6, From 86516bbf95e005fdc1acb23962dec70380bc2a4b Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Thu, 7 Nov 2024 21:54:58 -0500 Subject: [PATCH 6/7] missing wall --- src/main/resources/rs117/hd/scene/model_overrides.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 45804d437..ebcd461ee 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23663,6 +23663,14 @@ 12765 ] }, + { + "description": "Paterdomus Temple basement walls with portal - textured", + "baseMaterial": "DIRT_1", + "uvType": "MODEL_XZ_MIRROR_B", + "objectIds": [ + 3443 + ] + }, { "description": "Paterdomus Temple basement wall tops", "baseMaterial": "DIRT_1", From ab13d66565b0e4fce2a0e8c890eb38f41df92900 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Fri, 8 Nov 2024 10:19:43 -0500 Subject: [PATCH 7/7] position lights --- src/main/resources/rs117/hd/scene/lights.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index a9e6ee5ac..428a4061c 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35554,7 +35554,7 @@ { "description": "Paterdomus Temple Basement Monument lights", "height": 160, - "alignment": "BACK", + "offset": [ 0, -37, -90 ], "radius": 150, "strength": 7.7, "color": [ @@ -35563,7 +35563,7 @@ 0 ], "type": "FLICKER", - "duration": 0, + "duration": 30, "range": 10, "objectIds": [ 3493, @@ -35575,7 +35575,7 @@ { "description": "Paterdomus Temple Basement Monument lights - Angled", "height": 160, - "alignment": "BACKLEFT", + "offset": [ -40, -37, -74 ], "radius": 150, "strength": 7.7, "color": [ @@ -35584,7 +35584,7 @@ 0 ], "type": "FLICKER", - "duration": 0, + "duration": 30, "range": 10, "objectIds": [ 3497,