diff --git a/gldefs.mortalrifle b/gldefs.mortalrifle index 657a9969a..c005d9e73 100644 --- a/gldefs.mortalrifle +++ b/gldefs.mortalrifle @@ -13,10 +13,13 @@ HardwareShader Texture "models/MortalRifle.png" Texture "masktex" "models/MortalRifle_mask.png" Texture "envtex" "models/envmap/leadenv.png" Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex2" "models/envmap/iceenv.png" + Texture "rimtex2" "models/envmap/icerim.png" Define "RIM_LIGHTING" Define "ENVFACT" = "1.5" Define "RIMFACT" = "1.2" Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" } Brightmap Texture "models/MortalMag.png" { @@ -32,10 +35,13 @@ HardwareShader Texture "models/MortalMag.png" Texture "masktex" "models/MortalMag_mask.png" Texture "envtex" "models/envmap/leadenv.png" Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex2" "models/envmap/iceenv.png" + Texture "rimtex2" "models/envmap/icerim.png" Define "RIM_LIGHTING" Define "ENVFACT" = "1.5" Define "RIMFACT" = "1.2" Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" } HardwareShader Texture "models/MortalMag_Empty.png" { @@ -52,23 +58,17 @@ HardwareShader Texture "models/MortalRound.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalRound_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = "1.5" - Define "RIMFACT" = "1.2" - Define "RIMSTEP" = ".2" } HardwareShader Texture "models/MortalRound_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalRound_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = "1.5" - Define "RIMFACT" = "1.2" - Define "RIMSTEP" = ".2" } Brightmap Texture "models/MortalGrenade.png" { @@ -82,23 +82,17 @@ HardwareShader Texture "models/MortalGrenade.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalGrenade_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = "1.5" - Define "RIMFACT" = "1.2" - Define "RIMSTEP" = ".2" } HardwareShader Texture "models/MortalGrenade_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/MortalGrenade_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = "1.5" - Define "RIMFACT" = "1.2" - Define "RIMSTEP" = ".2" } HardwareShader Texture "models/MortalLED.png" { diff --git a/gldefs.pickups b/gldefs.pickups index 247b18f0f..c7ca7a3a1 100644 --- a/gldefs.pickups +++ b/gldefs.pickups @@ -129,17 +129,23 @@ HardwareShader Texture "models/Lamp.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Lamp_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/darkenv.png" + Texture "rimtex" "models/envmap/darkrim.png" + Texture "envtex2" "models/envmap/silverenv.png" + Texture "rimtex2" "models/envmap/silverrim.png" Define "RIM_LIGHTING" + Define "ENV_TWOLAYER" } HardwareShader Texture "models/Lamp_off.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Lamp_mask.png" - Texture "envtex" "models/envmap/leadenv.png" - Texture "rimtex" "models/envmap/leadrim.png" + Texture "envtex" "models/envmap/darkenv.png" + Texture "rimtex" "models/envmap/darkrim.png" + Texture "envtex2" "models/envmap/silverenv.png" + Texture "rimtex2" "models/envmap/silverrim.png" Define "RIM_LIGHTING" + Define "ENV_TWOLAYER" } Brightmap Texture "models/Invinciball.png" { diff --git a/language.version b/language.version index 99dcd958e..5bba20409 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r642 \cu(Mon 28 Nov 00:35:12 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r642 \cu(2022-11-28 00:35:12)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r643 \cu(Mon 28 Nov 01:17:34 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r643 \cu(2022-11-28 01:17:34)\c-"; diff --git a/models/Lamp_mask.png b/models/Lamp_mask.png index 89ff1b813..8443bd5c3 100644 Binary files a/models/Lamp_mask.png and b/models/Lamp_mask.png differ diff --git a/models/MortalMag_mask.png b/models/MortalMag_mask.png index e3f3dc10e..2b63455a2 100644 Binary files a/models/MortalMag_mask.png and b/models/MortalMag_mask.png differ diff --git a/models/MortalRifle.blend b/models/MortalRifle.blend index 2835fa1c0..18a31c63d 100644 Binary files a/models/MortalRifle.blend and b/models/MortalRifle.blend differ diff --git a/models/MortalRifle1st.blend b/models/MortalRifle1st.blend index d6d72a8d8..9ea8c94db 100644 Binary files a/models/MortalRifle1st.blend and b/models/MortalRifle1st.blend differ diff --git a/models/MortalRifle_mask.png b/models/MortalRifle_mask.png index 43304b36e..980ecb65a 100644 Binary files a/models/MortalRifle_mask.png and b/models/MortalRifle_mask.png differ