diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 47c6e44fe..01063986a 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -1170,7 +1170,14 @@ { "name": "EDGEVILLE_BANK_WINDOW_FIX", "aabbs": [ - [ 3089, 3493, 3089, 3498 ] + [ 3089, 3493, 3089, 3498 ], + [ 3090, 3497 ] + ] + }, + { + "name": "EDGEVILLE_BANK_WINDOW_FIX_2", + "aabbs": [ + [ 3090, 3497 ] ] }, { @@ -1894,10 +1901,10 @@ { "name": "EAST_ARDOUGNE_COBBLE_OFFICE", "aabbs": [ - [ 2668, 3320, 2673, 3323 ], [ 2668, 3318, 2675, 3319 ], [ 2671, 3315, 2675, 3317 ], - [ 2670, 3316, 2670, 3317 ] + [ 2670, 3316, 2670, 3317 ], + [ 2669, 3317 ] ] }, { @@ -1908,6 +1915,12 @@ [ 2670, 3315 ] ] }, + { + "name": "EAST_ARDOUGNE_COBBLE_OFFICE_HOUSE", + "aabbs": [ + [ 2668, 3320, 2673, 3323 ] + ] + }, { "name": "EAST_ARDOUGNE_COBBLE_CHURCH", "aabbs": [ @@ -2032,6 +2045,30 @@ [ 2667, 3264, 2689, 3276 ] ] }, + { + "name": "WIZARD_CROMPERTY_PATH_1", + "aabbs": [ + [ 2662, 3325, 2670, 3325 ], + [ 2666, 3319, 2666, 3323 ] + ] + }, + { + "name": "WIZARD_CROMPERTY_PATH_2", + "aabbs": [ + [ 2649, 3324, 2678, 3325 ], + [ 2651, 3329, 2655, 3329 ] + ] + }, + { + "name": "WIZARD_CROMPERTY_PATH_BLENDING_FIX", + "aabbs": [ + [ 2653, 3322, 2661, 3322 ], + [ 2661, 3323 ], + [ 2669, 3327 ], + [ 2679, 3323 ], + [ 2679, 3326 ] + ] + }, { "name": "CLOCK_TOWER_DUNGEON_COLORED_TILES", "aabbs": [ @@ -5508,12 +5545,6 @@ ], "hideOtherAreas": true }, - { - "name": "KOUREND_CASTLE_ENTRANCE_FIX", - "aabbs": [ - [ 1623, 3669, 0, 1623, 3677, 0 ] - ] - }, { "name": "KOUREND_CASTLE", "aabbs": [ @@ -5530,7 +5561,32 @@ [ 1586, 3661, 1, 1604, 3685, 1 ], [ 1610, 3656, 2, 1621, 3690, 2 ], [ 1591, 3681, 2, 1599, 3685, 2 ], - [ 1591, 3661, 2, 1599, 3667, 2 ] + [ 1591, 3661, 2, 1599, 3667, 2 ], + [ 1605, 3671, 1, 1609, 3675, 1 ], + [ 1605, 3676, 1, 1607, 3678, 1 ], + [ 1605, 3668, 1, 1607, 3670, 1 ], + [ 1618, 3671, 1, 1623, 3675, 1 ], + [ 1622, 3667, 1, 1623, 3670, 1 ], + [ 1622, 3676, 1, 1623, 3679, 1 ], + [ 1592, 3679, 1599, 3685, 2 ], + [ 1593, 3661, 1599, 3667, 2 ] + ] + }, + { + "name": "KOUREND_CASTLE_BACK_COURTYARD", + "aabbs": [ + [ 1598, 3666, 1607, 3680 ], + [ 1595, 3671, 1597, 3675 ] + ] + }, + { + "name": "KOUREND_CASTLE_CARPET", + "aabbs": [ + [ 1608, 3666, 1611, 3670, 1 ], + [ 1608, 3676, 1611, 3680, 1 ], + [ 1610, 3661, 1613, 3667, 2 ], + [ 1620, 3686, 1626, 3688, 0 ], + [ 1610, 3679, 1613, 3679, 2 ] ] }, { @@ -8026,6 +8082,19 @@ [ 1496, 9563, 1530, 9596 ] ] }, + { + "name": "FORTIS_BRIDGE", + "aabbs": [ + [ 1730, 3106, 1746, 3107 ] + ] + }, + { + "name": "FORTIS_BRIDGE_BRIGHTNESS_FIX", + "aabbs": [ + [ 1730, 3106, 1730, 3107 ], + [ 1746, 3106, 1746, 3108 ] + ] + }, { "name": "THE_FINAL_DAWN_KEYSTONE_ROOM", "aabbs": [ diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index 4beedaaf4..3a6a39258 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -560,6 +560,12 @@ "GROUND_WEB_3" ] }, + { + "name": "FORTIS_ROADS", + "materials": [ + "FORTIS_ROADS" + ] + }, { "name": "ABYSSAL_BILE", "materials": [ diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index afb7148fc..20a94562a 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -28785,7 +28785,9 @@ "type": "STATIC", "duration": 0, "range": 0, - "fadeInDuration": 500, + "fadeInDuration": 300, + "fadeOutDuration": 100, + "fadeOverlap": true, "projectileIds": [ "FIREBREATH_TRAVEL" ] @@ -29915,7 +29917,7 @@ { "description": "Wyrm Magic Attack", "offset": [ 0, 0, 0 ], - "radius": 220, + "radius": 250, "strength": 20, "color": [ 0, @@ -29924,16 +29926,15 @@ ], "type": "FLICKER", "duration": 1, - "range": 80, + "range": 60, "projectileIds": [ "WYRM_RANGE_PROJ" ], - "spawnDelay": 400, "fadeInDuration": 300, - "fadeOutDuration": 100 + "fadeOutDuration": 300 }, { "description": "Shadow Wyrm Magic Attack", "offset": [ 0, 0, 0 ], - "radius": 220, + "radius": 250, "strength": 50, "color": [ 0, @@ -29944,9 +29945,8 @@ "duration": 10, "range": 70, "projectileIds": [ "SUPERIOR_WYRM_RANGE_PROJ" ], - "spawnDelay": 400, "fadeInDuration": 300, - "fadeOutDuration": 100 + "fadeOutDuration": 300 }, { "description": "KARUULM_INDOOR_LAVA_1", @@ -39738,6 +39738,80 @@ "fadeOutDuration": 200, "graphicsObjectIds": [ "SPECIAL_ATLATL_SPOTANIM" ] }, + { + "description": "Scorching Bow Special Attack - Arrow", + "offset": [ 0, -25, 0 ], + "radius": 175, + "strength": 12, + "fadeOutDuration": 575, + "fadeInDuration": 200, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "projectileIds": [ "VFX_SCORCHING_BOW_PROJECTILE" ] + }, + { + "description": "Emberlight Special Attack Player", + "offset": [ 0, 75, 0 ], + "radius": 230, + "strength": 11.5, + "spawnDelay": 450, + "fixedDespawnTime": true, + "despawnDelay": 900, + "color": [ + 252, + 148, + 3 + ], + "type": "STATIC", + "fadeInDuration": 175, + "fadeOutDuration": 375, + "graphicsObjectIds": [ "VFX_EMBERLIGHT_SPEC_02" ] + }, + { + "description": "Emberlight Special Attack Impact", + "offset": [ 0, 75, 90 ], + "radius": 260, + "spawnDelay": 1150, + "fixedDespawnTime": true, + "despawnDelay": 650, + "strength": 11.5, + "color": [ + 252, + 148, + 3 + ], + "type": "STATIC", + "fadeInDuration": 150, + "fadeOutDuration": 275, + "graphicsObjectIds": [ "VFX_EMBERLIGHT_SPEC_02" ] + }, + { + "description": "Scorching Bow Special Attack - Shot Firing", + "offset": [ 0, 80, 50 ], + "radius": 165, + "strength": 12, + "fixedDespawnTime": true, + "despawnDelay": 1000, + "spawnDelay": 150, + "fadeOutDuration": 175, + "fadeInDuration": 250, + + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "graphicsObjectIds": [ "VFX_HUMAN_SCORCHING_BOW_SPECIAL_ATTACK_01" ] + }, { "description": "Varlamore - Ruins of Tapoyauik - Brazier", "offset": [ 0, 350, 0 ], diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index faca1687f..26e4832d5 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -661,13 +661,13 @@ { "name": "FORTIS_ROADS", "vanillaTextureIndex": 121, - "textureScale": [ -1, -1 ] + "textureScale": [ -1, -1 ], + "brightness": 0.92 }, { "name": "FORTIS_ROADS_MIRRORED", "parent": "FORTIS_ROADS", - "vanillaTextureIndex": 122, - "textureScale": [ -1, -1 ] + "vanillaTextureIndex": 122 }, { "name": "BRICK_CAM_TORUM", diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index 1aaef03b7..e1a99765a 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -2674,12 +2674,13 @@ }, { "description": "Short grass that is constructed out of triangles at perpendicular angles from each other. Shouldn't cast shadows, and should use up as the normal direction to prevent lighting artifacts.", - "baseMaterial": "GRAY_75", + "baseMaterial": "GRAY_65", "flatNormals": true, "upwardsNormals": true, "inheritTileColorType": "UNDERLAY", "castShadows": false, "windDisplacementMode": "OBJECT", + "windDisplacementModifier": -2, "objectIds": [ "GRASS_LIGHT_1", "GRASS_LIGHT_2", @@ -3113,6 +3114,16 @@ "DS2_OGRE_BROWN_GRASS_4" ] }, + { + "description": "Hide Grass on Wizard Cromperty's Path", + "areas": [ "WIZARD_CROMPERTY_PATH_2" ], + "hide": true, + "objectIds": [ + "LONG_GRASS_1", + "GRASS_LIGHT_1", + "GRASS_LIGHT_2" + ] + }, { "description": "WOODEN_FENCES", "baseMaterial": "WOOD_GRAIN_3", @@ -41218,6 +41229,16 @@ } ] }, + { + "description": "Fortis Bridge - Hide Road Model to Replace with Tiles", + "areas": [ "FORTIS_BRIDGE" ], + "hide": true, + "objectIds": [ + "FLOOR_CIVITAS_MIDDLE01", + "FLOOR_CIVITAS_MIDDLE02" + ], + "uvType": "BOX" + }, { "description": "Mortytania Slayer Tower Spiked Chain shortcuts", "baseMaterial": "METALLIC_1_LIGHT_GLOSS", diff --git a/src/main/resources/rs117/hd/scene/textures/fortis_roads.png b/src/main/resources/rs117/hd/scene/textures/fortis_roads.png new file mode 100644 index 000000000..c9eb7165b Binary files /dev/null and b/src/main/resources/rs117/hd/scene/textures/fortis_roads.png differ diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index b3522694b..361bd418f 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1537,6 +1537,14 @@ "minLightness": 22, "maxLightness": 22 }, + { + "name": "EDGEVILLE_BANK_WINDOW_FIX_2", + "area": "EDGEVILLE_BANK_WINDOW_FIX_2", + "overlayIds": [ + 10 + ], + "groundMaterial": "VARROCK_PATHS" + }, { "name": "EDGEVILLE_BANK_PERIMETER_FIX", "area": "EDGEVILLE_BANK_PERIMETER_FIX", @@ -2275,16 +2283,18 @@ "overlayIds": [ 10 ], - "groundMaterial": "VARROCK_PATHS" + "groundMaterial": "VARROCK_PATHS", + "shiftLightness": 3 }, { "name": "EAST_ARDOUGNE_COBBLE_HOUSE", - "area": "EAST_ARDOUGNE_COBBLE_OFFICE", + "area": "EAST_ARDOUGNE_COBBLE_OFFICE_HOUSE", "overlayIds": [ 10 ], "groundMaterial": "VARROCK_PATHS", - "blended": false + "blended": false, + "shiftLightness": 3 }, { "name": "EAST_ARDOUGNE_COBBLE_CHURCH", @@ -2494,6 +2504,52 @@ "shiftSaturation": 3, "shiftLightness": -2 }, + { + "name": "WIZARD_CROMPERTY_PATH_BLENDING_FIX", + "area": "WIZARD_CROMPERTY_PATH_BLENDING_FIX", + "underlayIds": [ + 48, + 64 + ], + "overlayIds": [ 5 ], + "groundMaterial": "WOOD_PLANKS_1", + "blended": false, + "blendedAsOpposite": true + }, + { + "name": "WIZARD_CROMPERTY_PATH_1", + "area": "WIZARD_CROMPERTY_PATH_1", + "underlayIds": [ + 48, + 64 + ], + "overlayIds": [ 10 ], + "groundMaterial": "VARROCK_PATHS", + "maxSaturation": 0, + "maxHue": 0, + "shiftLightness": 12, + "blended": false, + "blendedAsOpposite": true, + "replacements": { + "WINTER_EDGEVILLE_PATH": "season == SeasonalTheme.WINTER" + } + }, + { + "name": "WIZARD_CROMPERTY_PATH_2", + "area": "WIZARD_CROMPERTY_PATH_2", + "underlayIds": [ + 48, + 64 + ], + "groundMaterial": "VARROCK_PATHS", + "maxSaturation": 0, + "maxHue": 0, + "shiftLightness": 12, + "blendedAsOpposite": true, + "replacements": { + "WINTER_EDGEVILLE_PATH": "season == SeasonalTheme.WINTER" + } + }, { "name": "WEST_ARDOUGNE_COBBLE_HOUSES", "area": "WEST_ARDOUGNE_COBBLE_HOUSES", @@ -3456,12 +3512,13 @@ "uvScale": 1.2 }, { - "name": "KOUREND_CASTLE_BLEND_FIX", - "area": "KOUREND_CASTLE_ENTRANCE_FIX", + "name": "KOUREND_CASTLE_CARPET", + "area": "KOUREND_CASTLE_CARPET", "overlayIds": [ 11 ], - "groundMaterial": "VARROCK_PATHS", + "groundMaterial": "CARPET", + "uvScale": 1.5, "blended": false }, { @@ -3470,7 +3527,18 @@ "overlayIds": [ 11 ], - "groundMaterial": "VARROCK_PATHS" + "groundMaterial": "TILES_2x2_1", + "shiftLightness": 2, + "blended": false + }, + { + "name": "KOUREND_CASTLE_BACK_COURTYARD", + "area": "KOUREND_CASTLE_BACK_COURTYARD", + "underlayIds": [ + 66, + 72 + ], + "groundMaterial": "VARIED_DIRT" }, { "name": "KOUREND_CASTLE_GUARDPOSTS_FLOORS", @@ -3518,6 +3586,9 @@ "overlayIds": [ 11 ], + "underlayIds": [ + 112 + ], "groundMaterial": "GRASS_1", "blended": false }, @@ -5593,6 +5664,25 @@ "overlayIds": [ 139, 228 ], "groundMaterial": "VARROCK_PATHS" }, + { + "name": "FORTIS_BRIDGE_BRIGHTNESS_FIX", + "area": "FORTIS_BRIDGE_BRIGHTNESS_FIX", + "overlayIds": [ 329 ], + "groundMaterial": "FORTIS_ROADS", + "blended": false, + "minLightness": 70, + "maxLightness": 85 + }, + { + "name": "FORTIS_BRIDGE", + "area": "FORTIS_BRIDGE", + "overlayIds": [ 132, 228 ], + "groundMaterial": "FORTIS_ROADS", + "blended": false, + "shiftLightness": 65, + "maxHue": 0, + "maxSaturation": 0 + }, { "name": "Varlamore - Outer fortis temple - brick floors", "area": "Varlamore - Outer Fortis Temples",