Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abyssal Nexus Improvments #543

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Abyssal Nexus Improvments #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a356f4
Texture fleshy objects
Jin-Jiyunsun Dec 19, 2024
5b4bcc1
Adjust textures on abyssal objects
Jin-Jiyunsun Dec 20, 2024
65de4bf
Adjust area definitions to be more accurate
Jin-Jiyunsun Dec 20, 2024
5bcc22c
Darken abyssal area fog
Jin-Jiyunsun Dec 20, 2024
0a16cb0
Adjust textures
Jin-Jiyunsun Dec 20, 2024
502e96a
Darken Respiratory System so they don't stand out
Jin-Jiyunsun Dec 20, 2024
f093571
Color override for abyssal eyes so their sclera and iris isn't textures
Jin-Jiyunsun Dec 20, 2024
dc5606c
Remove Abyssal Nexus tendril lights as they were barely visible yet p…
Jin-Jiyunsun Dec 20, 2024
f7b97a4
Add light to Sire's throne
Jin-Jiyunsun Dec 20, 2024
e544da9
Add lights to sires belly portal
Jin-Jiyunsun Dec 22, 2024
7f19085
Adjust ground
Jin-Jiyunsun Dec 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/main/java/rs117/hd/data/materials/Material.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 28 additions & 5 deletions src/main/resources/rs117/hd/scene/areas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand All @@ -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
},
Expand All @@ -6075,7 +6097,8 @@
"areas": [
"THE_ABYSS",
"ABYSSAL_NEXUS",
"ABYSS_AREA_ALR"
"ABYSS_AREA_ALR",
"THE_ABYSS_FULL"
]
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/rs117/hd/scene/environments.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,7 @@
{
"area": "ABYSSAL_AREAS",
"fogColor": "#100707",
"fogDepth": 65,
"fogDepth": 60,
"ambientColor": "#AAAFB6",
"ambientStrength": 2.2,
"directionalColor": "#FFFFFF",
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/rs117/hd/scene/ground_materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,5 +462,12 @@
"ABYSSAL",
"ABYSSAL"
]
},
{
"name": "ABYSSAL_BILE",
"materials": [
"ABYSSAL_2_FLOW",
"ABYSSAL_FLOW"
]
}
]
103 changes: 77 additions & 26 deletions src/main/resources/rs117/hd/scene/lights.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading