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

Wintertodt Polish #526

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

Wintertodt Polish #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
60c1622
Improve texturing on crates and texture reward cart
Jin-Jiyunsun Nov 12, 2024
014969e
Improve texturing on the braziers
Jin-Jiyunsun Nov 12, 2024
87da0f3
Improve texturing on the Bruma Root and Sprouding Root nodes
Jin-Jiyunsun Nov 12, 2024
3519e33
Add some missing dead tree textures
Jin-Jiyunsun Nov 12, 2024
77e9e86
Add a more intense flicker to the brazier
Jin-Jiyunsun Nov 12, 2024
eacf0f0
Adjust environment to add ground fog and brighten the howling storms …
Jin-Jiyunsun Nov 21, 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
1 change: 1 addition & 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 @@ -302,6 +302,7 @@ public enum Material {
BRICK_CAM_TORUM_2(126),

WHITE(NONE),
GRAY_150(NONE, p -> p.setBrightness(ColorUtils.srgbToLinear(1.5f))),
GRAY_110(NONE, p -> p.setBrightness(ColorUtils.srgbToLinear(1.1f))),
GRAY_90(NONE, p -> p.setBrightness(ColorUtils.srgbToLinear(.90f))),
GRAY_75(NONE, p -> p.setBrightness(ColorUtils.srgbToLinear(.75f))),
Expand Down
5 changes: 4 additions & 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 @@ -997,7 +997,10 @@
"directionalColor": "#f4e5c9",
"directionalStrength": 0.75,
"fogColor": "#aebde3",
"fogDepth": 75
"fogDepth": 75,
"groundFogStart": -1750,
"groundFogEnd": -2250,
"groundFogOpacity": 0.65
},
{
"area": "ARCEUUS",
Expand Down
20 changes: 19 additions & 1 deletion 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 @@ -30148,7 +30148,7 @@
"range": 10
},
{
"description": "WINTERTODT_LIT_BRAZIER",
"description": "WINTERTODT_LIT_BRAZIER_MAIN",
"height": 300,
"alignment": "CENTER",
"radius": 600,
Expand All @@ -30168,6 +30168,24 @@
31926
]
},
{
"description": "WINTERTODT_LIT_BRAZIER_FLICKER",
"offset": [ -7, 135, -4 ],
"radius": 100,
"strength": 300,
"color": [
165,
255,
56
],
"type": "FLICKER",
"duration": 10,
"range": 45,
"objectIds": [
29314,
31926
]
},
{
"description": "WINTERTODT_DOOR_INSIDE_1",
"height": 500,
Expand Down
128 changes: 110 additions & 18 deletions src/main/resources/rs117/hd/scene/model_overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2955,11 +2955,9 @@
"description": "Wintertodt Terrain",
"baseMaterial": "SNOW_4",
"objectIds": [
29297,
29293,
29296,
29295,
29298,
29294,
29279,
29265,
Expand All @@ -2981,6 +2979,45 @@
"uvType": "BOX",
"uvScale": 1.25
},
{
"description": "Wintertodt Root Terrain",
"baseMaterial": "SNOW_4",
"objectIds": [
29297
],
"uvType": "BOX",
"uvScale": 1.25,
"colorOverrides": [
{
"colors": "h == 32",
"baseMaterial": "VERY_LIGHT_BARK",
"uvType": "BOX"
},
{
"colors": "h == 16",
"baseMaterial": "LIGHT_BARK",
"uvType": "BOX",
"uvOrientation": 512,
"uvScale": 0.75
}
]
},
{
"description": "Wintertodt Herb Terrain",
"baseMaterial": "SNOW_4",
"objectIds": [
29298
],
"uvType": "BOX",
"uvScale": 1.25,
"colorOverrides": [
{
"colors": "h == 32",
"baseMaterial": "LIGHT_BARK",
"uvType": "BOX"
}
]
},
{
"description": "Wintertodt Railings",
"baseMaterial": "SNOW_4",
Expand All @@ -2989,14 +3026,15 @@
29287,
29289,
29290,
29291
29291,
29292
],
"uvType": "BOX",
"uvScale": 1.25
},
{
"description": "Wintertodt Wooden Objects",
"baseMaterial": "WOOD_GRAIN_2_SMOOTH_LIGHT",
"baseMaterial": "SNOW_1",
"objectIds": [
29319,
29320,
Expand All @@ -3007,36 +3045,72 @@
29305,
29302,
29321,
26330
29303,
29304,
55411,
55412,
55413,
55414,
55415,
55416
],
"uvType": "WORLD_XY",
"uvScale": 1.5
"colorOverrides": [
{
"colors": "h == 32",
"baseMaterial": "WOOD_GRAIN_2_SMOOTH",
"uvType": "BOX",
"uvScale": 0.75
}
]
},
{
"description": "Wintertodt Wooden Objects rotated",
"baseMaterial": "WOOD_GRAIN_2_SMOOTH_LIGHT",
"objectIds": [
29303,
29304
],
"uvType": "WORLD_XY",
"uvScale": 1.5
"description": "Wintertodt Barrel Group",
"baseMaterial": "SNOW_1",
"objectIds": [
26330
],
"colorOverrides": [
{
"colors": "h == 5",
"baseMaterial": "WOOD_GRAIN_2_SMOOTH",
"uvType": "BOX",
"uvScale": 0.75
}
]
},
{
"description": "Wintertodt Bruma Roots",
"baseMaterial": "VERY_LIGHT_BARK",
"objectIds": [
29311
],
"colorOverrides": [
{
"colors": "h == 16",
"baseMaterial": "VERY_LIGHT_BARK",
"uvType": "BOX",
"uvOrientation": 512,
"uvScale": 0.75
}
],
"uvType": "BOX"
},
{
"description": "Wintertodt Herb Roots",
"baseMaterial": "LIGHT_BARK",
"baseMaterial": "VERY_LIGHT_BARK",
"objectIds": [
29315
],
"uvType": "BOX"
"colorOverrides": [
{
"colors": "h == 16",
"baseMaterial": "GRUNGE_3",
"uvType": "BOX",
"uvScale": 0.4
}
],
"uvType": "BOX",
"uvOrientation": 512
},
{
"description": "Wintertodt Brazier",
Expand All @@ -3046,7 +3120,23 @@
29313,
29314
],
"uvType": "BOX"
"uvType": "BOX",
"uvScale": 0.5,
"colorOverrides": [
{
"colors": ["h == 14", "h == 17"],
"baseMaterial": "NONE"
}
]
},
{
"description": "Wintertodt Storm - Brighten",
"baseMaterial": "GRAY_150",
"objectIds": [
29308
],
"uvType": "BOX",
"uvScale": 0.5
},
{
"description": "Wintertodt Tents",
Expand Down Expand Up @@ -10065,6 +10155,8 @@
23559,
23530,
23561,
25169,
25174,
51766
],
"uvType": "BOX"
Expand Down