diff --git a/graphics/Fanart/Marisa6.jpg b/graphics/Fanart/Marisa6.jpg new file mode 100644 index 000000000..7d70cbcb1 Binary files /dev/null and b/graphics/Fanart/Marisa6.jpg differ diff --git a/language.def_base b/language.def_base index 06677b9bb..2cb5ed096 100644 --- a/language.def_base +++ b/language.def_base @@ -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"; diff --git a/language.version b/language.version index 0d2009189..d802ea88f 100644 --- a/language.version +++ b/language.version @@ -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-"; diff --git a/zscript/weapons/swwm_thiccboolet.zsc b/zscript/weapons/swwm_thiccboolet.zsc index 74f3712fb..34cd562aa 100644 --- a/zscript/weapons/swwm_thiccboolet.zsc +++ b/zscript/weapons/swwm_thiccboolet.zsc @@ -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);