From 1bd05de59ee2581617a8e8a37794c525f6ed2423 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Tue, 26 Nov 2024 16:27:22 -0500 Subject: [PATCH 1/4] Add light to lanterns --- 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 12398c829..31bf7f704 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35550,5 +35550,22 @@ "type": "FLICKER", "duration": 0, "range": 20 + }, + { + "description": "Elemental Workshop wall lantern", + "offset": [ 4, 155, 0 ], + "radius": 500, + "strength": 12.5, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "objectIds": [ + 18536 + ] } ] From a6b03d13438d250f5ecd707ef46349e70bc42c72 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Tue, 26 Nov 2024 16:30:53 -0500 Subject: [PATCH 2/4] Add area, enable hide other regions --- src/main/resources/rs117/hd/scene/areas.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 29dbe2a8f..dbeaa3395 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -1136,6 +1136,13 @@ [ 2732, 3465, 2739, 3471 ] ] }, + { + "name": "Elemental Workshop floor 1", + "aabbs": [ + [ 2670, 9857, 2763, 9934 ] + ], + "hideOtherAreas": true + }, { "name": "SINCLAIR_MANSION", "aabbs": [ From 992149cec6ef905dd6bb0a05f681ccbda7a41eeb Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Tue, 26 Nov 2024 16:33:55 -0500 Subject: [PATCH 3/4] define floor --- src/main/resources/rs117/hd/scene/tile_overrides.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 0eb6e1283..e4c5aed13 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1864,6 +1864,12 @@ ], "groundMaterial": "FALADOR_PATHS" }, + { + "name": "elemental workshop floor", + "area": "Elemental Workshop floor 1", + "groundMaterial": "PACKED_EARTH", + "underlayIds": [ 67 ] + }, { "name": "SINCLAIR_MANSION_FLOOR", "area": "SINCLAIR_MANSION", From 0a30233a45ec7dc752fc2b5e366650ff83625583 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Tue, 26 Nov 2024 17:26:49 -0500 Subject: [PATCH 4/4] texture objects --- .../rs117/hd/scene/model_overrides.json | 173 +++++++++++++++++- 1 file changed, 172 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 6f80a85fa..aa06c6db3 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -7636,6 +7636,11 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ 2071, + 3394, + 3395, + 3398, + 3400, + 3401, 9534, 9064, 11485, @@ -7644,6 +7649,8 @@ 12548, 15031, 14739, + 18506, + 18507, 41450 ], "uvType": "BOX", @@ -7694,9 +7701,12 @@ "description": "Objects - Wooden - Stack of crates - Rotated", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ + 3397, + 3399, 7513, 14742, 15693, + 18508, 42068, 42070 ], @@ -12712,8 +12722,11 @@ 872, 877, 2542, + 3419, + 3420, 3421, - 6480 + 6480, + 18531 ] }, { @@ -23592,5 +23605,163 @@ "objectIds": [ 2783 ] + }, + { + "description": "Metal spiral staircase in ground", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.5, + "objectIds": [ + 3415 + ] + }, + { + "description": "Metal spiral staircase", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.5, + "objectIds": [ + 3416 + ] + }, + { + "description": "Water wheel - DYNAMIC", + "objectIds": [ 18512 ], + "flatNormals": true + }, + { + "description": "Elemental workshop water controls - DYNAMIC", + "objectIds": [ 18509, 18510 ] + }, + { + "description": "Elemental workshop moving machinery - DYNAMIC", + "objectIds": [ 18530 ] + }, + { + "description": "Elemental workshop levers", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ 3406, 3409, 3417 ] + }, + { + "description": "metallic pipe with a beige stripe on the side", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + 18726, + 18727, + 18728, + 18729, + 18730, + 18732 + ] + }, + { + "description": "metallic pipe with a orange stripe on the side", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + 18528, + 18529, + 18532, + 18533, + 18534, + 18535 + ] + }, + { + "description": "Lava trough", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 42, + "objectIds": [ + 18519, + 18520, + 18521, + 18522, + 18523 + ] + }, + { + "description": "Lava trough end caps", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + 18588, + 18589 + ] + }, + { + "description": "Domed machinery with a dial on the front of it", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 256, + "objectIds": [ + 3422, + 3423 + ] + }, + { + "description": "Bellows - DYNAMIC", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvOrientation": 343, + "objectIds": [ + 18515, + 18516 + ] + }, + { + "description": "Elemental Workshop lava furnace - DYNAMIC", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvOrientation": 343, + "objectIds": [ + 18517, + 18518, + 18525 + ] + }, + { + "description": "Elemental Workshop metal plate walls with stone bricks", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvOrientation": 343, + "objectIds": [ + 18538, + 18539, + 18540, + 18541, + 18543, + 18544, + 18545, + 18547, + 18548, + 18550, + 18552, + 18553, + 18554, + 18555, + 18556, + 18557, + 18558, + 18565, + 18567, + 18568, + 18570, + 18571, + 18573, + 18574, + 18575, + 18576, + 18577, + 18579, + 18583, + 18585 + ] } ]