From 519435ab901c8b938cd29d84e8a9c4fe5804e206 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 19:38:57 -0500 Subject: [PATCH 01/12] Fix gnome lamp UVs --- .../resources/rs117/hd/scene/model_overrides.json | 12 +++++++++++- 1 file changed, 11 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..fc2637396 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10137,8 +10137,18 @@ ] }, { - "description": "Gnome - Objects - Wooden - Lamp", + "description": "Gnome - Objects - Wooden Lamp - DYNAMIC", "baseMaterial": "BARK", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": 42, + "colorOverrides": [ + { + "description": "Lamp", + "colors": "s == 0", + "baseMaterial": "METALLIC_1_LIGHT" + } + ], "objectIds": [ 201 ] From 69148a0838e152eb045b7650ce9d542143ca53dc Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 19:55:53 -0500 Subject: [PATCH 02/12] stronghold door --- .../rs117/hd/scene/model_overrides.json | 30 ++++++++++++++++++- 1 file changed, 29 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 fc2637396..64f958694 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10141,7 +10141,6 @@ "baseMaterial": "BARK", "uvType": "BOX", "uvScale": 0.6, - "uvOrientation": 42, "colorOverrides": [ { "description": "Lamp", @@ -10153,6 +10152,35 @@ 201 ] }, + { + "description": "Gnome Stronghold tree doors", + "baseMaterial": "BARK", + "uvType": "BOX", + "materialOverrides": { + "SIMPLE_GRAIN_WOOD": { + "textureMaterial": "SIMPLE_GRAIN_WOOD", + "uvOrientation": 512, + "uvScale": 0.7, + "uvType": "BOX", + "retainVanillaUvs": false + } + }, + "colorOverrides": [ + { + "description": "Carving", + "colors": "h == 17", + "baseMaterial": "GRUNGE_3_LIGHT", + "uvType": "BOX", + "uvOrientation": 343 + } + ], + "objectIds": [ + 1967, + 1968, + 1969, + 1970 + ] + }, { "description": "Gnome - Objects - Wooden - Bench - Textured", "baseMaterial": "GRUNGE_2", From f57a2d4994b9e544dab48e65918297c722bdc729 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 20:02:16 -0500 Subject: [PATCH 03/12] gnome bust --- .../rs117/hd/scene/model_overrides.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 64f958694..e0d1a89ee 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10181,6 +10181,26 @@ 1970 ] }, + { + "description": "Gnome - Objects - Gnome busts on wooden piller", + "baseMaterial": "BARK", + "uvType": "BOX", + "uvScale": 0.6, + "colorOverrides": [ + { + "description": "Bust", + "colors": "s == 0", + "uvScale": 0.4, + "uvOrientation": 343, + "baseMaterial": "MARBLE_3", + "uvType": "BOX" + } + ], + "objectIds": [ + 571, + 572 + ] + }, { "description": "Gnome - Objects - Wooden - Bench - Textured", "baseMaterial": "GRUNGE_2", From a4d155e9ccd56f9e4d8a5941ca196a7ae922783e Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 20:03:08 -0500 Subject: [PATCH 04/12] scale uv --- 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 e0d1a89ee..a80615731 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10185,7 +10185,7 @@ "description": "Gnome - Objects - Gnome busts on wooden piller", "baseMaterial": "BARK", "uvType": "BOX", - "uvScale": 0.6, + "uvScale": 0.8, "colorOverrides": [ { "description": "Bust", From 31896cb42c8681d5d2e81acdcb4269c69d15e1be Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 20:59:56 -0500 Subject: [PATCH 05/12] add roots in stronghold --- .../resources/rs117/hd/scene/model_overrides.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index a80615731..683b2c8e2 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -14420,6 +14420,17 @@ "uvScale": 0.6, "uvOrientation": 342 }, + { + "description": "Objects - Root - Large", + "baseMaterial": "LIGHT_BARK", + "objectIds": [ + 1985, + 1986 + ], + "uvType": "BOX", + "uvScale": 0.4, + "uvOrientation": 342 + }, { "description": "Wooden crates, Wooden table, wooden rack", "baseMaterial": "WOOD_GRAIN_3", From 8cc40a3e1c0dd6612f12225f4dde7993bb8f117e Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 21:36:06 -0500 Subject: [PATCH 06/12] add missing cupboard --- src/main/resources/rs117/hd/scene/model_overrides.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 683b2c8e2..ed762a65f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22905,6 +22905,8 @@ 2057, 2062, 2063, + 2434, + 2435, 2612, 2613 ], From 902df25d15cd7fb7fd622e8a673adcc020001530 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 21:45:40 -0500 Subject: [PATCH 07/12] fix gnome bench uv, add table and stool --- .../rs117/hd/scene/model_overrides.json | 29 ++++++++++++++++++- 1 file changed, 28 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 ed762a65f..b86d89b2f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10203,11 +10203,38 @@ }, { "description": "Gnome - Objects - Wooden - Bench - Textured", - "baseMaterial": "GRUNGE_2", + "baseMaterial": "WOOD_GRAIN_2", + "uvType": "BOX", + "uvScale": 0.48, "objectIds": [ 1104 ] }, + { + "description": "Gnome table with cutlery and napkins", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 600, + "objectIds": [ + 1103 + ] + }, + { + "description": "Gnome stool", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 84, + "colorOverrides": [ + { + "description": "Silverware and napkin", + "colors": "s == 0", + "baseMaterial": "NONE" + } + ], + "objectIds": [ + 600 + ] + }, { "description": "Gnome - Objects - Wooden - Staircase Rails - Textured", "baseMaterial": "DOCK_FENCE", From f83841aa7e8af91780ebe4c821ab4f73f0f8d920 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 21:49:48 -0500 Subject: [PATCH 08/12] add missing fence --- src/main/resources/rs117/hd/scene/model_overrides.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index b86d89b2f..79b05770e 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -1954,9 +1954,13 @@ 1562, 1563, 1564, + 1565, + 1566, 1567, 1739, 1740, + 2438, + 2439, 993, 7527, 20857, From d3026de946437d70c8a5a1bbe886b8578caa54b2 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 22:07:12 -0500 Subject: [PATCH 09/12] add missing dead tree parts --- src/main/resources/rs117/hd/scene/model_overrides.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 79b05770e..1fdaca1d3 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -10053,6 +10053,8 @@ 1287, 1288, 1384, + 2447, + 2448, 14593, 14594, 14595, @@ -10069,6 +10071,7 @@ 23559, 23530, 23561, + 28658, 51766 ], "uvType": "BOX" From 49302190e8cce7f091fa616dd46ce6db2601a583 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 22:09:53 -0500 Subject: [PATCH 10/12] quest items --- .../resources/rs117/hd/scene/model_overrides.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 1fdaca1d3..406ce7642 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23697,5 +23697,17 @@ "objectIds": [ 2783 ] + }, + { + "description": "Glough house pillars", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.7, + "objectIds": [ + 2440, + 2441, + 2442, + 2443 + ] } ] From c50006a1705c3c9356f65a1054d4a0ff15d65254 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 22:12:54 -0500 Subject: [PATCH 11/12] add broken ladder --- src/main/resources/rs117/hd/scene/model_overrides.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 406ce7642..3e105c7cc 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5194,6 +5194,7 @@ 16684, 16685, 17026, + 17028, 17384, 17385, 17387, From 31ad0e512613e9aaa4ba8532cac32a959981af40 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 25 Nov 2024 22:25:12 -0500 Subject: [PATCH 12/12] add stronghold basement roots --- .../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 3e105c7cc..aec3786a3 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -23710,5 +23710,21 @@ 2442, 2443 ] + }, + { + "description": "Gnome Stronghold tunnels walls with roots - DYNAMIC", + "baseMaterial": "GRUNGE_1", + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Roots", + "baseMaterial": "LIGHT_BARK", + "colors": "h == 7", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8 + } + ], + "objectIds": [ 2451 ] } ]