diff --git a/src/main/java/rs117/hd/data/materials/Material.java b/src/main/java/rs117/hd/data/materials/Material.java index 926476c15..75665e9b0 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[] { -37, 37 }) + ), + ABYSSAL_2_FLOW(ABYSSAL_2, p -> p + .setFlowMap(UNDERWATER_FLOW_MAP) + .setFlowMapStrength(0.2f) + .setFlowMapDuration(new float[] { 28, -28 }) + ), // Aliases for separately replacing textures of different trees 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" ] }, { diff --git a/src/main/resources/rs117/hd/scene/environments.json b/src/main/resources/rs117/hd/scene/environments.json index 60a3af367..b3b57c583 100644 --- a/src/main/resources/rs117/hd/scene/environments.json +++ b/src/main/resources/rs117/hd/scene/environments.json @@ -1505,7 +1505,7 @@ { "area": "ABYSSAL_AREAS", "fogColor": "#100707", - "fogDepth": 65, + "fogDepth": 60, "ambientColor": "#AAAFB6", "ambientStrength": 2.2, "directionalColor": "#FFFFFF", 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/lights.json b/src/main/resources/rs117/hd/scene/lights.json index afb1db814..fa37a30e6 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, @@ -28414,6 +28388,83 @@ 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 ], + "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/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index db0b7ac17..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", @@ -19004,6 +19002,7 @@ { "description": "Abyss - Wall", "baseMaterial": "ABYSSAL", + "areas": [ "ABYSSAL_AREAS" ], "objectIds": [ 20737, 25382, @@ -19027,14 +19026,11 @@ 26969, 26970, 26971, - 26972, - 26973, 27027, - 27054, - 27055 + 27054 ], "uvType": "BOX", - "uvScale": 1.85 + "uvScale": 0.9 }, { "description": "Abyss - Wall", @@ -19043,24 +19039,24 @@ 26154 ], "uvType": "WORLD_XZ", - "uvScale": 1.85 + "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, @@ -19080,25 +19076,28 @@ }, { "description": "Abyss - Tendrils - Large", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_1", "objectIds": [ 25425, 25427 - ], - "uvType": "BOX", - "uvScale": 0.8, - "uvOrientation": 512 + ] }, { "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", @@ -19125,13 +19124,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, @@ -19140,7 +19139,7 @@ }, { "description": "Abyss - Object - Popped Pustules - Small", - "baseMaterial": "ABYSSAL", + "baseMaterial": "ABYSSAL_2", "objectIds": [ 26161, 26162, @@ -19154,7 +19153,7 @@ 27024 ], "uvType": "BOX", - "uvScale": 0.52, + "uvScale": 0.3, "uvOrientation": 256 }, { @@ -19165,12 +19164,12 @@ 26173 ], "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.3, "uvOrientation": 512 }, { "description": "Abyss - Peak Eye", - "baseMaterial": "ABYSSAL_2", + "baseMaterial": "GRUNGE_3", "objectIds": [ 27048, 27049, @@ -19179,20 +19178,170 @@ 27052, 27053 ], - "uvType": "BOX", - "uvOrientation": 512, - "uvScale": 0.6 + "colorOverrides": [ + { + "colors": [ "h == 1", "h == 7" ], + "baseMaterial": "ABYSSAL", + "uvType": "BOX", + "uvScale": 0.75 + } + ] }, { - "description": "Abyss - Green-tipped Tendrils", - "baseMaterial": "ABYSSAL_2", + "description": "Abyssal Nexus - Green-tipped Tendrils & Pustules", + "baseMaterial": "GRUNGE_1", "objectIds": [ 27014, 27015, - 27016 + 27016, + 27017, + 27018, + 27019, + 27020 + ] + }, + { + "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.5 + "uvScale": 0.45 + }, + { + "description": "Abyssal Nexus - Flesh with Bone", + "baseMaterial": "ABYSSAL", + "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.65, + "colorOverrides": [ + { + "colors": [ "h == 6", "h == 7" ], + "baseMaterial": "GRUNGE_3" + } + ] + }, + { + "description": "Abyssal Nexus - Bile Pool Edges", + "baseMaterial": "ABYSSAL_2", + "objectIds": [ + 26956, + 26957, + 26958, + 26959, + 26960 + ], + "uvType": "BOX", + "uvScale": 0.7 + }, + { + "description": "Abyssal Nexus - Respiratory System", + "baseMaterial": "GRAY_75", + "objectIds": [ 26953, 26954 ], + "npcIds": [ 5915 ] }, { "description": "Walls - Law Altar", diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index d4cdb2a1a..ff52b5dcd 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": -6, + "shiftHue": -1, + "blended": false }, { "name": "GOBLIN_VILLAGE_TILES_BLEND_FIX_OVERLAY",