diff --git a/language.def_base b/language.def_base index 40233a281..bc0ea650b 100644 --- a/language.def_base +++ b/language.def_base @@ -430,8 +430,8 @@ FN_MBOSS_FUN = "Magic Boi"; FN_CBOSS_FUN = "Holy Boi"; FN_HERESIARCH_FUN = "Oh Lawd He Comin'"; // Additional tags -FN_BOSSBRAIN = "Marisa Kirisame"; -FN_BOSSBRAIN_FUN = "YOU WERE EXPECTING JOHN ROMERO BUT IT WAS ME, MARISA!"; +FN_BOSSBRAIN = "Boss Brain"; +FN_BOSSBRAIN_FUN = "Very Wrappy Oatmeal"; FN_KEEN = "Commander Keen"; FN_KEEN_FUN = "Ruined by Bethesda"; FN_VOODOO = "Voodoo doll of %s"; diff --git a/language.es_base b/language.es_base index 0dd77fd33..3f4b4ff39 100644 --- a/language.es_base +++ b/language.es_base @@ -342,7 +342,8 @@ FN_MBOSS_FUN = "Tío Mágico"; FN_CBOSS_FUN = "Tío Santurrón"; FN_HERESIARCH_FUN = "Hostia Puta"; // Additional tags -FN_BOSSBRAIN_FUN = "¡ESPERABAS A JOHN ROMERO PERO ERA YO, MARISA!"; +FN_BOSSBRAIN = "Cerebro de Jefe"; +FN_BOSSBRAIN_FUN = "Avenas Las Buenas"; FN_KEEN_FUN = "Arruinado por Bethesda"; FN_VOODOO = "Muñeco Vudú de %s"; FN_VOODOO_NP = "Muñeco Vudú"; diff --git a/language.version b/language.version index 1717b823b..725a25e1b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r351 \cu(Sat 20 Aug 19:08:11 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r351 \cu(2022-08-20 19:08:11)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r352 \cu(Sat 20 Aug 19:51:47 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r352 \cu(2022-08-20 19:51:47)\c-"; diff --git a/sprites/bossbrain/MBRNA0.png b/sprites/bossbrain/MBRNA0.png index 3af9fdb85..0ee42f21e 100644 Binary files a/sprites/bossbrain/MBRNA0.png and b/sprites/bossbrain/MBRNA0.png differ diff --git a/sprites/bossbrain/MBRNB0.png b/sprites/bossbrain/MBRNB0.png index 3af9fdb85..0ee42f21e 100644 Binary files a/sprites/bossbrain/MBRNB0.png and b/sprites/bossbrain/MBRNB0.png differ diff --git a/trnslate.txt b/trnslate.txt index 9834eb49f..a46db3d33 100644 --- a/trnslate.txt +++ b/trnslate.txt @@ -8,3 +8,4 @@ HotMetal6 = "0:255=%[0.2,0.12,0.1]:[0.5,0.4,0.28]" HotMetal7 = "0:255=%[0.0,0.0,0.0]:[0.25,0.25,0.25]" Rubble = "0:255=%[0.0,0.0,0.0]:[0.2,0.2,0.2]" StoneSpike = "0:255=%[0.20,0.10,0.05]:[0.70,0.50,0.35]" +DeadOats = "0:255=#[255,0,0]" diff --git a/zscript/swwm_monsters.zsc b/zscript/swwm_monsters.zsc index 9a3389cb0..83e5561c8 100644 --- a/zscript/swwm_monsters.zsc +++ b/zscript/swwm_monsters.zsc @@ -206,7 +206,6 @@ Class SWWMBossBrainPain : Actor Default { RenderStyle "Add"; - Scale .8; Radius .1; Height 0.; } @@ -286,10 +285,10 @@ Class SWWMBossBrain : BossBrain Default { Tag "$FN_BOSSBRAIN"; - Scale .8; Radius 16; Height 32; +NOBLOOD; + +CASTSPRITESHADOW; } States { @@ -306,8 +305,9 @@ Class SWWMBossBrain : BossBrain } Goto Spawn; Death: - MBRN A 120 + MBRN A 20 { + A_SetTranslation('DeadOats'); A_StartSound("brain/death",CHAN_VOICE,attenuation:ATTN_NONE); A_QuakeEx(9,9,9,120,0,65535,"",QF_RELATIVE|QF_SCALEDOWN,falloff:65535,rollIntensity:1.); if ( !eyeless ) @@ -317,7 +317,14 @@ Class SWWMBossBrain : BossBrain } Spawn("SWWMBossBrainPain",pos); } - MBRN A -1 A_BrainDie(); + MBRN A 1 + { + A_FadeOut(.025,FTF_CLAMP); + return A_JumpIf(alpha<=0,1); + } + Wait; + MBRN A 80; + MBRN A 1 A_BrainDie(); Stop; } }