OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Hotfix for yet another case where shit destroys itself on death on the same tic for fuck's sake why do you people keep doing this shit can't you fucking learn for once to code death states properly you goddamn maniacs.

Browse source 
Also added another intermission art while I was at it, because why not.
This commit is contained in:
Mari the Deer 2021-08-13 18:02:08 +02:00
commit 57684c03b1
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
graphics/Fanart/Marisa6.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 707 KiB

3
language.def_base
View file

@ -876,7 +876,7 @@ SWWM_INTERTIP129 = "Bunnyhopping can let you reach ludicrous speeds (thought not
SWWM_INTERTIP130 = "The Ragekit's speed boost may make you violently bump against everything as you run around. This might become troublesome in enclosed spaces.";
// intermission fanart
SWWM_FANART = "Art: ";
SWWM_NFANART = "11";
SWWM_NFANART = "12";
SWWM_FANART1 = "S20TBL.jpg;Substance20 (@S20_TBL)";
SWWM_FANART2 = "CaptainJ.png;Captain J (@Jho7835)";
SWWM_FANART3 = "RedeadITA.png;Redead-ITA";
@ -888,6 +888,7 @@ SWWM_FANART8 = "Marisa2.jpg";
SWWM_FANART9 = "Marisa3.jpg";
SWWM_FANART10 = "Marisa4.jpg";
SWWM_FANART11 = "Marisa5.jpg";
SWWM_FANART11 = "Marisa6.jpg";
// achievements
SWWM_ACHIEVEMENT_ACID_TAG = "Fizzy Goodness";
SWWM_ACHIEVEMENT_ACID_TXT = "Melt %d enemies with Telebrium Flechettes";

4
language.version
View file

@ -1,3 +1,3 @@
[default]
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0 \cu(Thu 12 Aug 16:29:51 CEST 2021)\c-";
SWWM_SHORTVER="\cw1.0 \cu(2021-08-12 16:29:51)\c-";
SWWM_MODVER="\chSWWM \czGZ\c- \cw1.0.1 \cu(Fri 13 Aug 18:05:21 CEST 2021)\c-";
SWWM_SHORTVER="\cw1.0.1 \cu(2021-08-13 18:05:21)\c-";

2
zscript/weapons/swwm_thiccboolet.zsc
View file

@ -403,7 +403,7 @@ Class SilverBullet : SWWMWeapon
{
SWWMUtility.DoKnockback(t.HitList[i].HitActor,t.HitList[i].x+(0,0,0.025),t.Hitlist[i].HitDamage*20.*FRandom[SilverBullet](.8,1.2));
int dmg = t.HitList[i].HitActor.DamageMobj(invoker,self,t.Hitlist[i].HitDamage,'shot',DMG_FOILINVUL|DMG_USEANGLE|DMG_THRUSTLESS,atan2(t.Results.HitVector.y,t.Results.HitVector.x));
if ( (t.HitList[i].HitActor.Health <= 0) && (t.HitList[i].HitActor.bIsMonster || t.HitList[i].HitActor.player) && t.HitList[i].HitActor.IsHostile(self) )
if ( t.HitList[i].HitActor && (t.HitList[i].HitActor.Health <= 0) && (t.HitList[i].HitActor.bIsMonster || t.HitList[i].HitActor.player) && t.HitList[i].HitActor.IsHostile(self) )
{
invoker.nkills++;
SWWMUtility.AchievementProgress('swwm_progress_conga',invoker.nkills,player);