diff --git a/assets/material/models/creatures_r5/prowler/prowler_body_06_colpass_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_body_06_colpass_sknp.json index 55fe7034..0dfc4841 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_body_06_colpass_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_body_06_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_body_06_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_body_06_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_body_06_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_body_06_sknp.json index 08262a61..1ee1f513 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_body_06_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_body_06_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_body_06_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_body_06_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_body_07_colpass_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_body_07_colpass_sknp.json index 2fcc5944..23d31b73 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_body_07_colpass_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_body_07_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_body_07_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_body_07_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_body_07_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_body_07_sknp.json index ac306dfa..3f561104 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_body_07_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_body_07_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_body_07_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_body_07_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_head_06_colpass_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_head_06_colpass_sknp.json index ae7f4294..07d59b67 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_head_06_colpass_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_head_06_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_head_06_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_head_06_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_head_06_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_head_06_sknp.json index 404208e3..262112bb 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_head_06_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_head_06_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_head_06_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_head_06_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_head_07_colpass_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_head_07_colpass_sknp.json index eceac438..d380c66a 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_head_07_colpass_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_head_07_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_head_07_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_head_07_normalTexture.rpak", diff --git a/assets/material/models/creatures_r5/prowler/prowler_head_07_sknp.json b/assets/material/models/creatures_r5/prowler/prowler_head_07_sknp.json index 3fac469e..83e68294 100644 --- a/assets/material/models/creatures_r5/prowler/prowler_head_07_sknp.json +++ b/assets/material/models/creatures_r5/prowler/prowler_head_07_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/creatures_r5/prowler/prowler_head_07_albedoTexture.rpak", "1": "texture/models/creatures_r5/prowler/prowler_head_07_normalTexture.rpak", diff --git a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_colpass_sknp.json b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_colpass_sknp.json index a2170cb8..58452ba0 100644 --- a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_colpass_sknp.json +++ b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.rpak", "$textures": { "0": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_body_col.rpak", "1": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_body_nml.rpak", diff --git a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_sknp.json b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_sknp.json index 4fc8c9d7..5f623ec3 100644 --- a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_sknp.json +++ b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_body_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.rpak", "$textures": { "0": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_body_col.rpak", "1": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_body_nml.rpak", diff --git a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_colpass_sknp.json b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_colpass_sknp.json index 687a3cf7..bad59185 100644 --- a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_colpass_sknp.json +++ b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_colpass_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_face_col.rpak", "1": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_face_nml.rpak", diff --git a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_sknp.json b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_sknp.json index 9bcaddcc..06470a7f 100644 --- a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_sknp.json +++ b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_face_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak", "$textures": { "0": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_face_col.rpak", "1": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_face_nml.rpak", diff --git a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_hair_sknp.json b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_hair_sknp.json index a5d98e50..d740ec35 100644 --- a/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_hair_sknp.json +++ b/assets/material/models/humans_r5/pilots_r5/pilot_loba/loba_hair_sknp.json @@ -24,7 +24,7 @@ "surfaceProp": "flesh", "surfaceProp2": "", "shaderType": "sknp", - "shaderSet": "shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_sknp.rpak", + "shaderSet": "shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_comb_sknp.rpak", "$textures": { "0": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_hair_col.rpak", "1": "texture/models/humans_r5/pilots_r5/pilot_loba/loba_hair_nml.rpak", diff --git a/assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoAnisoDirAmtUv0m0Samp2222222222_lprobe_ps.msw b/assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoAnisoDirAmtUv0m0Samp2222222222_comb_lprobe_ps.msw similarity index 100% rename from assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoAnisoDirAmtUv0m0Samp2222222222_lprobe_ps.msw rename to assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoAnisoDirAmtUv0m0Samp2222222222_comb_lprobe_ps.msw diff --git a/assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoUv0m0Samp22222222_lprobe_ps.msw b/assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoUv0m0Samp22222222_comb_lprobe_ps.msw similarity index 100% rename from assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoUv0m0Samp22222222_lprobe_ps.msw rename to assets/shader/uberAoCavCbstSSTransThknsSSSScttrR5AoUv0m0Samp22222222_comb_lprobe_ps.msw diff --git a/assets/shader/uberAoCavOpmCbstCutR5AoAnisoDirAmtUv0m0Samp222222222_lprobe_ps.msw b/assets/shader/uberAoCavOpmCbstCutR5AoAnisoDirAmtUv0m0Samp222222222_comb_lprobe_ps.msw similarity index 100% rename from assets/shader/uberAoCavOpmCbstCutR5AoAnisoDirAmtUv0m0Samp222222222_lprobe_ps.msw rename to assets/shader/uberAoCavOpmCbstCutR5AoAnisoDirAmtUv0m0Samp222222222_comb_lprobe_ps.msw diff --git a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.msw new file mode 100644 index 00000000..0228cea0 Binary files /dev/null and b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.msw differ diff --git a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.msw deleted file mode 100644 index d3624288..00000000 Binary files a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.msw and /dev/null differ diff --git a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.msw new file mode 100644 index 00000000..c24c262b Binary files /dev/null and b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.msw differ diff --git a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.msw deleted file mode 100644 index 3002a7e3..00000000 Binary files a/assets/shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.msw and /dev/null differ diff --git a/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_comb_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_comb_sknp.msw new file mode 100644 index 00000000..5b691032 Binary files /dev/null and b/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_comb_sknp.msw differ diff --git a/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_sknp.msw b/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_sknp.msw deleted file mode 100644 index 5a8c4762..00000000 Binary files a/assets/shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_sknp.msw and /dev/null differ diff --git a/common_sdk.json b/common_sdk.json index d6070d30..1ae611fe 100644 --- a/common_sdk.json +++ b/common_sdk.json @@ -62,6 +62,18 @@ "_type": "shdr", "_path": "shader/uberAoCavSSTransThknsSSSScttrR5AoUv0m0Samp22222222_lprobe_ps.rpak" }, + { + "_type": "shdr", // replaces the game's existing shader, supports new combined sctr/thk textures. + "_path": "shader/uberAoCavCbstSSTransThknsSSSScttrR5AoUv0m0Samp22222222_comb_lprobe_ps.rpak" // 7DCFDFBDA4D4DF39 + }, + { + "_type": "shdr", // replaces the game's existing shader, supports new combined asa/asd textures. + "_path": "shader/uberAoCavOpmCbstCutR5AoAnisoDirAmtUv0m0Samp222222222_comb_lprobe_ps.rpak" // 1CB9120B5C814B79 + }, + { + "_type": "shdr", // replaces the game's existing shader, supports new combined asa/asd textures. + "_path": "shader/uberAoCavCbstSSTransThknsSSSScttrR5AoAnisoDirAmtUv0m0Samp2222222222_comb_lprobe_ps.rpak" // 7B41109E2BF4399A + }, { "_type": "shdr", "_path": "shader/uberUnlitAefVbwem0InterpInst_sknp_vs.rpak" @@ -200,16 +212,16 @@ "_path": "shaderset/uberLyrDetallTnBnInterpEmiAoDetovrDtmEmlEmi1Ao1Det1ovr1Dtm1Uvd1Uvd2R5AoUv0m0Uv1m1dtUv2m0Uv3m1tUv4m1tUV520002022234120000022PSSamp22222222222222222222_rgdp.rpak" }, { - "_type": "shds", - "_path": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_sknp.rpak" + "_type": "shds", // used for loba's body, was 9D73811A7DDC0EFF + "_path": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoAnisoDirAmtUv0m0PSSamp2222222222_comb_sknp.rpak" }, { - "_type": "shds", - "_path": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_sknp.rpak" + "_type": "shds", // used for loba's face, was C860B93C913EB69C + "_path": "shaderset/uberTnBnInterpAoCavCbstSSTransThknsSSSScttrVbweR5AoUv0m0PSSamp22222222_comb_sknp.rpak" }, { - "_type": "shds", - "_path": "shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_sknp.rpak" + "_type": "shds", // used for loba's hair, was 0xEC9CE8928CCA9111 + "_path": "shaderset/uberTnBnInterpAoCavOpmCbstCutVbweR5AoAnisoDirAmtUv0m0PSSamp222222222_comb_sknp.rpak" }, { "_type": "shds",