diff --git a/src/main/java/rs117/hd/data/materials/Material.java b/src/main/java/rs117/hd/data/materials/Material.java index 926476c15..d8a2748b4 100644 --- a/src/main/java/rs117/hd/data/materials/Material.java +++ b/src/main/java/rs117/hd/data/materials/Material.java @@ -348,6 +348,9 @@ public enum Material { .setNormalMap(GRAVEL_N) .setSpecular(0.4f, 130) ), + VERTICAL_GRAVEL(GRAVEL, p -> p + .setNormalMap(null) + ), GRAVEL_LIGHT(GRAVEL, p -> p .setBrightness(1.5f) ), diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index ccc16dff3..22adb0cd3 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -1927,18 +1927,16 @@ { "name": "AL_KHARID_GRASS_FIXES", "aabbs": [ - [ 3348, 3293, 0, 3415, 3329, 0 ], - [ 3399, 3267, 0, 3414, 3292, 0 ], - [ 3393, 3269, 0, 3398, 3292, 0 ], - [ 3389, 3274, 0, 3392, 3292, 0 ], - [ 3383, 3290, 0, 3385, 3292, 0 ], - [ 3358, 3292, 0, 3382, 3292, 0 ], - [ 3365, 3291, 0, 3375, 3291, 0 ], - [ 3316, 3328, 0, 3327, 3330, 0 ], - [ 3347, 3298, 0, 3347, 3314, 0 ], - [ 3266, 3262, 0, 3269, 3263, 0 ], - [ 3275, 3294, 0, 3275, 3295, 0 ], - [ 3292, 3328, 0, 3300, 3329, 0 ] + [ 3348, 3293, 3415, 3329 ], + [ 3399, 3267, 3414, 3292 ], + [ 3393, 3269, 3398, 3292 ], + [ 3389, 3274, 3392, 3292 ], + [ 3383, 3290, 3385, 3292 ], + [ 3358, 3292, 3382, 3292 ], + [ 3365, 3291, 3375, 3291 ], + [ 3301, 3328, 3327, 3330 ], + [ 3347, 3298, 3347, 3314 ], + [ 3292, 3328, 3300, 3329 ] ] }, { diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index 2dcf9dc3a..ea9ac5a48 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -46,6 +46,12 @@ "DIRT_2_VERT" ] }, + { + "name": "VERTICAL_GRAVEL", + "materials": [ + "VERTICAL_GRAVEL" + ] + }, { "name": "SNOW_1", "materials": [ diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index d4cdb2a1a..193adaedd 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -1035,6 +1035,12 @@ "blended": false, "shiftLightness": 10 }, + { + "name": "AL_KHARID_MINE_WALLS", + "area": "AL_KHARID_MINE", + "groundMaterial": "VERTICAL_GRAVEL", + "overlayIds": [ 26 ] + }, { "name": "KHARID_PATHS_1", "area": "KHARID_DESERT_REGION", @@ -5180,6 +5186,7 @@ "underlayIds": [ 49, 50, + 52, 62, 61, 64 @@ -5266,13 +5273,64 @@ "maxSaturation": 3, "shiftLightness": 5 }, + { + "name": "KHARID_DIRT", + "groundMaterial": "DIRT", + "maxLightness": 50, + "shiftHue": -1, + "shiftSaturation": -1 + }, + { + "name": "KHARID_GRASS", + "groundMaterial": "OVERWORLD_GRASS_1", + "maxLightness": 50 + }, { "name": "KHARID_SAND_1", "area": "KHARID_DESERT_REGION", + "groundMaterial": "SAND", + "maxLightness": 60, + "shiftHue": -1, + "underlayIds": [ + 45, + 49, + 50, + 52, + 53, + 58, + 61, + 62, + 63, + 64, + 67, + 68, + 69, + 99, + 126, + 129 + ], + "replacements": { + "KHARID_GRASS": [ + "h > 11", + "h > 9 && s > 3", + "h == 9 && s > 4" + ], + "KHARID_DIRT": [ + "h < 8", + "h == 8 && s > 3", + "h == 9 && s == 4" + ] + } + }, + { + "name": "KHARID_DESERT_SAND", + "area": "KHARID_DESERT", "underlayIds": [ 45, 49, 50, + 52, + 53, 58, 61, 62,