Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
41 changes: 39 additions & 2 deletions src/main/resources/rs117/hd/scene/areas.json
Original file line number Diff line number Diff line change
Expand Up @@ -2823,9 +2823,46 @@
]
},
{
"name": "MAGE_TRAINING_ARENA",
"name": "MAGE_TRAINING_ARENA_ENCHANTERS",
"aabbs": [
[ 3347, 3288, 3374, 3327 ]
[ 3328, 9600, 3391, 9663, 0 ]
],
"hideOtherAreas": true
},
{
"name": "MAGE_TRAINING_ARENA_GRAVEYARD",
"aabbs": [
[ 3328, 9600, 3391, 9663, 1 ]
],
"hideOtherAreas": true
},
{
"name": "MAGE_TRAINING_ARENA_ALCHEMIST",
"aabbs": [
[ 3328, 9600, 3391, 9663, 2 ]
],
"hideOtherAreas": true
},
{
"name": "MAGE_TRAINING_ARENA_TELEKENTIC",
"regions": [ 13463 ],
"hideOtherAreas": true
},
{
"name": "MAGE_TRAINING_ARENA_LOBBY",
"aabbs": [
[ 3347, 3288, 3374, 3327 ],
[ 3356, 3283, 3365, 3285 ],
[ 3375, 3289, 3375, 3290 ]
]
},
{
"name": "MAGE_TRAINING_ARENA_PLAYGROUNDS",
"areas": [
"MAGE_TRAINING_ARENA_GRAVEYARD",
"MAGE_TRAINING_ARENA_ENCHANTERS",
"MAGE_TRAINING_ARENA_ALCHEMIST",
"MAGE_TRAINING_ARENA_TELEKENTIC"
]
},
{
Expand Down
50 changes: 26 additions & 24 deletions src/main/resources/rs117/hd/scene/lights.json
Original file line number Diff line number Diff line change
Expand Up @@ -20960,7 +20960,7 @@
},
{
"description": "LANTERN_CANDLE",
"offset": [ 10, 260, -12 ],
"offset": [ 16, 265, 0 ],
"alignment": "CENTER",
"radius": 550,
"strength": 15.5,
Expand Down Expand Up @@ -38303,10 +38303,9 @@
},
{
"description": "MAGE_TRAIN_ARENA_WALL_CRYSTALS",
"height": 210,
"alignment": "FRONT",
"offset": [ 0, 210, 100 ],
"radius": 300,
"strength": 5.5,
"strength": 4.5,
"color": [
252,
252,
Expand All @@ -38322,10 +38321,11 @@
},
{
"description": "MAGE_TRAIN_ARENA_CANDLEABRA",
"height": 210,
"height": 267,
"alignment": "CENTER",
"radius": 500,
"strength": 10,
"visibleFromOtherPlanes": true,
"radius": 330,
"strength": 7,
"color": [
252,
148,
Expand All @@ -38340,24 +38340,23 @@
},
{
"description": "MAGE_TRAIN_ARENA_AREA_PORTALS",
"height": 140,
"alignment": "CENTER",
"radius": 220,
"offset": [ 0, 140, 0 ],
"radius": 180,
"strength": 11,
"color": [
143,
0,
255
200,
70,
200
],
"type": "PULSE",
"duration": 1100,
"type": "FLICKER",
"range": 20,
"objectIds": [
"MAGICTRAINING_TELEDOOR",
"MAGICTRAINING_ENCHANTDOOR",
"MAGICTRAINING_ALCHEMDOOR",
"MAGICTRAINING_GRAVEDOOR",
"MAGICTRAINING_RETURNDOOR"
"MAGICTRAINING_RETURNDOOR",
"MAGICTRAINING_HIDDEN_PORTAL_ENTRANCE1"
]
},
{
Expand Down Expand Up @@ -38397,19 +38396,23 @@
]
},
{
"description": "MAGE_TRAIN_ARENA_EGG_STATUE",
"description": "MAGE_TRAIN_ARENA_BONE_DROP",
"height": 200,
"alignment": "CENTER",
"radius": 220,
"strength": 11,
"strength": 9,
"color": [
255,
255,
255
],
"type": "PULSE",
"duration": 1254,
"range": 15,
"type": "FLICKER",
"range": 40,
"spawnDelay": 200,
"fadeInDuration": 100,
"fadeOutDuration": 400,
"despawnDelay": 1200,
"fixedDespawnTime": true,
"graphicsObjectIds": [
"MAGICTRAINING_BONE_DROP1",
"MAGICTRAINING_BONE_DROP2",
Expand All @@ -38419,10 +38422,9 @@
},
{
"description": "MAGE_TRAIN_ARENA_DOORWAY",
"height": 20,
"alignment": "CENTER",
"offset": [ -13.3, 100, 0 ],
"radius": 220,
"strength": 44,
"strength": 20,
"color": [
255,
255,
Expand Down
120 changes: 98 additions & 22 deletions src/main/resources/rs117/hd/scene/model_overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -32349,7 +32349,6 @@
"MAGICTRAINING_DOORWAY_L",
"MAGICTRAINING_DOORWAY_R",
"MAGICTRAINING_DUNGEONWALL_LIGHT",
"MAGICTRAINING_DUNGEONWALL_LIGHTING",
"MAGICTRAINING_DUNGEONWALL",
"MAGICTRAINING_DUNGEONWALL_TOP",
"MAGICTRAINING_WALL",
Expand All @@ -32358,13 +32357,48 @@
"MAGICTRAINING_WALL_WINDOW"
],
"uvType": "BOX",
"flatNormals": true
"flatNormals": true,
"colorOverrides": [
{
"colors": "h == 0",
"baseMaterial": "BLACK"
}
]
},
{
"description": "Mage Training Arena - Wall Light",
"baseMaterial": "MARBLE_2",
"objectIds": [
"MAGICTRAINING_DUNGEONWALL_LIGHTING"
],
"uvType": "BOX",
"colorOverrides": [
{
"colors": "h == 40 && a == 255",
"baseMaterial": "GRAY_70",
"uvType": "BOX",
"uvScale": 0.65,
"upwardsNormals": true
},
{
"colors": "a < 255",
"baseMaterial": "GRAY_150",
"uvType": "BOX",
"uvScale": 0.65
}
]
},
{
"description": "Mage Training Arena - Walls - Doorway of Light",
"baseMaterial": "MARBLE_2",
"objectIds": [
"MAGICTRAINING_TEMPLE_DOOR"
],
"colorOverrides": [
{
"colors": "a < 255",
"baseMaterial": "UNLIT"
}
]
},
{
Expand Down Expand Up @@ -32413,7 +32447,8 @@
"MAGICTRAINING_STAIRS_TOP_MIRROR"
],
"uvType": "BOX",
"uvOrientation": 512
"uvOrientation": 512,
"uvScale": 0.35
},
{
"description": "Mage Training Arena - Telekinetic Fence",
Expand All @@ -32435,6 +32470,38 @@
],
"uvType": "BOX"
},
{
"description": "Mage Training Arena - Alchemist Cupboards",
"baseMaterial": "MARBLE_2",
"uvScale": 0.8,
"objectIds": [
"MAGICTRAINING_ALCHEM_CUPBOARD0_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD1_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD2_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD3_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD4_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD5_OPEN",
"MAGICTRAINING_ALCHEM_CUPBOARD0",
"MAGICTRAINING_ALCHEM_CUPBOARD1",
"MAGICTRAINING_ALCHEM_CUPBOARD2",
"MAGICTRAINING_ALCHEM_CUPBOARD3",
"MAGICTRAINING_ALCHEM_CUPBOARD4",
"MAGICTRAINING_ALCHEM_CUPBOARD5"
],
"uvType": "BOX",
"colorOverrides": [
{
"colors": "h == 5",
"baseMaterial": "WOOD_GRAIN_3_LIGHT",
"uvType": "BOX",
"uvScale": 0.5
},
{
"colors": "h == 8",
"baseMaterial": "METALLIC_1_LIGHT"
}
]
},
{
"description": "Mage Training Arena - Entrance Statues",
"baseMaterial": "MARBLE_3",
Expand All @@ -32453,7 +32520,7 @@
],
"colorOverrides": [
{
"description": "Wooden base",
"description": "Flame",
"colors": "a < 255",
"baseMaterial": "GRAY_125",
"upwardsNormals": true
Expand All @@ -32478,26 +32545,16 @@
},
{
"description": "Falador - Mage Training Arena - Marble - Steps",
"baseMaterial": "MARBLE_3",
"baseMaterial": "MARBLE_1",
"objectIds": [
"MAGICTRAINING_SKEWSTEPS1",
"MAGICTRAINING_SKEWSTEPS_R",
"MAGICTRAINING_SKEWSTEPS_L"
],
"uvType": "BOX",
"uvOrientation": 640,
"flatNormals": true
},
{
"description": "Falador - Mage Training Arena - Marble - Steps - Corner",
"baseMaterial": "MARBLE_3",
"objectIds": [
"MAGICTRAINING_SKEWSTEPS_L",
"MAGICTRAINING_SKEWSTEPS_DIAG"
],
"uvType": "BOX",
"uvOrientationZ": 640,
"uvOrientationX": 640,
"flatNormals": true
"uvOrientation": 640,
"uvScale": 0.75
},
{
"description": "Objects - Bush - Dead",
Expand Down Expand Up @@ -32552,7 +32609,14 @@
"MAGICTRAINING_GRAVEDOOR",
"MAGICTRAINING_RETURNDOOR"
],
"uvType": "BOX"
"uvType": "BOX",
"colorOverrides": [
{
"colors": "a < 255",
"baseMaterial": "NONE",
"upwardsNormals": true
}
]
},
{
"description": "Mage Training Arena - Ground Decoration - Carpets",
Expand All @@ -32564,6 +32628,7 @@
],
"baseMaterial": "CARPET",
"uvType": "WORLD_XZ",
"uvScale": 0.6,
"flatNormals": true,
"castShadows": false
},
Expand Down Expand Up @@ -45198,9 +45263,20 @@
"objectIds": [ "DRAYNOR_OUTSIDE_LAMP" ],
"baseMaterial": "METALLIC_1_LIGHT",
"uvType": "BOX",
"uvScale": 0.5,
"uvOrientation": 42,
"hideVanillaShadows": true
"uvScale": 0.3,
"uvOrientation": 512,
"hideVanillaShadows": true,
"colorOverrides": [
{
"colors": "h == 10 && s == 2",
"baseMaterial": "GRUNGE_3"
},
{
"colors": "h == 10 && a > 100",
"baseMaterial": "GRAY_75",
"upwardsNormals": true
}
]
},
{
"description": "Plain Rowboat with no Ripples",
Expand Down
Loading