diff --git a/gldefs.ammo b/gldefs.ammo index e27e93f72..126cc2b8f 100644 --- a/gldefs.ammo +++ b/gldefs.ammo @@ -1,22 +1,74 @@ +HardwareShader Texture "models/Shell_Normal.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Shell_Normal_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".8" +} +HardwareShader Texture "models/Shell_Normal_Used.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Shell_Normal_Used_mask.png" + Texture "envtex" "models/envmap/ekaenv.png" + Texture "rimtex" "models/envmap/ekarim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".8" +} HardwareShader Texture "models/Shell_Gold.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Gold_mask.png" - Texture "envtex" "models/envmap/goldenv.png" - Texture "rimtex" "models/envmap/goldrim.png" + Texture "envtex" "models/envmap/silverenv.png" + Texture "rimtex" "models/envmap/silverrim.png" + Texture "envtex2" "models/envmap/goldenv.png" + Texture "rimtex2" "models/envmap/goldrim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".6" - Define "RIMFACT" = ".9" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".8" + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".6" + Define "RIMFACT2" = ".9" } HardwareShader Texture "models/Shell_Gold_Used.png" { Shader "shaders/glsl/Envmask.fp" Texture "masktex" "models/Shell_Gold_Used_mask.png" + Texture "envtex" "models/envmap/silverenv.png" + Texture "rimtex" "models/envmap/silverrim.png" + Texture "envtex2" "models/envmap/goldenv.png" + Texture "rimtex2" "models/envmap/goldrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".8" + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".6" + Define "RIMFACT2" = ".9" +} +HardwareShader Texture "models/EvisceratorShell.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/EvisceratorShell_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".8" + Define "RIMFACT" = ".9" + Define "RIMSTEP" = "0." +} +HardwareShader Texture "models/HellblazerMissile.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/HellblazerMissile_mask.png" Texture "envtex" "models/envmap/goldenv.png" Texture "rimtex" "models/envmap/goldrim.png" Define "RIM_LIGHTING" Define "ENVFACT" = ".6" - Define "RIMFACT" = ".9" + Define "RIMFACT" = ".4" + Define "RIMSTEP" = "0." } Brightmap Texture "models/SparksterAmmo.png" { diff --git a/gldefs.candygun b/gldefs.candygun index 36e2ba2c3..01fde6025 100644 --- a/gldefs.candygun +++ b/gldefs.candygun @@ -1,22 +1,28 @@ HardwareShader Texture "models/CandyGun.png" { Shader "shaders/glsl/Envmask.fp" - Texture "masktex" "models/CandyGun_mask.png" + Texture "masktex" "models/ExplodiumGun_mask.png" Texture "envtex" "models/envmap/purpenv.png" Texture "rimtex" "models/envmap/purprim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".2" - Define "RIMFACT" = ".9" + Define "ENVFACT" = ".9" + Define "RIMFACT" = ".4" Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" } HardwareShader Texture "models/CandyGun_EmptyMag.png" { Shader "shaders/glsl/Envmask.fp" - Texture "masktex" "models/CandyGun_mask.png" + Texture "masktex" "models/ExplodiumGun_mask.png" Texture "envtex" "models/envmap/purpenv.png" Texture "rimtex" "models/envmap/purprim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" Define "RIM_LIGHTING" - Define "ENVFACT" = ".2" - Define "RIMFACT" = ".9" + Define "ENVFACT" = ".9" + Define "RIMFACT" = ".4" Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" } diff --git a/gldefs.deepimpact b/gldefs.deepimpact new file mode 100644 index 000000000..86e24e23e --- /dev/null +++ b/gldefs.deepimpact @@ -0,0 +1,8 @@ +HardwareShader Texture "models/DeepImpact.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/DeepImpact_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" +} diff --git a/gldefs.dlcammo b/gldefs.dlcammo index 901d97bbf..f6760c036 100644 --- a/gldefs.dlcammo +++ b/gldefs.dlcammo @@ -1,7 +1,92 @@ +HardwareShader Texture "models/SheenBullet.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/SheenBullet_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Texture "envtex2" "models/envmap/telenv.png" + Texture "rimtex2" "models/envmap/telrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".9" + Define "RIMFACT" = ".8" + Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" + Define "ENVFACT2" = "1.1" + Define "RIMFACT2" = "1.3" + Define "RIMSTEP2" = "0." +} +HardwareShader Texture "models/SheenBullet_Fired.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/SheenBullet_Fired_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Texture "envtex2" "models/envmap/telenv.png" + Texture "rimtex2" "models/envmap/telrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".9" + Define "RIMFACT" = ".8" + Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" + Define "ENVFACT2" = "1.1" + Define "RIMFACT2" = "1.3" + Define "RIMSTEP2" = "0." +} +HardwareShader Texture "models/SheenAmmoBox.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/SheenAmmoBox_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Texture "envtex2" "models/envmap/telenv.png" + Texture "rimtex2" "models/envmap/telrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".7" + Define "RIMFACT" = ".8" + Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = "0." +} Brightmap Texture "models/QuadCell.png" { map "models/QuadCell_bright.png" } +HardwareShader Texture "models/QuadCell.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/QuadCell_mask.png" + Texture "envtex" "models/envmap/lavaenv.png" + Texture "rimtex" "models/envmap/lavarim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".8" + Define "RIMFACT" = ".9" + Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = ".2" +} +HardwareShader Texture "models/QuadCell_Used.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/QuadCell_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".8" + Define "RIMFACT" = ".9" + Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = ".2" +} PointLight QUADAMMOLIGHT { diff --git a/gldefs.eviscerator b/gldefs.eviscerator new file mode 100644 index 000000000..d3950c402 --- /dev/null +++ b/gldefs.eviscerator @@ -0,0 +1,7 @@ +HardwareShader Texture "models/Eviscerator.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Eviscerator_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" +} diff --git a/gldefs.explodiumgun b/gldefs.explodiumgun new file mode 100644 index 000000000..1ada5bf88 --- /dev/null +++ b/gldefs.explodiumgun @@ -0,0 +1,28 @@ +HardwareShader Texture "models/ExplodiumGun.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/ExplodiumGun_mask.png" + Texture "envtex" "models/envmap/goldenv.png" + Texture "rimtex" "models/envmap/goldrim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".3" + Define "RIMFACT" = ".4" + Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" +} +HardwareShader Texture "models/ExplodiumGun_EmptyMag.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/ExplodiumGun_mask.png" + Texture "envtex" "models/envmap/goldenv.png" + Texture "rimtex" "models/envmap/goldrim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".3" + Define "RIMFACT" = ".4" + Define "RIMSTEP" = ".2" + Define "ENV_TWOLAYER" +} diff --git a/gldefs.hellblazer b/gldefs.hellblazer index b3d39e08a..bcbdcf77f 100644 --- a/gldefs.hellblazer +++ b/gldefs.hellblazer @@ -1,3 +1,26 @@ +HardwareShader Texture "models/Hellblazer.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Hellblazer_mask.png" + Texture "envtex" "models/envmap/goldenv.png" + Texture "rimtex" "models/envmap/goldrim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Texture "envtex3" "models/envmap/silverenv.png" + Texture "rimtex3" "models/envmap/silverrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".3" + Define "RIMFACT" = ".2" + Define "RIMSTEP" = "0." + Define "ENV_THREELAYER" + Define "ENVFACT2" = "1.2" + Define "RIMFACT2" = ".8" + Define "RIMSTEP2" = ".2" + Define "ENVFACT3" = "1.1" + Define "RIMFACT3" = "1.3" + Define "RIMSTEP3" = "0." +} + PointLight BLAZERLIGHT { Color 1.0 0.8 0.3 diff --git a/gldefs.misc b/gldefs.misc index 878d8d900..22dce6365 100644 --- a/gldefs.misc +++ b/gldefs.misc @@ -1,3 +1,67 @@ +HardwareShader Texture "chiptilb" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/bluenv.png" + Texture "rimtex" "models/envmap/blurim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptilc" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/kinyenv.png" + Texture "rimtex" "models/envmap/kinyrim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptile" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptilg" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/greenenv.png" + Texture "rimtex" "models/envmap/greenrim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptilm" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/purpenv.png" + Texture "rimtex" "models/envmap/purprim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptilr" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/redenv.png" + Texture "rimtex" "models/envmap/redrim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptilw" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Define "RIM_LIGHTING" +} +HardwareShader Texture "chiptily" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "chiptilw" + Texture "envtex" "models/envmap/goldenv.png" + Texture "rimtex" "models/envmap/goldrim.png" + Define "RIM_LIGHTING" +} HardwareShader Texture "graphics/HUD/EnemyBarS.png" { Shader "shaders/glsl/Fuzz.fp" diff --git a/gldefs.quadravol b/gldefs.quadravol index 6479bcb93..6bde3b43d 100644 --- a/gldefs.quadravol +++ b/gldefs.quadravol @@ -1,3 +1,20 @@ +HardwareShader Texture "models/Quadravol.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Quadravol_mask.png" + Texture "envtex" "models/envmap/darkenv.png" + Texture "rimtex" "models/envmap/darkrim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".4" + Define "RIMFACT" = ".6" + Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = ".2" +} HardwareShader Texture "models/QuadLED.png" { Shader "shaders/glsl/CanvasProxy.fp" diff --git a/gldefs.sheenhmg b/gldefs.sheenhmg index e535aff2b..81b90c013 100644 --- a/gldefs.sheenhmg +++ b/gldefs.sheenhmg @@ -1,3 +1,21 @@ +HardwareShader Texture "models/SheenHMG.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/SheenHMG_mask.png" + Texture "envtex" "models/envmap/iceenv.png" + Texture "rimtex" "models/envmap/icerim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".7" + Define "RIMFACT" = ".9" + Define "RIMSTEP" = "0." + Define "ENV_TWOLAYER" + Define "ENVFACT2" = ".6" + Define "RIMFACT2" = ".4" + Define "RIMSTEP2" = ".2" +} + HardwareShader Texture "models/SheenLED.png" { Shader "shaders/glsl/CanvasProxy.fp" diff --git a/gldefs.silverbullet b/gldefs.silverbullet index b6591fc66..00a90df89 100644 --- a/gldefs.silverbullet +++ b/gldefs.silverbullet @@ -1,3 +1,26 @@ +HardwareShader Texture "models/SilverBullet.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/SilverBullet_mask.png" + Texture "envtex" "models/envmap/silverenv.png" + Texture "rimtex" "models/envmap/silverrim.png" + Texture "envtex2" "models/envmap/ekaenv.png" + Texture "rimtex2" "models/envmap/ekarim.png" + Texture "envtex3" "models/envmap/goldenv.png" + Texture "rimtex3" "models/envmap/goldrim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".3" + Define "RIMFACT" = ".2" + Define "RIMSTEP" = "0." + Define "ENV_THREELAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = ".2" + Define "ENVFACT3" = "1.1" + Define "RIMFACT3" = "1.3" + Define "RIMSTEP3" = "0." +} + HardwareShader Texture "models/SilverBulletJetSmoke.png" { Shader "shaders/glsl/JetSmoke.fp" diff --git a/gldefs.spreadgun b/gldefs.spreadgun new file mode 100644 index 000000000..81a7b9faf --- /dev/null +++ b/gldefs.spreadgun @@ -0,0 +1,7 @@ +HardwareShader Texture "models/Spreadgun.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Spreadgun_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" +} diff --git a/gldefs.wallbuster b/gldefs.wallbuster new file mode 100644 index 000000000..611fe354a --- /dev/null +++ b/gldefs.wallbuster @@ -0,0 +1,7 @@ +HardwareShader Texture "models/Wallbuster.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Wallbuster_mask.png" + Texture "envtex" "models/envmap/leadenv.png" + Texture "rimtex" "models/envmap/leadrim.png" +} diff --git a/gldefs.ynykron b/gldefs.ynykron index 0fa89746d..494598916 100644 --- a/gldefs.ynykron +++ b/gldefs.ynykron @@ -1,3 +1,26 @@ +HardwareShader Texture "models/Ynykron.png" +{ + Shader "shaders/glsl/Envmask.fp" + Texture "masktex" "models/Ynykron_mask.png" + Texture "envtex" "models/envmap/pronoenv.png" + Texture "rimtex" "models/envmap/pronorim.png" + Texture "envtex2" "models/envmap/leadenv.png" + Texture "rimtex2" "models/envmap/leadrim.png" + Texture "envtex3" "models/envmap/dekaenv.png" + Texture "rimtex3" "models/envmap/dekarim.png" + Define "RIM_LIGHTING" + Define "ENVFACT" = ".8" + Define "RIMFACT" = ".9" + Define "RIMSTEP" = "0." + Define "ENV_THREELAYER" + Define "ENVFACT2" = ".8" + Define "RIMFACT2" = ".9" + Define "RIMSTEP2" = "0." + Define "ENVFACT3" = "1.1" + Define "RIMFACT3" = ".9" + Define "RIMSTEP3" = ".3" +} + HardwareShader Texture "models/YnykronSmoke.png" { Shader "shaders/glsl/YnykronSmoke.fp" diff --git a/language.version b/language.version index 5bba20409..2a9684e9e 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -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-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r644 \cu(Mon 28 Nov 13:51:17 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r644 \cu(2022-11-28 13:51:17)\c-"; diff --git a/models/CandyGun_mask.png b/models/CandyGun_mask.png deleted file mode 100644 index ac1cc20a3..000000000 Binary files a/models/CandyGun_mask.png and /dev/null differ diff --git a/models/DeepImpact_mask.png b/models/DeepImpact_mask.png new file mode 100644 index 000000000..ae333ce41 Binary files /dev/null and b/models/DeepImpact_mask.png differ diff --git a/models/EvisceratorShell_mask.png b/models/EvisceratorShell_mask.png new file mode 100644 index 000000000..31bf36b49 Binary files /dev/null and b/models/EvisceratorShell_mask.png differ diff --git a/models/Eviscerator_mask.png b/models/Eviscerator_mask.png new file mode 100644 index 000000000..a78aec90f Binary files /dev/null and b/models/Eviscerator_mask.png differ diff --git a/models/ExplodiumGun_mask.png b/models/ExplodiumGun_mask.png new file mode 100644 index 000000000..f29d0563d Binary files /dev/null and b/models/ExplodiumGun_mask.png differ diff --git a/models/HellblazerMissile_mask.png b/models/HellblazerMissile_mask.png new file mode 100644 index 000000000..701ef9e09 Binary files /dev/null and b/models/HellblazerMissile_mask.png differ diff --git a/models/Hellblazer_mask.png b/models/Hellblazer_mask.png new file mode 100644 index 000000000..fbe5f4bfe Binary files /dev/null and b/models/Hellblazer_mask.png differ diff --git a/models/QuadCell_mask.png b/models/QuadCell_mask.png new file mode 100644 index 000000000..270184ae9 Binary files /dev/null and b/models/QuadCell_mask.png differ diff --git a/models/Quadravol_mask.png b/models/Quadravol_mask.png new file mode 100644 index 000000000..aa5039cd5 Binary files /dev/null and b/models/Quadravol_mask.png differ diff --git a/models/SheenAmmoBox_mask.png b/models/SheenAmmoBox_mask.png new file mode 100644 index 000000000..6e333bd6c Binary files /dev/null and b/models/SheenAmmoBox_mask.png differ diff --git a/models/SheenBullet_Fired_mask.png b/models/SheenBullet_Fired_mask.png new file mode 100644 index 000000000..fa30940d8 Binary files /dev/null and b/models/SheenBullet_Fired_mask.png differ diff --git a/models/SheenBullet_mask.png b/models/SheenBullet_mask.png new file mode 100644 index 000000000..e277058a4 Binary files /dev/null and b/models/SheenBullet_mask.png differ diff --git a/models/SheenHMG_mask.png b/models/SheenHMG_mask.png new file mode 100644 index 000000000..fc0948b1f Binary files /dev/null and b/models/SheenHMG_mask.png differ diff --git a/models/Shell_Gold_Used_mask.png b/models/Shell_Gold_Used_mask.png index 7f8290d91..0f37ecbd0 100644 Binary files a/models/Shell_Gold_Used_mask.png and b/models/Shell_Gold_Used_mask.png differ diff --git a/models/Shell_Gold_mask.png b/models/Shell_Gold_mask.png index 79e388daa..972843fc6 100644 Binary files a/models/Shell_Gold_mask.png and b/models/Shell_Gold_mask.png differ diff --git a/models/Shell_Normal_Used_mask.png b/models/Shell_Normal_Used_mask.png new file mode 100644 index 000000000..02e696758 Binary files /dev/null and b/models/Shell_Normal_Used_mask.png differ diff --git a/models/Shell_Normal_mask.png b/models/Shell_Normal_mask.png new file mode 100644 index 000000000..8d5fedf69 Binary files /dev/null and b/models/Shell_Normal_mask.png differ diff --git a/models/Silverbullet_mask.png b/models/Silverbullet_mask.png new file mode 100644 index 000000000..eed24faf6 Binary files /dev/null and b/models/Silverbullet_mask.png differ diff --git a/models/Spreadgun_mask.png b/models/Spreadgun_mask.png new file mode 100644 index 000000000..5553ffa7b Binary files /dev/null and b/models/Spreadgun_mask.png differ diff --git a/models/Wallbuster_mask.png b/models/Wallbuster_mask.png new file mode 100644 index 000000000..f2c3d9a44 Binary files /dev/null and b/models/Wallbuster_mask.png differ diff --git a/models/Ynykron_mask.png b/models/Ynykron_mask.png new file mode 100644 index 000000000..c3a9e0b97 Binary files /dev/null and b/models/Ynykron_mask.png differ diff --git a/zscript/weapons/swwm_blazeit.zsc b/zscript/weapons/swwm_blazeit.zsc index 14b6ff93f..41e471114 100644 --- a/zscript/weapons/swwm_blazeit.zsc +++ b/zscript/weapons/swwm_blazeit.zsc @@ -3,6 +3,11 @@ Class HellblazerX : SWWMItemOverlay { + Default + { + RenderStyle "Translucent"; + Alpha .5; + } States { Spawn: @@ -117,8 +122,9 @@ Class Hellblazer : SWWMWeapon { player.SetPSprite(PSP_WEAPON+1,invoker.FindState(g)); // we have to still use A_Overlay* functions for these - A_OverlayFlags(PSP_WEAPON+1,PSPF_RENDERSTYLE|PSPF_FORCESTYLE,true); - A_OverlayRenderStyle(PSP_WEAPON+1,STYLE_Add); + A_OverlayFlags(PSP_WEAPON+1,PSPF_RENDERSTYLE|PSPF_FORCESTYLE|PSPF_ALPHA|PSPF_FORCEALPHA,true); + A_OverlayRenderStyle(PSP_WEAPON+1,STYLE_Translucent); + A_OverlayAlpha(PSP_WEAPON+1,.5); } action state A_JumpX( StateLabel a, StateLabel g )