diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 8331151278..1275cb8ed7 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -2174,6 +2174,14 @@ [ 2562, 3265, 2579, 3278 ] ] }, + { + "name": "EAST_ARDOUGNE_HAZEL_HOUSE_COBBLE_CORNERS", + "aabbs": [ + [ 2576, 3267, 2576, 3270 ], + [ 2571, 3274, 2575, 3274 ], + [ 2564, 3275, 2567, 3275 ] + ] + }, { "name": "EAST_ARDOUGNE_BRIDGE", "aabbs": [ @@ -2269,8 +2277,7 @@ { "name": "WIZARD_CROMPERTY_PATH_2", "aabbs": [ - [ 2649, 3324, 2678, 3325 ], - [ 2651, 3329, 2655, 3329 ] + [ 2649, 3324, 2678, 3325 ] ] }, { diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index a2d54d3058..fe76f9f8ff 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -459,18 +459,6 @@ "WINTER_JAGGED_STONE_TILE" ] }, - { - "name": "WINTER_JAGGED_STONE_TILE_LIGHT", - "materials": [ - "WINTER_JAGGED_STONE_TILE_LIGHT" - ] - }, - { - "name": "WINTER_JAGGED_STONE_TILE_LIGHT_2", - "materials": [ - "WINTER_JAGGED_STONE_TILE_LIGHTER" - ] - }, { "name": "ROCKY_CAVE_FLOOR", "materials": [ @@ -574,6 +562,15 @@ "GRASS_3" ] }, + { + "name": "GRASSY_SAND", + "materials": [ + "GRASS_1", + "SAND_1", + "SAND_2", + "SAND_3" + ] + }, { "name": "OOZE_FLOOR", "materials": [ diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index c392f7e629..35aba6b8b9 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -3410,15 +3410,5 @@ "brightness": 1.159, "specularStrength": 0.6, "specularGloss": 30.0 - }, - { - "name": "WINTER_JAGGED_STONE_TILE_LIGHT", - "parent": "WINTER_JAGGED_STONE_TILE", - "brightness": 1.825 - }, - { - "name": "WINTER_JAGGED_STONE_TILE_LIGHTER", - "parent": "WINTER_JAGGED_STONE_TILE", - "brightness": 2.916 } ] diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index c1c9364e6c..fb363ee466 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -151,20 +151,39 @@ }, { "name": "WINTER_JAGGED_STONE_TILE", - "groundMaterial": "WINTER_JAGGED_STONE_TILE" + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "replacements": { + "WINTER_JAGGED_STONE_TILE_TEXTURE_ONLY": "blendingTextures" + } + }, + { + "name": "WINTER_JAGGED_STONE_TILE_TEXTURE_ONLY", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "blended": false }, { "name": "WINTER_JAGGED_STONE_TILE_LIGHT", - "groundMaterial": "WINTER_JAGGED_STONE_TILE_LIGHT" + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "shiftLightness": 15, + "replacements": { + "WINTER_JAGGED_STONE_TILE_LIGHT_TEXTURE_ONLY": "blendingTextures" + } + }, + { + "name": "WINTER_JAGGED_STONE_TILE_LIGHT_TEXTURE_ONLY", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "blended": false, + "shiftLightness": 15 }, { - "name": "WINTER_JAGGED_STONE_TILE_LIGHT_2", - "groundMaterial": "WINTER_JAGGED_STONE_TILE_LIGHT_2" + "name": "WINTER_JAGGED_STONE_TILE_LIGHTER", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "shiftLightness": 23 }, { "name": "WINTER_EAST_ARDOUGNE_BRIDGE", "groundMaterial": "WINTER_JAGGED_STONE_TILE", - "maxLightness": 53, + "maxLightness": 42, "replacements": { "WINTER_EAST_ARDOUGNE_BRIDGE_NO_BLEND": "!blending" } @@ -172,14 +191,25 @@ { "name": "WINTER_EAST_ARDOUGNE_BRIDGE_NO_BLEND", "groundMaterial": "WINTER_JAGGED_STONE_TILE", - "maxLightness": 44 + "maxLightness": 41 }, { "name": "WINTER_EDGEVILLE_PATH", - "groundMaterial": "WINTER_JAGGED_STONE_TILE_LIGHT", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", "maxHue": 0, "maxSaturation": 0, - "shiftLightness": 8 + "shiftLightness": 23, + "replacements": { + "WINTER_EDGEVILLE_PATH_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "WINTER_EDGEVILLE_PATH_TEXTURE_BLENDING_ONLY", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "maxHue": 0, + "maxSaturation": 0, + "shiftLightness": 23, + "blended": false }, { "name": "WINTER_EAST_ARDOUGNE_CASTLE_PATH_FIX", @@ -464,7 +494,7 @@ }, { "name": "WIZARDS_TOWER_PATH_BLEND_FIX", - "groundMaterial": "OVERWORLD_GRASS_1", + "groundMaterial": "HD_LAVA", "minHue": 10, "maxHue": 10, "minSaturation": 5, @@ -488,6 +518,7 @@ ], "groundMaterial": "BRICK_PATHS", "shiftSaturation": -1, + "blended": false, "replacements": { "WIZARDS_TOWER_PATH_BLEND_FIX_WINTER": "season == SeasonalTheme.WINTER", "WIZARDS_TOWER_PATH_BLEND_FIX": "blending" @@ -584,6 +615,18 @@ "overlayIds": [ 123 ], + "groundMaterial": "BRICK_PATHS", + "replacements": { + "HOSIDIUS_STONE_FLOOR_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "HOSIDIUS_STONE_FLOOR_TEXTURE_BLENDING_ONLY", + "area": "HOSIDIUS", + "blended": false, + "overlayIds": [ + 123 + ], "groundMaterial": "BRICK_PATHS" }, { @@ -677,6 +720,7 @@ "minSaturation": 0, "maxSaturation": 1, "shiftLightness": 7, + "blended": false, "replacements": { "LUMBRIDGE_PATHS": "blending", "NONE": "!textures" @@ -694,6 +738,24 @@ "minSaturation": 0, "maxSaturation": 1, "shiftLightness": 7, + "replacements": { + "NONE": "!textures", + "LUM_BRIDGE_10_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "LUM_BRIDGE_10_TEXTURE_BLENDING_ONLY", + "area": "LUM_BRIDGE", + "overlayIds": [ + 10 + ], + "groundMaterial": "VARROCK_PATHS", + "minHue": 7, + "maxHue": 7, + "minSaturation": 0, + "maxSaturation": 1, + "shiftLightness": 7, + "blended": false, "replacements": { "NONE": "!textures" } @@ -1103,7 +1165,9 @@ }, { "name": "EAST_ARDOUGNE_PATH_BLENDING_FIX_TOGGLE_WINTER", - "groundMaterial": "WINTER_JAGGED_STONE_TILE_LIGHT", + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "shiftLightness": 15, + "blended": false, "replacements": { "WINTER_GRASS": "blending" } @@ -1116,6 +1180,22 @@ ], "groundMaterial": "VARROCK_PATHS", "shiftLightness": 6, + "replacements": { + "NONE": "!textures", + "EAST_ARDOUGNE_PATH_BLENDING_FIX_TOGGLE_WINTER": "season == SeasonalTheme.WINTER", + "EAST_ARDOUGNE_PATH_BLENDING_FIX": "blending", + "EAST_ARDOUGNE_PATH_BLENDING_FIX_TOGGLE_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "EAST_ARDOUGNE_PATH_BLENDING_FIX_TOGGLE_TEXTURE_BLENDING_ONLY", + "area": "EAST_ARDOUGNE_PATHING_FIXES", + "overlayIds": [ + 10 + ], + "groundMaterial": "VARROCK_PATHS", + "blended": false, + "shiftLightness": 6, "replacements": { "NONE": "!textures", "EAST_ARDOUGNE_PATH_BLENDING_FIX_TOGGLE_WINTER": "season == SeasonalTheme.WINTER", @@ -1337,6 +1417,24 @@ "minSaturation": 1, "maxSaturation": 1, "shiftLightness": 19, + "replacements": { + "NONE": "!textures", + "FALADOR_SOUTH_PATH_FIX_1_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "FALADOR_SOUTH_PATH_FIX_1_TEXTURE_BLENDING_ONLY", + "area": "FALADOR_SOUTH_PATH_FIX", + "overlayIds": [ + 119 + ], + "groundMaterial": "FALADOR_PATHS", + "minHue": 8, + "maxHue": 8, + "minSaturation": 1, + "maxSaturation": 1, + "shiftLightness": 19, + "blended": false, "replacements": { "NONE": "!textures" } @@ -2452,6 +2550,18 @@ "overlayIds": [ 26 ], + "groundMaterial": "BRICK_PATHS", + "replacements": { + "SOPHANEM_PATH_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "SOPHANEM_PATH_TEXTURE_BLENDING_ONLY", + "area": "SOPHANEM", + "blended": false, + "overlayIds": [ + 26 + ], "groundMaterial": "BRICK_PATHS" }, { @@ -2571,6 +2681,24 @@ "minSaturation": 1, "maxSaturation": 1, "shiftLightness": 16, + "replacements": { + "NONE": "!textures", + "FALADOR_PATHS_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "FALADOR_PATHS_TEXTURE_BLENDING_ONLY", + "area": "FALADOR", + "overlayIds": [ + 137 + ], + "groundMaterial": "FALADOR_PATHS", + "minHue": 8, + "maxHue": 8, + "minSaturation": 1, + "maxSaturation": 1, + "shiftLightness": 16, + "blended": false, "replacements": { "NONE": "!textures" } @@ -2773,7 +2901,8 @@ ], "groundMaterial": "VARROCK_PATHS", "replacements": { - "WINTER_JAGGED_STONE_TILE_LIGHT": "season == SeasonalTheme.WINTER" + "WINTER_JAGGED_STONE_TILE_LIGHT": "season == SeasonalTheme.WINTER", + "OVERWORLD - COBBLESTONE_PATHS - Texture Blending Only": "blendingTextures" } }, { @@ -3472,6 +3601,21 @@ ], "groundMaterial": "VARROCK_PATHS", "shiftLightness": 6, + "replacements": { + "WINTER_JAGGED_STONE_TILE_LIGHT": "season == SeasonalTheme.WINTER", + "EAST_ARDOUGNE_PATHS_1_TEXTURE_BLENDING_ONLY": "blendingTextures", + "NONE": "!textures" + } + }, + { + "name": "EAST_ARDOUGNE_PATHS_1_TEXTURE_BLENDING_ONLY", + "area": "EAST_ARDOUGNE", + "overlayIds": [ + 10 + ], + "groundMaterial": "VARROCK_PATHS", + "shiftLightness": 6, + "blended": false, "replacements": { "WINTER_JAGGED_STONE_TILE_LIGHT": "season == SeasonalTheme.WINTER", "NONE": "!textures" @@ -3498,16 +3642,51 @@ { "name": "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE", "area": "EAST_ARDOUGNE_HAZEL_HOUSE", + "groundMaterial": "VARROCK_PATHS", + "minLightness": 28, + "maxLightness": 28, "overlayIds": [ 12 ], + "replacements": { + "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE_WINTER": "season == SeasonalTheme.WINTER", + "NONE": "!textures" + } + }, + { + "name": "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE_WINTER", + "area": "EAST_ARDOUGNE_HAZEL_HOUSE", + "maxLightness": 27, + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "overlayIds": [ + 12 + ] + }, + { + "name": "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE_COBBLE_CORNERS", + "area": "EAST_ARDOUGNE_HAZEL_HOUSE_COBBLE_CORNERS", "groundMaterial": "VARROCK_PATHS", - "minLightness": 33, - "maxLightness": 33, + "minLightness": 28, + "maxLightness": 28, + "setSaturation": 0, + "setHue": 0, + "underlayIds": [ 50 ], "replacements": { + "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE_COBBLE_CORNERS_WINTER": "season == SeasonalTheme.WINTER", "NONE": "!textures" } }, + { + "name": "EAST_ARDOUGNE_HAZEL_MANOR_PATH_TEXTURE_COBBLE_CORNERS_WINTER", + "area": "EAST_ARDOUGNE_HAZEL_HOUSE_COBBLE_CORNERS", + "shiftLightness": 14, + "setSaturation": 0, + "setHue": 0, + "groundMaterial": "WINTER_JAGGED_STONE_TILE", + "overlayIds": [ + 12 + ] + }, { "name": "EAST_ARDOUGNE_BRIDGE_TEXTURE", "area": "EAST_ARDOUGNE_BRIDGE", @@ -3515,8 +3694,8 @@ 12 ], "groundMaterial": "VARROCK_PATHS", - "minLightness": 33, - "maxLightness": 33, + "minLightness": 30, + "maxLightness": 30, "replacements": { "NONE": "!textures", "WINTER_EAST_ARDOUGNE_BRIDGE": "season == SeasonalTheme.WINTER" @@ -3582,8 +3761,26 @@ "groundMaterial": "VARROCK_PATHS", "maxSaturation": 0, "maxHue": 0, - "shiftLightness": 12, + "shiftLightness": 11, "blendedAsOpposite": true, + "replacements": { + "WINTER_EDGEVILLE_PATH": "season == SeasonalTheme.WINTER", + "WIZARD_CROMPERTY_PATH_2_TEXTURE_BLENDING_ONLY": "blendingTextures", + "NONE": "!textures" + } + }, + { + "name": "WIZARD_CROMPERTY_PATH_2_TEXTURE_BLENDING_ONLY", + "area": "WIZARD_CROMPERTY_PATH_2", + "underlayIds": [ + 48, + 64 + ], + "groundMaterial": "VARROCK_PATHS", + "maxSaturation": 0, + "maxHue": 0, + "shiftLightness": 11, + "blended": false, "replacements": { "WINTER_EDGEVILLE_PATH": "season == SeasonalTheme.WINTER", "NONE": "!textures" @@ -3691,7 +3888,7 @@ ], "groundMaterial": "VARROCK_PATHS", "replacements": { - "WINTER_JAGGED_STONE_TILE_LIGHT_2": "season == SeasonalTheme.WINTER" + "WINTER_JAGGED_STONE_TILE_LIGHTER": "season == SeasonalTheme.WINTER" } }, { @@ -3927,7 +4124,20 @@ 164 ], "groundMaterial": "BRICK_PATHS", - "shiftSaturation": -1 + "shiftSaturation": -1, + "replacements": { + "WIZARDS_TOWER_PATH_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "WIZARDS_TOWER_PATH_TEXTURE_BLENDING_ONLY", + "area": "WIZARDS_TOWER_PATH", + "overlayIds": [ + 164 + ], + "groundMaterial": "BRICK_PATHS", + "shiftSaturation": -1, + "blended": false }, { "name": "MISTHALIN_MYSTERY_MANOR_TILE_DARK_1", @@ -4159,7 +4369,8 @@ "groundMaterial": "DARKMEYER_BRICK_PATH", "shiftLightness": 3, "uvScale": 0.760009, - "minLightness": 12 + "minLightness": 12, + "blended": false }, { "name": "DARKMEYER_PATH_MIDDLE", @@ -4843,7 +5054,21 @@ ], "groundMaterial": "VARROCK_PATHS", "replacements": { - "WINTER_JAGGED_STONE_TILE_LIGHT_2": "season == SeasonalTheme.WINTER" + "WINTER_JAGGED_STONE_TILE_LIGHTER": "season == SeasonalTheme.WINTER", + "OVERLAY_ZEAH_PATHS_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "OVERLAY_ZEAH_PATHS_TEXTURE_BLENDING_ONLY", + "area": "KOUREND", + "overlayIds": [ + 11, + 50 + ], + "groundMaterial": "VARROCK_PATHS", + "blended": false, + "replacements": { + "WINTER_JAGGED_STONE_TILE_LIGHTER": "season == SeasonalTheme.WINTER" } }, { @@ -5139,8 +5364,7 @@ 203 ], "groundMaterial": "SAND", - "minLightness": 64, - "maxLightness": 64 + "maxLightness": 68 }, { "name": "TEMPLE_OF_THE_EYE_ROCK_OVERLAY", @@ -7674,7 +7898,7 @@ }, { "name": "KHARID_GRASSY_SAND", - "groundMaterial": "SAND", + "groundMaterial": "GRASSY_SAND", "maxLightness": 60, "shiftHue": -1, "minHue": 6, @@ -9344,7 +9568,10 @@ 60 ], "groundMaterial": "VARIED_DIRT_SHINY", - "shiftLightness": 5 + "shiftLightness": 5, + "replacements": { + "TEMPLE_OF_THE_EYE_ROCK_UNDERLAY_BLENDING": "blendingTextures" + } }, { "name": "TEMPLE_OF_THE_EYE_DIRT", @@ -10081,6 +10308,21 @@ 179 ], "groundMaterial": "VARROCK_PATHS", + "replacements": { + "OVERWORLD - COBBLESTONE_PATHS - Texture Blending Only": "blendingTextures", + "WINTER_JAGGED_STONE_TILE": "season == SeasonalTheme.WINTER" + } + }, + { + "name": "OVERWORLD - COBBLESTONE_PATHS - Texture Blending Only", + "area": "OVERWORLD", + "overlayIds": [ + 117, + 171, + 179 + ], + "blended": false, + "groundMaterial": "VARROCK_PATHS", "replacements": { "WINTER_JAGGED_STONE_TILE": "season == SeasonalTheme.WINTER" } @@ -10319,6 +10561,18 @@ "overlayIds": [ 137 ], + "groundMaterial": "BRICK_PATHS", + "replacements": { + "OVERLAY_N119_TEXTURE_BLENDING_ONLY": "blendingTextures" + } + }, + { + "name": "OVERLAY_N119_TEXTURE_BLENDING_ONLY", + "area": "ALL", + "blended": false, + "overlayIds": [ + 137 + ], "groundMaterial": "BRICK_PATHS" }, {