From 3a356f43ba5f46678233b24a7f461c45becad16f Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Thu, 19 Dec 2024 04:15:33 +0000 Subject: [PATCH 01/11] Texture fleshy objects --- .../rs117/hd/scene/model_overrides.json | 153 +++++++++++++++++- 1 file changed, 149 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 db0b7ac17..c6fbdee24 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -19027,14 +19027,12 @@ 26969, 26970, 26971, - 26972, - 26973, 27027, 27054, 27055 ], "uvType": "BOX", - "uvScale": 1.85 + "uvScale": 1.1 }, { "description": "Abyss - Wall", @@ -19043,7 +19041,7 @@ 26154 ], "uvType": "WORLD_XZ", - "uvScale": 1.85 + "uvScale": 1.21 }, { "description": "Abyss - Puddle", @@ -19194,6 +19192,153 @@ "uvType": "BOX", "uvScale": 0.5 }, + { + "description": "Abyssal Nexus - Flesh", + "baseMaterial": "ABYSSAL_2", + "objectIds": [ + 26935, + 26922, + 26923, + 26902, + 26903, + 26905, + 26908, + 26911, + 26912, + 26913, + 26914, + 26918, + 26919, + 26920, + 26927, + 26928, + 26929, + 26930, + 26933, + 26936, + 26938, + 26937, + 26931, + 26932, + 26934, + 26939, + 26915, + 26917, + 26925, + 26921, + 26904, + 26910, + 26909, + 26907, + 26906, + 26890, + 26891, + 26896, + 26901, + 26892, + 20249, + 26899, + 26889, + 26895, + 26898, + 26924, + 26994, + 26995, + 26996, + 26997, + 26975, + 26976, + 26977, + 26979, + 26978, + 26998, + 26999, + 27000, + 27003, + 27005, + 27004, + 27006, + 27007, + 27008, + 27002, + 27001, + 26981, + 26988, + 26985, + 26986, + 26989, + 26984, + 26982, + 26983, + 26980, + 26900, + 26897, + 26893, + 26926, + 26974 + ], + "uvType": "BOX", + "uvScale": 0.45 + }, + { + "description": "Abyssal Nexus - Flesh with Bone", + "baseMaterial": "ABYSSAL_2", + "objectIds": [ + 26940, + 26941, + 26942, + 26943, + 26944, + 26945, + 26946, + 26948, + 26949, + 26950, + 26951, + 26952, + 26990, + 26991, + 26992, + 26993, + 27010, + 27011, + 27012, + 27013, + 26972, + 26973 + ], + "uvType": "BOX", + "uvScale": 0.55, + "colorOverrides": [ + { + "colors": [ "h == 7" ], + "baseMaterial": "GRUNGE_2", + "uvType": "BOX" + } + ] + }, + { + "description": "Abyssal Nexus - Flesh with Bone - End", + "baseMaterial": "ABYSSAL_2", + "objectIds": [ + 26972, + 26973 + ], + "uvType": "BOX", + "uvScale": 0.45, + "colorOverrides": [ + { + "colors": [ "h == 6", "h == 7" ], + "baseMaterial": "GRUNGE_2", + "uvType": "BOX" + }, + { + "colors": [ "h == 0", "h == 1", "h == 2" ], + "baseMaterial": "ABYSSAL", + "uvType": "BOX" + } + ] + }, { "description": "Walls - Law Altar", "baseMaterial": "ROCK_2", From 5b4bcc1b39f42e27a65ceeeed18a2478b89895b8 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:22:15 +0000 Subject: [PATCH 02/11] Adjust textures on abyssal objects - Adjust the "abyssal liquid" ground material - Remove UVs from some animated objects for optimisation --- .../rs117/hd/data/materials/Material.java | 10 +++ .../rs117/hd/scene/ground_materials.json | 7 ++ .../rs117/hd/scene/model_overrides.json | 69 +++++++++++-------- .../rs117/hd/scene/tile_overrides.json | 8 ++- 4 files changed, 64 insertions(+), 30 deletions(-) diff --git a/src/main/java/rs117/hd/data/materials/Material.java b/src/main/java/rs117/hd/data/materials/Material.java index 926476c15..3d2185323 100644 --- a/src/main/java/rs117/hd/data/materials/Material.java +++ b/src/main/java/rs117/hd/data/materials/Material.java @@ -832,6 +832,16 @@ public enum Material { .setDisplacementScale(0.1f) .setBrightness(1.9f) ), + ABYSSAL_FLOW(ABYSSAL, p -> p + .setFlowMap(UNDERWATER_FLOW_MAP) + .setFlowMapStrength(0.075f) + .setFlowMapDuration(new float[] { -40, 36 }) + ), + ABYSSAL_2_FLOW(ABYSSAL_2, p -> p + .setFlowMap(UNDERWATER_FLOW_MAP) + .setFlowMapStrength(0.2f) + .setFlowMapDuration(new float[] { 28, -24 }) + ), // Aliases for separately replacing textures of different trees diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index 2dcf9dc3a..21bf58851 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -462,5 +462,12 @@ "ABYSSAL", "ABYSSAL" ] + }, + { + "name": "ABYSSAL_BILE", + "materials": [ + "ABYSSAL_2_FLOW", + "ABYSSAL_FLOW" + ] } ] diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index c6fbdee24..ae0072506 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -19004,6 +19004,7 @@ { "description": "Abyss - Wall", "baseMaterial": "ABYSSAL", + "areas": [ "ABYSSAL_AREAS" ], "objectIds": [ 20737, 25382, @@ -19028,11 +19029,10 @@ 26970, 26971, 27027, - 27054, - 27055 + 27054 ], "uvType": "BOX", - "uvScale": 1.1 + "uvScale": 0.9 }, { "description": "Abyss - Wall", @@ -19041,24 +19041,24 @@ 26154 ], "uvType": "WORLD_XZ", - "uvScale": 1.21 + "uvScale": 1.1 }, { "description": "Abyss - Puddle", - "baseMaterial": "WATER_PUDDLE", + "hide": true, "objectIds": [ 26174, 26176, 26177 - ], - "uvType": "MODEL_XZ" + ] }, { - "description": "Abyss - Gap", + "description": "Abyss - Agility Gap", "baseMaterial": "ABYSSAL_2", "objectIds": [ 25428, - 25381 + 25381, + 27055 ], "uvType": "BOX", "uvScale": 0.8, @@ -19078,14 +19078,11 @@ }, { "description": "Abyss - Tendrils - Large", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_1", "objectIds": [ 25425, 25427 - ], - "uvType": "BOX", - "uvScale": 0.8, - "uvOrientation": 512 + ] }, { "description": "Abyss - Eyes", @@ -19123,13 +19120,13 @@ "objectIds": [ 26159 ], - "uvType": "BOX", - "uvScale": 0.4, + "uvType": "MODEL_XZ", + "uvScale": 0.33, "uvOrientation": 256 }, { "description": "Abyss - Object - Ground Tendrils - Small", - "baseMaterial": "ABYSSAL", + "baseMaterial": "GRUNGE_1", "objectIds": [ 26167, 26168, @@ -19138,7 +19135,7 @@ }, { "description": "Abyss - Object - Popped Pustules - Small", - "baseMaterial": "ABYSSAL", + "baseMaterial": "ABYSSAL_2", "objectIds": [ 26161, 26162, @@ -19152,7 +19149,7 @@ 27024 ], "uvType": "BOX", - "uvScale": 0.52, + "uvScale": 0.3, "uvOrientation": 256 }, { @@ -19163,7 +19160,7 @@ 26173 ], "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.3, "uvOrientation": 512 }, { @@ -19182,15 +19179,17 @@ "uvScale": 0.6 }, { - "description": "Abyss - Green-tipped Tendrils", - "baseMaterial": "ABYSSAL_2", + "description": "Abyssal Nexus - Green-tipped Tendrils & Pustules", + "baseMaterial": "GRUNGE_1", "objectIds": [ 27014, 27015, - 27016 - ], - "uvType": "BOX", - "uvScale": 0.5 + 27016, + 27017, + 27018, + 27019, + 27020 + ] }, { "description": "Abyssal Nexus - Flesh", @@ -19312,8 +19311,9 @@ "colorOverrides": [ { "colors": [ "h == 7" ], - "baseMaterial": "GRUNGE_2", - "uvType": "BOX" + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.7 } ] }, @@ -19339,6 +19339,19 @@ } ] }, + { + "description": "Abyssal Nexus - Bile Pool Edges", + "baseMaterial": "ABYSSAL_2", + "objectIds": [ + 26956, + 26957, + 26958, + 26959, + 26960 + ], + "uvType": "BOX", + "uvScale": 0.7 + }, { "description": "Walls - Law Altar", "baseMaterial": "ROCK_2", diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index d4cdb2a1a..dae0afdf2 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1524,13 +1524,17 @@ "groundMaterial": "ABYSSAL_FLOOR" }, { - "name": "ABYSSAL_LIQUID", + "name": "ABYSSAL_BILE", "area": "ABYSSAL_AREAS", "overlayIds": [ 66, 67 ], - "waterType": "ABYSS_BILE" + "groundMaterial": "ABYSSAL_BILE", + "uvScale": 1.12, + "shiftLightness": 4, + "shiftHue": -4, + "blended": false }, { "name": "GOBLIN_VILLAGE_TILES_BLEND_FIX_OVERLAY", From 65de4bf832f0034453df891fe158224de753269e Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:23:13 +0000 Subject: [PATCH 03/11] Adjust area definitions to be more accurate - Add area definition as a fallback for texturing objects in the abyss when area hiding is disabled --- src/main/resources/rs117/hd/scene/areas.json | 33 +++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index ccc16dff3..d412ac02e 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -6040,12 +6040,18 @@ [ 1216, 1216, 1406, 1343 ] ] }, + { + "name": "THE_ABYSS_FULL", + "aabbs": [ + [ 2944, 4736, 3135, 4863 ] + ] + }, { "name": "THE_ABYSS", "aabbs": [ [ 3034, 4803, 3044, 4863 ], - [ 3008, 4800, 3033, 4863 ], - [ 3045, 4800, 3071, 4863 ] + [ 3009, 4803, 3033, 4863 ], + [ 3045, 4803, 3071, 4863 ] ], "hideOtherAreas": true }, @@ -6054,12 +6060,28 @@ "regions": [ 11850, 11851, - 12106, 12362, 12363 ], "aabbs": [ - [ 3034, 4800, 3044, 4803 ] + [ 3034, 4800, 3044, 4801 ], + [ 3035, 4802, 3043, 4802 ], + [ 3036, 4803, 3042, 4803 ], + [ 3008, 4784, 3010, 4793 ], + [ 3011, 4784, 3013, 4790 ], + [ 3014, 4784, 3027, 4787 ], + [ 3024, 4788, 3027, 4788 ], + [ 3026, 4789, 3028, 4791 ], + [ 3027, 4792, 3030, 4797 ], + [ 3031, 4797, 3046, 4799 ], + [ 3047, 4791, 3052, 4798 ], + [ 3053, 4790, 3071, 4793 ], + [ 3068, 4794, 3071, 4797 ], + [ 3031, 4790, 3046, 4796 ], + [ 3047, 4790, 3052, 4790 ], + [ 3029, 4789, 3030, 4791 ], + [ 3028, 4752, 3071, 4789 ], + [ 3008, 4752, 3027, 4783 ] ], "hideOtherAreas": true }, @@ -6075,7 +6097,8 @@ "areas": [ "THE_ABYSS", "ABYSSAL_NEXUS", - "ABYSS_AREA_ALR" + "ABYSS_AREA_ALR", + "THE_ABYSS_FULL" ] }, { From 5bcc22c946900239ee73524775026449ab266e7c Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:28:31 +0000 Subject: [PATCH 04/11] Darken abyssal area fog --- src/main/resources/rs117/hd/scene/environments.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/rs117/hd/scene/environments.json b/src/main/resources/rs117/hd/scene/environments.json index 60a3af367..b9e33ac4a 100644 --- a/src/main/resources/rs117/hd/scene/environments.json +++ b/src/main/resources/rs117/hd/scene/environments.json @@ -1504,7 +1504,7 @@ }, { "area": "ABYSSAL_AREAS", - "fogColor": "#100707", + "fogColor": "#0a0404", "fogDepth": 65, "ambientColor": "#AAAFB6", "ambientStrength": 2.2, From 0a16cb044c6120f0a2b60ba63f84d2edb2b7c483 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:33:22 +0000 Subject: [PATCH 05/11] Adjust textures --- .../rs117/hd/scene/model_overrides.json | 30 ++----------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index ae0072506..108111818 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -19281,7 +19281,7 @@ }, { "description": "Abyssal Nexus - Flesh with Bone", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "ABYSSAL", "objectIds": [ 26940, 26941, @@ -19307,35 +19307,11 @@ 26973 ], "uvType": "BOX", - "uvScale": 0.55, - "colorOverrides": [ - { - "colors": [ "h == 7" ], - "baseMaterial": "GRUNGE_3", - "uvType": "BOX", - "uvScale": 0.7 - } - ] - }, - { - "description": "Abyssal Nexus - Flesh with Bone - End", - "baseMaterial": "ABYSSAL_2", - "objectIds": [ - 26972, - 26973 - ], - "uvType": "BOX", - "uvScale": 0.45, + "uvScale": 0.65, "colorOverrides": [ { "colors": [ "h == 6", "h == 7" ], - "baseMaterial": "GRUNGE_2", - "uvType": "BOX" - }, - { - "colors": [ "h == 0", "h == 1", "h == 2" ], - "baseMaterial": "ABYSSAL", - "uvType": "BOX" + "baseMaterial": "GRUNGE_3" } ] }, From 502e96a4ae045ba0bc33c778430822f3dab949cc Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:37:08 +0000 Subject: [PATCH 06/11] Darken Respiratory System so they don't stand out --- src/main/resources/rs117/hd/scene/model_overrides.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 108111818..f9af8057f 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -19328,6 +19328,11 @@ "uvType": "BOX", "uvScale": 0.7 }, + { + "description": "Abyssal Nexus - Respiratory System", + "baseMaterial": "GRAY_65", + "objectIds": [ 26953 ] + }, { "description": "Walls - Law Altar", "baseMaterial": "ROCK_2", From f0935716925387144acddfde6079e1492dd200e4 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:41:27 +0000 Subject: [PATCH 07/11] Color override for abyssal eyes so their sclera and iris isn't textures --- .../rs117/hd/scene/model_overrides.json | 25 +++++++++++++------ 1 file changed, 18 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 f9af8057f..204e27f69 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -19086,14 +19086,20 @@ }, { "description": "Abyss - Eyes", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_3", "objectIds": [ 26146, 26147, 26148 ], - "uvType": "BOX", - "uvScale": 0.5 + "colorOverrides": [ + { + "colors": [ "h == 1", "h == 7" ], + "baseMaterial": "ABYSSAL", + "uvType": "BOX", + "uvScale": 0.75 + } + ] }, { "description": "Abyss - Boil", @@ -19165,7 +19171,7 @@ }, { "description": "Abyss - Peak Eye", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_3", "objectIds": [ 27048, 27049, @@ -19174,9 +19180,14 @@ 27052, 27053 ], - "uvType": "BOX", - "uvOrientation": 512, - "uvScale": 0.6 + "colorOverrides": [ + { + "colors": [ "h == 1", "h == 7" ], + "baseMaterial": "ABYSSAL", + "uvType": "BOX", + "uvScale": 0.75 + } + ] }, { "description": "Abyssal Nexus - Green-tipped Tendrils & Pustules", From dc5606ce21ee78237d30f34f972fa7868b2e80e7 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 04:52:17 +0000 Subject: [PATCH 08/11] Remove Abyssal Nexus tendril lights as they were barely visible yet plentiful --- src/main/resources/rs117/hd/scene/lights.json | 26 ------------------- .../rs117/hd/scene/model_overrides.json | 11 ++++---- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index afb1db814..6bc9f25bc 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -28351,32 +28351,6 @@ 43730 ] }, - { - "description": "ABYSSAL_NEXUS_TENDRILS_THRONE", - "height": 65, - "alignment": "CENTER", - "radius": 600, - "strength": 5, - "color": [ - 70, - 242, - 31 - ], - "type": "FLICKER", - "duration": 2000, - "range": 20, - "objectIds": [ - 27005, - 26984, - 26985, - 26986, - 27004, - 27006, - 27014, - 27015, - 27016 - ] - }, { "description": "ABYSSAL_NEXUS_FONT", "height": 140, diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 204e27f69..91eb472df 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -16723,14 +16723,12 @@ }, { "description": "Stronghold Of Security Petilance - Dripping Tendrils", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_3", "objectIds": [ 23700, 23701, 23702 - ], - "uvType": "BOX", - "uvScale": 0.5 + ] }, { "description": "Stronghold Of Security - Death - Walls", @@ -19341,8 +19339,9 @@ }, { "description": "Abyssal Nexus - Respiratory System", - "baseMaterial": "GRAY_65", - "objectIds": [ 26953 ] + "baseMaterial": "GRAY_75", + "objectIds": [ 26953, 26954 ], + "npcIds": [ 5915 ] }, { "description": "Walls - Law Altar", From f7b97a493af0023ef55f44e369bab7371ad141fd Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Fri, 20 Dec 2024 21:59:08 +0000 Subject: [PATCH 09/11] Add light to Sire's throne - Adjust floor - Undo environment change --- .../java/rs117/hd/data/materials/Material.java | 4 ++-- .../resources/rs117/hd/scene/environments.json | 4 ++-- src/main/resources/rs117/hd/scene/lights.json | 15 +++++++++++++++ .../resources/rs117/hd/scene/tile_overrides.json | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/rs117/hd/data/materials/Material.java b/src/main/java/rs117/hd/data/materials/Material.java index 3d2185323..75665e9b0 100644 --- a/src/main/java/rs117/hd/data/materials/Material.java +++ b/src/main/java/rs117/hd/data/materials/Material.java @@ -835,12 +835,12 @@ public enum Material { ABYSSAL_FLOW(ABYSSAL, p -> p .setFlowMap(UNDERWATER_FLOW_MAP) .setFlowMapStrength(0.075f) - .setFlowMapDuration(new float[] { -40, 36 }) + .setFlowMapDuration(new float[] { -37, 37 }) ), ABYSSAL_2_FLOW(ABYSSAL_2, p -> p .setFlowMap(UNDERWATER_FLOW_MAP) .setFlowMapStrength(0.2f) - .setFlowMapDuration(new float[] { 28, -24 }) + .setFlowMapDuration(new float[] { 28, -28 }) ), diff --git a/src/main/resources/rs117/hd/scene/environments.json b/src/main/resources/rs117/hd/scene/environments.json index b9e33ac4a..b3b57c583 100644 --- a/src/main/resources/rs117/hd/scene/environments.json +++ b/src/main/resources/rs117/hd/scene/environments.json @@ -1504,8 +1504,8 @@ }, { "area": "ABYSSAL_AREAS", - "fogColor": "#0a0404", - "fogDepth": 65, + "fogColor": "#100707", + "fogDepth": 60, "ambientColor": "#AAAFB6", "ambientStrength": 2.2, "directionalColor": "#FFFFFF", diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 6bc9f25bc..d99ffee54 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -28388,6 +28388,21 @@ 43714 ] }, + { + "description": "SIRE_THRONE_LIGHT", + "offset": [ -50, 170, 50 ], + "objectIds": [ 26984 ], + "radius": 700, + "strength": 25, + "color": [ + 25, + 200, + 25 + ], + "type": "PULSE", + "duration": 2500, + "range": 13 + }, { "description": "GOTR_ENTRANCE_BARRIER_YELLOW", "height": 250, diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index dae0afdf2..7386ae7df 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1532,7 +1532,7 @@ ], "groundMaterial": "ABYSSAL_BILE", "uvScale": 1.12, - "shiftLightness": 4, + "shiftLightness": -4, "shiftHue": -4, "blended": false }, From e544da90e7d1a92125d8372496ed04cec2b51706 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Sun, 22 Dec 2024 17:49:29 +0000 Subject: [PATCH 10/11] Add lights to sires belly portal --- src/main/resources/rs117/hd/scene/lights.json | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index d99ffee54..fa37a30e6 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -28388,6 +28388,68 @@ 43714 ] }, + { + "description": "SIRE_BELLY_LIGHT_LOWER", + "offset": [ 0, 250, 100 ], + "npcIds": [ 5890, 5889, 5891 ], + "radius": 250, + "strength": 125, + "color": [ + 100, + 0, + 255 + ], + "type": "PULSE", + "duration": 2500, + "range": 13 + }, + { + "description": "SIRE_BELLY_LIGHT_UPPER", + "offset": [ 0, 350, 75 ], + "npcIds": [ 5890, 5889, 5891 ], + "radius": 100, + "strength": 125, + "color": [ + 100, + 0, + 255 + ], + "type": "PULSE", + "duration": 2500, + "range": 13 + }, + { + "description": "SIRE_BELLY_LIGHT_EXPLOSION", + "offset": [ 0, 325, 200 ], + "npcIds": [ 5908 ], + "radius": 350, + "strength": 200, + "color": [ + 100, + 0, + 255 + ], + "type": "STATIC" + }, + { + "description": "SIRE_BELLY_LIGHT_EXPLOSION_2", + "offset": [ 0, 150, 275 ], + "npcIds": [ 5908 ], + "animationIds": [ -1, 7098, 7099 ], + "radius": 450, + "strength": 15, + "color": [ + 200, + 0, + 255 + ], + "type": "FLICKER", + "range": 40, + "duration": 100, + "fadeInDuration": 400, + "fadeOutDuration": 100, + "spawnDelay": 150 + }, { "description": "SIRE_THRONE_LIGHT", "offset": [ -50, 170, 50 ], From 7f19085eab49cc08cd534729d68fa9ae0a7811a5 Mon Sep 17 00:00:00 2001 From: Jin-Jiyunsun <37377657+Jin-Jiyunsun@users.noreply.github.com> Date: Sun, 22 Dec 2024 17:59:42 +0000 Subject: [PATCH 11/11] Adjust ground --- src/main/resources/rs117/hd/scene/tile_overrides.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 7386ae7df..ff52b5dcd 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1532,8 +1532,8 @@ ], "groundMaterial": "ABYSSAL_BILE", "uvScale": 1.12, - "shiftLightness": -4, - "shiftHue": -4, + "shiftLightness": -6, + "shiftHue": -1, "blended": false }, {