diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index c0b77ed4dc..af603c2b98 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -1766,7 +1766,13 @@ { "name": "SOUTH_CATHERBY_SEASON_FIX", "aabbs": [ - [ 2865, 3414, 2871, 3424 ] + [ 2865, 3419, 2866, 3424 ], + [ 2867, 3418, 2867, 3423 ], + [ 2868, 3417, 2868, 3422 ], + [ 2869, 3415, 2869, 3420 ], + [ 2870, 3414, 2870, 3419 ], + [ 2871, 3414, 2871, 3416 ], + [ 2842, 3432 ] ] }, { @@ -1778,6 +1784,25 @@ [ 2871, 3413 ] ] }, + { + "name": "SOUTH_CATHERBY_PLAIN_SAND", + "aabbs": [ + [ 2843, 3434, 2845, 3434 ], + [ 2845, 3435, 2847, 3435 ], + [ 2847, 3436, 2849, 3436 ], + [ 2848, 3435, 2852, 3435 ], + [ 2857, 3415, 2863, 3421 ], + [ 2846, 3433, 2851, 3434 ], + [ 2827, 3423, 2830, 3426 ] + ] + }, + { + "name": "SOUTH_CATHERBY_HILL_BRIGHTNESS_FIX", + "aabbs": [ + [ 2863, 3406, 2876, 3433 ], + [ 2832, 3416, 2842, 3427 ] + ] + }, { "name": "CATHERBY_BANK", "aabbs": [ @@ -2009,9 +2034,70 @@ ] }, { - "name": "KARAMJA_KARAMBWAN_FIX", - "aabbs": [ - [ 2896, 3094, 2942, 3117 ] + "name": "KARAMJA_BEACHES_FIX", + "aabbs": [ + [ 2893, 3117, 2914, 3120 ], + [ 2893, 3114, 2896, 3116 ], + [ 2817, 3131, 2823, 3133 ], + [ 2755, 2947, 2755, 2954 ] + ] + }, + { + "name": "KARAMJA_DUNES", + "aabbs": [ + [ 2842, 3107, 2858, 3112 ], + [ 2842, 3113, 2853, 3114 ], + [ 2830, 3115, 2842, 3116 ], + [ 2830, 3117, 2838, 3119 ], + [ 2829, 3120, 2836, 3122 ], + [ 2829, 3123, 2833, 3124 ], + [ 2829, 3125, 2831, 3126 ], + [ 2827, 3122, 2828, 3127 ], + [ 2825, 3123, 2826, 3126 ], + [ 2811, 3115, 2818, 3119 ], + [ 2811, 3120, 2816, 3123 ], + [ 2812, 3124, 2815, 3125 ], + [ 2809, 3115, 2810, 3122 ], + [ 2859, 3106, 2866, 3109 ], + [ 2863, 3110, 2865, 3110 ], + [ 2859, 3111, 2863, 3111 ], + [ 2870, 3109, 2874, 3111 ], + [ 2872, 3114, 2876, 3115 ], + [ 2873, 3116, 2874, 3123 ], + [ 2875, 3116, 2875, 3120 ], + [ 2801, 3115, 2808, 3118 ], + [ 2804, 3120, 2808, 3121 ], + [ 2804, 3119, 2806, 3119 ], + [ 2801, 3119, 2803, 3120 ], + [ 2795, 3114, 2800, 3116 ], + [ 2795, 3118, 2800, 3119 ], + [ 2795, 3117, 2798, 3117 ], + [ 2790, 3113, 2794, 3115 ], + [ 2793, 3116, 2794, 3117 ], + [ 2792, 3116 ], + [ 2794, 3118 ], + [ 2803, 3122, 2808, 3123 ], + [ 2797, 3121, 2801, 3122 ], + [ 2795, 3120, 2798, 3120 ], + [ 2808, 3124, 2811, 3124 ], + [ 2814, 3126, 2815, 3126 ], + [ 2804, 2975, 2809, 2977 ], + [ 2802, 2974, 2809, 2974 ], + [ 2801, 2973, 2808, 2973 ], + [ 2803, 2975, 2803, 2976 ], + [ 2800, 2972, 2806, 2972 ], + [ 2801, 2971, 2803, 2971 ], + [ 2784, 2968, 2786, 2969 ], + [ 2787, 2968 ], + [ 2784, 2967, 2785, 2967 ], + [ 2922, 3139, 2925, 3140 ], + [ 2924, 3138, 2926, 3138 ] + ] + }, + { + "name": "KARAMJA_WATERFALL_DIRT_FIX", + "aabbs": [ + [ 2926, 2945, 2929, 2954 ] ] }, { diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index 3c725a2c0c..0812672276 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -370,9 +370,16 @@ "materials": [ "SAND_4", "GRAVEL_LIGHT", + "SAND_4_MIRRORED", + "SAND_5" + ] + }, + { + "name": "BEACH_SAND_PLAIN", + "materials": [ "DIRT_1", - "SAND_4", - "DIRT_1" + "GRAVEL_LIGHT", + "SAND_5" ] }, { @@ -519,7 +526,7 @@ "GRUNGE_1", "DIRT_1", "DIRT_2", - "DIRT_1" + "SAND_5" ] }, { diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index acc1eaed37..3ab2ba6de5 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -1409,14 +1409,21 @@ "specularGloss": 10.0 }, { - "name": "SAND_4_N" + "name": "SAND_4", + "normalMap": "DIRT_1_N", + "specularStrength": 0.2, + "specularGloss": 10.0 }, { - "name": "SAND_4", - "normalMap": "SAND_4_N", + "name": "SAND_4_MIRRORED", + "parent": "SAND_4", + "textureScale": [ -1, -1 ,1 ] + }, + { + "name": "SAND_5", + "normalMap": "DIRT_1_N", "specularStrength": 0.2, - "specularGloss": 10.0, - "textureScale": [ 1, 1, 0.65 ] + "specularGloss": 10.0 }, { "name": "GRUNGE_1_N" diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index d35132247f..9d4e100a31 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -3189,7 +3189,8 @@ "SAILING_BT_GWENITH_GLIDE_TELEPORT_MARKER_MEILYR", "SAILING_BT_GWENITH_GLIDE_TELEPORT_MARKER_TRAHAEARN", "SAILING_CHARTING_HINT_MARKER_SPYGLASS", - "XBOWS_INV_FLOOR_NOBLOCK" + "XBOWS_INV_FLOOR_NOBLOCK", + "XBOWS_INV_FLOOR" ] }, { diff --git a/src/main/resources/rs117/hd/scene/textures/sand_4.jpg b/src/main/resources/rs117/hd/scene/textures/sand_4.jpg index 4f3bcee6f6..33bba6c9cd 100644 Binary files a/src/main/resources/rs117/hd/scene/textures/sand_4.jpg and b/src/main/resources/rs117/hd/scene/textures/sand_4.jpg differ diff --git a/src/main/resources/rs117/hd/scene/textures/sand_4_n.png b/src/main/resources/rs117/hd/scene/textures/sand_4_n.png deleted file mode 100644 index 7dc936df50..0000000000 Binary files a/src/main/resources/rs117/hd/scene/textures/sand_4_n.png and /dev/null differ diff --git a/src/main/resources/rs117/hd/scene/textures/sand_5.jpg b/src/main/resources/rs117/hd/scene/textures/sand_5.jpg new file mode 100644 index 0000000000..050f00f305 Binary files /dev/null and b/src/main/resources/rs117/hd/scene/textures/sand_5.jpg differ diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 39bfb7a307..7c35a23f24 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1,15 +1,23 @@ [ { "name": "DEFAULT_GRASS", - "groundMaterial": "OVERWORLD_GRASS_1" + "groundMaterial": "OVERWORLD_GRASS_1", + "maxLightness": 55 }, { "name": "DEFAULT_DIRT", - "groundMaterial": "DIRT" + "groundMaterial": "DIRT", + "maxLightness": 55 }, { "name": "DEFAULT_SAND", - "groundMaterial": "SAND" + "groundMaterial": "SAND", + "maxLightness": 57 + }, + { + "name": "BEACH_SAND", + "groundMaterial": "BEACH_SAND", + "maxLightness": 57 }, { "name": "DEFAULT_SNOW", @@ -7508,6 +7516,7 @@ "overlayIds": [ 25 ], "groundMaterial": "BEACH_SAND", "maxLightness": 60, + "uvOrientation": 150, "replacements": { "WINTER_SAND_BEACH": "season == SeasonalTheme.WINTER" } @@ -7516,8 +7525,8 @@ "name": "SOUTH_CATHERBY_SAND_EXTENSION", "area": "SOUTH_CATHERBY_SEASON_FIX", "overlayIds": [ 25 ], - "groundMaterial": "BEACH_SAND", - "maxLightness": 65, + "groundMaterial": "BEACH_SAND_PLAIN", + "maxLightness": 59, "replacements": { "WINTER_SAND_BEACH": "season == SeasonalTheme.WINTER" } @@ -7527,7 +7536,7 @@ "area": "SOUTH_CATHERBY_SEASON_FIX_EDGE", "underlayIds": [ 62 ], "groundMaterial": "BEACH_SAND", - "maxLightness": 65, + "maxLightness": 60, "minLightness": 52, "shiftLightness": 4, "setSaturation": 3, @@ -7536,10 +7545,34 @@ "WINTER_SAND_BEACH": "season == SeasonalTheme.WINTER" } }, + { + "name": "SOUTH_CATHERBY_PLAIN_SAND", + "area": "SOUTH_CATHERBY_PLAIN_SAND", + "overlayIds": [ 25 ], + "underlayIds": [ 62 ], + "groundMaterial": "BEACH_SAND_PLAIN", + "maxLightness": 60, + "uvOrientation": 150, + "replacements": { + "WINTER_SAND_BEACH": "season == SeasonalTheme.WINTER" + } + }, + { + "name": "SOUTH_CATHERBY_HILL_BRIGHTNESS_FIX", + "area": "SOUTH_CATHERBY_HILL_BRIGHTNESS_FIX", + "overlayIds": [ 25 ], + "underlayIds": [ 48, 62, 64 ], + "groundMaterial": "GRASS_1", + "maxLightness": 48, + "uvOrientation": 150, + "replacements": { + "WINTER_SAND_BEACH": "season == SeasonalTheme.WINTER" + } + }, { "name": "CATHERBY_BEACH_SAND_COLOR_FIX", "area": "CATHERBY_SAND_COLOR_FIX", - "groundMaterial": "BEACH_SAND", + "groundMaterial": "BEACH_SAND_PLAIN", "maxLightness": 55, "setSaturation": 3, "setHue": 8, @@ -8201,15 +8234,15 @@ "minLightness": 13 }, { - "name": "KARAMJA_KARAMBWAN_FIX_NO_BLENDING", - "area": "KARAMJA_KARAMBWAN_FIX", + "name": "KARAMJA_BEACHES_FIX", + "area": "KARAMJA_BEACHES_FIX", + "minHue": 8, + "maxHue": 8, + "setSaturation": 3, "underlayIds": [ 62 ], - "groundMaterial": "PLAIN_DIRT", - "replacements": { - "COMPLEX_TILES_KARAMJA": "blending" - } + "groundMaterial": "BEACH_SAND" }, { "name": "SHILO_VILLAGE_MINE_SURFACE_FIX", @@ -8229,9 +8262,33 @@ "DEFAULT_ROCKY_GROUND": "s <= 2 && l <= 40" } }, + { + "name": "KARAMJA_WATERFALL_DIRT_FIX", + "area": "KARAMJA_WATERFALL_DIRT_FIX", + "overlayIds": [ 26 ], + "groundMaterial": "DIRT" + }, + { + "name": "KARAMJA_DUNES", + "area": "KARAMJA_DUNES", + "underlayIds": [ + 62, + 68 + ], + "replacements": { + "DEFAULT_DIRT": [ + "h <= 8 && s >= 4 && l <= 71", + "h == 9 && s == 2 && l <= 44", + "h == 8 && s == 3 && l <= 34" + ], + "BEACH_SAND": "!blendingTextures", + "DEFAULT_SAND": true + } + }, { "name": "COMPLEX_TILES_KARAMJA", "area": "KARAMJA", + "overlayIds": [ 25 ], "underlayIds": [ 48, 49, @@ -8266,7 +8323,7 @@ "h == 8 && s == 3 && l <= 34" ], "DEFAULT_ROCKY_GROUND": "s <= 2 && l <= 40", - "DEFAULT_SAND": true + "BEACH_SAND": true } }, {