diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index a2d54d3058..ad4a362442 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -574,6 +574,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/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index c1c9364e6c..82a9f4317e 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -464,7 +464,7 @@ }, { "name": "WIZARDS_TOWER_PATH_BLEND_FIX", - "groundMaterial": "OVERWORLD_GRASS_1", + "groundMaterial": "HD_LAVA", "minHue": 10, "maxHue": 10, "minSaturation": 5, @@ -488,6 +488,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 +585,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 +690,7 @@ "minSaturation": 0, "maxSaturation": 1, "shiftLightness": 7, + "blended": false, "replacements": { "LUMBRIDGE_PATHS": "blending", "NONE": "!textures" @@ -694,6 +708,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" } @@ -1116,6 +1148,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 +1385,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 +2518,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 +2649,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" } @@ -3472,6 +3568,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" @@ -3927,7 +4038,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 +4283,8 @@ "groundMaterial": "DARKMEYER_BRICK_PATH", "shiftLightness": 3, "uvScale": 0.760009, - "minLightness": 12 + "minLightness": 12, + "blended": false }, { "name": "DARKMEYER_PATH_MIDDLE", @@ -4842,6 +4967,20 @@ 50 ], "groundMaterial": "VARROCK_PATHS", + "replacements": { + "WINTER_JAGGED_STONE_TILE_LIGHT_2": "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_LIGHT_2": "season == SeasonalTheme.WINTER" } @@ -5139,8 +5278,7 @@ 203 ], "groundMaterial": "SAND", - "minLightness": 64, - "maxLightness": 64 + "maxLightness": 68 }, { "name": "TEMPLE_OF_THE_EYE_ROCK_OVERLAY", @@ -7674,7 +7812,7 @@ }, { "name": "KHARID_GRASSY_SAND", - "groundMaterial": "SAND", + "groundMaterial": "GRASSY_SAND", "maxLightness": 60, "shiftHue": -1, "minHue": 6, @@ -9344,7 +9482,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 +10222,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 +10475,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" }, {