OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

An important rewrite that was a long time coming.

Browse source 
First, a message: There is a time and a place for everything, and understanding
what is and is not appropriate is a fundamental aspect of how one should behave
in society. I must take steps in correcting my behavior, how I act both through
my interactions with others and through my own creations as well. While this is
only one step in a very, very long road, it is hopefully a step in the right
direction.

Various aspects of the story and lore, dialogues, character interactions, etc.
have been sanitized to be less explicit. I cannot in good conscience have
something like this in a project I'm creating, especially one with such a broad
audience as the one it has garnered.

A couple other things have been removed, such as direct references to
problematic media, and I've decided to forego the H-Doom compatibility that was
added "as a joke".

These changes will also be later applied to the side mods as well.

Should I have still missed anything, I please ask that people notify me and I
will address it as soon as I possibly can.

Furthermore, if any of the people still credited in this mod wish to have their
name and anything they contributed removed from it, I will do so.
This commit is contained in:
Mari the Deer 2023-03-17 11:52:36 +01:00
commit 7f5125b523
280 changed files with 1332 additions and 1357 deletions
Download patch file Download diff file Expand all files Collapse all files

4
zscript/handler/swwm_handler_damage.zsc
View file

@ -119,7 +119,7 @@ extend Class SWWMHandler
{
if ( e.Thing.IsFriend(e.DamageSource) )
lastcombat = AddOneliner("friendhit",1,10);
else if ( (!lastcombat || (gametic > lastcombat+90)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?1:4) && !SWWMHDoomHandler.IsCuteGirl(e.DamageSource) ) // [HDoom] don't shout at the girls
else if ( (!lastcombat || (gametic > lastcombat+90)) && !Random[DemoLines](0,(e.DamageSource.bBOSS||e.DamageSource.FindInventory("BossMarker"))?1:4) )
lastcombat = AddOneliner("gethit",1,15);
}
highesttic = gametic;
@ -169,7 +169,7 @@ extend Class SWWMHandler
lastcombat = AddOneliner("friendkill",1,5);
if ( Demolitionist(e.DamageSource) ) Demolitionist(e.DamageSource).facesad = true;
}
else if ( (!lastcombat || (gametic > lastcombat+50)) && !SWWMHDoomHandler.IsCuteGirl(e.Thing) ) // [HDoom] don't shout at the girls
else if ( !lastcombat || (gametic > lastcombat+50) )
{
int lc = 0;
Inventory buff = inflictor?inflictor.FindInventory('ParriedBuff'):null;

32
zscript/handler/swwm_handler_worldthings.zsc
View file

@ -294,72 +294,72 @@ extend Class SWWMHandler
e.Thing.bSHOOTABLE = false; // no hurt
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .2;
HeadpatTracker(hp).heightfix = .2;
}
else if ( e.Thing.GetClassName() == "CommanderKeen" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .4;
HeadpatTracker(hp).hdoomangfix = 5;
HeadpatTracker(hp).heightfix = .4;
HeadpatTracker(hp).angfix = 5;
}
else if ( e.Thing.GetClassName() == "BBChair" )
{
e.Thing.bUSESPECIAL = false;
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .2;
HeadpatTracker(hp).hdoomangfix = 15;
HeadpatTracker(hp).heightfix = .2;
HeadpatTracker(hp).angfix = 15;
HeadpatTracker(hp).patstate = e.Thing.MeleeState;
}
else if ( e.Thing.GetClassName() == "EvilEye" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .1;
HeadpatTracker(hp).heightfix = .1;
}
else if ( e.Thing.GetClassName() == "HeadCandles" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomangfix = 20;
HeadpatTracker(hp).angfix = 20;
}
else if ( e.Thing.GetClassName() == "HeartColumn" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = -.3;
HeadpatTracker(hp).heightfix = -.3;
}
else if ( e.Thing.GetClassName() == "Meat2" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .6;
HeadpatTracker(hp).hdoomangfix = -15;
HeadpatTracker(hp).heightfix = .6;
HeadpatTracker(hp).angfix = -15;
HeadpatTracker(hp).dvacationarghack = true;
}
else if ( e.Thing.GetClassName() == "Meat3" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .6;
HeadpatTracker(hp).hdoomangfix = 20;
HeadpatTracker(hp).heightfix = .6;
HeadpatTracker(hp).angfix = 20;
HeadpatTracker(hp).dvacationarghack = true;
}
else if ( e.Thing.GetClassName() == "LegsBabe" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = -1.5;
HeadpatTracker(hp).hdoomangfix = 20;
HeadpatTracker(hp).heightfix = -1.5;
HeadpatTracker(hp).angfix = 20;
HeadpatTracker(hp).dvacationarghack = true;
}
else if ( e.Thing.GetClassName() == "Meat4" )
{
let hp = Actor.Spawn("HeadpatTracker",e.Thing.pos);
hp.target = e.Thing;
HeadpatTracker(hp).hdoomheightfix = .6;
HeadpatTracker(hp).hdoomangfix = 15;
HeadpatTracker(hp).heightfix = .6;
HeadpatTracker(hp).angfix = 15;
HeadpatTracker(hp).dvacationarghack = true;
}
}

2
zscript/handler/swwm_handler_worldtick.zsc
View file

@ -111,8 +111,6 @@ extend Class SWWMHandler
if ( a.target != players[consoleplayer].mo ) continue;
// ignore friends
if ( a.IsFriend(players[consoleplayer].mo) ) continue;
// [HDoom] ignore cute girls
if ( SWWMHDoomHandler.IsCuteGirl(a.target) ) continue;
// ignore if player can't see it
if ( !SWWMUtility.InPlayerFOV(players[consoleplayer],a) ) continue;
// is it already in?

6
zscript/handler/swwm_statichandler.zsc
View file

@ -12,6 +12,9 @@ Class SWWMStaticHandler : StaticEventHandler
// crash handler
ui bool wasinmap;
ui int timer, msgpick;
// broccoli doccoli
bool isbd;
String bdname;
// versioning
bool tainted;
String taintver;
@ -525,8 +528,7 @@ Class SWWMStaticHandler : StaticEventHandler
}
else if ( timer == 140 )
{
let hnd = SWWMBrutalHandler(StaticEventHandler.Find("SWWMBrutalHandler"));
if ( hnd && hnd.detected ) Console.Printf("\cfYou shouldn't have tried running this with "..hnd.which..".\c-");
if ( isbd ) Console.Printf("\cfYou shouldn't have tried running this with "..bdname..".\c-");
else Console.Printf("\cfYou should probably screenshot this error and show it to Marisa.\c-");
Console.Printf("\cfLoaded Version:\n \cj%s\c-",StringTable.Localize("$SWWM_SHORTVER"));
if ( tainted ) Console.Printf("\cfSavegame Version:\n \cj%s\c-",taintver);