From b337726add2981bf5581d9d23b3c156cb2802283 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 21:58:56 -0500 Subject: [PATCH 01/19] External objects --- .../rs117/hd/scene/model_overrides.json | 59 ++++++++++++++++++- 1 file changed, 56 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 db0b7ac17..fae3e7240 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -18397,9 +18397,11 @@ "uvScale": 0.68 }, { - "description": "Mourners Tunnels - Metallic - Minecart", + "description": "Metallic - Minecart", "baseMaterial": "METALLIC_1_SEMIGLOSS", "objectIds": [ + 637, + 4918, 8831 ], "uvType": "BOX", @@ -25321,7 +25323,14 @@ 643, 644, 645, - 646 + 646, + 15818, + 15819, + 15820, + 15821, + 15822, + 15823, + 15824 ], "colorOverrides": [ { @@ -25334,12 +25343,49 @@ "uvType": "BOX", "uvScale": 0.6 }, + { + "description": "Mine cart tunnel with tracks going into cave", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationX": 512, + "colorOverrides": [ + { + "colors": " h == 0 && s == 0 && l < 15", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75 + }, + { + "colors": " h == 0 && s == 0 && l > 15", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "objectIds": [ + 4914, + 4915 + ] + }, + { + "description": "Mine cart tunnel with tracks going into cave", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationX": 512, + "objectIds": [ + 20396, + 20397 + ] + }, { "description": "Mine cart track Buffers", "baseMaterial": "WOOD_GRAIN_3", "uvOrientationX": 512, "objectIds": [ - 636 + 636, + 15825 ], "colorOverrides": [ { @@ -27081,5 +27127,12 @@ "objectIds": [ 31675 ] + }, + { + "description": "Haunted Mine Secret Entrance", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ 4919 ] } ] From d3c2fe0b2c6d6404dbaf3fb9943443d2dddce698 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:05:32 -0500 Subject: [PATCH 02/19] Rename Abandoned_mine, added new definition --- src/main/resources/rs117/hd/scene/areas.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index ccc16dff3..8444de088 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2765,11 +2765,16 @@ "hideOtherAreas": true }, { - "name": "ABANDONED_MINE", + "name": "ABANDONED_MINE_OVERWORLD", "aabbs": [ [ 3423, 3201, 3461, 3261 ] ] }, + { + "name": "ABANDONED_MINE", + "regions": [ 13718 ], + "hideOtherAreas": true + }, { "name": "GROTESQUE_GUARDIANS", "regions": [ From 852c059a87c5c615c0b05be3381a6c42c284b699 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:06:41 -0500 Subject: [PATCH 03/19] Correctly name --- 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 fae3e7240..4cb0452e6 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -27129,7 +27129,7 @@ ] }, { - "description": "Haunted Mine Secret Entrance", + "description": "Abandoned Mine Secret Entrance", "baseMaterial": "ROCK_3", "uvType": "BOX", "uvScale": 0.8, From 5e30286971dc3e041150be3cee4465dacdb3cbdc Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:40:49 -0500 Subject: [PATCH 04/19] First floor objects --- .../rs117/hd/scene/model_overrides.json | 212 +++++++++++++++++- 1 file changed, 211 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 4cb0452e6..989d5f1de 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -4069,6 +4069,8 @@ 15249, 15631, 15798, + 15799, + 15800, 15801, 15802, 15803, @@ -8706,6 +8708,8 @@ 4602, 5231, 5232, + 15813, + 15814, 17876, 17877, 42263, @@ -22968,6 +22972,8 @@ "description": "Skeleton with helmet named corpse", "baseMaterial": "BONE", "objectIds": [ + 661, + 662, 4984, 7208 ], @@ -25310,6 +25316,23 @@ "uvType": "BOX", "uvScale": 0.6 }, + { + "description": "Light wooden ladder in an stone ground hole", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + 4965 + ], + "colorOverrides": [ + { + "colors": "s == 0", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "uvType": "BOX", + "uvScale": 0.6 + }, { "description": "Mine cart tracks", "baseMaterial": "WOOD_GRAIN_3", @@ -25330,7 +25353,12 @@ 15821, 15822, 15823, - 15824 + 15824, + 15825, + 15826, + 15827, + 15828, + 15829 ], "colorOverrides": [ { @@ -27134,5 +27162,187 @@ "uvType": "BOX", "uvScale": 0.8, "objectIds": [ 4919 ] + }, + { + "description": "Abandoned Mine cart tunnel with tracks", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationX": 512, + "colorOverrides": [ + { + "colors": " h == 21", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75 + }, + { + "colors": " h == 0 && s == 0 && l > 15", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "objectIds": [ + 4920, + 15830 + ] + }, + { + "description": "Abandoned Mine walls with wooden supports", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8 + } + ], + "objectIds": [ + 15792, + 15793 + ] + }, + { + "description": "Abandoned Mine walls with support anchors", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Wooden post", + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientation": 512 + }, + { + "description": "Anchors", + "colors": " h == 0", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvOrientation": 42 + } + ], + "objectIds": [ + 15791 + ] + }, + { + "description": "Abandoned Mine Wooden wall support", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + 15832 + ] + }, + { + "description": "Abandoned Mine walls with wooden supports and a lamp", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8 + }, + { + "colors": " h == 0 && s == 0 && l > 15", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "objectIds": [ + 15796 + ] + }, + { + "description": "Abandoned Mine walls", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "objectIds": [ + 15789, + 15790 + ] + }, + { + "description": "Abandoned Mine walls - Tin ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_5_ORE", + "colors": "h == 0", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20443, + 20444, + 20445 + ] + }, + { + "description": "Abandoned Mine walls - Copper ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_4_ORE", + "colors": "h == 4", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20446, + 20447, + 20448 + ] + }, + { + "description": "Abandoned Mine walls - Clay vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "GRUNGE_1_SHINY", + "colors": "h == 6", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20449, + 20450 + ] + }, + { + "description": "Abandoned Mine wall toppers", + "baseMaterial": "GRUNGE_3_DARK", + "uvType": "WORLD_XZ", + "uvScale": 1.2, + "objectIds": [ + 15804 + ] } ] From 7ff8c091b58b6c63902306818ad1cf73db9003f1 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:41:41 -0500 Subject: [PATCH 05/19] remove dups from other pr --- src/main/resources/rs117/hd/scene/model_overrides.json | 2 -- 1 file changed, 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 989d5f1de..a779bf66e 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22972,8 +22972,6 @@ "description": "Skeleton with helmet named corpse", "baseMaterial": "BONE", "objectIds": [ - 661, - 662, 4984, 7208 ], From 7f45c0b9ad3603e045e18658fa84321c282ff84c Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:43:07 -0500 Subject: [PATCH 06/19] ladder --- src/main/resources/rs117/hd/scene/model_overrides.json | 3 ++- 1 file changed, 2 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 a779bf66e..de3097290 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -25318,7 +25318,8 @@ "description": "Light wooden ladder in an stone ground hole", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ - 4965 + 4965, + 4969 ], "colorOverrides": [ { From 53c778a014c7fbacb275fb335046370ddbe35aa8 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:50:31 -0500 Subject: [PATCH 07/19] barrel --- .../rs117/hd/scene/model_overrides.json | 32 +++++++++++++++++-- 1 file changed, 30 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 de3097290..84f58a670 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -8348,6 +8348,7 @@ 17907, 17908, 20429, + 20430, 24344, 24088, 25655, @@ -22219,10 +22220,35 @@ { "description": "Barrel with metal bands", "baseMaterial": "WOOD_GRAIN_3", - "objectIds": [ 2619, 5112, 5114, 5122, 9519, 9521 ], + "objectIds": [ + 2619, + 5112, + 5114, + 5122, + 9519, + 9521 + ], "uvType": "BOX", "uvScale": 0.8 }, + { + "description": "Barrel with tarnished metal bands", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "colorOverrides": [ + { + "description": "Metal bands", + "colors": "h == 5", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.66 + } + ], + "objectIds": [ + 20431 + ] + }, { "description": "Barrel with metal bands - Stacked", "baseMaterial": "WOOD_GRAIN_3", @@ -27270,7 +27296,8 @@ "uvScale": 0.75, "objectIds": [ 15789, - 15790 + 15790, + 20440 ] }, { @@ -27289,6 +27316,7 @@ } ], "objectIds": [ + 20407, 20443, 20444, 20445 From 99e03788c52f37f990a743fe92aae602143136a6 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:52:15 -0500 Subject: [PATCH 08/19] revert for compat --- src/main/resources/rs117/hd/scene/model_overrides.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 84f58a670..dff306d9d 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22220,14 +22220,7 @@ { "description": "Barrel with metal bands", "baseMaterial": "WOOD_GRAIN_3", - "objectIds": [ - 2619, - 5112, - 5114, - 5122, - 9519, - 9521 - ], + "objectIds": [ 2619, 5112, 5114, 5122, 9519, 9521 ], "uvType": "BOX", "uvScale": 0.8 }, From e3a2a5fc1c49c4a457b14c64f41d7c8ff151d758 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 22:55:06 -0500 Subject: [PATCH 09/19] Add light --- src/main/resources/rs117/hd/scene/lights.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index afb1db814..39ed98be6 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -20750,6 +20750,7 @@ "range": 30, "objectIds": [ 25056, + 15796, 17829, 25055 ] From c57f984bbdcd28a68e164e03b6f481ddd92bb517 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 23:21:25 -0500 Subject: [PATCH 10/19] Fix floor definitions --- src/main/resources/rs117/hd/scene/areas.json | 26 ++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 8444de088..a5969189a 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2771,10 +2771,32 @@ ] }, { - "name": "ABANDONED_MINE", - "regions": [ 13718 ], + "name": "ABANDONED_MINE_2", + "regions": [ 11079 ], + "hideOtherAreas": true + }, + { + "name": "ABANDONED_MINE_3", + "aabbs": [ + [ 10822 ] + ], + "hideOtherAreas": true + }, + { + "name": "ABANDONED_MINE_4", + "aabbs": [ + [ 10878 ] + ], "hideOtherAreas": true }, + { + "name": "ABANDONED_MINE", + "areas": [ + "ABANDONED_MINE_2", + "ABANDONED_MINE_3", + "ABANDONED_MINE_4" + ] + }, { "name": "GROTESQUE_GUARDIANS", "regions": [ From 90794a01e4b3efe3f78ba1f9e9c6c3c7bc9ae3a5 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 23:23:05 -0500 Subject: [PATCH 11/19] fix area, mushrooms glow --- src/main/resources/rs117/hd/scene/areas.json | 8 ++------ src/main/resources/rs117/hd/scene/lights.json | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index a5969189a..5491f98b6 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2777,16 +2777,12 @@ }, { "name": "ABANDONED_MINE_3", - "aabbs": [ - [ 10822 ] - ], + "regions": [ 10822 ], "hideOtherAreas": true }, { "name": "ABANDONED_MINE_4", - "aabbs": [ - [ 10878 ] - ], + "regions": [ 10878 ], "hideOtherAreas": true }, { diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 39ed98be6..a642ad898 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35835,5 +35835,23 @@ "objectIds": [ 16812 ] + }, + { + "description": "Glowing Fungus", + "offset": [ 0, 8, 0 ], + "radius": 180, + "strength": 8, + "color": [ + 100, + 3, + 187 + ], + "type": "FLICKER", + "duration": 0, + "range": 5, + "objectIds": [ + 4932, + 4933 + ] } ] From ec4a9a7f39d86176506dfa63a083becdce99a801 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sat, 14 Dec 2024 23:23:25 -0500 Subject: [PATCH 12/19] objects --- .../rs117/hd/scene/model_overrides.json | 29 +++++++++++++++++-- 1 file changed, 26 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 dff306d9d..b1606a2ca 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -5815,6 +5815,8 @@ 4164, 4187, 4189, + 4968, + 4970, 8744, 8745, 8746, @@ -25338,6 +25340,7 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ 4965, + 4967, 4969 ], "colorOverrides": [ @@ -25376,7 +25379,12 @@ 15826, 15827, 15828, - 15829 + 15829, + 20403, + 20404, + 20405, + 20406, + 20434 ], "colorOverrides": [ { @@ -27203,7 +27211,8 @@ ], "objectIds": [ 4920, - 15830 + 15830, + 20432 ] }, { @@ -27290,7 +27299,10 @@ "objectIds": [ 15789, 15790, - 20440 + 20439, + 20440, + 20441, + 20442 ] }, { @@ -27331,6 +27343,7 @@ } ], "objectIds": [ + 20408, 20446, 20447, 20448 @@ -27364,5 +27377,15 @@ "objectIds": [ 15804 ] + }, + { + "description": "Glowing Fungus - Medium", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 1.1, + "objectIds": [ + 4932, + 4933 + ] } ] From 59f0f7bf0c4f4b15c0cf872c814a39b5461ab584 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:08:00 -0500 Subject: [PATCH 13/19] Add floor 1, define more objects --- src/main/resources/rs117/hd/scene/areas.json | 6 + .../rs117/hd/scene/model_overrides.json | 166 +++++++++++++++++- 2 files changed, 171 insertions(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 5491f98b6..f5acf6279 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2770,6 +2770,11 @@ [ 3423, 3201, 3461, 3261 ] ] }, + { + "name": "ABANDONED_MINE_1", + "regions": [ 13718 ], + "hideOtherAreas": true + }, { "name": "ABANDONED_MINE_2", "regions": [ 11079 ], @@ -2788,6 +2793,7 @@ { "name": "ABANDONED_MINE", "areas": [ + "ABANDONED_MINE_1", "ABANDONED_MINE_2", "ABANDONED_MINE_3", "ABANDONED_MINE_4" diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index b1606a2ca..f1f4e38de 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -4068,6 +4068,7 @@ 15248, 15249, 15631, + 15797, 15798, 15799, 15800, @@ -5815,6 +5816,7 @@ 4164, 4187, 4189, + 4966, 4968, 4970, 8744, @@ -7017,6 +7019,8 @@ 2548, 2549, 2624, + 4963, + 4964, 2625, 5667, 10262, @@ -18409,6 +18413,7 @@ "objectIds": [ 637, 4918, + 4974, 8831 ], "uvType": "BOX", @@ -25384,7 +25389,8 @@ 20404, 20405, 20406, - 20434 + 20434, + 20438 ], "colorOverrides": [ { @@ -27189,6 +27195,13 @@ "uvScale": 0.8, "objectIds": [ 4919 ] }, + { + "description": "Abandoned Mine Secret Exit", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "objectIds": [ 4923 ] + }, { "description": "Abandoned Mine cart tunnel with tracks", "baseMaterial": "WOOD_GRAIN_3", @@ -27297,6 +27310,7 @@ "uvType": "BOX", "uvScale": 0.75, "objectIds": [ + 15788, 15789, 15790, 20439, @@ -27305,6 +27319,63 @@ 20442 ] }, + { + "description": "Abandoned Mine walls with Points Settings", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "colors": " h == 21", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "objectIds": [ + 4949 + ] + }, + { + "description": "Abandoned Mine walls with water", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Water", + "colors": "h == 27", + "baseMaterial": "NONE" + } + ], + "objectIds": [ + 15775, + 15776, + 15777, + 15778, + 15780, + 15781, + 15782, + 15783 + ] + }, + { + "description": "Abandoned Mine walls with rusty metal bars", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Metal bars", + "colors": "h == 6", + "baseMaterial": "METALLIC_1" + } + ], + "objectIds": [ + 20427, + 20428 + ] + }, { "description": "Abandoned Mine walls - Tin ore vein", "baseMaterial": "ROCK_3", @@ -27349,6 +27420,69 @@ 20448 ] }, + { + "description": "Abandoned Mine walls - Coal ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_4_ORE", + "colors": "h == 0", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20410, + 20411, + 20412, + 20413 + ] + }, + { + "description": "Abandoned Mine walls - Mithril ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_4_ORE", + "colors": "h == 42", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20418, + 20419 + ] + }, + { + "description": "Abandoned Mine walls - Adamentite ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_4_ORE", + "colors": "s > 0", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20414, + 20415, + 20416 + ] + }, { "description": "Abandoned Mine walls - Clay vein", "baseMaterial": "ROCK_3", @@ -27387,5 +27521,35 @@ 4932, 4933 ] + }, + { + "description": "Abandoned Mine wooden levels with metal plate", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "WOOD_GRAIN_3", + "colors": "h == 6", + "uvType": "BOX", + "uvOrientation": 768, + "uvScale": 0.8 + } + ], + "objectIds": [ + 4950, + 4951, + 4952, + 4953, + 4954, + 4955, + 4956, + 4957, + 4958, + 4959, + 4960, + 4961 + ] } ] From 7c35f5cef4a46519e20d601fecec5857cde728ff Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:41:15 -0500 Subject: [PATCH 14/19] Finish mine area definition --- src/main/resources/rs117/hd/scene/areas.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index f5acf6279..1eb36889f 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2787,7 +2787,19 @@ }, { "name": "ABANDONED_MINE_4", - "regions": [ 10878 ], + "regions": [ 11078 ], + "hideOtherAreas": true + }, + { + "name": "ABANDONED_MINE_5", + "aabbs": [ + [ 2690, 4416, 2754, 4482 ] + ], + "hideOtherAreas": true + }, + { + "name": "ABANDONED_MINE_6", + "regions": [ 11077 ], "hideOtherAreas": true }, { @@ -2796,7 +2808,9 @@ "ABANDONED_MINE_1", "ABANDONED_MINE_2", "ABANDONED_MINE_3", - "ABANDONED_MINE_4" + "ABANDONED_MINE_4", + "ABANDONED_MINE_5", + "ABANDONED_MINE_6" ] }, { From b6eb0686b2ad71af11fe1404708c6166948230a7 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:41:26 -0500 Subject: [PATCH 15/19] Fix lift tile --- src/main/resources/rs117/hd/scene/tile_overrides.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index d4cdb2a1a..3080af2f1 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -2933,6 +2933,16 @@ ], "groundMaterial": "DIRT" }, + { + "name": "ABANDONED_MINE_LIFT_PLATFORM", + "area": "ABANDONED_MINE", + "uvOrientation": 512, + "shiftLightness": 2, + "overlayIds": [ + 14 + ], + "groundMaterial": "HD_WOOD_PLANKS_2" + }, { "name": "TRUE_BLOOD_ALTAR_BLOOD", "area": "TRUE_BLOOD_ALTAR", From 68e57eaa1206a5c38b601f511a66c36a97da41ae Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:41:47 -0500 Subject: [PATCH 16/19] Finish objects --- .../rs117/hd/scene/model_overrides.json | 153 +++++++++++++++++- 1 file changed, 146 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 f1f4e38de..c79041ef2 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -6627,12 +6627,14 @@ { "description": "Sewer Valve", "baseMaterial": "METALLIC_1_SEMIGLOSS", + "uvType": "BOX", "objectIds": [ 2844, 2845, 2846, 2847, - 2848 + 2848, + 4924 ] }, { @@ -8249,10 +8251,11 @@ }, { "description": "Stone - Steps", - "baseMaterial": "STONE", + "baseMaterial": "STONE_NORMALED", "objectIds": [ 5307, 5460, + 20436, 30599, 30600, 30601 @@ -25380,7 +25383,6 @@ 15822, 15823, 15824, - 15825, 15826, 15827, 15828, @@ -27200,7 +27202,7 @@ "baseMaterial": "ROCK_3", "uvType": "BOX", "uvScale": 0.75, - "objectIds": [ 4923 ] + "objectIds": [ 4923, 4973 ] }, { "description": "Abandoned Mine cart tunnel with tracks", @@ -27319,6 +27321,56 @@ 20442 ] }, + { + "description": "Abandoned Mine walls with lift parts", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 84, + "colorOverrides": [ + { + "description": "Rock wall", + "colors": " h == 21", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75 + }, + { + "description": "Wood", + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.75 + } + ], + "objectIds": [ + 4939, + 4940, + 4941 + ] + }, + { + "description": "Abandoned Mine lift parts", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 84, + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Wood", + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.75 + } + ], + "objectIds": [ + 4937, + 4938 + ] + }, { "description": "Abandoned Mine walls with Points Settings", "baseMaterial": "GRUNGE_3", @@ -27420,6 +27472,28 @@ 20448 ] }, + { + "description": "Abandoned Mine walls - Iron ore vein", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Ore", + "baseMaterial": "ROCK_4_ORE", + "colors": "h == 2", + "uvType": "BOX", + "uvOrientation": 256, + "uvScale": 0.8 + } + ], + "objectIds": [ + 20422, + 20423, + 20424, + 20425 + ] + }, { "description": "Abandoned Mine walls - Coal ore vein", "baseMaterial": "ROCK_3", @@ -27459,7 +27533,8 @@ ], "objectIds": [ 20418, - 20419 + 20419, + 20420 ] }, { @@ -27523,13 +27598,13 @@ ] }, { - "description": "Abandoned Mine wooden levels with metal plate", + "description": "Abandoned Mine wooden levers with metal plate", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "uvType": "BOX", "uvScale": 0.75, "colorOverrides": [ { - "description": "Ore", + "description": "Lever", "baseMaterial": "WOOD_GRAIN_3", "colors": "h == 6", "uvType": "BOX", @@ -27551,5 +27626,69 @@ 4960, 4961 ] + }, + { + "description": "Abandoned Mine walls - Lift hole", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvScale": 0.75, + "objectIds": [ + 4946, + 4948 + ] + }, + { + "description": "Abandoned Mine walls - Lift platform", + "baseMaterial": "METALLIC_1_LIGHT", + "uvOrientation": 69, + "uvType": "BOX", + "uvScale": 0.75, + "objectIds": [ + 4947 + ] + }, + { + "description": "sunken mine cart", + "baseMaterial": "METALLIC_1_LIGHT", + "uvOrientation": 69, + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "description": "Fake water removal", + "colors": "h == 27", + "baseMaterial": "TRANSPARENT" + } + ], + "objectIds": [ + 4945 + ] + }, + { + "description": "Sunken lift parts", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 84, + "colorOverrides": [ + { + "description": "Wood", + "colors": " h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.75 + } + ], + "objectIds": [ + 4942 + ] + }, + { + "description": "Abandoned Mine stairs", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ 4971 ] } ] From 0070a9e9205a4bcd628201f4d4037a3ac46ef6f8 Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:48:13 -0500 Subject: [PATCH 17/19] fix area clipping --- src/main/resources/rs117/hd/scene/areas.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 1eb36889f..d02214dfd 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2793,7 +2793,7 @@ { "name": "ABANDONED_MINE_5", "aabbs": [ - [ 2690, 4416, 2754, 4482 ] + [ 2688, 4416, 2754, 4482 ] ], "hideOtherAreas": true }, From 6713335004d117433bf1ed56327d5f169127e60b Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:48:45 -0500 Subject: [PATCH 18/19] finish models --- .../resources/rs117/hd/scene/model_overrides.json | 12 ++++++++---- 1 file changed, 8 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 c79041ef2..e41e99597 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -27227,7 +27227,8 @@ "objectIds": [ 4920, 15830, - 20432 + 20432, + 29333 ] }, { @@ -27245,7 +27246,8 @@ ], "objectIds": [ 15792, - 15793 + 15793, + 15794 ] }, { @@ -27534,7 +27536,8 @@ "objectIds": [ 20418, 20419, - 20420 + 20420, + 20421 ] }, { @@ -27555,7 +27558,8 @@ "objectIds": [ 20414, 20415, - 20416 + 20416, + 20417 ] }, { From fea9e1c27d67e3855754ba7348bf8c9f783d0e7b Mon Sep 17 00:00:00 2001 From: SirFancyBacon Date: Sun, 15 Dec 2024 00:55:03 -0500 Subject: [PATCH 19/19] finishing touches --- src/main/resources/rs117/hd/scene/lights.json | 19 +++++++++++++++++++ .../rs117/hd/scene/model_overrides.json | 9 +++++++++ 2 files changed, 28 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index a642ad898..e73a186b8 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35853,5 +35853,24 @@ 4932, 4933 ] + }, + { + "description": "Crystal Outcroping ", + "offset": [ 0, 6, 0 ], + "radius": 180, + "strength": 8, + "color": [ + 187, + 3, + 187 + ], + "type": "FLICKER", + "duration": 0, + "range": 5, + "objectIds": [ + 4926, + 4927, + 4928 + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index e41e99597..bed8e486e 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -27694,5 +27694,14 @@ "uvType": "BOX", "uvScale": 0.8, "objectIds": [ 4971 ] + }, + { + "description": "Crystal Outcrop - Haunted Mine crystals", + "baseMaterial": "GRUNGE_3_LIGHT_SHINY", + "uvType": "BOX", + "objectIds": [ + 4927, + 4928 + ] } ]