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

Elemental workshop 1 upgrade #539

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

Elemental workshop 1 upgrade #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bd05de
Add light to lanterns
SirFancyBacon Nov 26, 2024
a6b03d1
Add area, enable hide other regions
SirFancyBacon Nov 26, 2024
992149c
define floor
SirFancyBacon Nov 26, 2024
0a30233
texture objects
SirFancyBacon Nov 26, 2024
51d2112
Merge branch 'master' into elemental-workshop-1
SirFancyBacon Dec 15, 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
7 changes: 7 additions & 0 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 @@ -1135,6 +1135,13 @@
[ 2732, 3465, 2739, 3471 ]
]
},
{
"name": "Elemental Workshop floor 1",
"aabbs": [
[ 2670, 9857, 2763, 9934 ]
],
"hideOtherAreas": true
},
{
"name": "SINCLAIR_MANSION",
"aabbs": [
Expand Down
17 changes: 17 additions & 0 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 @@ -35834,5 +35834,22 @@
"objectIds": [
16812
]
},
{
"description": "Elemental Workshop wall lantern",
"offset": [ 4, 155, 0 ],
"radius": 500,
"strength": 12.5,
"color": [
252,
148,
3
],
"type": "FLICKER",
"duration": 0,
"range": 20,
"objectIds": [
18536
]
}
]
173 changes: 172 additions & 1 deletion 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 @@ -8398,6 +8398,11 @@
"baseMaterial": "WOOD_GRAIN_3",
"objectIds": [
2071,
3394,
3395,
3398,
3400,
3401,
9534,
9064,
10662,
Expand All @@ -8407,6 +8412,8 @@
12548,
15031,
14739,
18506,
18507,
27223,
27224,
27225,
Expand Down Expand Up @@ -8461,9 +8468,12 @@
"description": "Objects - Wooden - Stack of crates - Rotated",
"baseMaterial": "WOOD_GRAIN_3",
"objectIds": [
3397,
3399,
7513,
14742,
15693,
18508,
42068,
42070
],
Expand Down Expand Up @@ -13672,8 +13682,11 @@
872,
877,
2542,
3419,
3420,
3421,
6480
6480,
18531
]
},
{
Expand Down Expand Up @@ -27081,5 +27094,163 @@
"objectIds": [
31675
]
},
{
"description": "Metal spiral staircase in ground",
"baseMaterial": "METALLIC_1_LIGHT_GLOSS",
"uvType": "BOX",
"uvScale": 0.5,
"objectIds": [
3415
]
},
{
"description": "Metal spiral staircase",
"baseMaterial": "METALLIC_1_LIGHT_GLOSS",
"uvType": "BOX",
"uvScale": 0.5,
"objectIds": [
3416
]
},
{
"description": "Water wheel - DYNAMIC",
"objectIds": [ 18512 ],
"flatNormals": true
},
{
"description": "Elemental workshop water controls - DYNAMIC",
"objectIds": [ 18509, 18510 ]
},
{
"description": "Elemental workshop moving machinery - DYNAMIC",
"objectIds": [ 18530 ]
},
{
"description": "Elemental workshop levers",
"baseMaterial": "METALLIC_1_LIGHT_GLOSS",
"uvType": "BOX",
"uvScale": 0.4,
"objectIds": [ 3406, 3409, 3417 ]
},
{
"description": "metallic pipe with a beige stripe on the side",
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvOrientation": 256,
"objectIds": [
18726,
18727,
18728,
18729,
18730,
18732
]
},
{
"description": "metallic pipe with a orange stripe on the side",
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvOrientation": 256,
"objectIds": [
18528,
18529,
18532,
18533,
18534,
18535
]
},
{
"description": "Lava trough",
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvOrientation": 42,
"objectIds": [
18519,
18520,
18521,
18522,
18523
]
},
{
"description": "Lava trough end caps",
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvOrientation": 256,
"objectIds": [
18588,
18589
]
},
{
"description": "Domed machinery with a dial on the front of it",
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvOrientation": 256,
"objectIds": [
3422,
3423
]
},
{
"description": "Bellows - DYNAMIC",
"baseMaterial": "GRUNGE_3",
"uvType": "BOX",
"uvOrientation": 343,
"objectIds": [
18515,
18516
]
},
{
"description": "Elemental Workshop lava furnace - DYNAMIC",
"baseMaterial": "METALLIC_1_LIGHT_GLOSS",
"uvType": "BOX",
"uvOrientation": 343,
"objectIds": [
18517,
18518,
18525
]
},
{
"description": "Elemental Workshop metal plate walls with stone bricks",
"baseMaterial": "GRUNGE_3",
"uvType": "BOX",
"uvOrientation": 343,
"objectIds": [
18538,
18539,
18540,
18541,
18543,
18544,
18545,
18547,
18548,
18550,
18552,
18553,
18554,
18555,
18556,
18557,
18558,
18565,
18567,
18568,
18570,
18571,
18573,
18574,
18575,
18576,
18577,
18579,
18583,
18585
]
}
]
6 changes: 6 additions & 0 deletions src/main/resources/rs117/hd/scene/tile_overrides.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,6 +1864,12 @@
],
"groundMaterial": "FALADOR_PATHS"
},
{
"name": "elemental workshop floor",
"area": "Elemental Workshop floor 1",
"groundMaterial": "PACKED_EARTH",
"underlayIds": [ 67 ]
},
{
"name": "SINCLAIR_MANSION_FLOOR",
"area": "SINCLAIR_MANSION",
Expand Down