From e18b930c91f4d932a31f9187350a6491379811a3 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:20:11 -0400 Subject: [PATCH 01/13] Slayer Tower walls to stone, and doors to wood --- .../rs117/hd/scene/model_overrides.json | 51 ++++++++++++++++++- 1 file changed, 49 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 bf9f05d3a..23bcefcdc 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3105,8 +3105,15 @@ }, { "description": "MORYTANIA_SLAYER_TOWER_WALLS", - "baseMaterial": "GRUNGE_1", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8, + "flatNormals": true, "objectIds": [ + 2106, + 2109, + 2110, 2160, 2161, 2162, @@ -3122,8 +3129,48 @@ 4332, 2171, 2114 + ] + }, + { + "description": "Morytania Slayer Tower Walls over door bricks", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8, + "flatNormals": true, + "objectIds": [ + 2110, + 2106 + ] + }, + { + "description": "Morytania Slayer Tower doors with metal hinges", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "flatNormals": true, + "colorOverrides": [ + { + "description": "Metal hinges", + "colors": "s == 0", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": 42 + } ], - "flatNormals": true + "objectIds": [ + 2100, + 2101, + 2102, + 2103, + 2104, + 2105, + 2108, + 2111, + 2112, + 2113 + ] }, { "description": "TOB_VERZIK_TILE_FLOOR", From 528341510b051272a348175fbccae4827c3508e2 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:23:47 -0400 Subject: [PATCH 02/13] Add shortcut chains --- .../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 23bcefcdc..a59656cea 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22138,5 +22138,16 @@ 28494, 28495 ] + }, + { + "description": "Mortytania Slayer Tower Spiked Chain shortcuts", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvOrientation": 343, + "uvType": "BOX", + "uvScale": 0.6, + "objectIds": [ + 16537, + 16538 + ] } ] From b58621a8ae038212fa99720153a63f840a710a2d Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:24:43 -0400 Subject: [PATCH 03/13] fix step UVs --- 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 a59656cea..211c03995 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -13218,6 +13218,7 @@ { "description": "Ground Decoration - Flat Rocks - Small", "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", "objectIds": [ 1862, 2159, From 10f47328e477e26d4cbe7ae996526d2f982fcfdc Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:25:46 -0400 Subject: [PATCH 04/13] add missing grass --- 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 211c03995..f8bced58e 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -1483,6 +1483,8 @@ 4986, 4987, 4988, + 4989, + 4990, 5341, 9502, 9503, From 6415229459c6c886121e87229ce01e1d1d95744f Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:36:10 -0400 Subject: [PATCH 05/13] Separate out stairs --- .../rs117/hd/scene/model_overrides.json | 24 ++++++++++++++++--- 1 file changed, 21 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 f8bced58e..7ff6ef58c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3128,9 +3128,19 @@ 2169, 2170, 2172, - 4332, - 2171, - 2114 + 2171 + ] + }, + { + "description": "Morytania Slayer Tower stairs", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8, + "flatNormals": true, + "objectIds": [ + 2114, + 2118 ] }, { @@ -22152,5 +22162,13 @@ 16537, 16538 ] + }, + { + "description": "Rock stick rubble that needs proper assignment - Check model", + "baseMaterial": "GREY_75", + "uvScale": 0.6, + "objectIds": [ + 4332 + ] } ] From 822160bd8b4482fd93e20b44e0eb064cb7fecd06 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:39:07 -0400 Subject: [PATCH 06/13] Add missing skeletons --- 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 7ff6ef58c..d51772abb 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -20655,6 +20655,9 @@ "description": "Skeleton named corpse", "baseMaterial": "BONE", "objectIds": [ + 2176, + 4983, + 4984, 21802, 21803 ], From ac235c85fa5545d1eb233763df9e57882100d3d6 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:41:08 -0400 Subject: [PATCH 07/13] Fix incorrect rock assignment --- 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 d51772abb..4d4c11003 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3127,7 +3127,6 @@ 2168, 2169, 2170, - 2172, 2171 ] }, @@ -6497,6 +6496,7 @@ "description": "Rock-Like Object - Rubble - Small", "baseMaterial": "STONE_NORMALED", "objectIds": [ + 2172, 5203, 5205, 24022, From 4fb6ea19761bd886126d25b81883344bcdec4525 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:48:18 -0400 Subject: [PATCH 08/13] Add bloodstains --- .../resources/rs117/hd/scene/model_overrides.json | 15 ++++++++++++++- 1 file changed, 14 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 4d4c11003..4fa9ae24f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3139,7 +3139,9 @@ "flatNormals": true, "objectIds": [ 2114, - 2118 + 2118, + 2119, + 2120 ] }, { @@ -22173,5 +22175,16 @@ "objectIds": [ 4332 ] + }, + { + "description": "Ground decoration blood", + "baseMaterial": "METALLIC_NONE_GLOSS", + "objectIds": [ + 654, + 3666, + 3667, + 3668 + ], + "uvType": "MODEL_XZ" } ] From ae4276131568cce036a5bf6da06f1c850b9e64a2 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:49:37 -0400 Subject: [PATCH 09/13] Add skeleton --- 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 4fa9ae24f..f1a1e3c0c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -20648,6 +20648,7 @@ "description": "Skeleton with helmet named corpse", "baseMaterial": "BONE", "objectIds": [ + 4984, 7208 ], "uvType": "BOX", From 0f8f92250bcb29c3e22fa848dbe3d5d234c4f78d Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 17:58:52 -0400 Subject: [PATCH 10/13] Add table and chairs --- .../rs117/hd/scene/model_overrides.json | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index f1a1e3c0c..06e9f2dcf 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -9911,6 +9911,34 @@ "uvType": "BOX", "uvScale": 0.8 }, + { + "description": "Slayer Tower broken chairs", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.6, + "objectIds": [ + 1898, + 1899 + ] + }, + { + "description": "Slayer Tower broken chair with golden ornament", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.6, + "colorOverrides": [ + { + "description": "Gold", + "colors": "l > 12", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS" + } + ], + "objectIds": [ + 1896 + ] + }, { "description": "Objects - Wooden - Ugly combined backed wooden chair", "baseMaterial": "WOOD_GRAIN_3", @@ -22187,5 +22215,23 @@ 3668 ], "uvType": "MODEL_XZ" + }, + { + "description": "Table with no visible legs and a golden candleholder", + "baseMaterial": "CARPET", + "uvScale": 0.8, + "uvOrientation": 256, + "uvType": "BOX", + "colorOverrides": [ + { + "description": "Candleholder", + "colors": "h == 10", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX" + } + ], + "objectIds": [ + 1901 + ] } ] From 8c2a98ddf8aad9eba69583aec3756cdc367814cb Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 18:04:23 -0400 Subject: [PATCH 11/13] fix table uvs --- src/main/resources/rs117/hd/scene/model_overrides.json | 7 +++++-- 1 file changed, 5 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 06e9f2dcf..01b9a72e2 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5460,11 +5460,13 @@ { "description": "Wooden tables - Solid - Cobwebs", "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "flatNormals": true, "objectIds": [ 616, 25615 - ], - "flatNormals": true + ] }, { "description": "Wooden tables - Solid", @@ -14333,6 +14335,7 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ 1032, + 2107, 10605 ], "uvType": "BOX", From 37358602347c25785eec8ac61318bea7b584722c Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 26 Aug 2024 18:47:41 -0400 Subject: [PATCH 12/13] Rooftop entrance and magical chest --- .../rs117/hd/scene/model_overrides.json | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 01b9a72e2..bbba754ab 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22236,5 +22236,53 @@ "objectIds": [ 1901 ] + }, + { + "description": "Morytania Slayer Tower roof entrance - Dynamic", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8, + "flatNormals": true, + "colorOverrides": [ + { + "description": "Mossy substance", + "colors": "h == 21", + "baseMaterial": "LEAF_VEINS" + } + ], + "objectIds": [ + 31672, + 31673 + ] + }, + { + "description": "Morytania Slayer Tower roof exit", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 343, + "uvScale": 0.8, + "flatNormals": true, + "objectIds": [ + 31674 + ] + }, + { + "description": "Morytania Slayer Magical Chest", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "colorOverrides": [ + { + "description": "Metal", + "colors": "h > 13", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvOrientation": 42 + } + ], + "objectIds": [ + 31675 + ] } ] From 337b86fe986e019e30fb7f5e59126f51b0634ca3 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Mon, 16 Sep 2024 16:47:23 -0400 Subject: [PATCH 13/13] Fix duplicates --- src/main/resources/rs117/hd/scene/model_overrides.json | 3 --- 1 file changed, 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 6294d444e..0b1a58b21 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3113,9 +3113,7 @@ "uvScale": 0.8, "flatNormals": true, "objectIds": [ - 2106, 2109, - 2110, 2160, 2161, 2162, @@ -20794,7 +20792,6 @@ "objectIds": [ 2176, 4983, - 4984, 21802, 21803 ],