From 14c831d35efef3ec2372a3ecd7e98794ce1b5292 Mon Sep 17 00:00:00 2001 From: Marisa Kirisame Date: Thu, 14 Oct 2021 18:24:12 +0200 Subject: [PATCH] Brightmaps were zero bytes in size for some reason. --- FuturePlans.md | 23 ++++++++++------------- language.version | 4 ++-- models/KirinPlush_bright.png | Bin 0 -> 267 bytes models/SayaBean_bright.png | Bin 0 -> 281 bytes zscript/utility/swwm_utility.zsc | 4 ++++ 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/FuturePlans.md b/FuturePlans.md index b477def1e..2ada8aad5 100644 --- a/FuturePlans.md +++ b/FuturePlans.md @@ -69,11 +69,7 @@ All the hard stuff *(some of these aren't guaranteed)*. - **[Hexen]** Demolition Quest *(a JRPG, kinda like early FF / BoF)* * **Mothgirl summon for Lämp easter egg** - Layers of White *(Summon the White Lady)* -* **Replace all hitscan with *"light projectiles"*** -* **Crouch sliding *(+ proper crouch dashing)*** -* **Expand third person animations** - - 4-directional movement variants - - Height-dependent headpats (current animation was designed for dogs on same floor) +* ***(Maybe)* Replace all hitscan with *"light projectiles"*** * **Additional gestures + gesture menu** - Clap - The Bird @@ -85,7 +81,7 @@ All the hard stuff *(some of these aren't guaranteed)*. * **Photo Mode** - Dedicated poses - Stickers -* **Virtual Training Map** +* ***(Maybe)* Virtual Training Map** - Featuring Maidbot as assistant ## Unspecified @@ -107,25 +103,26 @@ Add-ons and other related stuff. - Unique bosses - Some extra enemy variants - Coverage for all supported WADs *(oof)* -* **Ibuki side mod *(Red Oni):*** +* **[Doom]** **Ibuki side mod *(Red Oni):*** - A more *"mundane"* arsenal - Featuring a very big girl with very big... Assets - Possibly will have its own DLC Weaponset too - Featuring a toggleable companion - - Nudity, in a Doom mod? Wow, never seen that one before - - This one's surprisingly meant to be more of a power trip than SWWM GZ -* **Saya side mod *(Red-Eyed Rampage)*** + - See, I got tired of playing modded Fallout 4 so... +* **[Doom]** **Saya side mod *(Red-Eyed Rampage)*** - The first mod where you play as a mere squishy person - - Spellcasting! - - A more interesting take on "infinite lives" + - Even more fun weapons, including one made by a god! + - Spellcards! + - A more interesting take on *"infinite lives"* - Featuring the Pancor Jackhammer *(lol)* * **[Hexen]** **Kirin side mod *(Red Star of Innocence)*** - Finally, you get to play as the precious femboy emperor + - Anarukon firearms? Anarukon firearms - Designed entirely for Hexen's funky gameplay™ - Watch as our boy complains about *"puzzles"* - Some unique touches to spice things up - Basically a lite version of what you could expect in **UNDEATH** -* ***(Maybe)* Hardcore Mode sub-mod:** +* ***(Maybe)* Hardcore Mode side mod:** - Featuring Demolitionist on Maidbot frame - More complex game mechanics - Manual Hammerspace management diff --git a/language.version b/language.version index de7c240d5..8f1c428c0 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r26 \cu(Thu 14 Oct 17:04:45 CEST 2021)\c-"; -SWWM_SHORTVER="\cw1.2pre r26 \cu(2021-10-14 17:04:45)\c-"; +SWWM_MODVER="\chSWWM \czGZ\c- \cw1.2pre r27 \cu(Thu 14 Oct 18:24:12 CEST 2021)\c-"; +SWWM_SHORTVER="\cw1.2pre r27 \cu(2021-10-14 18:24:12)\c-"; diff --git a/models/KirinPlush_bright.png b/models/KirinPlush_bright.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..68f95631a73eae68cb66a4c5e91b07dcae4a2d3a 100644 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc7G?$phIKJpLm3ztk>{RpaAm8(_C1X{H+)(CJ)0xUfCKF4m>85><+1Ye?>(Li%l7KzYnp7U z{VTol^0wNao=b0++V+U-`t`5IbLq=M^Pp9%UUSTpr{4Pa+HUH(Z2O)ondkSOU%BP| v>yK)sw_@Y%f?ocy-oNb9mo3~N+X@)}pLrv`-X^Uf3&izw^>bP0l+XkKP#{~1 literal 0 HcmV?d00001 diff --git a/models/SayaBean_bright.png b/models/SayaBean_bright.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..1d4e75a0b657dfb9f851807ee568e41f35f512b6 100644 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc7G?$phIKJpLm3ztL7VrY&Q@1seWutGOMv`nSyLtBN;67l%%YHJvr- z@-`{olbON2(@ti__KLO3xR>ra`8;OsvCsReV!0SHOv1{qzWSxS{%VHIq*~J`mC8A* z&reAS?#-M0xoVwV_{qwU#q*zJuXF33z9)S3`}XBorf!T3^?#Y1r_1XwvQCf!xy94f K&t;ucLK6UW4qa#f literal 0 HcmV?d00001 diff --git a/zscript/utility/swwm_utility.zsc b/zscript/utility/swwm_utility.zsc index dc9340177..be411d5e0 100644 --- a/zscript/utility/swwm_utility.zsc +++ b/zscript/utility/swwm_utility.zsc @@ -11,6 +11,7 @@ enum EDoExplosionFlags DE_HOWL = 64, // 25% chance for hit enemies to howl DE_COUNTENEMIES = 128, // only count hits for hostiles DE_COUNTSTEALTH = 256, // only count hits for inactive monsters + DE_COUNTFHKILLS = 512 // only count kills for enemies that were at full health }; Struct SWWMProjectionData @@ -1187,9 +1188,12 @@ Class SWWMUtility if ( (!(flags&DE_COUNTENEMIES) || hostile) && (!(flags&DE_COUNTSTEALTH) || inactive) ) nhit++; int dmg = int(Damage*damagescale); if ( dmg <= 0 ) continue; // no harm + int oldhp = a.Health; + int basehp = a.GetSpawnHealth(); int ndmg = a.DamageMobj(Source,Instigator,dmg,(DamageType=='')?Source.DamageType:DamageType,DMG_EXPLOSION,atan2(-dir.y,-dir.x)); if ( a && !(flags&DE_NOBLEED) ) a.TraceBleed((ndmg>0)?ndmg:dmg,Source); if ( (flags&DE_HOWL) && a && (a.Health > 0) && a.bISMONSTER && !Random[DoBlast](0,3) ) a.Howl(); + if ( (flags&DE_COUNTFHKILLS) && (oldhp < basehp) ) continue; // was not at full health if ( (!a || (a.Health <= 0)) && (!(flags&DE_COUNTENEMIES) || hostile) && (!(flags&DE_COUNTSTEALTH) || inactive) ) nkill++; } }