diff --git a/src/main/resources/rs117/hd/scene/areas.json b/src/main/resources/rs117/hd/scene/areas.json index 3036cf969e..97fcdec275 100644 --- a/src/main/resources/rs117/hd/scene/areas.json +++ b/src/main/resources/rs117/hd/scene/areas.json @@ -33,8 +33,9 @@ { "name": "TUTORIAL_ISLAND_UNDERGROUND", "aabbs": [ - [ 3067, 9491, 3120, 9534 ] - ] + [ 3062, 9485, 3129, 9535 ] + ], + "hideOtherAreas": true }, { "name": "TUTORIAL_ISLAND_QUEST_BUILDING", @@ -185,7 +186,8 @@ { "name": "LUMBRIDGE_CASTLE_ENTRANCE", "aabbs": [ - [ 3217, 3218, 3218, 3219 ] + [ 3217, 3218, 3218, 3219 ], + [ 3204, 3214 ] ] }, { @@ -194,6 +196,12 @@ [ 3207, 3215, 3210, 3222, 3 ] ] }, + { + "name": "LUMBRIDGE_WINDMILL", + "aabbs": [ + [ 3163, 3303, 3170, 3310 ] + ] + }, { "name": "LUMBRIDGE_SWAMP_PATH_FIX", "aabbs": [ @@ -254,7 +262,7 @@ [ 3225, 3197, 3237, 3198 ], [ 3229, 3195, 3237, 3196 ], [ 3238, 3191, 3261, 3203 ], - [ 3247, 3190, 3252, 3190 ], + [ 3246, 3189, 3253, 3190 ], [ 3262, 3203, 3265, 3203 ], [ 3262, 3202, 3264, 3202 ], [ 3262, 3201, 3263, 3201 ], @@ -432,10 +440,16 @@ [ 3188, 3350, 3194, 3362 ] ] }, + { + "name": "VARROCK_CHAMPIONS_GUILD_ROOF", + "aabbs": [ + [ 3188, 3350, 3194, 3362, 2 ] + ] + }, { "name": "VARROCK_CHAMPIONS_GUILD_KITCHEN", "aabbs": [ - [ 3188, 3352, 3194, 3354 ] + [ 3188, 3352, 3194, 3354, 0 ] ] }, { @@ -503,6 +517,13 @@ [ 3149, 3427, 3164, 3441 ] ] }, + { + "name": "VARROCK_JULIETS_HOUSE_BLACONY", + "aabbs": [ + [ 3165, 3430, 3166, 3436, 1 ], + [ 3155, 3425, 3161, 3426, 1 ] + ] + }, { "name": "VARROCK_JOLLY_BOAR_INN", "aabbs": [ @@ -628,7 +649,8 @@ { "name": "VARROCK_SEWERS", "aabbs": [ - [ 3152, 9856, 3317, 9919 ] + [ 3152, 9856, 3317, 9919 ], + [ 3150, 9906, 3151, 9906 ] ] }, { @@ -1945,6 +1967,58 @@ "NORTH_OF_MUDSKIPPER" ] }, + { + "name": "IMCANDO_PENINSULA_DUNES", + "aabbs": [ + [ 2998, 3147, 3000, 3151 ], + [ 3001, 3147, 3001, 3149 ], + [ 2997, 3141, 3000, 3142 ], + [ 3001, 3141 ], + [ 2998, 3139, 3002, 3140 ], + [ 2999, 3138, 3006, 3138 ], + [ 3000, 3137, 3004, 3137 ], + [ 3001, 3136, 3003, 3136 ], + [ 3005, 3140, 3005, 3141 ], + [ 3017, 3146, 3019, 3149 ], + [ 3017, 3151, 3019, 3158 ], + [ 3020, 3156, 3020, 3158 ], + [ 3019, 3159, 3020, 3159 ], + [ 3021, 3158, 3022, 3160 ], + [ 3023, 3160, 3027, 3161 ], + [ 3022, 3161 ], + [ 3029, 3162, 3030, 3163 ], + [ 3032, 3164, 3033, 3168 ], + [ 3031, 3161 ], + [ 3029, 3161 ], + [ 3032, 3162 ], + [ 2996, 3140 ], + [ 2995, 3146 ], + [ 2996, 3147 ], + [ 2998, 3155 ], + [ 2999, 3156 ], + [ 3002, 3122, 3002, 3125 ], + [ 3003, 3124 ], + [ 3002, 3119, 3002, 3120 ], + [ 2999, 3109, 3000, 3109 ], + [ 2996, 3108, 2997, 3108 ], + [ 2984, 3108, 2985, 3110 ], + [ 2983, 3109 ], + [ 2986, 3109 ], + [ 3023, 3139 ], + [ 3024, 3140 ], + [ 3036, 3156 ], + [ 2999, 3155 ] + ] + }, + { + "name": "IMCANDO_PENINSULA_DUNES_FIX", + "aabbs": [ + [ 3003, 3110, 3005, 3114 ], + [ 3004, 3115, 3004, 3116 ], + [ 3001, 3111 ], + [ 2996, 3109 ] + ] + }, { "name": "SOUTH_FALADOR_FARM", "aabbs": [ @@ -3076,7 +3150,7 @@ [ 3285, 3187, 3290, 3192 ], [ 3289, 3202, 3296, 3206 ], [ 3297, 3185, 3306, 3194 ], - [ 3319, 3191, 3323, 3197 ], + [ 3318, 3191, 3323, 3197 ], [ 3312, 3173, 3318, 3186 ], [ 3313, 3160, 3318, 3165 ], [ 3282, 3159, 3303, 3177 ] @@ -11783,10 +11857,6 @@ "name": "Movario's Base - Library", "regions": [ 16717 ] }, - { - "name": "Black Knights Fort - Entrance Tile Fix", - "aabbs": [ [ 3016, 3519 ] ] - }, { "name": "Black Knights Fort - Basement", "aabbs": [ [ 1857, 4225, 1877, 4252 ] ], diff --git a/src/main/resources/rs117/hd/scene/ground_materials.json b/src/main/resources/rs117/hd/scene/ground_materials.json index e73ba3b763..9c45476db1 100644 --- a/src/main/resources/rs117/hd/scene/ground_materials.json +++ b/src/main/resources/rs117/hd/scene/ground_materials.json @@ -213,6 +213,14 @@ "GRUNGE_3" ] }, + { + "name": "GRUNGE_3_ALT", + "materials": [ + "GRUNGE_3_MIRRORED", + "GRUNGE_3", + "GRUNGE_3_MIRRORED" + ] + }, { "name": "GRUNGE_3_LIGHT_SHINY", "materials": [ diff --git a/src/main/resources/rs117/hd/scene/lights.json b/src/main/resources/rs117/hd/scene/lights.json index 6ebe89d7ef..fd757939dc 100644 --- a/src/main/resources/rs117/hd/scene/lights.json +++ b/src/main/resources/rs117/hd/scene/lights.json @@ -19265,6 +19265,7 @@ "SW_BANDOS_GHOST_VIS", "AHOY_GHOST_DISGUISE", "AHOY_GHOST_DISGUISE_GREEN", + "GHOSTX", "GHOST", "GHOST2", "GHOST3", @@ -21980,6 +21981,25 @@ "QUEST_LUNAR_HANGING_LANTERN" ] }, + { + "description": "LANTERN - VISIBLE ON OTHER PLANES", + "height": 250, + "alignment": "CENTER", + "radius": 300, + "strength": 12.5, + "visibleFromOtherPlanes": true, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "objectIds": [ + "FAI_WIZTOWER_LANTERN" + ] + }, { "description": "Shilo Mine Lantern", "offset": [ -8, 115, 30 ], @@ -22362,7 +22382,6 @@ "GRANDFIREPLACE_OLDBRICK", "XMAS20_POH_FIREPLACE_2_LIT", "FARM_FIREPLACE", - "DRAYNOR_FIREPLACE", "XMAS20_POH_FIREPLACE_3_LIT", "BOARDGAMES_FIREPLACE_SMALL", "FAI_VARROCK_SHANTY_FIREPLACE", @@ -22378,14 +22397,66 @@ "MYQ3_GHETTO_FIREPLACE_TOP_NOOFFSET", "FENK_FIREPLACE", "QIP_DIGSITE_FIREPLACE", - "MYQ3_FIREPLACE_LOOSE_TILE", - "MISTMYST_FIREPLACE_UNLIT", "MISTMYST_FIREPLACE_REVEALED", "MISTMYST_FIREPLACE_LIT", "POH_FIREPLACE_1_LIT", "POH_FIREPLACE_2_LIT" ] }, + { + "description": "DRAYNOR_FIREPLACE_EMBERS", + "offset": [ 0, 25, 40 ], + "alignment": "CENTER", + "radius": 150, + "strength": 30, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "objectIds": [ + "DRAYNOR_FIREPLACE" + ] + }, + { + "description": "DRAYNOR_FIREPLACE_CANDLES_LEFT", + "offset": [ 32, 235, -15 ], + "alignment": "CENTER", + "radius": 75, + "strength": 5, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "objectIds": [ + "DRAYNOR_FIREPLACE_LEFT" + ] + }, + { + "description": "DRAYNOR_FIREPLACE_CANDLES_RIGHT", + "offset": [ 32, 235, 15 ], + "alignment": "CENTER", + "radius": 75, + "strength": 5, + "color": [ + 252, + 148, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 20, + "objectIds": [ + "DRAYNOR_FIREPLACE_RIGHT" + ] + }, { "description": "Lumbridge Castle Fireplace", "offset": [ 50, 70, 0 ], @@ -23170,6 +23241,24 @@ "FAI_VARROCK_SMITHY_HEARTH" ] }, + { + "description": "Varrock Blacksmith Lathe", + "offset": [ -14, 60, 0 ], + "alignment": "CENTER", + "radius": 150, + "strength": 3.5, + "color": [ + 252, + 0, + 0 + ], + "type": "STATIC", + "duration": 0, + "range": 20, + "objectIds": [ + "FAI_VARROCK_SMITHY_LATHE" + ] + }, { "description": "TABLE", "height": 100, @@ -39119,8 +39208,7 @@ }, { "description": "SKULL_WALL_TORCH", - "height": 207, - "alignment": "FRONT", + "offset": [ -10, 207, 0 ], "radius": 300, "strength": 10.5, "color": [ @@ -42365,11 +42453,11 @@ ] }, { - "description": "Tutorial Island Cooking Range", + "description": "Tutorial Island Cooking Range Top", "height": 100, - "offset": [ 53, -53, 48 ], - "radius": 400, - "strength": 6, + "offset": [ 0, -10, -46 ], + "radius": 70, + "strength": 15, "color": [ 252, 148, @@ -42606,7 +42694,25 @@ "strength": 17.5, "color": [ 252, - 148, + 90, + 3 + ], + "type": "FLICKER", + "duration": 0, + "range": 5, + "objectIds": [ + "NEWBIERANGE" + ] + }, + { + "description": "Tutorial Island Cooking Range Front", + "height": 100, + "offset": [ 63, -33, 48 ], + "radius": 100, + "strength": 15, + "color": [ + 252, + 90, 3 ], "type": "FLICKER", @@ -49782,5 +49888,24 @@ "objectIds": [ "MYQ6_ENTRY_HALL_DEFENCE_DOOR" ] + }, + { + "description": "Demon Slayer - Delrith Weakened", + "offset": [ 0, 100, 0 ], + "alignment": "CENTER", + "fadeInDuration": 200, + "fadeOutDuration": 200, + "despawnWithParent": true, + "radius": 300, + "strength": 20, + "color": [ + 255, + 0, + 0 + ], + "type": "STATIC", + "npcIds": [ + "DELRITH_WEAKENED" + ] } ] diff --git a/src/main/resources/rs117/hd/scene/materials.json b/src/main/resources/rs117/hd/scene/materials.json index 17e3e0fc16..0180e70223 100644 --- a/src/main/resources/rs117/hd/scene/materials.json +++ b/src/main/resources/rs117/hd/scene/materials.json @@ -63,7 +63,7 @@ "vanillaTextureIndex": 5 }, { - "name": "ROOF_SHINGLES_1", + "name": "ROOF_SHINGLES_RED", "vanillaTextureIndex": 6, "specularStrength": 0.5, "specularGloss": 30.0 @@ -316,7 +316,7 @@ "vanillaTextureIndex": 43 }, { - "name": "ROOF_SHINGLES_2", + "name": "ROOF_SHINGLES_GRAY", "vanillaTextureIndex": 44 }, { @@ -1610,6 +1610,11 @@ "specularStrength": 0.25, "specularGloss": 30.0 }, + { + "name": "GRUNGE_3_MIRRORED", + "parent": "GRUNGE_3", + "textureScale": [ -1, -1 ,1 ] + }, { "name": "GRUNGE_3_SMOOTH", "parent": "GRUNGE_3", @@ -1884,7 +1889,13 @@ { "name": "ROCK_3_ORE", "parent": "ROCK_3", - "specularStrength": 1.0 + "specularStrength": 1, + "specularGloss": 50, + "textureScale": [ + 1.0, + 1.0, + 0.7 + ] }, { "name": "EADGARS_CAVE_FIX", @@ -1929,7 +1940,12 @@ "name": "ROCK_4_ORE", "parent": "ROCK_4", "displacementScale": 0.08, - "specularStrength": 1.0 + "specularStrength": 1.0, + "textureScale": [ + 1.0, + 1.0, + 0.7 + ] }, { "name": "ROCK_5_D" @@ -1960,7 +1976,12 @@ "name": "ROCK_5_ORE", "parent": "ROCK_5", "displacementScale": 0.08, - "specularStrength": 1.0 + "specularStrength": 1.0, + "textureScale": [ + 1.0, + 1.0, + 0.7 + ] }, { "name": "ROCK_6_N" @@ -2682,6 +2703,18 @@ "parent": "HD_BRICK", "brightness": 3.25 }, + { + "name": "VANILLA_ROOF_SHINGLES_RED", + "parent": "ROOF_SHINGLES_RED", + "specularStrength": 0.35, + "specularGloss": 40.0 + }, + { + "name": "VANILLA_ROOF_SHINGLES_GRAY", + "parent": "ROOF_SHINGLES_GRAY", + "specularStrength": 0.35, + "specularGloss": 40.0 + }, { "name": "HD_ROOF_SHINGLES_N" }, @@ -2689,14 +2722,14 @@ "name": "HD_ROOF_SHINGLES_D" }, { - "name": "HD_ROOF_SHINGLES_1", + "name": "HD_ROOF_SHINGLES_RED", "normalMap": "HD_ROOF_SHINGLES_N", "displacementMap": "HD_ROOF_SHINGLES_D", "displacementScale": 0.11, "specularStrength": 0.35, "specularGloss": 40.0, "materialsToReplace": [ - "ROOF_SHINGLES_1" + "ROOF_SHINGLES_RED" ], "replacementCondition": "modelTextures" }, @@ -2732,12 +2765,12 @@ "replacementCondition": "modelTextures" }, { - "name": "HD_ROOF_SHINGLES_2", + "name": "HD_ROOF_SHINGLES_GRAY", "normalMap": "HD_ROOF_SHINGLES_N", "specularStrength": 0.3, "specularGloss": 30.0, "materialsToReplace": [ - "ROOF_SHINGLES_2" + "ROOF_SHINGLES_GRAY" ], "replacementCondition": "modelTextures" }, @@ -3643,22 +3676,24 @@ "replacementCondition": "season == SeasonalTheme.WINTER" }, { - "name": "WINTER_HD_ROOF_SHINGLES_1", + "name": "WINTER_HD_ROOF_SHINGLES_RED", "normalMap": "HD_ROOF_SHINGLES_N", "specularStrength": 0.5, "specularGloss": 30.0, "materialsToReplace": [ - "HD_ROOF_SHINGLES_1" + "HD_ROOF_SHINGLES_RED", + "VANILLA_ROOF_SHINGLES_RED" ], "replacementCondition": "season == SeasonalTheme.WINTER" }, { - "name": "WINTER_HD_ROOF_SHINGLES_2", + "name": "WINTER_HD_ROOF_SHINGLES_GRAY", "normalMap": "HD_ROOF_SHINGLES_N", "specularStrength": 0.3, "specularGloss": 30.0, "materialsToReplace": [ - "HD_ROOF_SHINGLES_2" + "HD_ROOF_SHINGLES_GRAY", + "VANILLA_ROOF_SHINGLES_GRAY" ], "replacementCondition": "season == SeasonalTheme.WINTER" }, diff --git a/src/main/resources/rs117/hd/scene/model_overrides.json b/src/main/resources/rs117/hd/scene/model_overrides.json index c04f5bcb4f..b32fb7b7ec 100644 --- a/src/main/resources/rs117/hd/scene/model_overrides.json +++ b/src/main/resources/rs117/hd/scene/model_overrides.json @@ -843,7 +843,6 @@ ], "objectIds": [ "FAI_VARROCK_GYPSY_LAMP", - "FAI_VARROCK_GYPSY_LANTERN", "UPASS_CAGE_DUMMY", "UPASS_CAGE_DUMMY_DUMMY", "FAI_VARROCK_SWING_LANTERN", @@ -854,8 +853,6 @@ "FAIRY_MUSHROOM_TORCH_BLUE", "POH_DEMON", "POH_DUNGEON_TREASURE_2", - "II_FENCEGATE_L", - "II_FENCEGATE_LC", "EYEGLO_BATTLE_TORTOISE_REVEAL", "QIP_DIGSITE_SWING_LANTERN", "TOURTRAP_QIP_CART_CAMEL", @@ -1121,7 +1118,6 @@ "TREE3", "TREE4", "LEPRECHAUNTREE", - "NEWBIETREE2", "WOM_TREE", "MAPLETREE", "PEST_TREE2", @@ -1133,7 +1129,6 @@ "DRILL_TREE3", "TREE", "LIGHTTREE", - "NEWBIETREE", "PEST_TREE", "ZEP_TREE", "DRILL_TREE", @@ -1169,7 +1164,6 @@ "TREE4", "LIGHTTREE2", "LEPRECHAUNTREE", - "NEWBIETREE2", "MAPLETREE", "MAPLE_TREE_FULLYGROWN_1", "MAPLE_TREE_FULLYGROWN_2", @@ -1275,7 +1269,6 @@ "objectIds": [ "TREE", "LIGHTTREE", - "NEWBIETREE", "PEST_TREE", "ZEP_TREE", "DRILL_TREE", @@ -1296,6 +1289,29 @@ } } }, + { + "description": "Tree - Lighter", + "baseMaterial": "BARK", + "shiftLightness": 6, + "windDisplacementMode": "VERTEX_WITH_HEMISPHERE_BLEND", + "undoVanillaShading": false, + "objectIds": [ + "NEWBIETREE", + "NEWBIETREE2" + ], + "uvType": "BOX", + "uvScale": 0.8, + "materialOverrides": { + "LEAVES_SIDE": { + "windDisplacementMode": "VERTEX", + "textureMaterial": "LEAVES_ORANGE_SIDE" + }, + "LEAVES_TOP": { + "windDisplacementMode": "VERTEX", + "textureMaterial": "LEAVES_ORANGE_TOP" + } + } + }, { "description": "Tree - Achey Tree", "baseMaterial": "BARK", @@ -1498,7 +1514,6 @@ "MDAUGHTER_IMPASSABLE_TREE", "MDAUGHTER_IMPASSABLE_TREE2", "MDAUGHTER_PASSABLE_TREE", - "NEWBIEDEADTREE2", "MACRO_DIGGER_TREE", "DRAYNOR_DEADTREE", "WILD1_TREE_A", @@ -1524,11 +1539,22 @@ "DARKM_DEAD_TREE_03", "REGICIDE_TREE_DEAD2_D2", "REGICIDE_TREE_SWAMP1", - "REGICIDE_TREE_SWAMP2" + "REGICIDE_TREE_SWAMP2", + "NEWBIEDEADTREE2" ], "uvType": "BOX", "uvScale": 0.8 }, + { + "description": "UNDEAD_TREES", + "baseMaterial": "LIGHT_BARK", + "npcIds": [ + "NASTY_TREE_UNCHOPPABLE", + "NASTY_TREE_CHOPPABLE" + ], + "uvType": "BOX", + "uvScale": 0.7 + }, { "description": "My Arms Big Adventure - Rope Tree", "baseMaterial": "BARK", @@ -3333,6 +3359,7 @@ "GARDEN_WHITE_TREE_WEEDS_1", "GARDEN_WHITE_TREE_WEEDS_2", "GARDEN_WHITE_TREE_WEEDS_3", + "GARDEN_DELPHINIUMS_WEEDS_3", "GARDEN_SNOWDROPS_WEEDS_1", "GARDEN_SNOWDROPS_WEEDS_2", "GARDEN_SNOWDROPS_WEEDS_3", @@ -3923,10 +3950,14 @@ "objectIds": [ "QIP_DS_STONE_WALL_SMALL", "QIP_DS_STONE_WALL_LARGE", + "QIP_DS_STONE_WALL_LARGE_TOP_DOME2", "QIP_DS_STONE_WALL_LARGE_TOP", "QIP_DS_STONE_WALL_SMALL_TOP", "QIP_DS_STONE_WALL_SMALL_TOP_DOME", - "QIP_DS_STONE_TABLE_INTACT" + "QIP_DS_STONE_TABLE_INTACT", + "QIP_DS_STONE_WALL_TOP_DOME", + "QIP_DS_STONE_TABLE_EXPLOSION", + "QIP_DS_STONE_TABLE_DESTROYED" ] }, { @@ -4332,9 +4363,9 @@ { "description": "Lumbridge - Building Walls with roofs", "areas": [ "LUMBRIDGE" ], - "flatNormals": true, "objectIds": [ "ROOF_REDSLATE", + "ROOF_WOODEN_SMALL_FILLER", "ROOFWALLFILLER", "ROOF_DOUBLELENGTH", "ROOFEDGE_DOUBLELENGTH_R", @@ -4344,16 +4375,58 @@ "ROOFEDGE_AL", "ROOFEDGE_ALL", "ROOFEDGE_TIP", - "ROOF_THATCHED" + "ROOF_THATCHED", + "ROOFEDGE_ROUGH", + "ROOFEDGE_ROUGH2", + "ROOFEDGE_REDSLATE", + "ROOF_CHIMNEY_REDSLATE", + "ROOFEDGE_ENDL", + "OLDROOF_REDSLATE", + "WOODENROOF_REDSLATE", + "ROOF_TIP" + ], + "materialOverrides": { + "HD_BRICK": { + "textureMaterial": "HD_BRICK", + "depthBias": 1 + }, + "ROOF_SHINGLES_RED": { + "textureMaterial": "VANILLA_ROOF_SHINGLES_RED", + "shiftLightness": -3 + } + } + }, + { + "description": "Lumbridge - Building Walls with roofs - Gray", + "areas": [ "LUMBRIDGE" ], + "flatNormals": true, + "forceMaterialChanges": true, + "objectIds": [ + "ROOFEDGE_GREYSLATE", + "ROOFEDGE_GREYSLATE", + "OLDROOF_GREYSLATE", + "OLDROOFEDGE_ROUGH2_GREYSLATE", + "OLDROOFEDGE_ROUGH_GREYSLATE", + "OLDROOF_DOUBLELENGTH_GREYSLATE", + "OLDROOF_TIP_GREYSLATE", + "OLDROOF_TIP_X_JUNCTION_GREYSLATE" ], "materialOverrides": { "HD_BRICK": { "textureMaterial": "HD_BRICK" + }, + "ROOF_SHINGLES_GRAY": { + "textureMaterial": "VANILLA_ROOF_SHINGLES_GRAY", + "shiftLightness": -16, + "shiftHue": 5 } } }, { "description": "Lumbridge - Building Walls", + "baseMaterial": "SMOOTH_STONE_LIGHT", + "uvOrientation": 512, + "uvType": "MODEL_XZ", "areas": [ "LUMBRIDGE" ], "textureMaterial": "HD_BRICK", "flatNormals": true, @@ -4362,7 +4435,12 @@ "ROOFWALLFILLER_CHURCH", "BRICKWALL_CHURCH_FRAME", "BRICKWALL_RIVEREDGE", - "BRICKWALLSKEW" + "BRICKWALLSKEW", + "BRICKWALL_CHURCH", + "BRICKWALL_CHURCHBIGWINDOW1L", + "BRICKWALL_CHURCHBIGWINDOW1", + "BRICKWALL_CHURCHBIGWINDOW2L", + "BRICKWALL_CHURCHBIGWINDOW2" ] }, { @@ -4380,6 +4458,9 @@ }, { "description": "Lumbridge - Castle Walls", + "baseMaterial": "SMOOTH_STONE_LIGHT", + "uvOrientation": 512, + "uvType": "MODEL_XZ", "areas": [ "LUMBRIDGE" ], "textureMaterial": "HD_BRICK", "flatNormals": true, @@ -4490,7 +4571,15 @@ "objectIds": [ "FAI_VARROCK_ROOFKIT_SLATE", "FAI_VARROCK_ROOFKIT_SLATE_RAISED", - "FAI_VARROCK_ROOFKIT_SLATE_CUT_CORNER" + "FAI_VARROCK_ROOFKIT_SLATE_CUT_CORNER", + "FAI_VARROCK_ROOFKIT_SLATE_CUT", + "FAI_VARROCK_ROOFKIT_SLATE_CUT_MIRROR1", + "FAI_VARROCK_ROOFKIT_SLATE_CUT_MIRROR", + "FAI_VARROCK_ROOFKIT_SLATE_CUT_CORNER_MIRROR", + "FAI_VARROCK_ROOFKIT_SLATE_WALL", + "FAI_VARROCK_ROOFKIT_SLATE_WALL_CUT", + "FAI_VARROCK_ROOFKIT_SLATE_HORIZ_CUT", + "FAI_VARROCK_ROOFKIT_SLATE_HORIZ_CUT_CORNER" ] }, { @@ -4508,8 +4597,9 @@ }, { "description": "Varrock Fountain Railing and Statues", - "baseMaterial": "STONE_NORMALED", - "depthBias": 100, + "baseMaterial": "STONE_NORMALED_LIGHT", + "uvScale": 0.75, + "undoVanillaShading": false, "objectIds": [ "FAI_VARROCK_CENTRAL_SQUARE_STATUE01", "FAI_VARROCK_CENTRAL_SQUARE_STATUE01", @@ -4522,8 +4612,9 @@ }, { "description": "Varrock Fountain Rocks with Water", - "baseMaterial": "STONE_NORMALED", - "depthBias": 255, + "baseMaterial": "STONE_NORMALED_LIGHT", + "undoVanillaShading": false, + "uvScale": 0.75, "objectIds": [ "FAI_VARROCK_CENTRAL_SQUARE01" ], @@ -4532,8 +4623,7 @@ { "colors": "h >= 34", "baseMaterial": "WATER_FOUNTAIN_FLAT", - "uvType": "MODEL_XZ", - "depthBias": 255 + "uvType": "MODEL_XZ" }, { "colors": "h == 5", @@ -4619,7 +4709,9 @@ "uvScale": 0.6, "objectIds": [ "FAI_VARROCK_SMALL_WALL", + "FAI_VARROCK_SMALL_WALL_CASTLE_FIT_LEFT", "FAI_VARROCK_CASTLE_BATTLEMENT_CAPPED", + "FAI_VARROCK_SMALL_WALL_CASTLE_FIT_RIGHT", "FAI_VARROCK_CASTLE_BATTLEMENT_HILLSKEW", "FAI_VARROCK_CASTLE_BATTLEMENT_HILLSKEW_SHARELIGHT", "FAI_VARROCK_CASTLE_WALL_NO_BACK", @@ -4638,6 +4730,57 @@ "flatNormals": true, "shadowOpacityThreshold": 0.12 }, + { + "description": "GRAND_EXCHANGE_CLAN_RECRUITMENT_BOARD", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "CLAN_RECRUITMENT_TABLE", + "CLAN_RECRUITMENT_BOARD" + ], + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "colors": "h == 37 || h == 5", + "baseMaterial": "GRUNGE_3" + } + ] + }, + { + "description": "GRAND_EXCHANGE_BOARD_GAMES_PILLARS", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "objectIds": [ + "GZ_CANOPY_PILLAR_01", + "GZ_CANOPY_PILLAR_02", + "GZ_CANOPY_PILLAR_03", + "GZ_CANOPY_PILLAR_04" + ] + }, + { + "description": "GRAND_EXCHANGE_BOARD_GAMES_CANOPY", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "objectIds": [ + "GZ_CANOPY_SMALL" + ], + "colorOverrides": [ + { + "colors": "h == 0 || h == 5", + "baseMaterial": "CARPET_LIGHT", + "uvType": "BOX", + "uvScale": 0.65 + } + ] + }, { "description": "Grand Exchange - Stone - Arches and pillared walls", "baseMaterial": "MARBLE_2", @@ -4735,7 +4878,8 @@ "colors": "h == 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvOrientation": 448 + "uvOrientation": 512, + "uvScale": 0.85 } ], "objectIds": [ @@ -4900,6 +5044,7 @@ "uvScale": 0.6, "objectIds": [ "FAI_VARROCK_POOR_WALL", + "FAI_VARROCK_CRUMBLY_WALL7", "FAI_VARROCK_POOR_WALL_TOP", "FAI_VARROCK_POOR_WALL_TOP_ACTIVE", "FAI_VARROCK_POOR_WALL_HOLES", @@ -4911,6 +5056,7 @@ "FAI_VARROCK_WALLS_POOR_CRUMBLE", "FAI_VARROCK_WALLS_POOR_CRUMBLE_SMALL", "FAI_VARROCK_POOR_WALL_TERM", + "VC_BROKEN_WALL", "FAI_VARROCK_POOR_WALL_LVL2_DOUBLE", "FAI_VARROCK_POOR_WALL_LVL2_OFFSET1", "FAI_VARROCK_POOR_WALL_LVL2_OFFSET2", @@ -4952,11 +5098,11 @@ "FAI_VARROCKWALL_HILLSKEW", "FAI_VARROCKWALL", "FAI_VARROCK_INTERIORWALL", + "FAI_VARROCK_SMALL_WALL_FILLER", "FAI_VARROCK_INTERIORWALL_BLACK", "FAI_VARROCK_INTERIORWALL_BLACK_TOP", "FAI_VARROCK_INTERIORWALL_TERM", "FAI_VARROCK_INTERIORWALL_DOUBLE", - "FAI_VARROCK_INTERIOR_BANKWALL_CORNER", "FAI_VARROCK_INTERIOR_BANKWALL_CORNER_END", "FAI_VARROCK_INTERIORWALL_DOUBLE_TERM", "FAI_VARROCK_SMALL_WALL_FILLER_MIRROR", @@ -4986,6 +5132,7 @@ "FAI_VARROCK_CASTLE_GARDEN_FILL", "FAI_VARROCK_CASTLE_GARDEN_FILL_2", "FAI_VARROCK_CASTLE_INTERIOR", + "FAI_VARROCK_CASTLE_CAPPED", "FAI_VARROCK_CASTLE_INTERIOR_RESIZE", "FAI_VARROCK_CASTLE_INTERIOR_TERM_RESIZE", "FAI_VARROCK_CASTLE_INTERIOR_OFFSET", @@ -5054,7 +5201,7 @@ "baseMaterial": "WOOD_GRAIN_3", "colors": "h == 7", "uvType": "BOX", - "uvOrientation": 512, + "uvOrientationZ": 512, "uvScale": 0.6 } ] @@ -5117,26 +5264,39 @@ "FAI_FALADOR_CRENELATION_HILLSKEW", "FAI_FALADOR_INTERIOR_TALLER", "FAI_FALADOR_WALLS_TALLER", - "FAI_FALADOR_WALL_WINDOW_TALLER", "FAI_FALADOR_ROOFKIT_SLATE", + "FAI_FALADOR_ROOF_EDGE_L_OFFSETS", + "FAI_FALADOR_ROOFKIT_SLATE_SHORT1", + "FAI_FALADOR_ROOF_CUT_R_SHORT1", + "FAI_FALADOR_ROOFKIT_SLATE_CORNER_LEFT", + "FAI_FALADOR_ROOF_CUT_L_SHORT2", + "FAI_FALADOR_ROOFKIT_SLATE_SHORT2", "FAI_FALADOR_ROOFKIT_SLATE_CORNER_RIGHT", "FAI_FALADOR_ROOFKIT_SLATE_EDGECUT", "FAI_FALADOR_ROOFKIT_SLATE_TWO", + "FAI_FALADOR_ROOFKIT_SLATE_SHORT3", "FAI_FALADOR_ROOFKIT_SLATE_THREE", "FAI_FALADOR_ROOFKIT_SLATE_OFFSET_UP", "FAI_FALADOR_ROOFKIT_SLATE_OFFSET_UP_2", + "FAI_FALADOR_ROOFKIT_SLATE_SHORT1_MIRROR", "FAI_FALADOR_ROOF_EDGE_OFFSET_UP", + "FAI_FALADOR_ROOFKIT_SLATE_RAISED", + "FAI_FALADOR_ROOF_EDGE_RAISED", + "FAI_FALADOR_ROOF_EDGE_MIRROR_RAISED", + "FAI_FALADOR_ROOFKIT_SLATE_RAISED2", "FAI_FALADOR_CASTLE_WALLS", + "FAI_FALADOR_ROOFKIT_CORNERCUT", "FAI_FALADOR_CASTLE_WALLS_L2", + "FAI_FALADOR_CASTLE_WALLS_CFIX_L2", "FAI_FALADOR_CASTLE_WALLS_FIX_LFT", "FAI_FALADOR_CASTLE_WALLS_2_TALLER", "FAI_FALADOR_CASTLE_WALLS_L2_LFT", + "FAI_FALADOR_ROOF_EDGE_OFFSETS", "FAI_FALADOR_CASTLE_WALLS_L2_5_TERMINATOR_RHT", "FAI_FALADOR_CASTLE_WALLS_L2_5_TERMINATOR_LFT", "FAI_FALADOR_CASTLE_WALLS_SARODOMIN", "FAI_FALADOR_CASTLE_WALLS_SARODOMIN_L2", "FAI_FALADOR_INTERIOR", - "FAI_FALADOR_INTERIOR_WINDOW", "FAI_FALADOR_BATTLEMENTS", "FAI_FALADOR_BATTLEMENTS_2_TALL_TERMINATOR_LFT", "FAI_FALADOR_BATTLEMENTS_2_TALL_TERMINATOR_RHT", @@ -5183,7 +5343,10 @@ "FAI_FALADOR_CASTLE_CRUMBLE_MID", "FAI_FALADOR_INTERIOR_DOUBLE_TALLER", "FAI_FALADOR_CRENELATION", - "FAI_FALADOR_ROOF_EDGE_SHORT1" + "FAI_FALADOR_ROOF_EDGE_SHORT1", + "FAI_FALADOR_ROOF_CUT_L", + "FAI_FALADOR_ROOF_EDGE_SHORT1_MIRROR", + "FAI_FALADOR_ROOF_EDGE_R_SHORT1" ] }, { @@ -5193,12 +5356,20 @@ "uvScale": 0.6, "flatNormals": true, "colorOverrides": [ + { + "description": "Interior Wall", + "colors": "h == 42 && s == 0", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.8 + }, { "description": "Window Frame", - "colors": "h == 5", + "colors": "h > 5 && s > 1 || h == 6 && s == 3", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.8 + "uvScale": 0.8, + "uvOrientationY": 512 }, { "description": "Stained Glass", @@ -5208,7 +5379,8 @@ ], "objectIds": [ "FAI_FALADOR_SHOP_WINDOW", - "FAI_FALADOR_SHOP_WINDOW_CROSSED" + "FAI_FALADOR_SHOP_WINDOW_CROSSED", + "FAI_FALADOR_INTERIOR_WINDOW" ] }, { @@ -5230,7 +5402,8 @@ "colors": "h == 6 && s >= 2", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.8 + "uvScale": 0.6, + "uvOrientationY": 512 }, { "description": "Stained Glass", @@ -5244,7 +5417,8 @@ "FAI_FALADOR_PARTY_ROOM_WALL_WINDOW_BIG", "FAI_FALADOR_PARTY_ROOM_WALL_WINDOW_BIG_TERM", "FAI_FALADOR_PARTY_ROOM_WALL_WINDOW_BIG_TERM_MIRROR", - "FAI_FALADOR_PARTY_ROOM_WALL_WINDOW" + "FAI_FALADOR_PARTY_ROOM_WALL_WINDOW", + "FAI_FALADOR_WALL_WINDOW_TALLER" ] }, { @@ -5294,8 +5468,10 @@ { "description": "Falador - Metallic - White Knight Armor", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "undoVanillaShading": false, "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.2, + "minLightness": 17, "objectIds": [ "FAI_FALADOR_SUITOFAMOUR", "SUITOFARMOUR_WHITEKNIGHT" @@ -5377,6 +5553,8 @@ { "description": "STATUE_OF_SARADOMIN_1", "baseMaterial": "MARBLE_1_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.75, "objectIds": [ "FAI_FALADOR_SARADOMIN_STATUE", "FAI_FALADOR_SARADOMIN_STATUE_GREY" @@ -5384,10 +5562,10 @@ }, { "description": "STONE_SIGNPOST", - "baseMaterial": "GRUNGE_1", + "baseMaterial": "SMOOTH_STONE", "uvType": "BOX", "uvOrientation": 512, - "uvScale": 0.8, + "uvScale": 0.65, "objectIds": [ "FAI_STONE_SIGN_BOTTOM", "FAI_STONE_SIGN_TOP" @@ -6445,10 +6623,10 @@ }, { "description": "Grand Exchange - Stone - Teller Wall", - "baseMaterial": "GRUNGE_3_SHINY", + "baseMaterial": "SMOOTH_STONE", + "shiftLightness": 4, "uvType": "BOX", - "uvScale": 0.7, - "uvOrientation": 1024, + "uvScale": 0.65, "objectIds": [ "EXCHANGE_BANK_WALL", "EXCHANGE_BANK_WALL_BANK", @@ -6462,7 +6640,9 @@ "uvType": "BOX", "uvScale": 0.7, "objectIds": [ - "GZ_FENCE" + "GZ_FENCE", + "GZ_WALL_FENCE_CONNECTOR_LEFT", + "GZ_WALL_FENCE_CONNECTOR_RIGHT" ], "colorOverrides": [ { @@ -6472,6 +6652,12 @@ "uvType": "BOX", "uvOrientation": 512, "uvScale": 0.66 + }, + { + "colors": "h > 10", + "baseMaterial": "LEAVES_1", + "uvType": "BOX", + "uvScale": 0.4 } ] }, @@ -6983,7 +7169,8 @@ "uvScale": 0.6, "uvOrientation": 173, "objectIds": [ - "FAI_FALADOR_NOTICEBOARD" + "FAI_FALADOR_NOTICEBOARD", + "FAI_FALADOR_NOTICEBOARD2" ], "colorOverrides": [ { @@ -6991,7 +7178,7 @@ "colors": "h <= 5", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.8 + "uvScale": 0.4 }, { "description": "Metal", @@ -7049,14 +7236,15 @@ "description": "Varrock - Shayzien - Metal - Metal bars gate", "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", - "uvScale": 0.5, - "uvOrientation": 117, + "uvScale": 0.3, + "uvOrientation": 512, "objectIds": [ "SHAYZIEN_BANK_BARS_DOOR", "FAI_VARROCK_BANK_BARS", "FAI_VARROCK_BANK_BARS_END", "FAI_VARROCK_BANK_BARS_END_MIRROR", - "FAI_VARROCK_BANK_BARS_DOOR" + "FAI_VARROCK_BANK_BARS_DOOR", + "FAI_VARROCK_BANK_BARS_DOOR_MIRROR" ] }, { @@ -7663,7 +7851,8 @@ } ], "objectIds": [ - "GUIDEROPES1" + "GUIDEROPES1", + "GUIDEROPES2" ] }, { @@ -7680,11 +7869,14 @@ { "description": "STATUE_BUST", "baseMaterial": "MARBLE_1_GLOSS", + "uvType": "BOX", + "uvScale": 0.55, "objectIds": [ "BUST3", "MURDER_QIP_BUST_01", "MURDER_QIP_BUST_02", - "MURDER_QIP_BUST_03" + "MURDER_QIP_BUST_03", + "FAI_FALADOR_BUST" ] }, { @@ -7693,13 +7885,21 @@ "OLDCASTLEWALL", "OLDWALL", "CROSS_OLDCASTLEEDGE", + "OLDROOF_GREYSLATE_SMALL_FILLER", "OLDWALL_NO_OCCLUDE", "CASTLEWARS_WALL_SARADOMIN", "CASTLEWARS_CASTLEBATTLEMENTS_SARADOMIN", "CASTLEWARS_BATTLEMENTS_SARADOMIN_BLOCKRANGE", "CASTLEWARS_CASTLEBATTLEMENTS_ZAMORAK", "CASTLEWARS_BATTLEMENTS_SARADOMIN_CLIMBABLE", - "CASTLEWARS_BATTLEMENTS_ZAMORAK_CLIMBABLE" + "CASTLEWARS_BATTLEMENTS_ZAMORAK_CLIMBABLE", + "OLDROOFEDGE_ALL_GREYSLATE", + "OLDROOFEDGE_AL_GREYSLATE", + "OLDROOFWALLFILLER", + "OLDROOFEDGE_DOUBLELENGTH_RR_GREYSLATE", + "OLDROOFEDGE_DOUBLELENGTH_L_GREYSLATE", + "OLDROOFEDGE_DOUBLELENGTH_LL_GREYSLATE", + "OLDROOFEDGE_DOUBLELENGTH_R_GREYSLATE" ], "flatNormals": true }, @@ -8098,7 +8298,8 @@ "GIANTS_FOUNDRY_DUGUPSOIL02_07" ], "inheritTileColorType": "OVERLAY", - "uvType": "WORLD_XZ" + "uvType": "BOX", + "uvScale": 0.75 }, { "description": "Emirs Arena - Ground decoration - Sand - Tiny", @@ -8504,6 +8705,7 @@ "CAVEENTRANCE3", "UPASS_CAVEENTRANCE2", "XMAS20_GOBLIN_CAVE_ENTRANCE", + "XMAS20_GOBLIN_CAVE_ENTRANCE_NOOP", "GA_CAVE", "SHAYZIEN_RIVER_CAVE" ], @@ -10099,7 +10301,8 @@ "baseMaterial": "WOOD_GRAIN_2_SMOOTH", "objectIds": [ "PIER_RAIL_TALL", - "TIMBERWALL_BROWN" + "TIMBERWALL_BROWN", + "GOBLIN_OUTPOST_WALL" ], "uvType": "BOX", "uvScale": 0.5, @@ -11315,10 +11518,15 @@ "WALLKIT_SHAYZIEN_RAIL01", "PVPA_DESERTGATE_OPEN", "WALLKIT_AUBURN01_FENCE01_NOSHADOW", - "GRAB_EVIL_TWIN_WOODENRAILING_HILLSKEW" + "GRAB_EVIL_TWIN_WOODENRAILING_HILLSKEW", + "II_FENCING", + "II_FENCEGATE_L", + "II_FENCEGATE_LC", + "II_FENCEGATE_R" ], "flatNormals": true, "uvType": "BOX", + "uvScale": 0.75, "uvOrientation": 512 }, { @@ -11343,12 +11551,24 @@ }, { "description": "Single row fences - End, joining wall", - "baseMaterial": "GRAY_65", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, "objectIds": [ "FAI_VARROCK_CASTLE_INT_FENCE_JOIN", - "FAI_VARROCK_CASTLE_INT_FENCE_JOIN_MIRROR" + "FAI_VARROCK_WOODENRAILING_FILLER_FIX", + "FAI_VARROCK_CASTLE_INT_FENCE_JOIN_MIRROR", + "FAI_VARROCK_WOODENRAILING_FILLER_MIRROR" ], - "flatNormals": true + "colorOverrides": [ + { + "colors": "h == 10", + "baseMaterial": "SMOOTH_STONE_SEMI_DARK", + "flatNormals": true, + "uvType": "BOX", + "uvScale": 0.6 + } + ] }, { "description": "FENCES_3", @@ -11793,7 +12013,7 @@ "flatNormals": true }, { - "description": "Seers Village - Wooden -Bench", + "description": "Seers Village - Wooden - Bench", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvScale": 0.8, @@ -11961,7 +12181,17 @@ "baseMaterial": "CARPET_LIGHT", "objectIds": [ "DARKM_MIDDLE_RUG_CORNER", - "DARKM_MIDDLE_RUG_STRAIGHT" + "DARKM_MIDDLE_RUG_STRAIGHT", + "FAI_VARROCK_PRETTY_RUG_CORNER", + "FAI_VARROCK_PRETTY_RUG_EDGE", + "FAI_VARROCK_PRETTY_RUG_CENTER", + "FAI_VARROCK_HAIRDRESSER_WELCOME_MAT", + "FAI_VARROCK_SHANTY_RUG_MIDDLE", + "FAI_VARROCK_SHANTY_RUG_SIDE", + "FAI_VARROCK_SHANTY_RUG_CORNER", + "GZ_RUGCORNER", + "GZ_RUGSIDE", + "GZ_RUGMIDDLE" ], "uvType": "WORLD_XZ", "flatNormals": true @@ -12354,9 +12584,15 @@ "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvScale": 0.7, - "flatNormals": true, + "uvOrientationY": 512, "objectIds": [ "WALLSUPPORT" + ], + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH" + } ] }, { @@ -12398,6 +12634,7 @@ "QIP_WATCHTOWER_LADDER_TOP", "DK_LADDER", "DK_LADDERTOP", + "DK_MEETING_LADDERTOP", "DK_MEETING_LADDER", "MYQ3_LADDER_DOWN", "MYQ3_LADDER_UP", @@ -12407,6 +12644,7 @@ "CANAFIS_LADDERTOP", "BARROWS_LADDER", "FAI_FALADOR_LADDER", + "FAI_FALADOR_LADDER_TOP_FORCEAPPROACH_NORTH", "FAI_FALADOR_LADDER_TOP", "FAI_FALADOR_LADDER_TALLER", "KR_CAM_LADDERTOP", @@ -12443,10 +12681,12 @@ "PEST_WATCHTOWER_LADDER", "PEST_WATCHTOWER_LADDER_TOP", "PUZZLE_LADDER", - "PUZZLE_LADDER_TOP" + "PUZZLE_LADDER_TOP", + "_25TH_LADDER_BOTTOM", + "PHOENIXLADDER" ], "uvType": "BOX", - "uvScale": 0.8 + "uvScale": 0.7 }, { "description": "Ladder, rotated UVs - Textured", @@ -12545,7 +12785,7 @@ "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvScale": 0.8, - "uvOrientation": 512, + "uvOrientationY": 512, "objectIds": [ "SARIM_BANNISTER", "SARIM_BANNISTER_END", @@ -12818,8 +13058,8 @@ "colors": "h == 8", "baseMaterial": "METALLIC_1_GLOSS", "uvType": "BOX", - "uvScale": 0.5, - "uvOrientation": 192 + "uvScale": 0.2, + "uvOrientation": 512 }, { "description": "Cushion", @@ -13017,7 +13257,8 @@ "MURDER_QIP_POSH_BENCH", "HOS_BENCH_01", "SOTE_ELF_VILLAGE_BENCH", - "SHAYZIEN_BENCH01" + "SHAYZIEN_BENCH01", + "RD_BENCH2_HALF" ], "uvType": "BOX", "uvScale": 0.75, @@ -13074,7 +13315,7 @@ "description": "Rooftop Agility - Rope Bridge - Rope", "baseMaterial": "ROPE", "uvType": "BOX", - "uvScale": 0.75, + "uvScale": 0.6, "objectIds": [ "SHIPROPE" ] @@ -13182,7 +13423,8 @@ "FARMING_COUNTER_TABLE", "WILDY_HUB_BROKEN_TABLE", "TOURTRAP_QIP_DESERT_TABLE", - "MYQ3_HIDEOUT_LARGE_TABLE" + "MYQ3_HIDEOUT_LARGE_TABLE", + "DRAYNOR_BIG_WOODEN_TABLE" ] }, { @@ -13217,11 +13459,334 @@ "objectIds": [ "SPOOKYCHAIR", "DRAYNOR_CHAIR_COBWEB", - "KR_CAM_SPOOKYCHAIR" + "KR_CAM_SPOOKYCHAIR", + "DRAYNOR_HAUNTED_CHAIR" ], "uvType": "BOX", "flatNormals": true }, + { + "description": "Draynor Manor - Tables with Cloth Coverings", + "baseMaterial": "CARPET", + "shiftLightness": 2, + "objectIds": [ + "DRAYNOR_ROUND_TABLE", + "DRAYNOR_BIGTABLE", + "DRAYNOR_SMALLTABLE" + ], + "uvType": "BOX", + "uvScale": 0.5, + "colorOverrides": [ + { + "colors": "h == 3", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + } + ] + }, + { + "description": "Draynor Manor - Fancy Table", + "baseMaterial": "METALLIC_1", + "objectIds": [ + "DRAYNOR_BIGTABLE2" + ], + "uvType": "BOX", + "uvScale": 0.15, + "colorOverrides": [ + { + "colors": "h == 3", + "baseMaterial": "WOOD_GRAIN", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientation": 300 + } + ] + }, + { + "description": "Draynor Manor - Skeletons", + "baseMaterial": "METALLIC_1", + "objectIds": [ + "GOLEM_SKELETON_1", + "GOLEM_SKELETON_2", + "GOLEM_SKELETON_3", + "GOLEM_SKELETON_2_OFFSET" + ], + "uvType": "BOX", + "uvScale": 0.2, + "colorOverrides": [ + { + "colors": "h == 10", + "shiftLightness": -5, + "baseMaterial": "BONE", + "uvType": "BOX", + "uvScale": 0.2 + } + ] + }, + { + "description": "Draynor Manor - Stairs", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "DRAYNOR_MANOR_STAIRS_UP", + "DRAYNOR_MANOR_STAIRS_DOWN", + "CRYPTSTAIRSDOWN", + "CRYPTSTAIRSUP" + ], + "uvType": "BOX", + "uvScale": 0.7, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.5 + }, + { + "colors": "h == 4", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientation": 512, + "uvType": "BOX", + "uvScale": 0.8 + } + ] + }, + { + "description": "Draynor Manor - Floor Board Holes", + "baseMaterial": "BLACK", + "objectIds": [ + "BROKENFLOORBOARDS1", + "BROKENFLOORBOARDS2", + "BROKENFLOORBOARDS3" + ] + }, + { + "description": "Draynor Manor - Avas Bed", + "baseMaterial": "NONE", + "objectIds": [ + "ANMA_UNCOMF_BED", + "ANMA_COMF_BED" + ], + "colorOverrides": [ + { + "colors": "h == 3", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "colors": "h > 11", + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.5 + } + ] + }, + { + "description": "Draynor Manor - Count Draynor's Coffin", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "objectIds": [ + "VAMPCOFFIN", + "VAMPCOFFIN_ANIMATED" + ], + "npcIds": [ + "COUNT_DRAYNOR_COFFIN" + ], + "uvType": "BOX", + "uvScale": 0.25, + "colorOverrides": [ + { + "colors": "h == 8 && s == 4", + "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "colors": "h == 8 || h == 7", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.25 + } + ] + }, + { + "description": "Draynor Manor - Crypt Curtains", + "baseMaterial": "CARPET_LIGHT", + "objectIds": [ + "DRAYNOR_CRYPT_DRAPES", + "DRAYNOR_CRYPT_CURTAINSR" + ], + "uvType": "BOX", + "uvScale": 0.4, + "colorOverrides": [ + { + "colors": "h == 0 && s == 0", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.25 + } + ] + }, + { + "description": "Draynor Manor - Crypt Curtains - Darken", + "baseMaterial": "CARPET", + "shiftLightness": -5, + "objectIds": [ + "DRAYNOR_CRYPT_DRAPES_BRIGHT" + ], + "uvType": "BOX", + "uvScale": 0.4, + "colorOverrides": [ + { + "colors": "h == 0 && s == 0", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.25 + } + ] + }, + { + "description": "Draynor Manor - Crypt Curtains - Lighten", + "baseMaterial": "CARPET_LIGHT", + "shiftLightness": 3, + "objectIds": [ + "DRAYNOR_CRYPT_CURTAINSL" + ], + "uvType": "BOX", + "uvScale": 0.4, + "colorOverrides": [ + { + "colors": "h == 0 && s == 0", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.25 + } + ] + }, + { + "description": "Draynor Manor - Fireplace", + "baseMaterial": "SMOOTH_STONE", + "objectIds": [ + "DRAYNOR_FIREPLACE_RIGHT", + "DRAYNOR_FIREPLACE", + "DRAYNOR_FIREPLACE_LEFT" + ], + "uvType": "BOX", + "uvScale": 0.5, + "colorOverrides": [ + { + "colors": "h == 5 && s > 1", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65 + }, + { + "colors": "h == 6", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.1 + }, + { + "colors": "h == 8", + "baseMaterial": "GRUNGE_3" + } + ] + }, + { + "description": "Draynor Manor - Oddenstien Equipment", + "baseMaterial": "METALLIC_1", + "shiftLightness": 2, + "objectIds": [ + "DRAYNOR_MACHINE1", + "DRAYNOR_MACHINE2", + "DRAYNOR_MACHINE3", + "DRAYNOR_MACHINE4", + "DRAYNOR_MACHINE5" + ], + "uvType": "BOX", + "uvScale": 0.2, + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 512 + } + ] + }, + { + "description": "Rimmington - Seamstress Table", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.4, + "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + }, + { + "colors": "s == 0 && l < 53", + "baseMaterial": "METALLIC_1" + } + ], + "objectIds": [ + "RIMMINGTON_CLOTHESEQUIP_TABLE" + ] + }, + { + "description": "Seamstress Mannequin", + "baseMaterial": "CARPET_LIGHT", + "uvType": "BOX", + "uvScale": 0.45, + "colorOverrides": [ + { + "colors": "h == 5 || h == 6", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.5 + }, + { + "colors": "h == 7 && s == 0", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX" + } + ], + "objectIds": [ + "CLOTHESMODEL_WOMAN2", + "CLOTHESMODEL_WOMAN1", + "CLOTHESMODEL_MAN2", + "CLOTHESMODEL_MAN1", + "FAI_VARROCK_CLOTHESMODEL_MAN1", + "FAI_VARROCK_CLOTHESMODEL_WOMAN1", + "CLOTHESMODEL2", + "CLOTHESMODEL1" + ] + }, + { + "description": "Varrock - Robin Hood Mannequin", + "baseMaterial": "CARPET_LIGHT", + "uvType": "BOX", + "uvScale": 0.45, + "colorOverrides": [ + { + "colors": "h == 4 || h == 6 || h == 7", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.35 + }, + { + "colors": "h == 0 && s == 0 || h == 0 && s == 7", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX" + } + ], + "objectIds": [ + "FAI_VARROCK_BOW_SHOP_MANEQUIN" + ] + }, { "description": "Camelot - Brimhaven Dungeon - Stone", "baseMaterial": "ROCK_4", @@ -13369,9 +13934,13 @@ { "description": "Wattle Style House (Ardougne, Digsite, Hosidius) - Wooden overhang", "baseMaterial": "WOOD_GRAIN_3", + "uvOrientationX": 512, "uvType": "BOX", - "uvScale": 0.5, + "uvScale": 0.8, + "maxLightness": 23, + "minLightness": 23, "flatNormals": true, + "undoVanillaShading": false, "objectIds": [ "TIMBER_OVERHANG" ] }, { @@ -13420,7 +13989,7 @@ "description": "Candelabra - Wooden", "baseMaterial": "GRUNGE_3", "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.15, "objectIds": [ "CANDLES" ], @@ -13442,11 +14011,19 @@ ] }, { - "description": "Candelabra - Dusty", - "baseMaterial": "METALLIC_1_LIGHT", + "description": "Candelabra - Cobwebs", + "baseMaterial": "GRUNGE_3", "objectIds": [ "SPOOKYCANDLES" ], "uvType": "BOX", - "uvScale": 0.4 + "uvScale": 0.2, + "colorOverrides": [ + { + "colors": "h == 2", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + } + ] }, { "description": "Candlestick Holder", @@ -13493,20 +14070,37 @@ ] }, { - "description": "Decorative Armor", + "description": "Decorative Armor - Keep Vanilla Shading", "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "SUITOFARMOUR", "FAI_VARROCK_SUITOFARMOUR", - "ROYAL_DWARF_ARMOUR2", "DRAGON_SLAYER_QIP_SUITOFARMOUR", "KR_SUITOFARMOUR_DARKKNIGHT", "KR_CAM_SUITOFARMOR", + "WOM_SUITOFARMOUR_SARADOMIN", + "SUITOFARMOUR_SARADOMIN", "SUITOFARMOUR_DARKKNIGHT", - "SLUG2_SUITOFARMOUR_WHITEKNIGHT_BLACK" + "SLUG2_SUITOFARMOUR_WHITEKNIGHT_BLACK", + "DEATH_SUITOFARMOUR", + "OLDSUITOFARMOUR", + "SUITOFARMOUR_VARROCK" ], "uvType": "BOX", - "uvScale": 0.4 + "uvScale": 0.4, + "uvOrientation": 512, + "undoVanillaShading": false + }, + { + "description": "Decorative Armor", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "ROYAL_DWARF_ARMOUR1", + "ROYAL_DWARF_ARMOUR2" + ], + "uvType": "BOX", + "uvScale": 0.4, + "uvOrientation": 512 }, { "description": "STONE_WINDOWS", @@ -13543,11 +14137,30 @@ } ] }, + { + "description": "Skull Wall Torch with Metal Bracket", + "baseMaterial": "GRUNGE_2", + "objectIds": [ + "SKULLTORCH_GRUBBY" + ], + "colorOverrides": [ + { + "colors": "a < 255 || h == 3", + "baseMaterial": "GRAY_125", + "receiveShadows": false, + "upwardsNormals": true + }, + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, { "description": "WALL_SHIELD", "baseMaterial": "METALLIC_1_LIGHT_HIGHGLOSS", "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.25, "uvOrientation": 512, "objectIds": [ "WALLSHIELD3_WHITE", @@ -13560,6 +14173,8 @@ { "description": "MARBLE_STATUE_OF_KING", "baseMaterial": "MARBLE_1_SEMIGLOSS", + "undoVanillaShading": false, + "shiftLightness": 2, "uvType": "BOX", "uvScale": 0.6, "objectIds": [ @@ -13644,11 +14259,32 @@ "uvScale": 0.33, "uvOrientation": 512 }, + { + "description": "Metallic Guilded Chest with Wooden Planks", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "objectIds": [ + "PHOENIXSHUTCHEST", + "PHOENIXOPENCHEST" + ], + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientation": 512, + "colorOverrides": [ + { + "colors": "h == 8", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.2, + "uvOrientation": 512 + } + ] + }, { "description": "Metallic Chest - Textured", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "objectIds": [ "CHESTCLOSED", + "CHESTOPEN", "CHESTCLOSED_NOOP", "TRAPCHEST1", "TRAPCHEST5", @@ -13659,10 +14295,11 @@ "CAVEWITCHCHEST", "TWOCATS_CHEST", "TWOCATS_CHEST_OPEN", - "LUNAR_MOONCLAN_CHEST" + "LUNAR_MOONCLAN_CHEST", + "LOST_TRIBE_CHEST" ], "uvType": "BOX", - "uvScale": 0.33, + "uvScale": 0.25, "uvOrientation": 512 }, { @@ -13699,7 +14336,8 @@ "flatNormals": true, "objectIds": [ "FROG_QUEST_CHEST", - "FROG_QUEST_CHEST_OPEN" + "FROG_QUEST_CHEST_OPEN", + "THBANKCHEST" ], "colorOverrides": [ { @@ -13707,8 +14345,7 @@ "colors": "s == 0", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "uvType": "BOX", - "uvScale": 0.4, - "uvOrientation": -89 + "uvScale": 0.2 } ] }, @@ -13787,7 +14424,9 @@ "CTRATGATEA", "CTRATGATEC", "PRISONDOOR", + "SHANTAY_PRISONDOOR", "ARENA_PRISONDOOR", + "ALIDOOR", "ARENA_INACTIVEGATE", "ARENA_INACTIVEGATE_R", "ARENA_JEREMYDOOR", @@ -13795,6 +14434,7 @@ "ZQSHILOGATECLOSEDR", "PRISONDOOROPEN", "INACTIVEPRISONDOOR", + "INACTIVEPRISONDOOR_L", "PRISONDOOR_R", "PRISONDOOROPEN_R", "PRISONDOOR_L", @@ -13829,6 +14469,8 @@ "PORT_SARIM_JAILDOOR", "NEWBIEDOOR4L", "NEWBIEDOOR4R", + "NEWBIEDOOR5_L", + "NEWBIEDOOR5_R", "ERNEST_DOORCLOSED", "ERNEST_DOORAJAR", "PICKLOCK3_L", @@ -13845,9 +14487,12 @@ "FAI_FALADOR_PARTY_NEG_ROOM_DOOR_BARS_MIRROR", "FAI_FALADOR_PARTY_NEG_ROOM_DOOR_BARS", "FAI_VARROCK_PRISONBARS", + "FAI_VARROCK_PRISONBARS_FIX_B", + "FAI_VARROCK_PRISONBARS_FIX_A", "MURDER_QIP_METALGATECLOSEDL", "MURDER_QIP_METALGATECLOSEDR", "MURDER_QIP_METALGATEOPENL", + "MURDER_QIP_METALGATEOPENL", "MURDER_QIP_METALGATEOPENR", "HILLGIANT_BOSS_EXIT_R", "HILLGIANT_BOSS_EXIT_L", @@ -13983,7 +14628,8 @@ "objectIds": [ "FAI_VARROCK_FOUNTAIN_SPLASH", "ATES_FOUNTAIN", - "MURDERFOUNTAIN" + "MURDERFOUNTAIN", + "HAUNTEDFOUNTAIN" ], "colorOverrides": [ { @@ -14001,6 +14647,7 @@ "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "FURNACE", + "FURNACE2", "VIKING_FURNACE", "VIKING_FURNACE2", "DWARF_KELDAGRIM_FURNACE", @@ -14008,7 +14655,8 @@ "FAI_FALADOR_FURNACE", "FAI_FALADOR_FURNACE_DOOR_LEFT", "FAI_FALADOR_FURNACE_DOOR_RIGHT_MIRROR", - "DARKM_FURNACE" + "DARKM_FURNACE", + "NEWBIEFURNACE" ], "uvType": "BOX" }, @@ -14140,8 +14788,9 @@ "flatNormals": true }, { - "description": "Wizard Tower - Walls and Bridge", + "description": "Wizard Tower - Bridge Corner Tiles", "baseMaterial": "SMOOTH_STONE_VERY_LIGHT", + "undoVanillaShading": false, "uvType": "BOX", "uvScale": 0.7, "objectIds": [ @@ -14172,7 +14821,7 @@ ] }, { - "description": "Marble Staircase Spiral with wooden rails", + "description": "Stone Staircase Spiral with wooden rails", "baseMaterial": "SMOOTH_STONE", "uvType": "BOX", "uvScale": 0.8, @@ -14191,7 +14840,18 @@ "VARROCK_SPIRALSTAIRS_MIDDLE_TALLER", "VARROCK_SPIRALSTAIRSTOP", "FAI_WIZTOWER_SPIRALSTAIRS_MIDDLE", - "FAI_FALADOR_SPIRALSTAIRS" + "FAI_FALADOR_SPIRALSTAIRS", + "DRAYNOR_SPIRALSTAIRS" + ] + }, + { + "description": "Stone Staircase Top Wooden Rails Only", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientationY": 512, + "objectIds": [ + "FAI_FALADOR_SPIRALSTAIRSTOP" ] }, { @@ -14212,10 +14872,10 @@ }, { "description": "STONE Staircase Spiral with wooden rails", - "baseMaterial": "STONE_NORMALED", + "baseMaterial": "SMOOTH_STONE", "uvType": "BOX", "uvOrientation": 765, - "uvScale": 0.4, + "uvScale": 0.75, "colorOverrides": [ { "colors": [ "h == 7 && s > 2", "h == 5 && s == 2" ], @@ -14338,10 +14998,12 @@ "baseMaterial": "METALLIC_1_LIGHT_GLOSS", "objectIds": [ "HANGINGLANTERN", + "FAI_VARROCK_PRETTY_OILLAMP", "FAI_VARROCK_OILLAMP", "FAI_VARROCK_SWING_LANTERN_UNLIT", "FAI_FALADOR_LANTERN", - "LANTERN_OFF" + "LANTERN_OFF", + "FAI_WIZTOWER_LANTERN" ] }, { @@ -14388,6 +15050,18 @@ } ] }, + { + "description": "Wooden Door - Vanilla Textured", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "ELFDOOROPEN", + "ELFDOOR", + "INACTIVEELFDOOR" + ], + "uvType": "BOX", + "uvOrientationY": 512, + "uvScale": 0.5 + }, { "description": "Wooden Door 1 - Fake Plank", "baseMaterial": "WOOD_GRAIN_3", @@ -14481,9 +15155,9 @@ "FAI_VARROCK_DOOR", "FAI_VARROCK_DOOR_OPEN_TALLER", "FAI_VARROCK_DOOR_TALLER", + "BLACKARMDOOR", + "BLACKARMDOOR_OPEN", "FAI_VARROCK_BANK_LOCKED_DOOR", - "HUNDRED_LUMBRIDGE_DOUBLEDOORL", - "HUNDRED_LUMBRIDGE_DOUBLEDOORR", "QIP_SHEEP_SHEARER_POORDOOR", "QIP_SHEEP_SHEARER_POORDOOROPEN", "POORDOOR_DOUBLE_INNER", @@ -14550,6 +15224,7 @@ ], "uvType": "BOX", "flatNormals": true, + "uvOrientationY": 512, "uvScale": 0.65 }, { @@ -14599,15 +15274,20 @@ "CASTLEDOOR", "OPENCASTLEDOOR", "DEATH_CASTLEDOOR", - "CASTLEDOOR_INACTIVE" + "CASTLEDOOR_INACTIVE", + "CRAFTINGGUILDDOOR", + "CHAMPIONDOOR", + "CHAMPIONDOOR_OPEN" ], "flatNormals": true, "uvType": "BOX", + "uvOrientationY": 512, "uvScale": 0.4 }, { "description": "Wooden Door 3 - Fake Plank Golden Handle", "baseMaterial": "WOOD_GRAIN_3", + "uvOrientationY": 512, "uvType": "BOX", "objectIds": [ "LEFAYEUNOPENABLEDOORL", @@ -14684,16 +15364,15 @@ "FAI_FALADOR_DOUBLE_DOOR_R", "FAI_FALADOR_DOUBLE_DOOR_R_OPEN", "SLP_MANSION_DOOR_L", - "SLP_MANSION_DOOR_R" + "SLP_MANSION_DOOR_R", + "HUNDRED_LUMBRIDGE_DOUBLEDOORL", + "HUNDRED_LUMBRIDGE_DOUBLEDOORR" ], "colorOverrides": [ { "description": "Golden Handles", - "colors": "h == 6 && s > 5 && s < 8", - "baseMaterial": "METALLIC_1_SEMIGLOSS", - "uvType": "BOX", - "uvScale": 0.2, - "uvOrientation": 512 + "colors": "h == 6 && s == 7", + "baseMaterial": "METALLIC_1_SEMIGLOSS" } ] }, @@ -14727,6 +15406,7 @@ "FAI_VARROCK_POOR_DOOR_OPEN", "FAI_VARROCK_POOR_DOOR_INACTIVE", "FAI_VARROCK_POOR_DOOR", + "FAI_VARROCK_POOR_DOOR_BOARDED", "FAI_VARROCK_SHANTY_DOOR_OPEN", "FAI_VARROCK_SHANTY_DOOR", "FARMING_SHED_POORDOOR", @@ -14740,7 +15420,8 @@ "SLUG2_VILLAGE_POORDOOR", "PEST_POORDOOROPEN", "PEST_POORDOORALWAYSOPEN", - "MISC_BANK_DOOR" + "MISC_BANK_DOOR", + "PHOENIXDOOR" ], "uvOrientation": 512, "uvScale": 0.4, @@ -14752,7 +15433,7 @@ "uvType": "BOX", "flatNormals": true, "uvOrientationY": 512, - "uvScale": 0.4, + "uvScale": 0.55, "colorOverrides": [ { "description": "Metal", @@ -14767,6 +15448,7 @@ "GUIDORDOOR", "GUIDORDOOROPEN", "FAI_VARROCK_CASTLE_DOOR_OPEN", + "FAI_VARROCK_CASTLE_DOOR_INACTIVE", "FAI_VARROCK_CASTLE_DOOR", "DS2_VARROCK_DOOR_OPEN", "DS2_VARROCK_DOOR", @@ -14780,7 +15462,38 @@ "FAI_VARROCK_WOODENRAILING" ], "uvType": "BOX", - "uvOrientation": 512 + "uvOrientation": 512, + "uvScale": 0.6 + }, + { + "description": "Varrock Castle Railing - With Potted Plant", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_VARROCK_WOODEN_RAILING_CUT" + ], + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.6, + "colorOverrides": [ + { + "colors": "h >= 14", + "baseMaterial": "LEAF_VEINS", + "uvType": "BOX", + "uvScale": 0.3, + "undoVanillaShading": false, + "upwardsNormals": true + }, + { + "colors": "h == 5", + "baseMaterial": "DIRT_2", + "uvType": "MODEL_XZ", + "uvScale": 0.3 + }, + { + "colors": "h == 7 && s == 1 || h == 8", + "baseMaterial": "GRUNGE_3" + } + ] }, { "description": "Varrock Castle - Staircase", @@ -14895,7 +15608,8 @@ "objectIds": [ "FAI_VARROCK_IVY_MEDIUM", "FAI_VARROCK_IVY_SMALL", - "LIGHTHOUSE_IVY01_LARGE01" + "LIGHTHOUSE_IVY01_LARGE01", + "FAI_VARROCK_IVY_LARGE" ] }, { @@ -14938,6 +15652,25 @@ "uvScale": 0.3, "uvOrientation": 1024 }, + { + "description": "Sticks and Rocks - Rubble - Tiny", + "baseMaterial": "SMOOTH_STONE", + "objectIds": [ + "STICKS_TWIGS" + ], + "uvType": "MODEL_XZ", + "uvScale": 0.3, + "uvOrientation": 1024, + "colorOverrides": [ + { + "windDisplacementMode": "VERTEX", + "colors": "h == 6", + "baseMaterial": "LIGHT_BARK", + "uvScale": 0.2, + "uvType": "MODEL_XZ" + } + ] + }, { "description": "Rock-Like Object - Rubble - Small", "baseMaterial": "STONE_NORMALED", @@ -15157,6 +15890,27 @@ "uvType": "WORLD_XZ", "uvScale": 0.85 }, + { + "description": "Lumbridge Swamp - Cave Warning Sign", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvOrientation": 89, + "colorOverrides": [ + { + "description": "Sign Post", + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "flatNormals": true, + "uvOrientation": 512, + "undoVanillaShading": false, + "uvScale": 0.75 + } + ], + "objectIds": [ + "GOBLIN_CAVES_WARNINGSIGN" + ] + }, { "description": "Lumbridge Swamp Tree/Plant", "baseMaterial": "BARK", @@ -15195,11 +15949,37 @@ } ] }, + { + "description": "Lumbridge Swamp - Swampy Sink", + "baseMaterial": "WATER_FOUNTAIN_FLAT", + "objectIds": [ + "HW19_SLIMEY_SINK" + ], + "uvType": "BOX", + "uvScale": 0.3, + "colorOverrides": [ + { + "colors": "h == 0 || h == 10", + "baseMaterial": "METALLIC_1_LIGHT", + "uvScale": 0.2, + "uvType": "BOX" + } + ] + }, { "description": "Lumbridge Swamp - Fire with Pot", - "baseMaterial": "GRUNGE_3", + "baseMaterial": "GRUNGE_2", "objectIds": [ "EMBERS_WITH_PANS" + ], + "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "BARK", + "uvScale": 0.4, + "uvOrientationY": 512, + "uvType": "BOX" + } ] }, { @@ -15251,10 +16031,11 @@ "colorOverrides": [ { "description": "Both required to prevent vanilla texture from disappearing", - "colors": "h == 0 && s == 0 && l < 72", + "colors": "h == 0 && s == 0 && l < 72 || h == 7 || h == 6 && s == 3", "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", - "uvScale": 0.2 + "uvScale": 0.2, + "uvOrientation": 512 }, { "description": "Both required to prevent vanilla texture from disappearing", @@ -15265,6 +16046,34 @@ } ] }, + { + "description": "Lumbridge Windmill - Window", + "baseMaterial": "METALLIC_1", + "shiftLightness": -2, + "uvType": "BOX", + "uvScale": 0.2, + "uvOrientation": 512, + "objectIds": [ + "ELFWINDOW_LIGHT", + "ELFWINDOW_LIGHT_2" + ], + "colorOverrides": [ + { + "colors": "h == 34", + "baseMaterial": "NONE" + } + ] + }, + { + "description": "Lumbridge Windmill - Ladder Trim", + "baseMaterial": "WOOD_GRAIN_3_DARK", + "objectIds": [ + "BAMBOO_DEPTH" + ], + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientation": 512 + }, { "description": "Lumbridge Windmill - Darken moving parts so they don't stick out as much", "baseMaterial": "GRAY_75", @@ -15274,13 +16083,38 @@ "MILLSAIL_BACK" ] }, + { + "description": "Lumbridge - Axe Stump", + "baseMaterial": "METALLIC_1", + "upwardsNormals": true, + "objectIds": [ + "WOODCHIPPINGS", + "LOG_WITHAXE" + ], + "colorOverrides": [ + { + "colors": "h == 4", + "baseMaterial": "LIGHT_BARK", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "colors": "h == 6 && s > 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientationX": 612, + "uvScale": 0.4 + } + ] + }, { "description": "Scarecrow", "baseMaterial": "CARPET_LIGHT", "uvType": "BOX", "uvScale": 0.35, "objectIds": [ - "SCARECROW" + "SCARECROW", + "RIMMINGTON_SCARECROW" ], "colorOverrides": [ { @@ -15381,6 +16215,7 @@ "description": "Objects - Rocks - Medium", "baseMaterial": "ROCK_1_LIGHT", "objectIds": [ + "VARROCK_QUETZAL_LANDING_SITE_HIDDEN", "WATERFALLSQUISHEDROCKS", "FAI_VARROCK_ROCKS", "FAI_VARROCK_ROCKS_LARGE", @@ -15518,6 +16353,8 @@ "DOV_HUNTING_BOULDER1_OP", "DOV_HUNTING_BOULDER2", "DOV_HUNTING_BOULDER2_OP", + "DOV_HUNTING_BOULDER1_NOOP", + "DOV_HUNTING_BOULDER2_NOOP", "DS2_GRAVE_ROCKS", "DORGESH_CAVES_ROCKS_SMALL_02", "DORGESH_CAVES_ROCKS_SMALL_03", @@ -15619,6 +16456,8 @@ "description": "Inconspicuous Rocks", "baseMaterial": "BARK", "objectIds": [ + "HIDEY_UNBUILT_BUSH_BEGINNER", + "HIDEY_BUSH_BEGINNER", "HIDEY_UNBUILT_BUSH_EASY", "HIDEY_BUSH_EASY", "HIDEY_UNBUILT_BUSH_MEDIUM", @@ -15847,13 +16686,54 @@ "FAI_VARROCK_DRAINS2" ] }, + { + "description": "Varrock - Cloth - Bank barrier", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.7, + "objectIds": [ + "FAI_VARROCK_BANK_BARRIER_END", + "FAI_VARROCK_BANK_BARRIER", + "FAI_VARROCK_INTERIOR_BANKWALL_CORNER" + ], + "colorOverrides": [ + { + "colors": "h == 19", + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.35 + }, + { + "description": "Interior Wallpaper", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "colors": "h == 8 && s > 3" + }, + { + "description": "Interior Wallpaper", + "baseMaterial": "GRUNGE_3", + "colors": "h == 8", + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "description": "Interior trim", + "baseMaterial": "WOOD_GRAIN_3", + "colors": "h == 7", + "uvType": "BOX", + "uvScale": 0.45, + "setLightness": 30 + } + ] + }, { "description": "Sinclair Mansion Drain", "baseMaterial": "STONE_NORMALED", "uvType": "BOX", "uvScale": 0.75, "objectIds": [ - "MURDERDRAIN" + "MURDERDRAIN", + "QIP_DS_QUESTDRAIN_KEY", + "QIP_DS_QUESTDRAIN_NOKEY" ], "colorOverrides": [ { @@ -16209,6 +17089,7 @@ "FAI_VARROCK_RUBBLES2", "FAI_VARROCK_RUBBLES3", "FAI_VARROCK_RUBBLES4", + "FAI_VARROCK_RUBBLES5", "FAI_VARROCK_RUBBLES_LARGE", "SWAMP_DIGDUGUPSOIL1", "SWAMP_DIGDUGUPSOIL3", @@ -16289,7 +17170,7 @@ "FAI_BARBARIAN_ABODE_WALL_SHORTER" ], "uvType": "BOX", - "uvOrientation": 1536, + "uvOrientationZ": 1536, "uvScale": 0.66 }, { @@ -16310,6 +17191,7 @@ "objectIds": [ "DWARFHUT_WOODEN_ROOF", "DWARFHUT_WOODEN_ROOF1", + "DWARFHUT_WOODEN_ROOF_MID_EDGE", "FAI_BARBARIAN_LONGHALL_ROOF1", "FAI_BARBARIAN_LONGHALL_ROOF2", "FAI_BARBARIAN_LONGHALL_ROOF3", @@ -16319,7 +17201,8 @@ ], "uvType": "BOX", "uvScale": 0.66, - "uvOrientation": 512 + "uvOrientation": 512, + "depthBias": 1 }, { "description": "Barbarian Hall - Roof Corners - Wooden - Planks", @@ -16348,7 +17231,8 @@ "uvType": "BOX", "uvScale": 0.66, "uvOrientationX": 512, - "uvOrientationZ": 512 + "uvOrientationZ": 512, + "depthBias": 1 }, { "description": "Round Rug", @@ -16488,10 +17372,6 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "GERTRUDEEMPTY_CRATE", - "FAI_VARROCK_LARGE_CRATE", - "FAI_VARROCK_LARGE_CRATES", - "FAI_VARROCK_SMALL_CRATES", - "FAI_VARROCK_RED_CRATE", "FAI_VARROCK_GREEN_CRATE", "AHOY_BOXES_1", "FARMING_CRATE", @@ -16522,7 +17402,6 @@ "LOTR_MINE_CRATE", "LOTR_MINE_CRATE_STACKED", "CANAFIS_CRATE", - "FAI_FALADOR_SMALL_CRATES", "KR_MERLINCRATE_EMPTY2", "KR_UNDERGROUND_JAIL_CRATE", "KR_UNDERGROUND_JAIL_CRATES_STACKED", @@ -16570,6 +17449,41 @@ "uvType": "BOX", "flatNormals": true }, + { + "description": "Objects - Wooden - Crate - Don't Undo Vanilla Shading", + "undoVanillaShading": false, + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_VARROCK_LARGE_CRATE", + "FAI_VARROCK_LARGE_CRATES", + "FAI_VARROCK_RED_CRATE", + "DADDYSHOME_CRATES", + "GOBLIN_OUTPOST_LARGE_CRATE_ARMOUR1" + ], + "uvType": "BOX", + "uvScale": 0.8 + }, + { + "description": "Objects - Wooden - Small Crate - Don't Undo Vanilla Shading", + "undoVanillaShading": false, + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_VARROCK_SMALL_CRATES" + ], + "uvType": "BOX", + "uvOrientationY": 170, + "uvScale": 0.6 + }, + { + "description": "Objects - Wooden - Small Crate 550 degree top", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "DK_BOXES" + ], + "uvType": "BOX", + "uvOrientationY": 550, + "uvScale": 0.6 + }, { "description": "Objects - Wooden - Crate - Stacked - 256 degree angled top", "baseMaterial": "WOOD_GRAIN_3", @@ -16660,7 +17574,8 @@ "CRATE_WOODEN01_REINFORCED01_STACKED01_IMCANDO01", "CRATE_WOODEN01_REINFORCED01_IMCANDO01", "CRATE_WOODEN01_REINFORCED01_OPEN01_IMCANDO01", - "SLUG2_LIGHTHOUSE_CRATE_STACK" + "SLUG2_LIGHTHOUSE_CRATE_STACK", + "BANANACRATE" ], "uvType": "BOX", "flatNormals": true, @@ -16682,7 +17597,8 @@ "MYQ4_EMPTY_CRATE", "LUC2_MOV_CRATES_STACKED", "LANDS_END_HUNTER_CRATE", - "PEST_CRATES" + "PEST_CRATES", + "CHICKEN_CRATE" ], "uvType": "BOX", "flatNormals": true, @@ -16719,6 +17635,20 @@ "uvOrientationX": 512, "uvOrientationZ": 512 }, + { + "description": "Objects - Wooden - Stack of crates - Small - Angled", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_FALADOR_SMALL_CRATES", + "DRAYNOR_SMALL_CRATES" + ], + "uvType": "BOX", + "uvScale": 0.5, + "flatNormals": true, + "uvOrientationY": 170, + "uvOrientationX": 512, + "uvOrientationZ": 512 + }, { "description": "Objects - Wooden - Stack of crates - Rotated", "baseMaterial": "WOOD_GRAIN_3", @@ -16766,6 +17696,7 @@ "DWARF_KELDAGRIM_WOODEN_BOXES_NO_OPS" ], "uvType": "BOX", + "uvScale": 0.8, "flatNormals": true, "uvOrientationY": 600, "uvOrientationX": 512, @@ -17018,7 +17949,7 @@ }, { "description": "Metallic - Ground - Armor", - "baseMaterial": "METALLIC_2", + "baseMaterial": "METALLIC_1", "objectIds": [ "DAMAGEDARMOUR1", "DAMAGEDARMOUR2", @@ -17027,7 +17958,7 @@ ], "uvType": "BOX", "uvOrientation": 256, - "uvScale": 0.7 + "uvScale": 0.15 }, { "description": "Objects - Metallic - Chair - Broken", @@ -17064,7 +17995,8 @@ "uvScale": 0.3, "objectIds": [ "FAI_VARROCK_RANGE", - "FAI_VARROCK_RANGE_WITH_PIPE" + "FAI_VARROCK_RANGE_WITH_PIPE", + "RIMMINGTON_POOR_RANGE" ] }, { @@ -18286,7 +19218,9 @@ "HOS_STOOL_03", "BR_STOOL", "LUC2_MOV_STOOL", - "PEST_STOOL" + "PEST_STOOL", + "TOTE_PORTAL_TO_GOTR_CHILD_HIDDEN", + "DK_STOOL" ], "uvType": "BOX", "flatNormals": true, @@ -18321,7 +19255,8 @@ "CON_CONTRACT_VARROCK_SOUTH_SMALL_TABLE_REGULAR", "CON_CONTRACT_VARROCK_SOUTH_SMALL_TABLE_MAHOGANY", "AIDE_TABLE_SMALL", - "MYQ6_VANESCULA_TABLE" + "MYQ6_VANESCULA_TABLE", + "MISTMYST_TABLE_KNIFE" ], "uvType": "BOX", "flatNormals": true @@ -20309,6 +21244,30 @@ } ] }, + { + "description": "Restless Ghost Altar with Skull", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "objectIds": [ + "RESTLESS_GHOST_ALTAR_SKULL", + "RESTLESS_GHOST_ALTAR_NO_SKULL" + ], + "shiftSaturation": -1, + "colorOverrides": [ + { + "colors": "h == 5 || h == 6 && s != 1", + "baseMaterial": "MARBLE_1", + "uvType": "BOX", + "uvScale": 0.6, + "shiftSaturation": -2, + "shiftLightness": 7 + }, + { + "colors": "h == 8 || h == 9", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, { "description": "Player Killing - Loot Key Chest", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", @@ -20322,7 +21281,8 @@ } ], "objectIds": [ - "WILDY_HUB_LOOT_CHEST_CLOSED" + "WILDY_HUB_LOOT_CHEST_CLOSED", + "WILDY_HUB_LOOT_CHEST_CLOSED_SHIFTED" ] }, { @@ -20451,7 +21411,8 @@ "objectIds": [ "OLDCHAIR", "OLDCHAIR2", - "PISCARILIUS_CHAIR_02" + "PISCARILIUS_CHAIR_02", + "DADDYSHOME_CHAIR_BROKEN_0OP" ] }, { @@ -20542,6 +21503,7 @@ "description": "Blue Cushion", "colors": "h > 30", "baseMaterial": "CARPET", + "shiftLightness": 2, "uvType": "BOX", "uvScale": 0.65 }, @@ -20564,7 +21526,32 @@ "POSH_CHAIR", "FAI_VARROCK_CHAIR_BLUE", "FAI_FALADOR_POSH_CHAIR_WHITE", - "POSH_CHAIR_WHITE" + "POSH_CHAIR_WHITE", + "FAI_VARROCK_JULIET_CHAIR" + ] + }, + { + "description": "Wooden Table - Blue Cloth with Gold Decorations", + "baseMaterial": "CARPET", + "shiftLightness": 2, + "uvType": "BOX", + "uvScale": 0.5, + "colorOverrides": [ + { + "colors": "h == 0 && s == 0", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.2 + }, + { + "colors": "h == 9 && s == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.2 + } + ], + "objectIds": [ + "FAI_VARROCK_POSH_BIG_TABLE_BLUE" ] }, { @@ -20760,7 +21747,7 @@ ], "colorOverrides": [ { - "colors": "h > 3", + "colors": "h > 3 && h < 10", "baseMaterial": "LIGHT_BARK", "uvType": "BOX", "uvScale": 0.25 @@ -20841,7 +21828,7 @@ ] }, { - "description": "Varrock Scatle - Ardougne Castle - Bathroom Table", + "description": "Varrock Castle - Ardougne Castle - Bathroom Table", "baseMaterial": "GRUNGE_3", "uvType": "BOX", "uvScale": 0.5, @@ -20853,10 +21840,26 @@ { "description": "Wood", "baseMaterial": "WOOD_GRAIN_3", - "colors": "s > 0", - "uvScale": 0.8, + "colors": "h > 0 && h < 8", + "uvScale": 0.65, "uvType": "BOX", - "uvOrientation": 179 + "uvOrientation": 512 + } + ] + }, + { + "description": "Objects - Bath", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "objectIds": [ + "FAI_FALADOR_BATH" + ], + "colorOverrides": [ + { + "description": "Wood", + "baseMaterial": "MARBLE_4_LOW_CONTRAST_LIGHT_GLOSS", + "colors": "h == 42", + "uvScale": 0.6, + "uvType": "BOX" } ] }, @@ -20866,7 +21869,8 @@ "objectIds": [ "KR_BATHMIRROR", "BATHMIRROR", - "GRIM_WITCH_HOUSE_BATHMIRROR" + "GRIM_WITCH_HOUSE_BATHMIRROR", + "BATHMIRROR_SMALL" ], "uvType": "BOX", "uvScale": 0.33, @@ -20975,7 +21979,8 @@ "FULL_TWIG_LIGHT", "BROKEN_TWIG_LIGHT", "GROUNDCOVER_STRANGLER01_TWIGS04", - "TWIG_SAVANNAH_FULL01" + "TWIG_SAVANNAH_FULL01", + "FULL_TWIG_DARK" ] }, { @@ -21069,7 +22074,8 @@ "uvType": "BOX", "uvScale": 0.8, "objectIds": [ - "HAMMOCK" + "HAMMOCK", + "HAMMOCK_SWINGING" ] }, { @@ -21266,10 +22272,11 @@ "description": "Gnome - Objects - Wooden - Staircase Rails - Textured", "baseMaterial": "WOOD_GRAIN_3_LIGHT", "uvType": "BOX", - "uvOrientation": 512, + "uvOrientationY": 512, "uvScale": 0.8, "objectIds": [ - "SPIRALSTAIRSTOP_WOODEN" + "SPIRALSTAIRSTOP_WOODEN", + "SPIRALSTAIRSTOP_3" ] }, { @@ -21660,8 +22667,7 @@ "ROOFTOP_FOOTPRINTS_BROWN", "ROOFTOP_FOOTPRINTS_DIAGONAL_BROWN" ], - "castShadows": false, - "receiveShadows": false + "castShadows": false }, { "description": "Zanaris - Walls - Grass", @@ -21996,6 +23002,16 @@ "uvType": "BOX", "uvOrientation": 512 }, + { + "description": "Al-Kharid Roof Support Beams", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "DESERTROOFBEAMS" + ], + "uvType": "BOX", + "uvOrientationY": 512, + "uvScale": 0.5 + }, { "description": "Pollnivneach Windows", "baseMaterial": "WATTLE_1", @@ -22034,6 +23050,22 @@ "EGYPT_THRONE" ] }, + { + "description": "Al-Kharid Small Table", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.55, + "retainVanillaUvs": false, + "objectIds": [ + "EGYPT_SMALL_TABLE" + ], + "colorOverrides": [ + { + "colors": "h == 8", + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, { "description": "Al-Kharid Pillars", "baseMaterial": "MARBLE_3", @@ -22046,11 +23078,22 @@ ] }, { - "description": "Al-Kharid stone stable with pillars", - "baseMaterial": "STONE", + "description": "Al-Kharid stone table with pillars", + "baseMaterial": "GRUNGE_3", + "retainVanillaUvs": false, + "uvScale": 0.75, + "uvType": "BOX", "objectIds": [ "EGYPT_TABLE", - "EGYPT_TABLE_2" + "EGYPT_TABLE_2", + "EGYPT_TABLE_CARPET_EXHIBIT" + ], + "colorOverrides": [ + { + "colors": "h == 8 && s == 1", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX" + } ] }, { @@ -22198,7 +23241,16 @@ "DESERTDOOROPEN" ], "uvType": "MODEL_XY", - "uvScale": 0.80 + "uvScale": 0.80, + "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 512 + } + ] }, { "description": "Pollnivneach Double Doors", @@ -22263,7 +23315,8 @@ }, { "description": "AL Kharid - Bed and Chair", - "baseMaterial": "CARPET", + "baseMaterial": "CARPET_LIGHT", + "uvScale": 0.6, "uvType": "BOX", "objectIds": [ "EGYPT_BED", @@ -22311,6 +23364,24 @@ ], "uvType": "BOX" }, + { + "description": "Kharidian Tent Old Top", + "baseMaterial": "SMOOTH_STONE", + "uvScale": 0.6, + "objectIds": [ + "TENTROOFOLD" + ], + "uvType": "BOX" + }, + { + "description": "Shanty Pass Doorway", + "retainVanillaUvs": false, + "uvScale": 0.6, + "objectIds": [ + "SHANTAY_PASS_HENGE_DOORWAY" + ], + "uvType": "BOX" + }, { "description": "Metal Monkeybars", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", @@ -22329,8 +23400,17 @@ "objectIds": [ "ROOFTOPS_ARROWSIGN" ], - "uvType": "MODEL_XY", - "uvOrientation": 512 + "uvType": "BOX", + "uvScale": 0.6, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1", + "uvType": "BOX", + "shiftLightness": 2, + "uvScale": 0.2 + } + ] }, { "description": "Nardah Sophanem - Walls - Rock", @@ -22441,6 +23521,7 @@ "baseMaterial": "GRUNGE_3", "objectIds": [ "POTTEDFERN1", + "POTTEDFERN", "POTTEDSMALLFERN", "POTTEDFERN2" ], @@ -23097,7 +24178,9 @@ "ELID_MAYOR_STAIRS", "ELID_MAYOR_STAIRSTOP", "FAI_VARROCK_STAIRS", - "FAI_VARROCK_STAIRS_TOP" + "FAI_VARROCK_STAIRS_TOP", + "FAI_VARROCK_BANK_STAIRS", + "FAI_VARROCK_STAIRS_FROM_CELLAR" ] }, { @@ -23156,7 +24239,8 @@ "XBOWS_JUNGLETREE_ROPE_GRAPPLED", "XBOWS_JUNGLETREE_BASIC", "XBOWS_JUNGLETREE_ROPE_TIED", - "DRAGON_SLAYER_QIP_BURNT_JUNGLE_TREE3" + "DRAGON_SLAYER_QIP_BURNT_JUNGLE_TREE3", + "JUNGLETREE2_BIG" ], "uvType": "BOX", "uvScale": 0.4, @@ -23772,11 +24856,13 @@ { "description": "Drill Sergent - Tank", "baseMaterial": "METALLIC_1_LIGHT", + "uvOrientation": 512, "objectIds": [ "BARRACK_TANK", "BATHPIPES" ], - "uvType": "BOX" + "uvType": "BOX", + "uvScale": 0.25 }, { "description": "Drill Sergent - Barricade, Obstacle Net, Target & Wire Post", @@ -25298,7 +26384,9 @@ "GOBLIN_OUTPOST_POORDOOR_DOUBLE_INNER", "GOBLIN_OUTPOST_OPENPOORDOOR_DOUBLE_INNER", "GOBLIN_OUTPOST_POORDOOR_DOUBLER_INNER", - "GOBLIN_OUTPOST_OPENPOORDOOR_DOUBLER_INNER" + "GOBLIN_OUTPOST_OPENPOORDOOR_DOUBLER_INNER", + "GOBLIN_OUTPOST_POORDOOR_DOUBLE_INNER_NOOP", + "GOBLIN_OUTPOST_POORDOOR_DOUBLER_INNER_NOOP" ], "uvType": "BOX", "uvOrientation": 512, @@ -25339,10 +26427,144 @@ }, { "description": "Goblin Village Wooden Ladder", - "baseMaterial": "WOOD_GRAIN", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientationY": 512, + "uvScale": 0.6, + "uvType": "BOX", "objectIds": [ "GOBLIN_LADDER_BOTTOM", - "GOBLIN_LADDER_TOP" + "GOBLIN_LADDER_TOP", + "GOBLIN_LADDER_MIDDLE" + ] + }, + { + "description": "Goblin Village Wooden Ladder with Hole", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "_100_GOBLIN_LADDER_DOWN" + ], + "colorOverrides": [ + { + "colors": [ "h == 5" ], + "baseMaterial": "DIRT_1", + "uvType": "BOX", + "uvScale": 0.5 + } + ] + }, + { + "description": "Goblin Village Banner Pole", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientationY": 512, + "uvType": "BOX", + "uvScale": 0.65, + "objectIds": [ + "GOBLIN_BANNER_POLE" + ] + }, + { + "description": "Goblin Village Animated Banner", + "baseMaterial": "CARPET_LIGHT", + "shiftLightness": 3, + "objectIds": [ + "GOBLIN_BANNER_RED", + "GOBLIN_BANNER_GREEN" + ], + "colorOverrides": [ + { + "colors": [ "h == 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65, + "uvOrientation": 512 + } + ] + }, + { + "description": "Goblin Village Wall Banner", + "baseMaterial": "CARPET_LIGHT", + "shiftLightness": 3, + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "GOBLIN_WALL_FLAG_RED", + "GOBLIN_WALL_FLAG_GREEN", + "GOBLIN_CHANGING_CURTAIN" + ], + "colorOverrides": [ + { + "colors": [ "h == 5" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientationX": 512 + }, + { + "colors": [ "h == 2" ], + "baseMaterial": "METALLIC_1_LIGHT" + } + ] + }, + { + "description": "Goblin Village - Timber Defence", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "uvType": "BOX", + "uvScale": 0.15, + "colorOverrides": [ + { + "colors": "h == 7 && s == 3", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 512 + }, + { + "colors": "h == 7 && s == 4", + "baseMaterial": "BARK", + "shiftLightness": 3, + "uvType": "BOX", + "uvScale": 0.5 + } + ], + "objectIds": [ + "GOBLIN_TIMBERDEFENCE_NEW" + ] + }, + { + "description": "Goblin Village - Roof Middle", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientation": 512, + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "_100_GOBLIN_ROOF_TOP", + "_100_GOBLIN_ROOF_END_MIRROR", + "_100_GOBLIN_ROOF_END", + "_100_GOBLIN_ROOF_TOP_LOWER", + "_100_GOBLIN_ROOF_END2", + "_100_GOBLIN_ROOF_END2_MIRROR", + "_100_GOBLIN_ROOF_BEFORE_EX" + ] + }, + { + "description": "Goblin Village - Roof Middle - Not Rotated", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "_100_GOBLIN_ROOF1", + "_100_GOBLIN_ROOF2" + ] + }, + { + "description": "Goblin Village - Roof Edge", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "objectIds": [ + "_100_GOBLIN_ROOF" ] }, { @@ -29507,6 +30729,7 @@ "baseMaterial": "LEAF_VEINS", "uvType": "MODEL_XZ", "windDisplacementMode": "OBJECT", + "undoVanillaShading": false, "uvScale": 0.25, "objectIds": [ "SMALLFERN", @@ -29520,7 +30743,9 @@ "PLANT_FERN_TLATI01", "PLANT_FERN_TLATI02", "PLANT_FERN_TLATI03", - "PLANT_FERN_TLATI04" + "PLANT_FERN_TLATI04", + "MISTMYST_HEWEY_FERN_VIS", + "MISTMYST_ABIGALE_FERN_VIS" ] }, { @@ -29587,7 +30812,9 @@ "DOV_HUNTING_PLANT1_OP", "DOV_HUNTING_PLANT_INITIAL", "PLANT_TROPICAL_01", - "IG_PLANT_FLAT" + "IG_PLANT_FLAT", + "DOV_HUNTING_PLANT1_NOOP", + "DOV_HUNTING_PLANT1_OP" ] }, { @@ -29753,6 +30980,8 @@ { "description": "Generic - Plank - Tables - Picnic Bench", "baseMaterial": "WOOD_GRAIN_3", + "minLightness": 10, + "undoVanillaShading": false, "objectIds": [ "FAI_VARROCK_POSH_BENCH", "FAI_VARROCK_FULL_BENCH" @@ -29851,7 +31080,8 @@ "description": "Objects - Stone - Dessous Gravestone - Large", "baseMaterial": "STONE_NORMALED", "objectIds": [ - "VAMPIRE_BIG_GRAVE_NOBLOOD" + "VAMPIRE_BIG_GRAVE_NOBLOOD", + "FAIRY_DRAYNOR_GRAVESTONE" ], "uvType": "GEOMETRY", "flatNormals": true @@ -29877,7 +31107,8 @@ "MURDER_QIP_CONTEST_FENCE", "MURDER_QIP_CONTEST_FENCE_POST", "MURDER_QIP_CONTEST_FENCE_ENDR", - "MURDER_QIP_CONTEST_FENCE_ENDL" + "MURDER_QIP_CONTEST_FENCE_ENDL", + "LUMBRIDGE_SC_FENCEJUMP" ], "uvType": "BOX", "uvScale": 0.5, @@ -30725,7 +31956,8 @@ "DT2_GHORROCK_CELL_BED_OP", "DT2_GHORROCK_BED_POOR", "DT2_GHORROCK_THANKYOU_BED", - "DT2_HIDEOUT_BED" + "DT2_HIDEOUT_BED", + "DADDYSHOME_BED_BROKEN_0OP" ], "uvType": "BOX", "uvScale": 0.66 @@ -30991,14 +32223,6 @@ "uvOrientation": 256, "uvScale": 0.7 }, - { - "description": "Morytania - Objects - Metallic - Suit of Armor", - "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", - "objectIds": [ - "OLDSUITOFARMOUR" - ], - "uvType": "BOX" - }, { "description": "Wooden Wedge Stairs", "baseMaterial": "WOOD_GRAIN_3", @@ -31010,7 +32234,7 @@ ], "uvType": "BOX", "uvOrientation": 512, - "uvScale": 1.2 + "uvScale": 0.9 }, { "description": "Morytania - Fenkenstrains Castle - Walls - Brick Stone", @@ -31222,7 +32446,8 @@ "description": "Objects - Stone - Giants Foundry - Moulds", "baseMaterial": "GRUNGE_3", "objectIds": [ - "GIANTS_FOUNDRY_MOLD_LIBRARY" + "GIANTS_FOUNDRY_MOLD_LIBRARY", + "FAI_VARROCK_SMITHY_SWORD_MOULD_EMPTY" ], "uvType": "BOX", "uvScale": 0.6 @@ -32474,10 +33699,13 @@ "objectIds": [ "FAI_VARROCK_POOR_WALL_SUPPORT", "FAI_VARROCK_POOR_WALL_SUPPORT2", - "SLUG2_POOR_WALL_SUPPORT" + "SLUG2_POOR_WALL_SUPPORT", + "FAI_VARROCK_UNDERGROUND_SUPPORT", + "FAI_VARROCK_UNDERGROUND_SUPPORT2" ], "uvType": "BOX", - "flatNormals": true + "flatNormals": true, + "uvOrientationY": 512 }, { "description": "Object - Wooden - Support Post", @@ -32519,18 +33747,23 @@ "WILD_CHEST_CLOSED", "WILD_CHEST_OPEN", "KEBOS_CHEST_CLOSED_INACTIVE", - "WGS_MOVARIO_RUNE_CHEST" + "WGS_MOVARIO_RUNE_CHEST", + "GOBLIN_OUTPOST_CHEST_CLOSED" ], "uvType": "BOX", "uvOrientationZ": 512, "uvOrientationX": 512, - "flatNormals": true + "flatNormals": true, + "uvOrientationY": 512, + "uvScale": 0.8 }, { "description": "Object - Wooden - Plank - Chest - Metal Clasp", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ - "FAI_VARROCK_CONTAINER" + "FAI_VARROCK_CONTAINER", + "PARTYROOM_CHESTOPEN", + "FAI_FALADOR_PARTY_ROOM_CHEST_CLOSED" ], "uvType": "BOX", "uvOrientationZ": 512, @@ -32622,11 +33855,19 @@ { "description": "Object - Dying Tree", "baseMaterial": "BARK", + "terrainVertexSnap": true, "objectIds": [ "FAI_VARROCK_DEAD_TREE", "FAI_VARROCK_DEAD_TREE_NOOP" ], - "uvType": "BOX" + "uvType": "BOX", + "uvScale": 0.75, + "colorOverrides": [ + { + "colors": "h == 13 || h == 14", + "baseMaterial": "GRUNGE_3" + } + ] }, { "description": "Varrock - Wall Decoration - Wooden - Plank", @@ -32666,7 +33907,8 @@ "FAI_VARROCK_TENT_PEG_CONER_MIRROR", "FAI_VARROCK_TENT_SLOPE1", "FAI_VARROCK_TENT_SLOPE2", - "FAI_VARROCK_TENT_PEAK" + "FAI_VARROCK_TENT_PEAK", + "FAI_VARROCK_TENTDOOR" ], "uvType": "BOX", "uvScale": 0.75, @@ -32700,6 +33942,36 @@ "uvType": "BOX", "uvScale": 0.85 }, + { + "description": "Fortune-teller Aris - Shop Sign", + "baseMaterial": "GRUNGE_3_DULL", + "uvType": "BOX", + "uvScale": 0.45, + "objectIds": [ + "FAI_VARROCK_FORTUNE_SHOP_SIGN" + ], + "colorOverrides": [ + { + "colors": "h == 7 && s != 1 || h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientationY": 512, + "uvScale": 0.5 + } + ] + }, + { + "description": "Fortune-teller Aris - Hanging Lantern", + "baseMaterial": "METALLIC_1_LIGHT", + "upwardsNormals": true, + "shiftLightness": 5, + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.2, + "objectIds": [ + "FAI_VARROCK_GYPSY_LANTERN" + ] + }, { "description": "Zaff - Table and Rack with Staves", "baseMaterial": "WOOD_GRAIN_3_LIGHT", @@ -32748,7 +34020,9 @@ "uvScale": 0.2, "uvOrientation": 512, "objectIds": [ - "FAI_VARROCK_TOOLSET" + "FAI_VARROCK_TOOLSET", + "FAI_VARROCK_TOOLSET_02", + "FAI_VARROCK_HANGING_HORSESHOES" ], "colorOverrides": [ { @@ -32779,6 +34053,37 @@ } ] }, + { + "description": "Varrock Market - Tea Stall", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.65, + "uvOrientationY": 512, + "objectIds": [ + "TEA_STALL" + ], + "colorOverrides": [ + { + "baseMaterial": "CARPET_LIGHT", + "colors": "h == 6 && s == 1", + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "colors": "h == 6 && s == 4", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientationZ": 512 + }, + { + "baseMaterial": "METALLIC_1", + "colors": "h == 0 || h == 5 || h == 7", + "uvType": "BOX", + "uvScale": 0.15 + } + ] + }, { "description": "Varrock Market - Stalls", "baseMaterial": "CARPET_LIGHT", @@ -32885,22 +34190,42 @@ { "description": "Lumbridge - Varrock Crossroads Signpost", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "shiftLightness": -5, "objectIds": [ "FAI_VARROCK_SIGNPOST_1" ], "uvType": "BOX", "uvScale": 0.35, - "flatNormals": true + "upwardsNormals": true, + "undoVanillaShading": false }, { - "description": "Lumbridge - Al Khrid Crossroads Signpost", + "description": "Lumbridge - Al Kharid Crossroads Signpost", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "shiftLightness": 5, "objectIds": [ "AIDE_SIGNPOST_1" ], "uvType": "BOX", "uvScale": 0.35, - "upwardsNormals": true + "upwardsNormals": true, + "undoVanillaShading": false, + "colorOverrides": [ + { + "colors": "h == 10", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.2, + "undoVanillaShading": false + }, + { + "colors": "h == 4 || h == 5", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.2, + "undoVanillaShading": false + } + ] }, { "description": "What Lies Below - Camp Fire", @@ -32971,6 +34296,27 @@ } ] }, + { + "description": "Objects - Tree - Strange Palm", + "baseMaterial": "LEAF_VEINS", + "uvType": "BOX", + "uvScale": 0.3, + "shiftSaturation": -1, + "windDisplacementMode": "VERTEX_WITH_HEMISPHERE_BLEND", + "objectIds": [ + "PALM" + ], + "colorOverrides": [ + { + "colors": [ "h == 4" ], + "baseMaterial": "LIGHT_BARK", + "windDisplacementMode": "VERTEX_WITH_HEMISPHERE_BLEND", + "uvType": "BOX", + "uvScale": 0.35, + "shiftSaturation": -1 + } + ] + }, { "description": "Barbarian Village - Wall - Wooden - Log", "baseMaterial": "WOOD_GRAIN_2", @@ -33056,13 +34402,14 @@ }, { "description": "Ore - Empty - Rock", - "baseMaterial": "ROCK_4_ORE", + "baseMaterial": "ROCK_6_LIGHT", "objectIds": [ "ROCKS1", - "ROCKS2" + "ROCKS2", + "NEWBIEROCKS1" ], "uvType": "BOX", - "uvScale": 0.33, + "uvScale": 0.45, "uvOrientation": 700 }, { @@ -33347,6 +34694,7 @@ ], "objectIds": [ "BANKBOOTH", + "NEWBIEBANKBOOTH", "BANKPRIVATEBOOTH", "BANKBOOTH_END_RIGHT" ] @@ -33665,6 +35013,9 @@ "ROOTS_1", "ROOTS_2", "ROOTS_3", + "ROOTS_1_LIGHT", + "ROOTS_2_LIGHT", + "ROOTS_3_LIGHT", "CAVE_TWIG1", "AVIUM_ROOTS01", "AVIUM_ROOTS02", @@ -34139,7 +35490,8 @@ "description": "Crafting Guild Blacksmith's tools", "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", - "uvOrientation": 192, + "uvScale": 0.3, + "uvOrientation": 512, "objectIds": [ "BLACKSMITHTOOLS" ], "flatNormals": true }, @@ -34367,6 +35719,7 @@ "LEAFLESSBUSH", "LEAFLESSBUSH2", "ENAKH_LEAFLESSBUSH", + "NEW_LEAFLESSBUSH", "FAI_LEAFLESS_BUSH_LARGE_01", "FAI_LEAFLESS_BUSH_LARGE_02", "DOV_HUNTING_PLANT2_NOOP", @@ -34375,7 +35728,8 @@ "FAI_LEAFLESS_BUSH_SMALL_01", "FAI_LEAFLESS_BUSH_SMALL_02", "DOV_HUNTING_PLANT2", - "DOV_HUNTING_PLANT2_OP" + "DOV_HUNTING_PLANT2_OP", + "HW17_JARVIS_BUSH" ], "uvType": "BOX", "uvOrientation": 600 @@ -34516,6 +35870,7 @@ "description": "Objects - Hay - Hay Bale - Vanilla Textured", "textureMaterial": "HD_HAY", "objectIds": [ + "HAYBAIL", "HAYSTACK", "HAYSTACK2" ], @@ -34525,6 +35880,22 @@ "uvOrientationZ": 512, "retainVanillaUvs": false }, + { + "description": "Objects - Hay - Hay Bale", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "WEATHERVAIN" + ], + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientationY": 512, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH" + } + ] + }, { "description": "Objects - Hay - Hay Bale", "baseMaterial": "HD_HAY", @@ -34549,7 +35920,7 @@ "colorOverrides": [ { "colors": "a < 255", - "baseMaterial": "NONE", + "baseMaterial": "GRAY_50", "flatNormals": true } ] @@ -34674,7 +36045,11 @@ "baseMaterial": "GRUNGE_3", "objectIds": [ "BANKDOOR_R_INACTIVE", - "BANKDOOR_L_INACTIVE" + "BANKDOOR_L_INACTIVE", + "BANKDOOR_R", + "BANKDOOR_L", + "OPENBANKDOOR_R", + "OPENBANKDOOR_L" ], "uvType": "BOX", "uvScale": 0.4 @@ -34714,7 +36089,9 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "FAI_VARROCK_BANK_CHEST_OPEN", - "PIRATECHEST" + "PIRATECHEST", + "PIRATECHESTOPEN", + "FAI_FALADOR_BANK_CHEST" ], "uvOrientation": 512, "uvType": "BOX", @@ -34723,7 +36100,7 @@ { "colors": [ "h == 8" ], "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", - "uvType": "WORLD_XZ", + "uvType": "BOX", "uvScale": 0.25 } ] @@ -34817,12 +36194,12 @@ }, { "description": "Tutorial Island - Drill", - "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "FAI_VARROCK_SMITHY_DRILL" ], "uvType": "BOX", - "uvScale": 0.3, + "uvScale": 0.55, "colorOverrides": [ { "colors": [ "h == 0", "h == 5", "h == 10" ], @@ -34830,6 +36207,142 @@ } ] }, + { + "description": "Varrock - Bear Pit Hole with Ladder", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_VARROCK_BEARPIT_TRAPDOOR" + ], + "uvType": "BOX", + "uvScale": 0.3, + "colorOverrides": [ + { + "colors": [ "h == 6 && l == 37 || h == 7" ], + "baseMaterial": "DIRT_1", + "uvType": "BOX", + "uvScale": 0.7, + "uvOrientation": 512, + "maxLightness": 30 + } + ] + }, + { + "description": "Varrock - Smithy Hearth & Lathe", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "FAI_VARROCK_SMITHY_HEARTH", + "FAI_VARROCK_SMITHY_LATHE" + ], + "uvType": "BOX", + "uvScale": 0.2 + }, + { + "description": "Varrock - Smithy Bellows", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "FAI_VARROCK_BELLOWS" + ], + "uvType": "BOX", + "uvScale": 0.5, + "colorOverrides": [ + { + "colors": [ "s == 6" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientation": 512 + } + ] + }, + { + "description": "Varrock - Smithy Blueprint Poster", + "baseMaterial": "GRUNGE_3", + "objectIds": [ + "FAI_VARROCK_BLUEPRINT_POSTER" + ], + "uvType": "BOX", + "uvScale": 0.3 + }, + { + "description": "Varrock - Smithy Blueprint Poster", + "baseMaterial": "GRUNGE_3", + "objectIds": [ + "FAI_VARROCK_SMITHY_SAFETY_POSTER" + ], + "depthBias": 100, + "colorOverrides": [ + { + "colors": [ "h == 6" ], + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientation": 512 + } + ] + }, + { + "description": "Varrock - Shop Signs", + "baseMaterial": "GRAY_85", + "objectIds": [ + "FAI_VARROCK_BLACKSMITH_SHOP_SIGN", + "FAI_VARROCK_RANGE_SHOP_SIGN", + "FAI_VARROCK_BANK_SIGN", + "FAI_VARROCK_HAIRDRESSER_SIGN", + "FAI_VARROCK_GENERAL_STORE_SIGN", + "FAI_VARROCK_SEWING_SHOP_SIGN", + "FAI_VARROCK_FANCY_SIGN", + "FAI_VARROCK_DANCINGDONKEY_SIGN", + "FAI_VARROCK_SWORD_SHOP_SIGN" + ], + "colorOverrides": [ + { + "colors": [ "h == 5 || h == 6 || h == 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientationZ": 512, + "uvOrientationY": 512 + }, + { + "colors": [ "h == 3" ], + "baseMaterial": "BARK", + "uvType": "MODEL_YZ", + "uvScale": 0.2, + "uvOrientation": 512 + }, + { + "colors": [ "h > 12 && h < 30" ], + "baseMaterial": "LEAF_VEINS" + } + ] + }, + { + "description": "Varrock - Blue Moon Inn Sign", + "baseMaterial": "GRAY_85", + "objectIds": [ + "FAI_VARROCK_BLUEMOON_PUB_SIGN" + ], + "colorOverrides": [ + { + "colors": [ "h == 5 || h == 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientationY": 512 + }, + { + "colors": [ "h == 3" ], + "baseMaterial": "BARK", + "uvType": "MODEL_YZ", + "uvScale": 0.2, + "uvOrientation": 512 + }, + { + "colors": [ "h > 12 && h < 30" ], + "baseMaterial": "LEAF_VEINS" + } + ] + }, { "description": "Tutorial Island - Shelves - Boxes", "baseMaterial": "WOOD_GRAIN_3", @@ -34919,12 +36432,12 @@ }, { "description": "Stronghold Of Security Rock Entrance", - "baseMaterial": "ROCK_5", + "baseMaterial": "ROCK_3_SEMI_SMOOTH", "objectIds": [ "SOS_DUNG_ENT_OPEN" ], "uvType": "BOX", - "uvScale": 0.38, + "uvScale": 0.3, "uvOrientation": 128 }, { @@ -35083,7 +36596,8 @@ "objectIds": [ "SOS_FAM_WALL", "SOS_FAM_WALL_SPIKE", - "SOS_FAM_WALL_TOP" + "SOS_FAM_WALL_TOP", + "SOS_FAM_WALL_TOP_HALF" ], "uvType": "BOX", "uvScale": 0.44 @@ -36558,7 +38072,11 @@ "HUNTING_TRAIL_END_BUSH35_55", "ZEP_BUSH", "BIM_BUSH", - "WILDBUSH1" + "WILDBUSH1", + "DOV_HUNTING_BUSH1_NOOP", + "DOV_HUNTING_BUSH2_NOOP", + "DOV_HUNTING_BUSH2_OP", + "DOV_HUNTING_BUSH1_OP" ] }, { @@ -36614,7 +38132,6 @@ "OAK_TREE_3", "OAK_TREE_FULLYGROWN_1", "OAK_TREE_FULLYGROWN_2", - "NEWBIEOAKTREE", "OAKTREE", "DRILL_OAKTREE", "TUT2_OAK", @@ -36636,6 +38153,28 @@ } } }, + { + "description": "Oak Tree - Lighter", + "baseMaterial": "BARK", + "undoVanillaShading": false, + "shiftLightness": 6, + "windDisplacementMode": "VERTEX_WITH_HEMISPHERE_BLEND", + "objectIds": [ + "NEWBIEOAKTREE" + ], + "uvType": "BOX", + "uvScale": 0.8, + "materialOverrides": { + "LEAVES_SIDE": { + "windDisplacementMode": "VERTEX", + "textureMaterial": "LEAVES_RED_SIDE" + }, + "LEAVES_TOP": { + "windDisplacementMode": "VERTEX", + "textureMaterial": "LEAVES_RED_TOP" + } + } + }, { "description": "Warm Region Oak Tree", "areas": [ "WARM_REGIONS" ], @@ -36648,7 +38187,6 @@ "OAK_TREE_3", "OAK_TREE_FULLYGROWN_1", "OAK_TREE_FULLYGROWN_2", - "NEWBIEOAKTREE", "OAKTREE", "DRILL_OAKTREE", "TUT2_OAK", @@ -37953,13 +39491,14 @@ "uvScale": 0.5, "upwardsNormals": true, "objectIds": [ - "FAI_VARROCK_COOKING_CROCKERY_2" + "FAI_VARROCK_COOKING_CROCKERY_2", + "FAI_VARROCK_COOKING_CROCKERY_1" ], "uvType": "BOX", "uvOrientationX": 512, "colorOverrides": [ { - "colors": "h == 6", + "colors": "h == 6 || h == 7 && s == 3", "baseMaterial": "GRUNGE_3", "uvType": "BOX", "uvScale": 0.3, @@ -37977,7 +39516,6 @@ ], "uvType": "BOX", "uvScale": 0.5, - "uvOrientationX": 512, "colorOverrides": [ { "colors": "h == 0 && s == 0", @@ -40102,19 +41640,64 @@ }, { "description": "Varrock Sewers - Bryophyta - Axe Stump", - "baseMaterial": "GRUNGE_3", - "uvType": "BOX", + "baseMaterial": "METALLIC_1", + "upwardsNormals": true, "objectIds": [ "GB_LOG_WITHAXE", - "WOODCHIPPINGS_LIGHT", - "LOG_WITHAXE" + "WOODCHIPPINGS_LIGHT" ], "colorOverrides": [ { - "colors": "h == 6", + "colors": "h == 5 || h == 6 && s == 3", "baseMaterial": "LIGHT_BARK", "uvType": "BOX", "uvScale": 0.4 + }, + { + "colors": "h == 6 && s > 5 || h == 6 && s == 2", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientationX": 612, + "uvScale": 0.4 + } + ] + }, + { + "description": "Varrock Sewers - Bryophyta - Mossy Chest", + "baseMaterial": "METALLIC_1", + "shiftLightness": 6, + "undoVanillaShading": false, + "objectIds": [ + "MOSSYKEY_CHEST_CLOSED", + "MOSSYKEY_CHEST_OPEN" + ], + "colorOverrides": [ + { + "colors": "h == 9", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientation": 512, + "undoVanillaShading": false, + "uvScale": 0.4, + "shiftLightness": 5 + } + ] + }, + { + "description": "Varrock Sewers - Bryophyta - Wooden Stakes", + "baseMaterial": "BARK", + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "ROGUESDEN_RAILING" + ], + "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.2, + "uvOrientationY": 512 } ] }, @@ -40158,7 +41741,8 @@ "OLDWALL_BLACKBACK_A_DARK03", "OLDWALL_BLACKBACK_B_DARK03", "OLDWALL_BLACKBACK_A_DARK02", - "OLDWALL_BLACKBACK_A" + "OLDWALL_BLACKBACK_A", + "OLDWALL_BLACKBACK_B" ] }, { @@ -40169,6 +41753,17 @@ "DUNGEONKIT_WALLTOP01_SEWERS01" ] }, + { + "description": "Varrock Sewers - Agility Pipe", + "areas": [ "VARROCK_SEWERS" ], + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.2, + "objectIds": [ + "VARROCK_DUNGEON_PIPE_SC", + "VARROCK_DUNGEON_PIPE_SC" + ] + }, { "description": "Ground Objects - Wooden - Planks", "baseMaterial": "WOOD_GRAIN_3", @@ -40803,7 +42398,9 @@ "baseMaterial": "GRUNGE_1_DARK", "objectIds": [ "RUBBLE_1", - "RUBBLE_2" + "RUBBLE_2", + "HORROR_RUBBLE_1", + "FAI_VARROCK_BOTTLES1" ], "colorOverrides": [ { @@ -45288,7 +46885,8 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "DWARF_KELDAGRIM_SMALL_CUPBOARD", - "SWAN_CUPBOARD" + "SWAN_CUPBOARD", + "ALICUPBOARD" ], "uvType": "BOX", "uvScale": 0.75, @@ -45676,7 +47274,8 @@ "uvType": "BOX", "retainVanillaUvs": false, "objectIds": [ - "WATER_BARREL1" + "WATER_BARREL1", + "WATER_BARREL2" ], "colorOverrides": [ { @@ -46626,12 +48225,20 @@ "description": "Objects - Metallic - Range on textured bricks - Textured", "baseMaterial": "METALLIC_1", "uvType": "BOX", - "uvScale": 0.4, + "uvScale": 0.25, "objectIds": [ - "NEWBIERANGE", "RANGE" ] }, + { + "description": "Objects - Metallic - Range on textured bricks - Textured - Lighter", + "baseMaterial": "METALLIC_1_VERY_LIGHT", + "uvType": "BOX", + "uvScale": 0.25, + "objectIds": [ + "NEWBIERANGE" + ] + }, { "description": "Objects - WOODEN - Textured Torch", "objectIds": [ @@ -46744,17 +48351,62 @@ }, { "description": "Wooden Step Ladder", - "objectIds": [ "STEPLADDER" ], + "objectIds": [ + "STEPLADDER", + "FAI_VARROCK_STEPLADDERS" + ], "baseMaterial": "WOOD_GRAIN_3", - "uvType": "BOX" + "uvType": "BOX", + "uvScale": 0.7 + }, + { + "description": "Hanging Sacks", + "objectIds": [ + "FAI_VARROCK_GENERAL_STORE_HANGSACK1", + "FAI_VARROCK_GENERAL_STORE_HANGSACK2" + ], + "baseMaterial": "ROPE", + "uvType": "BOX", + "uvScale": 0.3, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT" + }, + { + "colors": "h == 7", + "baseMaterial": "BURLAP", + "uvType": "BOX", + "uvScale": 0.4 + } + ] + }, + { + "description": "Shop Counter", + "objectIds": [ + "FAI_VARROCK_GENERAL_STORE_COUNTER" + ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 512, + "colorOverrides": [ + { + "colors": "h == 0 || h == 7 && s == 3 || h == 21 || h == 23 || h == 59", + "baseMaterial": "GRUNGE_3" + }, + { + "colors": "h == 6 || h == 8", + "baseMaterial": "METALLIC_1" + } + ] }, { "description": "Ceramic Big Vase", "objectIds": [ "ORNATE_VASE1" ], - "baseMaterial": "GRUNGE_1", + "baseMaterial": "GRUNGE_3", "uvType": "BOX", - "uvScale": 0.4, - "uvOrientation": 462 + "uvScale": 0.3 }, { "description": "Sheep Shearer fence and gate", @@ -46906,7 +48558,8 @@ "description": "Wooden shelves - Empty", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ - "COOKINGSHELFEMPTY" + "COOKINGSHELFEMPTY", + "COOKINGSHELFEMPTY_OFFSET" ], "uvType": "BOX", "uvScale": 0.8, @@ -46931,8 +48584,9 @@ "colorOverrides": [ { "description": "Metal", - "colors": "h == 0 && s == 0", - "baseMaterial": "METALLIC_1_LIGHT_GLOSS" + "colors": "h == 0 && s == 0 || h == 10", + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "undoVanillaShading": false } ] }, @@ -46960,7 +48614,7 @@ "colors": "h == 0 && s == 0", "baseMaterial": "METALLIC_1_LIGHT_GLOSS", "undoVanillaShading": false, - "shiftLightness": 5 + "shiftLightness": 3 } ] }, @@ -46979,7 +48633,8 @@ { "description": "Metal", "colors": "h == 0 && s == 0", - "baseMaterial": "METALLIC_1_LIGHT_GLOSS" + "baseMaterial": "METALLIC_1_LIGHT_GLOSS", + "undoVanillaShading": false } ] }, @@ -47102,6 +48757,7 @@ "uvScale": 0.75, "objectIds": [ "SHOPSIGN", + "GENERALSTORESIGN", "XMTS_PUB_SIGN" ], "colorOverrides": [ @@ -47249,11 +48905,13 @@ "receiveShadows": false }, { - "description": "Marble statues at Lumbridge Entrance - Textured", + "description": "Marble statues - Textured", "objectIds": [ "STATUE_LUMBRIDGE", "GARDEN_QUEEN_STATUE", - "STATUE_PLINTH_LUMBRIDGE" + "STATUE_PLINTH_LUMBRIDGE", + "FAI_FALADOR_STATUE_KNIGHT_HALBERD", + "FAI_FALADOR_STATUE_KNIGHT_MACE" ], "baseMaterial": "MARBLE_2_SEMIGLOSS", "uvType": "BOX", @@ -47388,6 +49046,7 @@ "DRAYNOR_WALLS_PLASTER5", "DRAYNOR_WALLS_PLASTER6", "DRAYNOR_WALLS_BROKE", + "MISTMYST_DESTRUCTABLE_WALL_DAMAGED", "DRAYNOR_WALLS_BROKE_MIRROR", "DRAYNOR_WALLS_BROKE2", "DRAYNOR_WALLS_BROKE2_MIRROR", @@ -47404,22 +49063,47 @@ "DRAYNOR_WALL_TOP_NOT_ARCHED_EXT", "MISTMYST_DESTRUCTABLE_WALL_CLIMBABLE_BROKEN", "MISTMYST_DESTRUCTABLE_WALL_BROKEN", - "MISTMYST_KITCHEN_DOOR_TOP" + "MISTMYST_KITCHEN_DOOR_TOP", + "DRAYNOR_WALL_ARCH_EXT" ], "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvOrientation": 512, - "uvScale": 1.2, - "retainVanillaUvs": false, + "uvScale": 0.75, "colorOverrides": [ { - "description": "Red carpet", + "description": "Wallpaper", "colors": [ "h == 0 && s > 0" ], "baseMaterial": "GRUNGE_3", - "uvType": "BOX" + "uvType": "BOX", + "uvScale": 0.8 + }, + { + "description": "Stone", + "colors": [ "h == 0" ], + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "description": "Wood Panels Vertical", + "colors": [ "h == 3 && s == 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.75 } ] }, + { + "description": "Draynor Manor - Fence", + "objectIds": [ + "DRAYNOR_MANOR_FENCE" + ], + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvOrientation": 512, + "uvScale": 0.2 + }, { "description": "Avas Bookcase wall", "baseMaterial": "WOOD_GRAIN_3", @@ -47462,24 +49146,26 @@ "uvScale": 0.4 }, { - "description": "Red carpet", + "description": "Red wallapaper", "colors": [ "h == 0 && s >= 2" ], "baseMaterial": "GRUNGE_3", - "uvType": "BOX" + "uvType": "BOX", + "minLightness": 8 } ], "objectIds": [ "HAUNTEDBOOKCASER", "HAUNTEDBOOKCASEL", "DRAYNOR_WALLS_RIGHT_TERMINATOR", - "DRAYNOR_WALLS_LEFT_TERMINATOR" + "DRAYNOR_WALLS_LEFT_TERMINATOR", + "HAUNTEDBOOKCASEOPEN" ] }, { "description": "Murder Mystery Wooden Double Doors", "objectIds": [ - "TKBUSH_L", "HAUNTEDDOORR_INACTIVE", + "HAUNTEDDOORL_INACTIVE", "MISTMYST_FRONT_DOORL", "MISTMYST_FRONT_DOORR" ], @@ -47487,6 +49173,24 @@ "uvType": "BOX", "uvScale": 0.8 }, + { + "description": "Draynor Manor Wooden Double Doors - Closed", + "objectIds": [ + "HAUNTEDDOORL", + "HAUNTEDDOORR" + ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8, + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.3 + } + ] + }, { "description": "Murder Mystery Wooden Doors", "objectIds": [ @@ -47501,11 +49205,31 @@ "MISTMYST_DOOR_DIAMOND", "MISTMYST_DOOR_SAPPHIRE", "MISTMYST_DOOR_RUBY_INACTIVE", - "MISTMYST_DOOR_EMERALD_INACTIVE" + "MISTMYST_DOOR_EMERALD_INACTIVE", + "CLOSET_DOOR", + "DRAYNORPANELLEDDOOR_INACTIVE", + "HAUNTEDBACKDOOR", + "HAUNTEDBACKDOOR_INACTIVE" ], "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.7 + "uvScale": 0.75 + }, + { + "description": "Draynor Manor Grandfather Clock - DYNAMIC", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.65, + "objectIds": [ + "DRAYNOR_GRANDFATHERCLOCK" + ], + "colorOverrides": [ + { + "description": "Clock Face", + "colors": "h == 7 && s == 1", + "baseMaterial": "GRAY_80" + } + ] }, { "description": "Fancy wooden table with alternating lines", @@ -47537,7 +49261,13 @@ ], "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.7 + "uvScale": 0.7, + "colorOverrides": [ + { + "colors": "h == 8", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH" + } + ] }, { "description": "Lumbridge - Restless Ghost - Coffin", @@ -47550,6 +49280,16 @@ "uvType": "BOX", "uvScale": 0.88 }, + { + "description": "Lumbridge - Restless Ghost - The Ghost in Question", + "baseMaterial": "UNLIT", + "shiftLightness": 7, + "shiftAlpha": -30 , + "minAlpha": 30, + "npcIds": [ + "GHOSTX" + ] + }, { "description": "Lumbridge crypt stone block walls", "baseMaterial": "ROCK_3_SMOOTH", @@ -47581,6 +49321,42 @@ } ] }, + { + "description": "Lumbridge Window with ivy", + "baseMaterial": "LEAF_VEINS_DARKER", + "windDisplacementMode": "VERTEX_JIGGLE", + "objectIds": [ + "AIDE_SHUTTERWINDOW" + ], + "uvType": "MODEL_YZ", + "uvOrientation": 144, + "uvScale": 0.1, + "flatNormals": true, + "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.5, + "shiftLightness": -2, + "depthBias": 1 + }, + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "shiftLightness": -2, + "uvScale": 0.5 + }, + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientation": 512 + } + ] + }, { "description": "Lumbridge Basement - Culinaromancer's Chest", "baseMaterial": "WOOD_GRAIN_3", @@ -47608,6 +49384,15 @@ } ] }, + { + "description": "Lumbridge General Store - Teddy Bear", + "baseMaterial": "GRUNGE_2", + "objectIds": [ + "TOB_SPECTATOR_MISTHALIN_TEDDYBEAR" + ], + "uvType": "BOX", + "uvScale": 0.24 + }, { "description": "Objects - Wooden - Brown Drawers with metallic handles", "baseMaterial": "WOOD_GRAIN_3", @@ -47756,10 +49541,19 @@ "RIMMINGTON_WOOD_WALLS_WINDOW_DOUBLE01" ], "uvType": "BOX", - "uvScale": 0.8, + "uvScale": 0.7, "uvOrientationZ": 512, "uvOrientationY": 512, - "flatNormals": true + "flatNormals": true, + "colorOverrides": [ + { + "colors": "s == 4", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "flatNormals": true + } + ] }, { "description": "Rimmington House Roof - Corner", @@ -47814,7 +49608,8 @@ "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ "FAI_VARROCK_CHEST_CLOSED", - "FAI_VARROCK_POOR_CHEST" + "FAI_VARROCK_POOR_CHEST", + "FAI_VARROCK_CHEST_OPEN" ], "uvType": "BOX", "uvOrientation": 512 @@ -47856,6 +49651,47 @@ "SLUG2_WARDROBE" ] }, + { + "description": "Juliets Bed", + "baseMaterial": "CARPET_LIGHT", + "uvOrientation": 512, + "uvScale": 0.6, + "uvType": "BOX", + "objectIds": [ + "BIGPINKBED" + ], + "colorOverrides": [ + { + "colors": [ "h == 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "colors": [ "h == 0" ], + "baseMaterial": "METALLIC_1_SMOOTH_LIGHT" + } + ] + }, + { + "description": "Juliets Shoerack", + "baseMaterial": "GRUNGE_3", + "uvOrientation": 512, + "uvScale": 0.5, + "uvType": "BOX", + "objectIds": [ + "FAI_VARROCK_SHOERACK", + "FAI_VARROCK_SHOERACK02" + ], + "colorOverrides": [ + { + "colors": [ "h == 7 && s < 7" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.4 + } + ] + }, { "description": "Drawers with backsplash", "baseMaterial": "WOOD_GRAIN_3", @@ -47912,6 +49748,34 @@ ], "uvType": "BOX" }, + { + "description": "Stone slab - With Juliet lying on it", + "objectIds": [ + "ROMEO_JULIET_CRYPT_TOMB_NO_HEADSTONE" + ], + "colorOverrides": [ + { + "colors": "h == 0 && s == 0 || h == 5", + "uvType": "BOX", + "baseMaterial": "STONE_NORMALED" + } + ] + }, + { + "description": "Romeo & Juliet - Coffin", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "ROMEO_JULIET_COFFIN_UPRIGHT", + "ROMEO_JULIET_COFFIN_FLAT" + ], + "colorOverrides": [ + { + "colors": "h == 6", + "uvType": "BOX", + "baseMaterial": "WOOD_GRAIN_3" + } + ] + }, { "description": "Brown brick textured Stone Steps", "baseMaterial": "STONE_NORMALED", @@ -48068,7 +49932,9 @@ "MURDERBARRELC", "MURDERBARRELD", "MURDERBARRELE", - "MURDERBARRELF" + "MURDERBARRELF", + "GOBLIN_OUTPOST_BARREL", + "DK_BARREL" ] }, { @@ -48216,6 +50082,26 @@ "CART_HAY" ] }, + { + "description": "Wooden Cart - Filled with Dirt", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientationZ": 512, + "uvOrientationX": 512, + "colorOverrides": [ + { + "colors": "h == 5", + "uvType": "BOX", + "baseMaterial": "DIRT_2", + "uvScale": 0.5, + "shiftLightness": -3 + } + ], + "objectIds": [ + "RIMMINGTON_WHEEL_BARROW" + ] + }, { "description": "Lumbar yard - Pile of Wood", "baseMaterial": "WOOD_GRAIN_3", @@ -48927,7 +50813,8 @@ "FAI_FALADOR_ORNATERAIL_SYMBOL" ], "uvType": "BOX", - "uvScale": 0.6 + "uvOrientation": 512, + "uvScale": 0.2 }, { "description": "Falador Park - Hide floating floor trim", @@ -49076,7 +50963,9 @@ "HILLGIANT_BOSS_CORPSE2", "HILLGIANT_BOSS_CORPSE3", "DRAGON_SLAYER_QIP_CORPSE_1", - "DRAGON_SLAYER_QIP_CORPSE_2" + "DRAGON_SLAYER_QIP_CORPSE_2", + "CHARRED_BONES", + "WILD1_SKELETON_1" ], "uvType": "BOX", "uvScale": 0.6 @@ -49085,14 +50974,16 @@ "description": "Skulls", "baseMaterial": "BONE", "uvType": "BOX", - "uvScale": 0.6, + "uvScale": 0.25, "objectIds": [ "WEREWOLF_SKULL_CLIMB_1", "WEREWOLF_SKULL_CLIMB_2", "BLOODTEMPLE_SKULL_PILE01", "BLOODTEMPLE_SKULL_FLOATING01", "BLOODTEMPLE_SKULL_FLOATING02", - "BLOODTEMPLE_SKULL_FLOATING03" + "BLOODTEMPLE_SKULL_FLOATING03", + "PILE_OF_SKULLS", + "GOBLIN_OUTPOST_SKULL_PILE" ] }, { @@ -49110,8 +51001,7 @@ "objectIds": [ "WAREHOUSE_SHELVES" ], "uvType": "BOX", "uvScale": 0.8, - "uvOrientationX": 512, - "retainVanillaUvs": false + "uvOrientationX": 512 }, { "description": "Wooden shelves - Triple - Filled with Boxes", @@ -49123,9 +51013,8 @@ "COWQUEST_SETH_SHELF" ], "uvType": "BOX", - "uvScale": 0.8, + "uvScale": 0.65, "uvOrientationX": 512, - "retainVanillaUvs": false, "colorOverrides": [ { "colors": "h != 7", @@ -49188,7 +51077,16 @@ "baseMaterial": "METALLIC_1_SEMIGLOSS", "objectIds": [ "PLAGUE_GRILL", - "PLAGUE_GRILL_VIS" + "PLAGUE_GRILL_VIS", + "WITCHGRILL_INACTIVE", + "WITCHGRILL" + ] + }, + { + "description": "Grill - Lighter", + "baseMaterial": "METALLIC_1_VERY_LIGHT", + "objectIds": [ + "WALLGRILL" ] }, { @@ -49211,17 +51109,22 @@ { "description": "Gallows", "baseMaterial": "WOOD_GRAIN_3", - "objectIds": [ "GALLOWS" ], + "objectIds": [ + "DRAYNOR_HAUNTED_GALLOWS", + "GALLOWS" + ], "uvType": "BOX", "uvScale": 0.8 }, { - "description": "Gallows", + "description": "Gallow Steps", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvScale": 0.8, "uvOrientationY": 512, - "objectIds": [ "DRAYNOR_GALLOWS_STEPS" ] + "objectIds": [ + "DRAYNOR_GALLOWS_STEPS" + ] }, { "description": "Brown brick wall with metal spikes - Textured", @@ -49276,7 +51179,40 @@ "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "FIREPLACECOOKINGPOT" ], "uvType": "BOX", - "uvScale": 0.5 + "uvScale": 0.25, + "colorOverrides": [ + { + "colors": [ "a < 255" ], + "baseMaterial": "GRAY_200", + "upwardsNormals": true + } + ] + }, + { + "description": "Cooking Pot in textured brick fireplace", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ "MISC_SPITROAST" ], + "uvType": "BOX", + "uvScale": 0.25, + "colorOverrides": [ + { + "colors": [ "a < 255" ], + "baseMaterial": "NONE", + "upwardsNormals": true + }, + { + "colors": [ "h == 6 && s == 4" ], + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.65 + }, + { + "colors": [ "h == 6" ], + "baseMaterial": "BARK", + "uvType": "BOX", + "uvScale": 0.65 + } + ] }, { "description": "Brown Bed with pillow", @@ -49287,7 +51223,8 @@ "FAI_VARROCK_SINGLE_BED_DIRTY", "HOS_BED_01", "NORMAL_BED", - "MURDER_QIP_BED" + "MURDER_QIP_BED", + "FAVOUR_BED" ], "uvType": "BOX", "uvScale": 0.7, @@ -49347,17 +51284,18 @@ ], "uvType": "BOX", "uvOrientation": 64, + "uvScale": 0.6, "colorOverrides": [ { "description": "Wood frame", - "colors": "h == 6", + "colors": "h == 6 || h == 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX" } ] }, { - "description": "Hosidius- Blue Bed with pillows - Light Frame", + "description": "Hosidius - Blue Bed with pillows - Light Frame", "baseMaterial": "CARPET", "objectIds": [ "HOS_BED_03" @@ -49385,6 +51323,7 @@ "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "BARREL", + "BARREL_STACKED", "BARREL_WATERFALL_QUEST", "BARRELWITHTAP", "UPASSDWARFBREWBARREL" @@ -49404,9 +51343,9 @@ }, { "description": "Sink with textured water and wood paneling - textured", - "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", - "uvScale": 0.25, + "uvScale": 0.7, + "retainVanillaUvs": false, "objectIds": [ "SINK", "SINK2", @@ -49426,6 +51365,13 @@ "uvType": "BOX", "uvScale": 0.66, "uvOrientation": 512 + }, + { + "description": "Wood", + "colors": "h == 0", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.25 } ] }, @@ -49441,16 +51387,38 @@ "description": "Drain and pipe - textured", "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ - "PIPE_DRAIN" + "PIPE_DRAIN", + "QIP_DS_KEYPIPE" ], - "uvType": "BOX" + "uvType": "BOX", + "uvScale": 0.3 + }, + { + "description": "Demon Slayer - Muddy Key", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "QIP_DS_RUSTYKEY_MUD", + "QIP_DS_RUSTYKEY_MUDONLY" + ], + "uvType": "BOX", + "uvScale": 0.3, + "colorOverrides": [ + { + "description": "Wood", + "colors": "h == 6", + "baseMaterial": "DIRT_2", + "uvType": "BOX", + "uvScale": 0.3 + } + ] }, { "description": "Fractionalising Still", "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "REGICIDE_FRACTIONALIZING_STILL" ], "uvType": "BOX", - "uvOrientation": 512 + "uvOrientation": 512, + "uvScale": 0.45 }, { "description": "Objects - Dirt - Manhole", @@ -49487,7 +51455,10 @@ { "description": "Stone bat wall decoration", "baseMaterial": "STONE_NORMALED", - "objectIds": [ "GARGOYLE1" ], + "objectIds": [ + "GARGOYLE1", + "GARGOYLE1_DARKBROWN" + ], "uvType": "BOX", "uvScale": 0.8 }, @@ -49563,28 +51534,9 @@ } ] }, - { - "description": "Deaths office - Entrances roof - Falador", - "baseMaterial": "GRUNGE_1", - "uvType": "BOX", - "uvScale": 0.6, - "flatNormals": true, - "colorOverrides": [ - { - "description": "Stone", - "colors": "h == 2 && s == 2", - "baseMaterial": "STONE_NORMALED", - "uvType": "BOX", - "uvScale": 0.8 - } - ], - "objectIds": [ - "FAI_DEATH_CRYPT_ENTRANCE_TOP" - ] - }, { "description": "Deaths office - Entrances - Falador", - "baseMaterial": "GRUNGE_1", + "baseMaterial": "SMOOTH_STONE", "uvType": "BOX", "uvScale": 0.6, "flatNormals": true, @@ -49596,16 +51548,25 @@ "uvType": "BOX", "uvScale": 0.8 }, + { + "description": "Roof Tiles", + "colors": "h == 2 && s == 2", + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvScale": 0.8 + }, { "description": "Metal", - "colors": "(h == 6 && s == 4)|| s == 0", + "colors": "h == 6 && s == 4 || s == 0", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "uvType": "BOX", - "uvScale": 0.8 + "uvScale": 0.2, + "uvOrientation": 512 } ], "objectIds": [ - "FAI_DEATH_CRYPT_ENTRANCE" + "FAI_DEATH_CRYPT_ENTRANCE", + "FAI_DEATH_CRYPT_ENTRANCE_TOP" ] }, { @@ -49990,7 +51951,8 @@ "terrainVertexSnap": true, "terrainVertexSnapThreshold": 0.025, "objectIds": [ - "COMPOST" + "COMPOST", + "HAUNTEDCOMPOSTHEAP" ], "uvType": "BOX", "uvScale": 0.8, @@ -50082,12 +52044,80 @@ }, { "description": "Asgarnia Ice Dungeon - Entrance Trapdoor", - "baseMaterial": "GRUNGE_2", + "baseMaterial": "DIRT_1_LIGHT", "objectIds": [ "FAI_TRAPDOOR" ], "uvType": "BOX", - "uvScale": 0.55 + "uvScale": 0.55, + "colorOverrides": [ + { + "baseMaterial": "WOOD_GRAIN_3", + "colors": "h == 4", + "uvType": "BOX", + "uvOrientationY": 512, + "uvScale": 0.6 + }, + { + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "colors": "h > 9" + } + ] + }, + { + "description": "Asgarnia Ice Dungeon - Plants near entrance - Flower on Stalk", + "baseMaterial": "GRUNGE_3_SMOOTH", + "uvType": "BOX", + "uvScale": 0.35, + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "colorOverrides": [ + { + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "baseMaterial": "GRUNGE_2", + "colors": "h >= 17 && h < 22", + "uvType": "BOX", + "uvScale": 0.1 + } + ], + "objectIds": [ + "SANDDUNE_PLANT1" + ] + }, + { + "description": "Asgarnia Ice Dungeon - Plants near entrance - Leafy", + "baseMaterial": "LIGHT_BARK", + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "uvType": "BOX", + "uvScale": 0.25, + "colorOverrides": [ + { + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "baseMaterial": "GRUNGE_3_SMOOTH", + "colors": "h >= 22", + "uvType": "BOX", + "uvScale": 0.35 + }, + { + "windDisplacementMode": "OBJECT_NO_GROUND_DISPLACEMENT", + "windDisplacementModifier": -1, + "baseMaterial": "LEAF_VEINS", + "shiftLightness": 2, + "colors": "h >= 17 && h < 22", + "uvType": "BOX", + "uvScale": 0.25 + } + ], + "objectIds": [ + "SANDDUNE_PLANT4", + "SANDDUNE_PLANT3", + "SANDDUNE_PLANT2" + ] }, { "description": "Asgarnia Ice Dungeon - Muddy Walls", @@ -50274,6 +52304,18 @@ ], "uvType": "BOX" }, + { + "description": "Mudskipper Point - Warning Sign", + "baseMaterial": "WOOD_GRAIN_3", + "shiftLightness": 7, + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientationY": 512, + "uvOrientationZ": 512, + "objectIds": [ + "MUDSKIPPER_SIGN" + ] + }, { "description": "Campfire", "baseMaterial": "STONE_NORMALED", @@ -50889,7 +52931,8 @@ "FAI_VARROCK_BANK_BOOTH_PRIVATE", "FAI_VARROCK_BANK_BOOTH_PRIVATE_END", "KR_BANK_BOOTH_PRIVATE_END_MIRROR", - "KR_BANK_BOOTH_PRIVATE_END" + "KR_BANK_BOOTH_PRIVATE_END", + "FAI_VARROCK_BANK_BOOTH_PRIVATE_END_MIRROR" ], "uvType": "BOX", "uvScale": 0.8 @@ -51529,9 +53572,16 @@ "CURTAINEDBIGWINDOW", "REDCURTAINEDPOSHBIGWINDOW", "GREENCURTAINEDPOSHBIGWINDOW", - "BLACKCURTAINEDPOSHBIGWINDOW" + "BLACKCURTAINEDPOSHBIGWINDOW", + "CURTAINEDPOSHBIGWINDOW", + "WHITECURTAINEDPOSHBIGWINDOW" ], "colorOverrides": [ + { + "description": "Stone sile", + "colors": "s == 0 && l < 45 && l > 18", + "baseMaterial": "STONE" + }, { "description": "Glass", "colors": "s == 0 && l > 45", @@ -51556,11 +53606,6 @@ "description": "Curtains - Taupe", "colors": "h == 6 && s < 3", "baseMaterial": "GRAY_75" - }, - { - "description": "Stone sile", - "colors": "s == 0 && l < 45 && l > 30", - "baseMaterial": "STONE" } ] }, @@ -51700,7 +53745,11 @@ "FAI_VARROCK_SWORDCASE_SHORTSWORDS", "FAI_VARROCK_SWORDCASE_SCIMITAR", "FAI_VARROCK_BOWCASE", - "CABINET_BOWS_OFFSET_FOR_FALADOR_CASTLE_WALL" + "CABINET_BOWS_OFFSET_FOR_FALADOR_CASTLE_WALL", + "QIP_DS_SILVERLIGHT_CASE_FULL", + "QIP_DS_SILVERLIGHT_CASE_OPEN", + "QIP_DS_SILVERLIGHT_CASE_EMPTY", + "CABINET_BOWS_WHITE" ], "uvType": "BOX", "uvScale": 0.8, @@ -51709,12 +53758,12 @@ "colorOverrides": [ { "description": "Metal", - "colors": "h == 0 && s == 0", + "colors": "h == 0 && s == 0 || h == 46", "baseMaterial": "METALLIC_1_LIGHT_GLOSS" }, { "description": "Gold", - "colors": "h == 10 && s == 7", + "colors": "h == 10 && s == 0 || h == 10 && s == 7", "baseMaterial": "METALLIC_1_LIGHT_GLOSS" }, { @@ -51887,9 +53936,7 @@ "description": "Wine rack with bottles", "baseMaterial": "GRAY_75", "objectIds": [ - "FAI_VARROCK_WINE_RACK", - "FAI_VARROCK_CHEMISTY_SHELVES1", - "FAI_VARROCK_CHEMISTY_SHELVES2" + "FAI_VARROCK_WINE_RACK" ], "uvType": "BOX", "uvScale": 0.8, @@ -51904,6 +53951,25 @@ } ] }, + { + "description": "Bookshelf with books and a jar", + "baseMaterial": "GRUNGE_3_DARK", + "objectIds": [ + "FAI_VARROCK_CHEMISTY_SHELVES1", + "FAI_VARROCK_CHEMISTY_SHELVES2" + ], + "uvType": "BOX", + "uvScale": 0.2, + "colorOverrides": [ + { + "description": "Wood", + "colors": "h == 7 && s == 3", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.8 + } + ] + }, { "description": "Wooden bookcase with brown and taupe colored books", "baseMaterial": "WOOD_GRAIN_3", @@ -51912,7 +53978,6 @@ "SARIM_BOOKCASE2", "FAI_WIZTOWER_BOOKCASE", "FAI_WIZTOWER_BOOKCASE_WALL", - "BOOKCASE_MAHOGANY", "FAI_FALADOR_BOOKCASE_WIDE", "FAI_FALADOR_BOOKSHELF_OLD_TALL", "CAPT_SIAD_BOOKCASE", @@ -51923,6 +53988,7 @@ "SLUG2_BOOKCASE", "SARIM_BOOKCASE2_OFFSET", "SARIM_BOOKCASE2_OFFSET_WESTFACING", + "SARIM_BOOKCASE2_OFFSET_NORTHFACING", "BOOKCASE_POLYBOOKS", "CANAFIS_BOOKSHELF_OLD_SHORT", "CANAFIS_BOOKSHELF_OLD_SHORT3", @@ -51971,6 +54037,53 @@ } ] }, + { + "description": "Mahogany bookcase with brown and taupe colored books", + "baseMaterial": "WOOD_GRAIN_3", + "objectIds": [ + "BOOKCASE_MAHOGANY" + ], + "uvType": "BOX", + "uvScale": 0.8, + "uvOrientationX": 512, + "colorOverrides": [ + { + "description": "Paper", + "colors": "h == 10 && s == 0", + "baseMaterial": "GRAY_65", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "description": "Green books", + "colors": "h > 12", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "description": "Red books", + "colors": "h == 4 && s == 4 || h == 4 && s == 6", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "description": "Dark brown books", + "colors": "h == 7 && s > 4", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.4 + }, + { + "description": "Light brown books", + "colors": "h == 6 && s == 3", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.4 + } + ] + }, { "description": "Varrock - Kourend - Wooden - bookcase with Multicolored books", "baseMaterial": "WOOD_GRAIN_3", @@ -52014,7 +54127,7 @@ ] }, { - "description": "Varrock - Witchaven- Wooden - bookshelf with Multicolored books", + "description": "Varrock - Witchaven - Wooden - bookshelf with Multicolored books", "baseMaterial": "GRUNGE_3", "objectIds": [ "FAI_VARROCK_SHELVES_BOOKS" @@ -52031,9 +54144,11 @@ { "description": "Shelf", "colors": "h == 7", - "baseMaterial": "GRUNGE_3", + "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.4 + "uvScale": 0.75, + "uvOrientationZ": 512, + "uvOrientationX": 512 } ] }, @@ -52099,7 +54214,6 @@ "uvType": "BOX", "uvScale": 0.4 }, - { "description": "Light brown books", "colors": "h == 6 && s == 3 || h == 7 && s == 5 || h == 7 && s == 6 && l < 10", @@ -52191,7 +54305,8 @@ "baseMaterial": "WOOD_GRAIN_3", "uvOrientationY": 512, "objectIds": [ - "DS2_VARROCK_BOOKCASE" + "DS2_VARROCK_BOOKCASE", + "FAI_VARROCK_RUNE_BOOKCASE_THIN" ], "uvType": "BOX", "colorOverrides": [ @@ -52210,13 +54325,13 @@ }, { "description": "Dark brown books", - "colors": "h == 7 && s == 6", + "colors": "h == 7 && s == 6 || h == 4 || h == 14", "baseMaterial": "GRUNGE_3", "uvType": "BOX" }, { "description": "Light brown books", - "colors": "h == 7 && s == 3", + "colors": "h == 6", "baseMaterial": "GRUNGE_3", "uvType": "BOX" } @@ -52241,7 +54356,7 @@ "uvOrientationY": 512, "colorOverrides": [ { - "description": "Green books", + "description": "Wood", "colors": "h == 5", "baseMaterial": "WOOD_GRAIN_3", "shiftLightness": 2, @@ -52296,7 +54411,8 @@ "description": "Shelf with helmets", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ - "HELMETRACK" + "HELMETRACK", + "HELMETRACK_OFFSET_FOR_FALADOR_CASTLE_WALL" ], "uvType": "BOX", "uvScale": 0.8, @@ -52344,15 +54460,17 @@ "uvScale": 0.8, "colorOverrides": [ { - "colors": "h == 0 && s == 0", + "colors": "h == 0 && s == 0 || h == 10 && s == 0", "baseMaterial": "METALLIC_1_LIGHT_GLOSS", "uvType": "BOX", "uvOrientation": 920, - "uvScale": 0.5 + "uvScale": 0.2 } ], "objectIds": [ - "PLOUGH" + "PLOUGH", + "RIMMINGTON_PLOUGH", + "FAI_VARROCK_PLOUGH" ] }, { @@ -52482,6 +54600,33 @@ "MINING_SPADE" ] }, + { + "description": "Shovel in the ground with Dirt around it", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationY": 512, + "colorOverrides": [ + { + "colors": "h == 5 && s == 0", + "baseMaterial": "METALLIC_1_LIGHT", + "uvType": "BOX", + "uvScale": 0.2, + "uvOrientation": 512 + }, + { + "colors": "h == 5 && s == 7", + "baseMaterial": "DIRT_1", + "uvType": "BOX", + "uvScale": 0.2, + "shiftLightness": 2 + } + ], + "objectIds": [ + "RIMMINGTON_MINING_SPADE", + "MOLE_HILL_SPADE" + ] + }, { "description": "Dead Tree with snow", "baseMaterial": "BARK", @@ -52502,13 +54647,18 @@ }, { "description": "Golden 3 candle scone with lit flame - static", - "baseMaterial": "METALLIC_1_LIGHT_GLOSS", - "uvScale": 0.6, + "baseMaterial": "WOOD_GRAIN_3", + "uvScale": 0.45, "uvType": "BOX", "colorOverrides": [ { "colors": [ "h == 6 && s < 3" ], "baseMaterial": "NONE" + }, + { + "colors": [ "a < 255" ], + "baseMaterial": "NONE", + "upwardsNormals": true } ], "objectIds": [ @@ -52590,14 +54740,16 @@ "description": "Varrock - Jolly Boar Inn - Doublebed with orange blanket - Light Frame", "baseMaterial": "CARPET", "objectIds": [ - "FAI_VARROCK_DOUBLE_BED_ORANGE" + "FAI_VARROCK_DOUBLE_BED_ORANGE", + "FAI_VARROCK_SINGLE_BED_ORANGE02" ], "uvType": "BOX", + "uvScale": 0.6, "uvOrientation": 64, "colorOverrides": [ { "description": "Wood frame", - "colors": "h == 6", + "colors": "h == 6 || h == 7 && s != 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX" } @@ -52974,10 +55126,11 @@ }, { "description": "Spiral Staircase - Concrete textured", - "baseMaterial": "WOOD_GRAIN_3", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", "objectIds": [ "SPIRALSTAIRS", - "SPIRALSTAIRSMIDDLE" + "SPIRALSTAIRSMIDDLE", + "SPIRALSTAIRSBOTTOM_3" ], "uvType": "BOX", "uvScale": 0.6, @@ -53015,6 +55168,32 @@ "FAI_DWARF_BLACKSMITHTOOLS" ] }, + { + "description": "Blacksmiths Whetstone", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "colorOverrides": [ + { + "colors": "h == 36", + "baseMaterial": "WATER_FOUNTAIN_FLAT", + "uvType": "MODEL_XZ", + "uvScale": 0.4, + "shiftLightness": -8 + }, + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_SMOOTH" + }, + { + "colors": "h == 5 || h == 10", + "baseMaterial": "SMOOTH_STONE" + } + ], + "objectIds": [ + "DEVIOUS_WHETSTONE" + ] + }, { "description": "Pickaxes crossed as a wall decoration", "baseMaterial": "WOOD_GRAIN_3", @@ -53193,10 +55372,18 @@ "uvType": "BOX", "uvScale": 0.33, "objectIds": [ + "LOGPILE_SMALL", "LOGPILE", "CONTACT_LOGPILE" ], "colorOverrides": [ + { + "colors": "h == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvScale": 0.35, + "uvType": "MODEL_XY", + "uvOrientation": 512 + }, { "colors": "h == 7", "baseMaterial": "METALLIC_1" @@ -53438,10 +55625,33 @@ "FAI_VARROCK_CHURCH_PEW" ] }, + { + "description": "Cushioned church pew with foot rest with npcs sleeping", + "colorOverrides": [ + { + "description": "Red Cushion", + "colors": "h == 7 && s != 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientation": 512, + "uvType": "BOX", + "uvScale": 0.6 + }, + { + "description": "Golden Cushion", + "colors": "h == 7 && s == 7", + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.75 + } + ], + "npcIds": [ + "ROMEO_JULIET_PEW_SLEEPING_MAN", + "ROMEO_JULIET_PEW_SLEEPING_WOMAN" + ] + }, { "description": "Varrock church wooden lectern", "baseMaterial": "WOOD_GRAIN_3", - "uvOrientation": 512, "uvType": "BOX", "uvScale": 0.6, "colorOverrides": [ @@ -53503,8 +55713,7 @@ { "description": "Paper", "colors": [ - "h == 5 && s == 0", - "h == 10 && s == 0" + "h == 0 || h == 3 || h == 4 || h > 6 && s > 5 || h == 8 || h == 42" ], "baseMaterial": "GRUNGE_3", "uvType": "MODEL_XY" @@ -53519,7 +55728,8 @@ ], "objectIds": [ "FAI_VARROCK_APOTHECARY_CABINET_TWO", - "FAI_VARROCK_APOTHECARY_CABINET_ALT" + "FAI_VARROCK_APOTHECARY_CABINET_ALT", + "FAI_VARROCK_PERIODIC_TABLE" ] }, { @@ -53540,6 +55750,39 @@ "FAI_VARROCK_CHEMISTY_TABLE" ] }, + { + "description": "Varrock - PoH Easel", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "uvType": "BOX", + "flatNormals": true, + "uvScale": 0.1, + "objectIds": [ + "POH_ESTATE_AGENTS_LOC_ITEM" + ] + }, + { + "description": "Varrock - Church Altar", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "uvType": "BOX", + "uvScale": 0.1, + "objectIds": [ + "FAI_VARROCK_CHURCH_ALTAR" + ], + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + }, + { + "colors": [ "h == 0" ], + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.2 + } + ] + }, { "description": "Baxtorian Falls - Small Marble Pillars", "baseMaterial": "MARBLE_2", @@ -56635,7 +58878,8 @@ "uvScale": 0.5, "objectIds": [ "POH_BOARD_YANILLE", - "POH_BOARD_PRIFDDINAS" + "POH_BOARD_PRIFDDINAS", + "POH_BOARD_RIMMINGTON" ], "colorOverrides": [ { @@ -57335,7 +59579,7 @@ }, { "description": "Game Objects - Wooden Shelf With Book and Urns", - "baseMaterial": "WOOD_GRAIN_3", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", "uvType": "BOX", "uvOrientationX": 512, "uvOrientationZ": 512, @@ -57469,7 +59713,9 @@ "BOOKSHELF_OLD_SHORT3_MOVEDIN3", "BOOKSHELF_OLD_SHORT3_MOVEDIN2", "BOOKSHELF_OLD_TALL_MOVEDIN2", - "BOOKSHELF_OLD_TALL2_MOVEDIN2" + "BOOKSHELF_OLD_TALL2_MOVEDIN2", + "RD_BOOKSHELF_OLD_TALL", + "BOOKSHELF_OLD_SHORT3" ], "colorOverrides": [ { @@ -57545,7 +59791,10 @@ "WISE_OLD_MAN_FLOORCHART3", "WISE_OLD_MAN_WALLCHART1", "WISE_OLD_MAN_WALLCHART2", - "WISE_OLD_MAN_WALLCHART3" + "WISE_OLD_MAN_WALLCHART3", + "WITCHESWALLCHART", + "DRAYNOR_HAUNTED_PAINTING", + "DRAYNOR_SPOOKYPICTURE" ] }, { @@ -57557,8 +59806,7 @@ "WOM_RICH_GLOBE_MODEL", "SARADOMIN_STAFF", "WOM_BATHSCREEN_GOLD", - "WISE_OLD_MAN_TELESCOPE", - "WOM_SUITOFARMOUR_SARADOMIN" + "WISE_OLD_MAN_TELESCOPE" ], "colorOverrides": [ { @@ -57614,11 +59862,16 @@ "colorOverrides": [ { "colors": "h == 7", - "baseMaterial": "WOOD_GRAIN_2_SMOOTH", - "uvScale": 0.2, + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvScale": 0.4, "uvType": "BOX", - "uvOrientationY": 512, + "uvOrientationX": 512, "uvOrientationZ": 512 + }, + { + "colors": "h == 5", + "baseMaterial": "GRUNGE_3", + "shiftSaturation": -2 } ] }, @@ -57647,7 +59900,8 @@ { "description": "Aggie's House - Broom", "objectIds": [ - "DRAYNOR_AGGIE_WITCHESBROOM" + "DRAYNOR_AGGIE_WITCHESBROOM", + "WITCHESBROOM" ], "colorOverrides": [ { @@ -57671,17 +59925,38 @@ "baseMaterial": "METALLIC_1_LIGHT", "objectIds": [ "DRAYNOR_AGGIE_CAULDRON", - "SARIM_BETTYS_CAULDRON" + "SARIM_BETTYS_CAULDRON", + "HETTYCAULDRON", + "DK_CAULDRON", + "BLACKKNIGHTHOLE", + "DK_CAULDRON_SABOTAGED" ], "uvType": "BOX", "uvScale": 0.25, "colorOverrides": [ { - "colors": "h == 34", + "colors": "h == 34 || h == 21", "baseMaterial": "GRAY_75" } ] }, + { + "description": "Witches Metal Table", + "baseMaterial": "METALLIC_1_LIGHT", + "objectIds": [ + "DK_WITCHES_TABLE_CORNER" + ], + "uvType": "BOX", + "uvScale": 0.25, + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5 + } + ] + }, { "description": "Aggie's House - Garlic", "baseMaterial": "GRUNGE_3", @@ -57717,13 +59992,16 @@ "uvOrientationZ": 512, "objectIds": [ "MARKET", + "ROGUETRADER_ALI_M_STALL_NOWT", "DRAYNOR_TOY_MARKET", "RAG_MARKET_STALL", "SEED_STALL", "FURTHIEFSTALL", "GEMTHIEFSTALL", + "GEMMARKET", "CAKETHIEFSTALL", "SILKTHIEFSTALL", + "SILKMARKET", "SILVERTHIEFSTALL", "SPICETHIEFSTALL", "FORTIS_MARKET_STALL_GEMS", @@ -58277,7 +60555,8 @@ "colors": "h == 8", "baseMaterial": "ROPE", "uvType": "MODEL_YZ", - "uvOrientation": 512 + "uvOrientation": 512, + "uvScale": 0.85 } ] }, @@ -58454,7 +60733,8 @@ ], "objectIds": [ "KR_STUDYDESK", - "STUDYDESK" + "STUDYDESK", + "STUDYDESK_MAHOGANY" ] }, { @@ -62817,7 +65097,8 @@ "uvType": "BOX", "uvScale": 0.4, "objectIds": [ - "FAI_VARROCK_FABRIC_RACK" + "FAI_VARROCK_FABRIC_RACK", + "FAI_VARROCK_FABRIC_RACK_HAIRDRESSER01" ], "colorOverrides": [ { @@ -62840,9 +65121,10 @@ "colorOverrides": [ { "colors": "h == 7", - "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvOrientation": 512, + "uvOrientationY": 512, + "uvOrientationZ": 512, "uvScale": 0.70 } ] @@ -62855,18 +65137,65 @@ "objectIds": [ "FAI_VARROCK_FABRIC01", "FAI_VARROCK_FABRIC02", - "ICS_FLOOR_CLOTH" + "ICS_FLOOR_CLOTH", + "RIMMINGTON_FLOOR_CLOTH", + "FAI_VARROCK_FLOOR_CLOTH", + "FAI_VARROCK_CLOTHES3", + "FAI_VARROCK_CLOTHES4", + "FAI_VARROCK_CLOTHES1", + "FAI_VARROCK_CLOTHES5", + "FAI_VARROCK_CLOTHES2", + "FAI_VARROCK_FLOOR_CLOTH_HAIRDRESSER01" ], "colorOverrides": [ { - "colors": "h == 7", + "colors": "h == 6 || h == 7 || h == 8", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", "uvType": "BOX", "uvOrientation": 512, - "uvScale": 0.4 + "uvScale": 0.3 + } + ] + }, + { + "description": "East Varrock - Fancy Dress Shop - Hanging Coat", + "baseMaterial": "CARPET_LIGHT", + "minLightness": 14, + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "FAI_VARROCK_HANGING_COAT" + ] + }, + { + "description": "East Varrock - Fancy Dress Shop - Pretty Bed", + "baseMaterial": "CARPET", + "shiftLightness": 2, + "uvType": "BOX", + "uvScale": 0.4, + "objectIds": [ + "FAI_VARROCK_PRETTY_BED" + ], + "colorOverrides": [ + { + "colors": "h == 5 || h == 6 && s == 2", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientationY": 512 } ] }, + { + "description": "East Varrock - Fancy Dress Shop - Coat Hangars", + "baseMaterial": "WOOD_GRAIN_3_LIGHT", + "uvType": "BOX", + "uvScale": 0.3, + "uvOrientation": 250, + "objectIds": [ + "FAI_VARROCK_HANGERS" + ] + }, { "description": "East Varrock - Fancy Dress Shop - Sophanem - Shelf with thread", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", @@ -62878,8 +65207,8 @@ ], "colorOverrides": [ { - "colors": "h == 7", - "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "colors": "h == 7 || h == 8", + "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvOrientation": 512, "uvScale": 0.4 @@ -62927,10 +65256,15 @@ "uvOrientation": 512, "uvScale": 0.8 }, + { + "colors": "h == 9 || h == 16", + "baseMaterial": "CARPET", + "uvType": "BOX", + "uvScale": 0.34 + }, { "colors": "s == 0", - "baseMaterial": "METALLIC_1_GLOSS", - "uvType": "MODEL_XZ" + "baseMaterial": "METALLIC_1_GLOSS" } ] }, @@ -62950,6 +65284,84 @@ } ] }, + { + "description": "East Varrock - Hair Dresser - Shelves and Tables", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.3, + "objectIds": [ + "FAI_VARROCK_SHELF_HAIRDRESSER01", + "FAI_VARROCK_SHELF_HAIRDRESSER02", + "FAI_VARROCK_WOODEN_TABLE_HAIRDRESSER01", + "FAI_VARROCK_WOODEN_TABLE_HAIRDRESSER02" + ], + "colorOverrides": [ + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationY": 512 + } + ] + }, + { + "description": "East Varrock - Hair Dresser - Tables with Mirror", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvScale": 0.3, + "objectIds": [ + "FAI_VARROCK_TABLE_HAIRDRESSER01", + "FAI_VARROCK_TABLE_HAIRDRESSER02" + ], + "colorOverrides": [ + { + "colors": "h == 7 && s == 2", + "baseMaterial": "GRUNGE_3" + }, + { + "colors": "h == 7", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6, + "uvOrientationY": 512 + } + ] + }, + { + "description": "East Varrock - Hair Dresser - Chairs", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientationY": 512, + "objectIds": [ + "FAI_VARROCK_CHAIR_HAIRDRESSER01" + ], + "colorOverrides": [ + { + "colors": "h == 7 && s == 7", + "baseMaterial": "CARPET_LIGHT", + "uvType": "BOX", + "uvScale": 0.4 + } + ] + }, + { + "description": "East Varrock - Hair Dresser - Parrot in Cage", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.5, + "uvOrientationY": 256, + "objectIds": [ + "FAI_CAGE_PARROT01_DEFAULT01" + ], + "colorOverrides": [ + { + "colors": "h != 7", + "baseMaterial": "GRAY_90" + } + ] + }, { "description": "Objects - Table - Long - Wooden – With book scrolls and papers", "baseMaterial": "WOOD_GRAIN_3", @@ -63508,12 +65920,13 @@ "uvType": "BOX", "objectIds": [ "KR_BANKTABLE", - "KR_BANKTABLE2" + "KR_BANKTABLE2", + "FAI_VARROCK_BANKTABLE" ], "colorOverrides": [ { "description": "Wood", - "colors": "h == 6", + "colors": "h == 6 || h == 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "uvScale": 0.5, @@ -63546,8 +65959,7 @@ "colors": "h == 0 && s == 0", "baseMaterial": "METALLIC_1_LIGHT", "uvType": "BOX", - "uvScale": 0.4, - "uvOrientation": 89 + "uvScale": 0.2 } ] }, @@ -63640,7 +66052,9 @@ "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "objectIds": [ - "KR_SEERS_VILLAGE_PIANO_A" + "KR_SEERS_VILLAGE_PIANO_A", + "MISTMYST_PIANO_CLOSED", + "MISTMYST_PIANO_OPEN" ] }, { @@ -63694,7 +66108,12 @@ "uvType": "BOX", "uvScale": 0.1, "objectIds": [ - "GRANDFIREPLACE" + "GRANDFIREPLACE", + "FARM_FIREPLACE", + "GRANDFIREPLACE_OLDBRICK", + "MISTMYST_FIREPLACE_LIT", + "MISTMYST_FIREPLACE_UNLIT", + "MISTMYST_FIREPLACE_REVEALED" ], "colorOverrides": [ { @@ -64281,7 +66700,8 @@ "uvOrientationY": 512, "objectIds": [ "FAI_VARROCK_POSH_DRESSER", - "AKD_HUGHES_DRESSER_1_NOOP" + "AKD_HUGHES_DRESSER_1_NOOP", + "FAI_VARROCK_POSH_WARDROBE" ], "colorOverrides": [ { @@ -64294,7 +66714,7 @@ }, { "description": "Black Trim", - "colors": "h == 35", + "colors": "h == 35 || h == 42", "baseMaterial": "BLANK_GLOSS", "uvType": "BOX" } @@ -64452,7 +66872,8 @@ }, "objectIds": [ "FAI_VARROCK_POSH_BATHSCREEN1", - "ALDARIN_SCREEN_DEFAULT01" + "ALDARIN_SCREEN_DEFAULT01", + "BATHSCREEN" ], "uvType": "BOX", "uvScale": 0.65 @@ -64469,6 +66890,7 @@ { "colors": "h == 0", "baseMaterial": "MARBLE_2_SEMIGLOSS", + "shiftLightness": -10, "uvScale": 0.6, "uvOrientation": 256, "uvType": "BOX" @@ -64877,23 +67299,41 @@ "SHAYZIEN_WEAPONCASE_LARGE" ], "uvType": "BOX", - "uvScale": 0.8, + "uvScale": 0.65, "uvOrientationX": 512, "colorOverrides": [ { "description": "Metal", - "colors": "h == 0 && s == 0", + "colors": "h == 0 || h == 10 && s == 7", "baseMaterial": "METALLIC_1_LIGHT_GLOSS" }, { - "description": "Gold", - "colors": "h == 10 && s == 7", + "description": "Glass", + "colors": "a < 255", + "baseMaterial": "GRAY_60" + } + ] + }, + { + "description": "Kourend - Varrock - Metallic - Wooden - Wall standing Weapons case", + "baseMaterial": "WOOD_GRAIN_3", + "uvOrientationZ": 512, + "objectIds": [ + "FAI_VARROCK_FLOORSTANDING_WEAPONCASE2", + "FAI_VARROCK_FLOORSTANDING_WEAPONCASE" + ], + "uvType": "BOX", + "uvScale": 0.65, + "colorOverrides": [ + { + "description": "Metal", + "colors": "h == 0 || h == 10 && s == 7", "baseMaterial": "METALLIC_1_LIGHT_GLOSS" }, { "description": "Glass", "colors": "a < 255", - "baseMaterial": "GRAY_75" + "baseMaterial": "GRAY_60" } ] }, @@ -65100,7 +67540,8 @@ "FAI_VARROCK_WINDMILL_WINDOW_LARGE", "FAI_VARROCK_WINDMILL_WINDOW", "FAI_VARROCK_WINDMILL_TERM", - "FAI_VARROCK_WINDMILL_TERM_MIRROR" + "FAI_VARROCK_WINDMILL_TERM_MIRROR", + "FAI_VARROCK_WINDMILL_WALL_TYPE2_MIRROR_5" ] }, { @@ -65700,7 +68141,9 @@ "colors": "h >= 5 && h <= 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.75 + "uvScale": 0.75, + "uvOrientationZ": 512, + "uvOrientationX": 512 }, { "colors": "h == 0 && s == 0", @@ -65739,8 +68182,8 @@ "description": "Varrock - Wooden - Metallic - Shelves Gold canisters", "baseMaterial": "METALLIC_1_SEMIGLOSS", "uvType": "BOX", - "uvScale": 0.35, - "uvOrientation": 42, + "uvScale": 0.2, + "uvOrientation": 512, "objectIds": [ "FAI_VARROCK_RUNE_SHELF2", "FAI_VARROCK_RUNE_SHELF3" @@ -65755,6 +68198,24 @@ } ] }, + { + "description": "Varrock - Phoenix Hideout Sign", + "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", + "uvType": "BOX", + "uvScale": 0.25, + "objectIds": [ + "QIP_SOA_VTAM_CORPORATION_SIGN" + ], + "colorOverrides": [ + { + "colors": "h == 5", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvOrientationX": 512, + "uvScale": 0.75 + } + ] + }, { "description": "Varrock - Wooden - Metallic - Glass - - Paper shelf with Crystal ball and papers", "baseMaterial": "GRUNGE_3", @@ -65853,6 +68314,7 @@ "uvScale": 0.75, "objectIds": [ "DRAGONMOUNTEDHEAD_RED", + "DRAGONMOUNTEDHEAD_RED3_OFFSET2", "DRAGONMOUNTEDHEAD_RED3_OFFSET", "DRAGONMOUNTEDHEAD", "DRAGONMOUNTEDHEAD3" @@ -65879,7 +68341,7 @@ "description": "Varrock - Wooden - Bull Head Trophy (also in Spira's house)", "baseMaterial": "CARPET", "uvType": "BOX", - "uvScale": 0.75, + "uvScale": 0.45, "objectIds": [ "BULLMOUNTEDHEAD" ], @@ -65895,7 +68357,6 @@ "colors": "h == 10", "baseMaterial": "BONE", "uvType": "BOX", - "uvOrientation": 512, "uvScale": 0.25 } ] @@ -65915,8 +68376,7 @@ "colors": "h == 7", "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", - "uvScale": 0.75, - "uvOrientationY": 512 + "uvScale": 0.75 } ] }, @@ -65924,18 +68384,10 @@ "description": "Varrock - Cloth - Wooden - Castle Long Table", "baseMaterial": "CARPET", "uvType": "BOX", - "uvScale": 0.5, + "uvScale": 0.6, "uvOrientation": 64, "objectIds": [ "FAI_VARROCK_POSH_LARGE_TABLE" - ], - "colorOverrides": [ - { - "description": "Wood frame", - "colors": "h == 7 && s == 3", - "baseMaterial": "WOOD_GRAIN_3", - "uvType": "BOX" - } ] }, { @@ -66655,44 +69107,35 @@ } ] }, - { - "description": "Draynor - Kourend - Wooden - Table with pink purple table cloth", - "baseMaterial": "WOOD_GRAIN_3", - "uvType": "BOX", - "uvScale": 0.6, - "objectIds": [ - "DRAYNOR_SMALLTABLE" - ], - "colorOverrides": [ - { - "description": "Gold Table cloth", - "colors": "h == 60", - "baseMaterial": "CARPET", - "uvType": "BOX", - "uvScale": 0.65 - } - ] - }, { "description": "Zeah - Hosidius - Potted Plants", "baseMaterial": "GRUNGE_3", "uvType": "BOX", "uvOrientation": 89, "objectIds": [ - "FAI_VARROCK_POTTED_PLANT3" + "FAI_VARROCK_POTTED_PLANT3", + "FAI_VARROCK_POTTED_PLANT1" ], "colorOverrides": [ { - "colors": "h >= 16", + "colors": "h >= 14", "baseMaterial": "LEAF_VEINS", "uvType": "BOX", - "uvScale": 0.3 + "uvScale": 0.3, + "undoVanillaShading": false, + "upwardsNormals": true }, { - "colors": "h == 5", + "colors": "h == 5 && l == 15 || h == 5 && l == 14", "baseMaterial": "DIRT_2", "uvType": "BOX", "uvScale": 0.3 + }, + { + "colors": "h == 5 && l != 14 || h == 6", + "baseMaterial": "BARK", + "uvType": "BOX", + "uvScale": 0.35 } ] }, @@ -66900,7 +69343,8 @@ "objectIds": [ "CABBAGE", "AVIUM_CABBAGE01", - "AVIUM_CABBAGE02" + "AVIUM_CABBAGE02", + "DRAYNOR_MAGIC_CABBAGE" ], "uvType": "BOX", "uvScale": 0.6, @@ -70214,7 +72658,8 @@ "uvOrientation": 512, "upwardsNormals": true, "objectIds": [ - "VARLAMORE_NICE_CHEST" + "VARLAMORE_NICE_CHEST", + "DIARY_GUILD_BANKCHEST" ], "colorOverrides": [ { @@ -70222,8 +72667,7 @@ "colors": "s == 0", "baseMaterial": "METALLIC_1_LIGHT_SEMIGLOSS", "uvType": "BOX", - "uvScale": 0.4, - "uvOrientation": -89 + "uvScale": 0.2 } ] }, @@ -70272,7 +72716,9 @@ "objectIds": [ "MUSHROOM2_LARGE", "MUSHROOMS2", - "MUSHROOM2" + "MUSHROOM2", + "MUSHROOM2_DARK", + "MUSHROOMS2_DARK" ], "uvType": "BOX" }, @@ -72272,7 +74718,8 @@ "uvType": "BOX", "uvScale": 0.75, "objectIds": [ - "CON_CONTRACT_VARROCK_MID_BED_EDITABLE" + "CON_CONTRACT_VARROCK_MID_BED_EDITABLE", + "CON_CONTRACT_VARROCK_MID_BED_DEFAULT" ], "colorOverrides": [ { @@ -72303,7 +74750,8 @@ "objectIds": [ "CON_CONTRACT_VARROCK_SOUTH_MEDIUM_BED_OAK", "CON_CONTRACT_VARROCK_SOUTH_MEDIUM_BED_TEAK", - "CON_CONTRACT_VARROCK_SOUTH_MEDIUM_BED_MAHOGANY" + "CON_CONTRACT_VARROCK_SOUTH_MEDIUM_BED_MAHOGANY", + "CON_CONTRACT_VARROCK_SOUTH_MEDIUM_BED_DEFAULT" ], "colorOverrides": [ { @@ -72647,7 +75095,8 @@ "CON_CONTRACT_VARROCK_MID_DRESSER_REGULAR", "CON_CONTRACT_VARROCK_MID_DRESSER_OAK", "CON_CONTRACT_VARROCK_MID_DRESSER_TEAK", - "CON_CONTRACT_VARROCK_MID_DRESSER_MAHOGANY" + "CON_CONTRACT_VARROCK_MID_DRESSER_MAHOGANY", + "FAI_VARROCK_DRESSER" ], "colorOverrides": [ { @@ -75249,7 +77698,27 @@ "baseMaterial": "METALLIC_1_LIGHT" }, { - "colors": "h == 8", + "colors": "h == 8 && s == 1", + "baseMaterial": "MARBLE_4_LOW_CONTRAST_LIGHT_GLOSS", + "uvScale": 0.65, + "uvOrientation": 256, + "uvType": "BOX" + } + ] + }, + { + "description": "While Guthix Sleeps - Memorial Statues - Unbuilt", + "baseMaterial": "STONE", + "objectIds": [ + "LUC2_HERO_STATUE_ANCIENT_01" + ], + "colorOverrides": [ + { + "colors": "h == 8 && s > 5", + "baseMaterial": "METALLIC_1_LIGHT" + }, + { + "colors": "h == 8 && s == 1", "baseMaterial": "MARBLE_4_LOW_CONTRAST_LIGHT_GLOSS", "uvScale": 0.65, "uvOrientation": 256, @@ -76639,7 +79108,8 @@ "uvType": "BOX", "uvScale": 0.5, "objectIds": [ - "FAI_VARROCK_WALLSHELF_HAIRDRESSER01" + "FAI_VARROCK_WALLSHELF_HAIRDRESSER01", + "FAI_VARROCK_WALLSHELF_HAIRDRESSER02" ], "colorOverrides": [ { @@ -80815,22 +83285,123 @@ "objectIds": [ "PIRATETREASURE_WAREHOUSE_SHELVES2", "PIRATETREASURE_WAREHOUSE_SHELVES3", - "PIRATETREASURE_WAREHOUSE_SHELVES4" + "PIRATETREASURE_WAREHOUSE_SHELVES4", + "DK_SHELVES1", + "DK_SHELVES2", + "DK_SHELVES3" ] }, { "description": "Rimmington - Lands End - Wooden - Shelves - With Boxes", - "baseMaterial": "WOOD_GRAIN_3", + "baseMaterial": "GRUNGE_3", "uvType": "BOX", + "uvScale": 0.4, "objectIds": [ "RIMMINGTON_WAREHOUSE_SHELVES3", + "RIMMINGTON_WAREHOUSE_SHELVES2", "RIMMINGTON_WAREHOUSE_SHELVES4" ], "colorOverrides": [ { - "colors": "h == 6", - "baseMaterial": "GRUNGE_3", - "uvType": "BOX" + "colors": "h == 6 && s > 4", + "baseMaterial": "WOOD_GRAIN_3", + "shiftLightness": 1, + "uvType": "BOX", + "uvScale": 0.75 + } + ] + }, + { + "description": "Rimmington - Double Bed", + "baseMaterial": "CARPET_LIGHT", + "uvOrientation": 512, + "uvScale": 0.6, + "uvType": "BOX", + "objectIds": [ + "POOR_BIGBED" + ], + "colorOverrides": [ + { + "colors": [ "h == 6" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "uvScale": 0.6 + } + ] + }, + { + "description": "Rimmington - Chemist Tables with Equipment", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "uvType": "BOX", + "uvScale": 0.2, + "objectIds": [ + "RIMMINGTON_CHEMIST_TABLE_2", + "RIMMINGTON_CHEMIST_TABLE_1", + "LAMP_OIL_STILL", + "LAMP_OIL_STILL_0", + "LAMP_OIL_STILL_1" + ], + "colorOverrides": [ + { + "colors": [ "h == 6" ], + "baseMaterial": "WOOD_GRAIN_2_SMOOTH", + "uvType": "BOX", + "flatNormals": true, + "uvScale": 0.6 + } + ] + }, + { + "description": "Rimmington - Art Easel", + "baseMaterial": "METALLIC_1_LIGHT_SMOOTH", + "uvType": "BOX", + "uvScale": 0.1, + "objectIds": [ + "RIMMINGTON_ARTIST_EASIL", + "TOB_SPECTATOR_MISTHALIN_EASEL" + ], + "colorOverrides": [ + { + "colors": [ "h == 6" ], + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "flatNormals": true, + "uvScale": 0.6 + } + ] + }, + { + "description": "Rimmington - Campfire", + "baseMaterial": "LIGHT_BARK", + "uvType": "BOX", + "uvScale": 0.3, + "objectIds": [ + "FAVOUR_CAMPFIRE_BASE" + ], + "colorOverrides": [ + { + "colors": [ "h == 6 || h == 7" ], + "baseMaterial": "STONE_NORMALED", + "uvType": "BOX", + "uvScale": 0.4 + } + ] + }, + { + "description": "Rimmington - Wind Chimes", + "baseMaterial": "WOOD_GRAIN_3", + "shiftLightness": 3, + "uvType": "BOX", + "uvScale": 0.45, + "uvOrientationY": 512, + "objectIds": [ + "WITCHESCHARMS", + "DRAYNOR_AGGIE_WITCHESCHARMS" + ], + "colorOverrides": [ + { + "colors": [ "h == 10" ], + "baseMaterial": "METALLIC_1_LIGHT" } ] }, @@ -82282,7 +84853,7 @@ ] }, { - "description": "Canafis - Slepe - Table with thread scissors and other items", + "description": "Canafis - Slepe - Hole with Ladder and Trapdoor", "baseMaterial": "ROCK_3_SMOOTH", "uvType": "BOX", "uvScale": 0.8, @@ -85217,7 +87788,8 @@ "description": "Tirannwn - Prifddinas - Archery Target", "baseMaterial": "WOOD_GRAIN_2_SMOOTH", "objectIds": [ - "PRIF_TARGET" + "PRIF_TARGET", + "TARGET" ], "uvType": "BOX", "uvScale": 0.7, @@ -85424,11 +87996,12 @@ }, { "description": "Varrock - Stone - Surok Statue", - "baseMaterial": "STONE_NORMALED", + "baseMaterial": "SMOOTH_STONE", "uvType": "BOX", "uvScale": 0.8, "objectIds": [ "SUROK_STATUEBASE", + "SUROK_STATUEBASE1", "SUROK_STATUEBASE2" ] }, @@ -85459,7 +88032,12 @@ "uvType": "BOX", "uvScale": 0.75, "objectIds": [ - "FAI_VARROCK_UNDERGROUND" + "FAI_VARROCK_UNDERGROUND", + "FAI_VARROCK_UNDERGROUND_DOUBLE_TERM_L", + "FAI_VARROCK_UNDERGROUND_DOUBLE_TERM_R", + "FAI_VARROCK_UNDERGROUND_JOIN_MIRROR", + "FAI_VARROCK_UNDERGROUND_DOUBLE", + "FAI_VARROCK_UNDERGROUND_JOIN" ], "colorOverrides": [ { @@ -86728,6 +89306,47 @@ } ] }, + { + "description": "Falador Party Room - Fireplace", + "baseMaterial": "GRUNGE_3", + "objectIds": [ + "FAI_FALADOR_PARTY_ROOM_FIREPLACE" + ], + "colorOverrides": [ + { + "colors": "a < 255", + "baseMaterial": "NONE", + "upwardsNormals": true + }, + { + "colors": "h == 8 && s == 1", + "baseMaterial": "SMOOTH_STONE", + "uvType": "BOX", + "uvScale": 0.6, + "depthBias": 1 + } + ] + }, + { + "description": "Falador - Sir Tiffy Cashien sitting on bench", + "npcIds": [ + "RD_TELEPORTER_GUY" + ], + "colorOverrides": [ + { + "colors": "a < 255", + "baseMaterial": "NONE", + "upwardsNormals": true + }, + { + "colors": "h == 6", + "uvType": "BOX", + "uvScale": 0.75, + "uvOrientation": 512, + "baseMaterial": "WOOD_GRAIN_3" + } + ] + }, { "description": "Xmas 2025 - Rug", "baseMaterial": "CARPET_LIGHT", @@ -87257,7 +89876,9 @@ "objectIds": [ "DTTD_MACHINE_PARTS_CRATE_SMALL_FULL", "DTTD_MACHINE_PARTS_CRATE_BIG_FULL", + "DTTD_MACHINE_PARTS_CRATE_BIG_EMPTY", "DTTD_BOX_KART", + "DTTD_KART_EMPTY", "DTTD_MACHINE_PARTS_CRATE_SMALL_EMPTY", "DTTD_MACHINE_CRATE_OPEN_WITH_LID" ], @@ -87281,12 +89902,17 @@ "description": "Death to the Dorgushuun - Watermill Ladder", "baseMaterial": "WOOD_GRAIN_3", "objectIds": [ - "DTTD_MILL_TRAPDOOR_OPEN" + "DTTD_MILL_TRAPDOOR_OPEN", + "DTTD_MILL_TRAPDOOR_CLOSED" ], "uvType": "BOX", "uvScale": 0.6, "uvOrientationX": 512, "colorOverrides": [ + { + "colors": "h == 0", + "baseMaterial": "METALLIC_1_SMOOTH" + }, { "colors": "l == 2", "baseMaterial": "BLACK" @@ -87528,7 +90154,8 @@ "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "flatNormals": true, - "uvScale": 1.2 + "undoVanillaShading": false, + "uvScale": 0.7 }, { "description": "Sign", @@ -87536,7 +90163,9 @@ "baseMaterial": "WOOD_GRAIN_3", "uvType": "BOX", "flatNormals": true, - "uvOrientation": 512 + "undoVanillaShading": false, + "uvOrientation": 512, + "uvScale": 0.7 } ], "objectIds": [ @@ -87545,6 +90174,25 @@ "COWBOSS_SCOREBOARD_UBER" ] }, + { + "description": "Lumbridge - Generic Signpost", + "baseMaterial": "GRUNGE_3", + "uvType": "BOX", + "uvOrientation": 89, + "colorOverrides": [ + { + "description": "Sign Post", + "colors": "h == 6 || h == 7 && s == 6", + "baseMaterial": "WOOD_GRAIN_3", + "uvType": "BOX", + "flatNormals": true, + "uvScale": 0.75 + } + ], + "objectIds": [ + "DRAYNOR2_SIGNPOST" + ] + }, { "description": "Crandor Lab - Birthing Pool", "baseMaterial": "SMOOTH_STONE", diff --git a/src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_2.jpg b/src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_gray.jpg similarity index 100% rename from src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_2.jpg rename to src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_gray.jpg diff --git a/src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_1.jpg b/src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_red.jpg similarity index 100% rename from src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_1.jpg rename to src/main/resources/rs117/hd/scene/textures/hd_roof_shingles_red.jpg diff --git a/src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_2.jpg b/src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_gray.jpg similarity index 100% rename from src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_2.jpg rename to src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_gray.jpg diff --git a/src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_1.jpg b/src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_red.jpg similarity index 100% rename from src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_1.jpg rename to src/main/resources/rs117/hd/scene/textures/winter_hd_roof_shingles_red.jpg diff --git a/src/main/resources/rs117/hd/scene/tile_overrides.json b/src/main/resources/rs117/hd/scene/tile_overrides.json index 5df7e25970..fd679a5d64 100644 --- a/src/main/resources/rs117/hd/scene/tile_overrides.json +++ b/src/main/resources/rs117/hd/scene/tile_overrides.json @@ -244,10 +244,6 @@ "heightOffset": -150, "blended": false }, - { - "area": "Black Knights Fort - Entrance Tile Fix", - "heightOffset": -170 - }, { "name": "TAG - TEMPORARY - END" }, @@ -977,6 +973,20 @@ "NONE": "!textures" } }, + { + "name": "LUMBRIDGE_WINDMILL_FLOOR", + "area": "LUMBRIDGE_WINDMILL", + "overlayIds": [ + 14 + ], + "groundMaterial": "HD_WOOD_PLANKS_2", + "shiftLightness": 4, + "shiftSaturation": -2, + "blended": false, + "replacements": { + "NONE": "!textures" + } + }, { "name": "Molch Temple floor fix", "area": "Molch Temple floor fix", @@ -1601,7 +1611,22 @@ ], "groundMaterial": "VARROCK_PATHS", "shiftSaturation": -1, - "shiftLightness": 4 + "shiftLightness": 4, + "replacements": { + "NONE": "!textures", + "VARROCK_WEST_BANK_SOUTH_PATH_FIX_1_TEXTURE_BLENDING_ONLY": "!blendingColors" + } + }, + { + "name": "VARROCK_WEST_BANK_SOUTH_PATH_FIX_1_TEXTURE_BLENDING_ONLY", + "area": "VARROCK_WEST_BANK_SOUTH_PATH_FIX", + "overlayIds": [ + 172 + ], + "groundMaterial": "VARROCK_PATHS", + "shiftSaturation": -1, + "shiftLightness": 4, + "blended": false }, { "name": "VARROCK_WILDERNESS_DITCH_PATH_FIX_1", @@ -1818,6 +1843,17 @@ ], "groundMaterial": "GRASS_1" }, + { + "name": "VARROCK_SEWERS_WATER", + "area": "VARROCK_SEWERS", + "overlayIds": [ + 7, + 128, + 156 + ], + "waterType": "CAVE_WATER_SWAMP", + "blended": false + }, { "name": "STRONGHOLD_OF_SECURITY_OOZE", "area": "STRONGHOLD_OF_SECURITY_PESTILENCE", @@ -2213,6 +2249,19 @@ "NONE": "!textures" } }, + { + "name": "VARROCK_CHAMPIONS_GUILD_ROOF", + "area": "VARROCK_CHAMPIONS_GUILD_ROOF", + "overlayIds": [ + 171 + ], + "groundMaterial": "BRICK_PATHS", + "blended": false, + "heightOffset": 37, + "replacements": { + "NONE": "!textures" + } + }, { "name": "VARROCK_CHAMPIONS_GUILD_BOTTOM_FLOOR", "area": "VARROCK_CHAMPIONS_GUILD", @@ -2295,6 +2344,15 @@ "groundMaterial": "CARPET", "blended": false }, + { + "name": "VARROCK_JULIETS_HOUSE_BLACONY", + "area": "VARROCK_JULIETS_HOUSE_BLACONY", + "overlayIds": [ + 171 + ], + "groundMaterial": "WORN_TILES", + "blended": false + }, { "name": "VARROCK_JOLLY_BOAR_INN_KITCHEN_1", "area": "VARROCK_JOLLY_BOAR_INN", @@ -2573,6 +2631,17 @@ "groundMaterial": "MARBLE_2_SEMIGLOSS", "blended": false }, + { + "name": "AL_KHARID_ROOF", + "area": "AL_KHARID_BUILDINGS", + "overlayIds": [ + 9 + ], + "groundMaterial": "GRUNGE_3_ALT", + "blended": false, + "maxLightness": 65, + "uvScale": 1.5 + }, { "name": "AL_KHARID_FLOOR_MARBLE_2", "area": "AL_KHARID_BUILDINGS", @@ -8130,6 +8199,28 @@ ], "groundMaterial": "DIRT" }, + { + "name": "IMCANDO_PENINSULA_DUNES", + "area": "IMCANDO_PENINSULA_DUNES", + "underlayIds": [ + 62, + 68 + ], + "replacements": { + "DEFAULT_GRASS": [ + "h > 8" + ], + "BEACH_SAND": "!blendingTextures", + "DEFAULT_SAND": true + } + }, + { + "name": "IMCANDO_PENINSULA_DUNES_FIX", + "area": "IMCANDO_PENINSULA_DUNES_FIX", + "groundMaterial": "BEACH_SAND", + "setHue": 8, + "setSaturation": 3 + }, { "name": "COMPLEX_TILES_IMCANDO_PENINSULA", "area": "IMCANDO_PENINSULA", @@ -8149,8 +8240,8 @@ "h >= 9 && s >= 4", "h >= 10 && s >= 2" ], - "SEASONAL_DIRT": "h <= 8 && s >= 4 && l <= 71", - "SEASONAL_SAND": true + "SEASONAL_DIRT": "h <= 8 && s >= 4 && l <= 71 || h == 9 && s == 3", + "BEACH_SAND": true } }, { @@ -8448,7 +8539,38 @@ "groundMaterial": "OVERWORLD_GRASS_1", "maxLightness": 50, "shiftHue": -1, - "minHue": 9 + "minHue": 9, + "maxSaturation": 4 + }, + { + "name": "KHARID_GRASS_TO_DIRT_TRANSITION", + "groundMaterial": "GRASSY_DIRT", + "maxLightness": 50, + "shiftHue": -2, + "minHue": 8 + }, + { + "name": "KHARID_DIRT_TO_SAND_TRANSITION", + "groundMaterial": "DIRT_1", + "maxLightness": 55, + "shiftHue": -2, + "minHue": 7 + }, + { + "name": "KHARID_DIRT_TO_SAND_TRANSITION_2", + "groundMaterial": "DIRT_1", + "maxLightness": 52, + "shiftHue": -2, + "minHue": 4, + "maxSaturation": 3 + }, + { + "name": "KHARID_DIRT_TO_SAND_TRANSITION_3", + "groundMaterial": "VARIED_DIRT", + "maxLightness": 48, + "shiftHue": -1, + "minHue": 6, + "maxSaturation": 3 }, { "name": "KHARID_GRASS_CLAMPED", @@ -8464,14 +8586,6 @@ "maxLightness": 50, "shiftHue": -2 }, - { - "name": "KHARID_GRASSY_SAND", - "groundMaterial": "GRASSY_SAND", - "maxLightness": 60, - "shiftHue": -1, - "minHue": 6, - "maxSaturation": 3 - }, { "name": "KHARID_DIRTY_SAND", "groundMaterial": "SAND", @@ -8557,6 +8671,9 @@ 129 ], "replacements": { + "KHARID_DIRT_TO_SAND_TRANSITION": [ + "h == 9 && s == 3 || h == 10 && s == 3" + ], "KHARID_GRASS": [ "h >= 19", "h >= 10 && s >= 3", @@ -8599,7 +8716,7 @@ "KHARID_DIRT": [ "h == 7 && s > 3 && s < 8" ], - "KHARID_GRASSY_SAND": [ + "KHARID_DIRT_TO_SAND_TRANSITION_3": [ "h == 8 && s == 5 || s == 6" ] } @@ -8627,7 +8744,7 @@ "h > 9 && s > 3", "h == 9 && s > 4" ], - "KHARID_GRASSY_SAND": [ + "KHARID_DIRT_TO_SAND_TRANSITION_3": [ "h == 8 && s >= 5", "h == 8 && s == 4", "h == 8 && s >= 5" @@ -8654,6 +8771,10 @@ 126 ], "replacements": { + "KHARID_GRASS_TO_DIRT_TRANSITION": + [ + "h == 10 && s == 3 || h == 11 && s == 3" + ], "KHARID_GRASS_CLAMPED": [ "h > 11", "h > 9 && s > 3", @@ -8687,6 +8808,9 @@ 129 ], "replacements": { + "KHARID_DIRT_TO_SAND_TRANSITION": [ + "h == 9 && s == 3 || h == 10 && s == 3" + ], "KHARID_GRASS": [ "h > 10", "h > 9 && s > 3", @@ -8798,7 +8922,19 @@ 129 ], "replacements": { - "KHARID_GRASSY_SAND":[ + "KHARID_GRASS_TO_DIRT_TRANSITION": + [ + "h == 10 && s == 3 || h == 11 && s == 3" + ], + "KHARID_DIRT_TO_SAND_TRANSITION": + [ + "h == 9 && s == 3" + ], + "KHARID_DIRT_TO_SAND_TRANSITION_2": + [ + "h == 9 && s == 4 || h == 10 && s == 4" + ], + "KHARID_DIRT_TO_SAND_TRANSITION_3":[ "s == 2 && 9 <= h && h <= 10", "s == 4 && 9 <= h && h <= 11" ], @@ -8806,7 +8942,7 @@ "s == 4 && 8 == h" ], "KHARID_GRASS": [ - "h >= 12", + "h >= 10", "h > 8 && s > 3" ], "KHARID_DIRT": [ diff --git a/src/main/resources/rs117/hd/scene/water_types.json b/src/main/resources/rs117/hd/scene/water_types.json index 74d145dcd4..e5810cfd39 100644 --- a/src/main/resources/rs117/hd/scene/water_types.json +++ b/src/main/resources/rs117/hd/scene/water_types.json @@ -310,6 +310,28 @@ 41.32 ] }, + { + "name": "CAVE_WATER_SWAMP", + "specularStrength": 0.15, + "specularGloss": 75.0, + "baseOpacity": 0.9, + "fresnelAmount": 0.13, + "surfaceColor": [ + 15, + 25, + 17 + ], + "foamColor": [ + 55, + 55, + 55 + ], + "depthColor": [ + 10.79, + 36.75, + 41.32 + ] + }, { "name": "VANILLA_130", "vanillaTextureIndex": 130,