From 960852294bdc368c9d9fb82451943a8cd348962c Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Sat, 20 Mar 2021 22:50:48 +0100 Subject: [PATCH] Blown kisses leave decals. --- decaldef.txt | 18 ++++++++++++++++++ graphics/Decals/hearty.png | Bin 0 -> 2062 bytes graphics/Decals/hearty2.png | Bin 0 -> 2585 bytes language.version | 4 ++-- zscript/swwm_gesture_fx.zsc | 1 + 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 graphics/Decals/hearty.png create mode 100644 graphics/Decals/hearty2.png diff --git a/decaldef.txt b/decaldef.txt index 939033f25..fe578c84a 100644 --- a/decaldef.txt +++ b/decaldef.txt @@ -549,6 +549,24 @@ decalgroup BigPock BigPock4 1 BigPock5 1 } +decal Hearty +{ + pic hearty + translucent 0.5 + shade "00 00 00" + x-scale 0.2 + y-scale 0.2 +} +decal HeartyGlow +{ + pic hearty2 + add 1.0 + x-scale 0.2 + y-scale 0.2 + fullbright + animator SlowBurn + lowerdecal Hearty +} decal DemoSpray { pic DemoIcon diff --git a/graphics/Decals/hearty.png b/graphics/Decals/hearty.png new file mode 100644 index 0000000000000000000000000000000000000000..973ef8903079f49823191ecb3c06a3f32acd17a4 GIT binary patch literal 2062 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 literal 0 HcmV?d00001 diff --git a/language.version b/language.version index 38ba45811..3fdc55553 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r381 \cu(Sat 20 Mar 13:50:12 CET 2021)\c-"; -SWWM_SHORTVER="\cw0.9.11b-pre r381 \cu(2021-03-20 13:50:12)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r382 \cu(Sat 20 Mar 22:50:48 CET 2021)\c-"; +SWWM_SHORTVER="\cw0.9.11b-pre r382 \cu(2021-03-20 22:50:48)\c-"; diff --git a/zscript/swwm_gesture_fx.zsc b/zscript/swwm_gesture_fx.zsc index 11eb670c4..f8d4be9fa 100644 --- a/zscript/swwm_gesture_fx.zsc +++ b/zscript/swwm_gesture_fx.zsc @@ -348,6 +348,7 @@ Class LoveHeart : Actor //A_RemoveLight('LOVELIGHT'); CheckSplash(40); A_QuakeEx(2,2,2,8,0,300,"",QF_RELATIVE|QF_SCALEDOWN); + A_SprayDecal("HeartyGlow",64); A_StartSound("bestsound",CHAN_VOICE); Spawn("LoveHeartBurstLight",pos); int numpt = Random[ExploS](10,15);