diff --git a/gldefs.shinemaps b/gldefs.shinemaps index 937f1eba8..54f5181bc 100644 --- a/gldefs.shinemaps +++ b/gldefs.shinemaps @@ -22,6 +22,10 @@ HardwareShader Texture "models/pinkmap.png" { Shader "shaders/glsl/Shinemap.fp" } +HardwareShader Texture "models/puromap.png" +{ + Shader "shaders/glsl/Shinemap.fp" +} HardwareShader Texture "models/purpmap.png" { Shader "shaders/glsl/Shinemap.fp" diff --git a/language.version b/language.version index 2f9e5852e..90b742b9f 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r280 \cu(Tue 16 Feb 21:09:25 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r280 \cu(2021-02-16 21:09:25)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r281 \cu(Tue 16 Feb 22:59:42 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r281 \cu(2021-02-16 22:59:42)\c-"; diff --git a/modeldef.misc b/modeldef.misc index 3af1ec4aa..8db4265dc 100644 --- a/modeldef.misc +++ b/modeldef.misc @@ -195,12 +195,14 @@ Model "ShinemapDebugSphere" FrameIndex XZW1 I 0 0 Skin 0 "pinkmap.png" FrameIndex XZW1 J 0 0 - Skin 0 "purpmap.png" + Skin 0 "puromap.png" FrameIndex XZW1 K 0 0 - Skin 0 "ragemap.png" + Skin 0 "purpmap.png" FrameIndex XZW1 L 0 0 - Skin 0 "redmap.png" + Skin 0 "ragemap.png" FrameIndex XZW1 M 0 0 - Skin 0 "silvermap.png" + Skin 0 "redmap.png" FrameIndex XZW1 N 0 0 + Skin 0 "silvermap.png" + FrameIndex XZW1 O 0 0 } diff --git a/models/YnykronRod.png b/models/YnykronRod.png new file mode 100644 index 000000000..38b4bf57c Binary files /dev/null and b/models/YnykronRod.png differ diff --git a/models/YnykronRod_a.3d b/models/YnykronRod_a.3d new file mode 100644 index 000000000..b8c529084 Binary files /dev/null and b/models/YnykronRod_a.3d differ diff --git a/models/YnykronRod_bright.png b/models/YnykronRod_bright.png new file mode 100644 index 000000000..ff0a81dcf Binary files /dev/null and b/models/YnykronRod_bright.png differ diff --git a/models/YnykronRod_d.3d b/models/YnykronRod_d.3d new file mode 100644 index 000000000..e74db39b8 Binary files /dev/null and b/models/YnykronRod_d.3d differ diff --git a/models/YnykronRod_mask.png b/models/YnykronRod_mask.png new file mode 100644 index 000000000..ce134bf63 Binary files /dev/null and b/models/YnykronRod_mask.png differ diff --git a/models/puromap.png b/models/puromap.png new file mode 100644 index 000000000..86bfadeec Binary files /dev/null and b/models/puromap.png differ diff --git a/zscript/swwm_utility.zsc b/zscript/swwm_utility.zsc index 447e5035c..bb67c6915 100644 --- a/zscript/swwm_utility.zsc +++ b/zscript/swwm_utility.zsc @@ -1567,6 +1567,7 @@ Class ShinemapDebugSphere : Actor XZW1 L -1 A_SetRenderStyle(1.,STYLE_Normal); XZW1 M -1 A_SetRenderStyle(1.,STYLE_Normal); XZW1 N -1 A_SetRenderStyle(1.,STYLE_Normal); + XZW1 O -1 A_SetRenderStyle(1.,STYLE_Normal); Loop; } }