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

Object Light Adjustments #548

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

Object Light Adjustments #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd7d5e1
Adjust some common lights in Lumbrige and Varrock to be less bright a…
Jin-Jiyunsun Jan 11, 2025
120aa45
Adjust camelot range light
Jin-Jiyunsun Jan 15, 2025
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_125(NONE, p -> p.setBrightness(ColorUtils.srgbToLinear(1.25f))),
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
177 changes: 153 additions & 24 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 @@ -20150,10 +20150,9 @@
},
{
"description": "WALL_TORCH_MID",
"height": 200,
"alignment": "CENTER",
"radius": 300,
"strength": 12.5,
"offset": [ 0, 185, 0 ],
"radius": 250,
"strength": 7.5,
"color": [
252,
148,
Expand All @@ -20165,19 +20164,51 @@
"objectIds": [
196,
197,
7432,
202,
203,
206,
11474,
5746,
4501,
5787,
24414,
2175,
30130
]
},
{
"description": "Varrock Wall Candelabra",
"offset": [ 0, 215 , 0 ],
"radius": 275,
"strength": 5.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
7432
]
},
{
"description": "Varrock Lantern",
"offset": [ -10, 155 , 0 ],
"radius": 220,
"strength": 8.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
4501
]
},
{
"description": "Wall torch - Shades of Mort'ton & Morytania underground",
"height": 200,
Expand All @@ -20201,7 +20232,7 @@
"height": 220,
"alignment": "CENTER",
"radius": 300,
"strength": 12.5,
"strength": 7.5,
"color": [
252,
148,
Expand Down Expand Up @@ -20287,10 +20318,63 @@
4691,
10307,
16901,
23577,
23577
]
},
{
"description": "Aris Tent Lantern",
"height": 200,
"alignment": "CENTER",
"radius": 350,
"strength": 7.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
2492
]
},
{
"description": "Aris Tent Candle",
"offset": [ 0, 150, 0 ],
"alignment": "CENTER",
"radius": 125,
"strength": 15.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
2458
]
},
{
"description": "Aris Tent Crystal Ball",
"height": 120,
"alignment": "CENTER",
"radius": 200,
"strength": 10.5,
"color": [
255,
255,
255
],
"type": "FLICKER",
"duration": 10,
"range": 30,
"objectIds": [
2459
]
},
{
"description": "LANTERN_CANDLE",
"offset": [ 10, 260, -12 ],
Expand Down Expand Up @@ -20518,16 +20602,13 @@
40775,
8712,
10824,
24969,
40777,
4618,
10058,
24970,
6093,
6094,
6095,
6096,
7185,
9439,
9440,
9441,
Expand All @@ -20546,6 +20627,57 @@
6783
]
},
{
"description": "Lumbridge Castle Fireplace",
"offset": [ 50, 70, 0 ],
"radius": 400,
"strength": 12.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
24970
]
},
{
"description": "Bluemoon Inn Fireplace",
"offset": [ 0, 40, 0 ],
"radius": 300,
"strength": 12.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
7185
]
},
{
"description": "Lumbridge General Store Fireplace",
"offset": [ 30, 70, 0 ],
"radius": 235,
"strength": 11.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
24969
]
},
{
"description": "AIR_BALLOON_FIRE",
"height": 400,
Expand Down Expand Up @@ -21266,10 +21398,10 @@
]
},
{
"description": "HEARTH",
"height": 50,
"description": "Varrock Blacksmith Hearth",
"offset": [ 0, 100, 40 ],
"alignment": "CENTER",
"radius": 650,
"radius": 350,
"strength": 12.5,
"color": [
252,
Expand Down Expand Up @@ -25007,9 +25139,8 @@
},
{
"description": "CLAN_HALL_PORTAL",
"height": 130,
"alignment": "FRONT",
"radius": 700,
"offset": [ 0, 150, -100 ],
"radius": 600,
"strength": 12.5,
"color": [
0,
Expand Down Expand Up @@ -25831,9 +25962,9 @@
},
{
"description": "CAMELOT_COOKING_RANGE",
"height": 120,
"offset": [ 0, 120, 0 ],
"alignment": "CENTER",
"radius": 800,
"radius": 225,
"strength": 5,
"color": [
252,
Expand All @@ -25848,9 +25979,8 @@
]
},
{
"description": "WALL_STATIC_LAMPS",
"height": 190,
"alignment": "CENTER",
"description": "Lantern with Glass",
"offset": [ -5, 210, 0 ],
"radius": 450,
"strength": 7.5,
"color": [
Expand Down Expand Up @@ -33902,8 +34032,7 @@
},
{
"description": "Wall Lantern",
"height": 235,
"alignment": "CENTER",
"offset": [ 0, 200, 0 ],
"radius": 250,
"strength": 6.5,
"color": [
Expand Down
35 changes: 33 additions & 2 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 @@ -6797,13 +6797,27 @@
"description": "Metal Lanturn",
"baseMaterial": "METALLIC_1_LIGHT_GLOSS",
"objectIds": [
205,
3474,
4501,
4503,
24172
]
},
{
"description": "Static Lantern - Brighten Glass and Texture Metal",
"baseMaterial": "GRAY_125",
"objectIds": [
205
],
"colorOverrides": [
{
"colors": "h == 0",
"baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS",
"uvType": "BOX",
"uvScale": 0.25
}
]
},
{
"description": "Wooden Door 1 - Fake Plank",
"baseMaterial": "WOOD_GRAIN_3",
Expand Down Expand Up @@ -15067,7 +15081,7 @@
},
{
"description": "Fortune-teller Aris - Tent",
"baseMaterial": "CARPET",
"baseMaterial": "BURLAP",
"objectIds": [
2460,
2461,
Expand All @@ -15079,6 +15093,23 @@
"uvType": "BOX",
"uvScale": 0.85
},
{
"description": "Fortune-teller Aris - Table with Crystal Ball",
"baseMaterial": "NONE",
"objectIds": [
2459
],
"colorOverrides": [
{
"colors": "h== 0 && s ==7",
"baseMaterial": "CARPET",
"uvType": "BOX",
"uvScale": 0.5
}
],
"uvType": "BOX",
"uvScale": 0.85
},
{
"description": "Pillory random event crates",
"baseMaterial": "GRUNGE_2",
Expand Down