From dc23f3c67e8b1571b690e3daaca27f2182e460d7 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 03:46:48 +0100 Subject: [PATCH 01/16] Add texture to rocks at Hueycoatl --- .../rs117/hd/scene/model_overrides.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 8b2ba1d37..de324b8c0 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22620,5 +22620,22 @@ "uvType": "BOX" } ] + }, + { + "description": "Hueycoatl Rocks", + "baseMaterial": "STONE_NORMALED", + "objectIds": [ + 55249, + 55250, + 55251, + 55252, + 55253, + 55254, + 55256, + 55259, + 55260 + ], + "uvType": "BOX", + "uvScale": 0.8 } ] From 70dc1cf8b275036619c98f64eb06280d673c440b Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 03:59:14 +0100 Subject: [PATCH 02/16] Add texture to caves containing body segments in phase 1 --- .../rs117/hd/scene/model_overrides.json | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index de324b8c0..c4d3cd332 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22637,5 +22637,42 @@ ], "uvType": "BOX", "uvScale": 0.8 + }, + { + "description": "Hueycoatl Body Cave", + "objectIds": [ + 55242, + 55243, + 55245, + 55246 + ], + "uvType": "MODEL_XZ", + "uvScale": 0.8, + "colorOverrides": [ + { + "colors": "h == 0 && s == 0", + "baseMaterial": "STONE_NORMALED" + }, + { + "colors": "h == 63", + "baseMaterial": "BLACK", + "uvType": "BOX" + } + ] + }, + { + "description": "Hueycoatl Blockage Segment Caves", + "objectIds": [ + 55206, + 55207 + ], + "uvType": "MODEL_XZ", + "uvScale": 0.8, + "colorOverrides": [ + { + "colors": ["h == 0", "h == 63" ], + "baseMaterial": "STONE_NORMALED" + } + ] } ] From 19b0a3c1fba00a9f985e9fc88da238bb03c86ff0 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:09:49 +0100 Subject: [PATCH 03/16] Add texture to caves containing tails in phase 2 --- .../rs117/hd/scene/model_overrides.json | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index c4d3cd332..7ea46608c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22646,8 +22646,6 @@ 55245, 55246 ], - "uvType": "MODEL_XZ", - "uvScale": 0.8, "colorOverrides": [ { "colors": "h == 0 && s == 0", @@ -22655,8 +22653,7 @@ }, { "colors": "h == 63", - "baseMaterial": "BLACK", - "uvType": "BOX" + "baseMaterial": "BLACK" } ] }, @@ -22666,13 +22663,26 @@ 55206, 55207 ], - "uvType": "MODEL_XZ", - "uvScale": 0.8, "colorOverrides": [ { "colors": ["h == 0", "h == 63" ], "baseMaterial": "STONE_NORMALED" } ] + }, + { + "description": "Hueycoatl Tail Cave", + "objectIds": [ 55241 ], + "npcIds": [ 14014, 14015 ], + "colorOverrides": [ + { + "colors": [ 2 ], + "baseMaterial": "BLACK" + }, + { + "colors": [ "h == 0" ], + "baseMaterial": "STONE" + } + ] } ] From 2eaf52fbc567a9aad6fac1f60a0107660e8749b3 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:17:13 +0100 Subject: [PATCH 04/16] Add texture to the rock the Hueycoatl is coming out of --- src/main/resources/rs117/hd/scene/model_overrides.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 7ea46608c..f2d92c64a 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22684,5 +22684,15 @@ "baseMaterial": "STONE" } ] + }, + { + "description": "Hueycoatl", + "npcIds": [ 14009, 14010, 14011, 14012, 14013 ], + "colorOverrides": [ + { + "colors": [ "h == 0 && s == 0", "h == 63" ], + "baseMaterial": "STONE" + } + ] } ] From 29fc2da6d70738ea5366138a9df3c62f3b462a2e Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:25:36 +0100 Subject: [PATCH 05/16] Add texture to the big broken sigil on the ground --- .../rs117/hd/scene/model_overrides.json | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index f2d92c64a..7fe52dc51 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22694,5 +22694,44 @@ "baseMaterial": "STONE" } ] + }, + { + "description": "Hueycoatl Broken Ground Sigil", + "baseMaterial": "MARBLE_1", + "uvType": "MODEL_XZ", + "objectIds": [ + 55263, + 55264, + 55265, + 55266, + 55267, + 55268, + 55269, + 55270, + 55271, + 55272, + 55273, + 55274, + 55275, + 55276, + 55277, + 55278, + 55279, + 55280, + 55281, + 55282, + 55283, + 55284, + 55285, + 55286, + 55287, + 55288, + 55289, + 55290, + 55291, + 55292, + 55293, + 55294 + ] } ] From fee7812cfe5396bdf3bcd7f07742407a08d2a504 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:28:58 +0100 Subject: [PATCH 06/16] Add texture to the entrance chain --- .../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 7fe52dc51..c238d4c7f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22733,5 +22733,20 @@ 55293, 55294 ] + }, + { + "description": "Hueycoatl Entrance Chain", + "baseMaterial": "ROCK_1", + "uvType": "BOX", + "uvScale": 0.5, + "objectIds": [ + 55202 + ], + "colorOverrides": [ + { + "colors": [ "h == 3" ], + "baseMaterial": "METALLIC_1_GLOSS" + } + ] } ] From d777d8f60f00b654c66cfb64a9d1a5a0ca5012f0 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:32:37 +0100 Subject: [PATCH 07/16] Add texture to the scoreboard --- .../resources/rs117/hd/scene/model_overrides.json | 13 +++++++++++-- 1 file changed, 11 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 c238d4c7f..ecdcf6de6 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22736,9 +22736,9 @@ }, { "description": "Hueycoatl Entrance Chain", - "baseMaterial": "ROCK_1", + "baseMaterial": "STONE", "uvType": "BOX", - "uvScale": 0.5, + "uvScale": 0.75, "objectIds": [ 55202 ], @@ -22748,5 +22748,14 @@ "baseMaterial": "METALLIC_1_GLOSS" } ] + }, + { + "description": "Hueycoatl Scoreboard", + "baseMaterial": "STONE", + "uvType": "BOX", + "uvScale": 0.5, + "objectIds": [ + 55198 + ] } ] From a468493abf008db1fa759d8748fffde4241237f1 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:32:47 +0100 Subject: [PATCH 08/16] Add texture to the tents --- .../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 ecdcf6de6..98001daee 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22757,5 +22757,20 @@ "objectIds": [ 55198 ] + }, + { + "description": "Hueycoatl Tent", + "baseMaterial": "SNOW_1", + "objectIds": [ + 55261 + ], + "colorOverrides": [ + { + "colors": [ "h == 10" ], + "baseMaterial": "FINE_CARPET", + "uvType": "BOX", + "uvScale": 0.85 + } + ] } ] From e745f25b84a80488616dd518423a30df1c815114 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:35:56 +0100 Subject: [PATCH 09/16] Add texture to the campfire --- .../rs117/hd/scene/model_overrides.json | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 98001daee..9a0db431b 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22772,5 +22772,35 @@ "uvScale": 0.85 } ] + }, + { + "description": "Hueycoatl Campfire", + "baseMaterial": "METALLIC_1_GLOSS", + "objectIds": [ + 55200 + ], + "colorOverrides": [ + { + "colors": [ "h > 6" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 512 + } + ] + }, + { + "description": "Hueycoatl Campfires Fire", + "objectIds": [ + 19882 + ], + "colorOverrides": [ + { + "colors": [ "h == 5" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.25 + } + ] } ] From ff25c9b23945dffd70f4933d42875a00cca38ae6 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:38:48 +0100 Subject: [PATCH 10/16] Add light to the campfire --- src/main/resources/rs117/hd/scene/lights.json | 17 +++++++++++++++++ .../rs117/hd/scene/model_overrides.json | 4 ++-- 2 files changed, 19 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..59873291d 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": "Hueycoatl Campfire", + "height": 50, + "radius": 400, + "strength": 12, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 600, + "range": 15, + "objectIds": [ + 55200 + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 9a0db431b..b7641486c 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22774,7 +22774,7 @@ ] }, { - "description": "Hueycoatl Campfire", + "description": "Hueycoatl Campfire Frame", "baseMaterial": "METALLIC_1_GLOSS", "objectIds": [ 55200 @@ -22790,7 +22790,7 @@ ] }, { - "description": "Hueycoatl Campfires Fire", + "description": "Hueycoatl Campfire Fire", "objectIds": [ 19882 ], From e3da02a42ba0bcdd1011465340f047506ab48863 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 04:58:51 +0100 Subject: [PATCH 11/16] Add texture and light to the braziers --- src/main/resources/rs117/hd/scene/lights.json | 21 ++++++++++++++++++ .../rs117/hd/scene/model_overrides.json | 22 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 59873291d..0319b0427 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35567,5 +35567,26 @@ "objectIds": [ 55200 ] + }, + { + "description": "Hueycoatl Brazier", + "height": 650, + "radius": 400, + "strength": 12, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "fadeInDuration": 100, + "fadeOutDuration": 200, + "duration": 600, + "range": 15, + "objectIds": [ + 55210, + 55218, + 55226 + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index b7641486c..1822c406d 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22625,6 +22625,7 @@ "description": "Hueycoatl Rocks", "baseMaterial": "STONE_NORMALED", "objectIds": [ + 55234, 55249, 55250, 55251, @@ -22802,5 +22803,26 @@ "uvScale": 0.25 } ] + }, + { + "description": "Hueycoatl Brazier", + "baseMaterial": "ROCK_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 256, + "objectIds": [ + 55210, + 55211, + 55218, + 55219, + 55226, + 55227 + ], + "colorOverrides": [ + { + "colors": [ "h == 5" ], + "baseMaterial": "METALLIC_1_SEMIGLOSS" + } + ] } ] From 3ffd0153174e9b3a5745052623a27fd057fd2ffa Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 26 Sep 2024 05:07:08 +0100 Subject: [PATCH 12/16] Add texture to the meeting flag --- .../rs117/hd/scene/model_overrides.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 1822c406d..925ead5ff 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22824,5 +22824,24 @@ "baseMaterial": "METALLIC_1_SEMIGLOSS" } ] + }, + { + "description": "Hueycoatl Meeting Flag", + "objectIds": [ + 55203 + ], + "colorOverrides": [ + { + "colors": [ "h == 33" ], + "baseMaterial": "GRUNGE_3" + }, + { + "colors": [ "h == 5" ], + "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 512 + } + ] } ] From 9f2c8125e727deb6501f63ba2820c5eb3e806c36 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:26:57 +0100 Subject: [PATCH 13/16] Add lights to Hueycoatl's attacks --- src/main/resources/rs117/hd/scene/lights.json | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 0319b0427..e38055f8a 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35588,5 +35588,75 @@ 55218, 55226 ] + }, + { + "description": "Hueycoatl Melee Projectile", + "height": 0, + "radius": 220, + "strength": 12, + "color": [ + 255, + 0, + 0 + ], + "type": "FLICKER", + "fadeInDuration": 100, + "fadeOutDuration": 300, + "duration": 600, + "range": 15, + "projectileIds": [ 2969 ] + }, + { + "description": "Hueycoatl Range Projectile", + "height": 0, + "radius": 200, + "strength": 12, + "color": [ + 0, + 255, + 0 + ], + "type": "FLICKER", + "fadeInDuration": 100, + "fadeOutDuration": 300, + "duration": 600, + "range": 15, + "projectileIds": [ 2972 ] + }, + { + "description": "Hueycoatl Mage Projectile", + "height": 0, + "radius": 265, + "strength": 12, + "color": [ + 0, + 200, + 255 + ], + "type": "FLICKER", + "fadeInDuration": 100, + "fadeOutDuration": 300, + "duration": 600, + "range": 15, + "projectileIds": [ 2975 ] + }, + { + "description": "Hueycoatl Ground Attack", + "height": 25, + "radius": 105, + "strength": 6, + "color": [ + 0, + 200, + 255 + ], + "type": "FLICKER", + "fixedDespawnTime": true, + "despawnDelay": 3500, + "fadeInDuration": 400, + "fadeOutDuration": 200, + "duration": 600, + "range": 15, + "graphicsObjectIds": [ 3001 ] } ] From cc0288cb67933328771505820a7add32af8b8d93 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:28:26 +0100 Subject: [PATCH 14/16] Add missing rock IDs --- 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 925ead5ff..62104845f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22625,6 +22625,7 @@ "description": "Hueycoatl Rocks", "baseMaterial": "STONE_NORMALED", "objectIds": [ + 55205, 55234, 55249, 55250, @@ -22741,6 +22742,7 @@ "uvType": "BOX", "uvScale": 0.75, "objectIds": [ + 55201, 55202 ], "colorOverrides": [ From bf7d5333ddbc960ed46428a90de3b3fa07637138 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:29:19 +0100 Subject: [PATCH 15/16] Remove meeting flag texture, unnecessary --- .../rs117/hd/scene/model_overrides.json | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 62104845f..e36cdc796 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -22826,24 +22826,5 @@ "baseMaterial": "METALLIC_1_SEMIGLOSS" } ] - }, - { - "description": "Hueycoatl Meeting Flag", - "objectIds": [ - 55203 - ], - "colorOverrides": [ - { - "colors": [ "h == 33" ], - "baseMaterial": "GRUNGE_3" - }, - { - "colors": [ "h == 5" ], - "baseMaterial": "WOOD_GRAIN_2_SMOOTH", - "uvType": "BOX", - "uvScale": 0.75, - "uvOrientation": 512 - } - ] } ] From 9d575b88f4762bce3487d34df62ba062df2cb9d9 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 27 Sep 2024 03:35:35 +0100 Subject: [PATCH 16/16] Adjust lights --- src/main/resources/rs117/hd/scene/lights.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index e38055f8a..f1ba46ef0 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -35608,8 +35608,8 @@ }, { "description": "Hueycoatl Range Projectile", - "height": 0, - "radius": 200, + "offset": [ 5, 20, 5], + "radius": 210, "strength": 12, "color": [ 0, @@ -35625,9 +35625,9 @@ }, { "description": "Hueycoatl Mage Projectile", - "height": 0, - "radius": 265, - "strength": 12, + "height": 20, + "radius": 285, + "strength": 14, "color": [ 0, 200,