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

Haunted Mine overhaul #540

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

Haunted Mine overhaul #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b337726
External objects
SirFancyBacon Dec 15, 2024
d3c2fe0
Rename Abandoned_mine, added new definition
SirFancyBacon Dec 15, 2024
852c059
Correctly name
SirFancyBacon Dec 15, 2024
5e30286
First floor objects
SirFancyBacon Dec 15, 2024
7ff8c09
remove dups from other pr
SirFancyBacon Dec 15, 2024
7f45c0b
ladder
SirFancyBacon Dec 15, 2024
53c778a
barrel
SirFancyBacon Dec 15, 2024
99e0378
revert for compat
SirFancyBacon Dec 15, 2024
e3a2a5f
Add light
SirFancyBacon Dec 15, 2024
c57f984
Fix floor definitions
SirFancyBacon Dec 15, 2024
90794a0
fix area, mushrooms glow
SirFancyBacon Dec 15, 2024
ec4a9a7
objects
SirFancyBacon Dec 15, 2024
59f0f7b
Add floor 1, define more objects
SirFancyBacon Dec 15, 2024
7c35f5c
Finish mine area definition
SirFancyBacon Dec 15, 2024
b6eb068
Fix lift tile
SirFancyBacon Dec 15, 2024
68e57ea
Finish objects
SirFancyBacon Dec 15, 2024
0070a9e
fix area clipping
SirFancyBacon Dec 15, 2024
6713335
finish models
SirFancyBacon Dec 15, 2024
fea9e1c
finishing touches
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
45 changes: 44 additions & 1 deletion 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 @@ -2765,11 +2765,54 @@
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE",
"name": "ABANDONED_MINE_OVERWORLD",
"aabbs": [
[ 3423, 3201, 3461, 3261 ]
]
},
{
"name": "ABANDONED_MINE_1",
"regions": [ 13718 ],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE_2",
"regions": [ 11079 ],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE_3",
"regions": [ 10822 ],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE_4",
"regions": [ 11078 ],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE_5",
"aabbs": [
[ 2688, 4416, 2754, 4482 ]
],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE_6",
"regions": [ 11077 ],
"hideOtherAreas": true
},
{
"name": "ABANDONED_MINE",
"areas": [
"ABANDONED_MINE_1",
"ABANDONED_MINE_2",
"ABANDONED_MINE_3",
"ABANDONED_MINE_4",
"ABANDONED_MINE_5",
"ABANDONED_MINE_6"
]
},
{
"name": "GROTESQUE_GUARDIANS",
"regions": [
Expand Down
38 changes: 38 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 @@ -20750,6 +20750,7 @@
"range": 30,
"objectIds": [
25056,
15796,
17829,
25055
]
Expand Down Expand Up @@ -35834,5 +35835,42 @@
"objectIds": [
16812
]
},
{
"description": "Glowing Fungus",
"offset": [ 0, 8, 0 ],
"radius": 180,
"strength": 8,
"color": [
100,
3,
187
],
"type": "FLICKER",
"duration": 0,
"range": 5,
"objectIds": [
4932,
4933
]
},
{
"description": "Crystal Outcroping ",
"offset": [ 0, 6, 0 ],
"radius": 180,
"strength": 8,
"color": [
187,
3,
187
],
"type": "FLICKER",
"duration": 0,
"range": 5,
"objectIds": [
4926,
4927,
4928
]
}
]
Loading