Skip to content

Commit

Permalink
- Option to allow dashing to deal minor damage to whatever you bowl t…
Browse files Browse the repository at this point in the history
…hrough [set off by default]. Barrels/Pods are immune to dash damage, and monsters do not flinch from dash damage, and dashing cannot crit. :V

- Misc :V
  • Loading branch information
LordMisfit committed Jul 21, 2018
1 parent a31b4c2 commit 6338718
Show file tree
Hide file tree
Showing 8 changed files with 301 additions and 240 deletions.
1 change: 1 addition & 0 deletions CVARINFO.txt
Expand Up @@ -71,6 +71,7 @@ server int dvds_advancedvileres = 1;
server int dvds_allowexperiessence = 1;
server int dvds_improvediconofsin = 1;
server int dvds_monstercrits = 1;
server int dvds_dashdoesdmg = 0;

server int dvds_dmgindicator = 1;
server int dvds_dmgind_delay = 2;
Expand Down
18 changes: 18 additions & 0 deletions GLDEFS.txt
Expand Up @@ -3108,6 +3108,24 @@ Object DarkSeekerCrisis
Frame DKB1E { Light DarkBallSeeker4 }
}

Object DarkSeeker-Claw
{
Frame DKB1A { Light DarkBallSeeker1 }
Frame DKB1B { Light DarkBallSeeker1 }
Frame DKB1C { Light DarkBallSeeker2 }
Frame DKB1D { Light DarkBallSeeker3 }
Frame DKB1E { Light DarkBallSeeker4 }
}

Object DarkSeekerCrisis-Claw
{
Frame DKB1A { Light DarkBallSeeker1 }
Frame DKB1B { Light DarkBallSeeker1 }
Frame DKB1C { Light DarkBallSeeker2 }
Frame DKB1D { Light DarkBallSeeker3 }
Frame DKB1E { Light DarkBallSeeker4 }
}

Flickerlight2 NamiDarkImpFire
{
Color 0.5 0.2 0.8
Expand Down
2 changes: 1 addition & 1 deletion KEYCONF.txt
@@ -1,6 +1,6 @@
alias dvds_tiltdefaults "set sv_strafetilt true; set sv_strafetiltreversed false; set sv_strafetiltspeed 1.0; sv_strafetiltangle 0.5; set sv_movetilt true; set sv_movetiltspeed 15.000; set sv_movetiltangle 0.015; sv_movetiltscalar 0.5; set sv_underwatertilt true; set sv_underwatertiltspeed 0.8; set sv_underwatertiltangle 0.2; sv_underwatertiltscalar 1.0; set sv_deathtilt true; set sv_deathtiltangle 90.0; set sv_deathtiltangleerror 45.0"

alias dvds_defaults1 "set dvds_rapidcast 1; set dvds_doubledash 1; set dvds_healthdegenmode 1; set dvds_classicdviimonsters 1; set dvds_suicidebombers 1; set dvds_shotgunnerspread 0; set dvds_monsterbulletstracers 1; set dvds_monstercrisisattacks 1; set dvds_tracervelmulti 1.0; set dvds_pprojectilevelmulti 1.0; set dvds_mprojectilevelmulti 1.0; set dvds_monstercrisismulti 30; set dvds_bfg2704 1; set dvds_allowdashing 1; set dvds_allowdashing 1; set dvds_allowtension 1; set dvds_allowtensionocdmg 1; set dvds_tensionspeed 100; set dvds_canseedsappear 1; set dvds_survivemercyinvin 1; set dvds_staminaaffectsspeed 1; set dvds_monsterlevelbehavior 1; set dvds_advancedvileres 1; set dvds_allowexperiessence 1; set dvds_improvediconofsin 1; set dvds_levelaffectsspeed 1; set dvds_speedmult 1; set dvds_evadecalcfactor 100; set dvds_survivecalcfactor 100; set dvds_criticalcalcfactor 100; set dvds_monsterprojectileboost 1; set dvds_monsprojboostfactor 0.5; set dvds_LD_projspeedmulti 1.0; set dvds_monstercrits 1; set dvds_imposeinventorylimits 0"
alias dvds_defaults1 "set dvds_rapidcast 1; set dvds_doubledash 1; set dvds_healthdegenmode 1; set dvds_classicdviimonsters 1; set dvds_suicidebombers 1; set dvds_shotgunnerspread 0; set dvds_monsterbulletstracers 1; set dvds_monstercrisisattacks 1; set dvds_tracervelmulti 1.0; set dvds_pprojectilevelmulti 1.0; set dvds_mprojectilevelmulti 1.0; set dvds_monstercrisismulti 30; set dvds_bfg2704 1; set dvds_allowdashing 1; set dvds_allowdashing 1; set dvds_allowtension 1; set dvds_allowtensionocdmg 1; set dvds_tensionspeed 100; set dvds_canseedsappear 1; set dvds_survivemercyinvin 1; set dvds_staminaaffectsspeed 1; set dvds_monsterlevelbehavior 1; set dvds_advancedvileres 1; set dvds_allowexperiessence 1; set dvds_improvediconofsin 1; set dvds_levelaffectsspeed 1; set dvds_speedmult 1; set dvds_evadecalcfactor 100; set dvds_survivecalcfactor 100; set dvds_criticalcalcfactor 100; set dvds_monsterprojectileboost 1; set dvds_monsprojboostfactor 0.5; set dvds_LD_projspeedmulti 1.0; set dvds_monstercrits 1; set dvds_imposeinventorylimits 0; set dvds_dashdoesdmg 0"

alias dvds_defaults2 "set dvds_dmgindicator 1; set dvds_dmgind_delay 2; set dvds_dmgind_monstdivisor 160; set dvds_actorlifebars 1; set dvds_actorlifebarnames 1; set dvds_actorlifebarhp 1; set dvds_actorlifebarstats 1; set dvds_tensionauratype 1; set dvds_gfxeffectlevel 0"

Expand Down
2 changes: 2 additions & 0 deletions MENUDEF.txt
Expand Up @@ -973,7 +973,9 @@ OptionMenu "DVDS-SubMenu1"
Title "AETHERIUS - Special Game Options"
StaticText ""
Option "Rapid casting", "dvds_rapidcast", "OnOff"
StaticText ""
Option "Double-tap dashing", "dvds_doubledash", "OnOff"
Option "Dashing Deals Damage", "dvds_dashdoesdmg", "OnOff"
StaticText " "
Option "Stat Gain Items Appear?", "dvds_canseedsappear", "SeedsAppear"
Option "Experiessence Can Appear?", "dvds_allowexperiessence", "AllowExperiessence"
Expand Down
10 changes: 8 additions & 2 deletions decorate/SpecialItems.dec
Expand Up @@ -721,8 +721,10 @@ actor UpgradeAccuracyNew : AetheriusCustomInventory replaces UpgradeAccuracy

Actor ExplosiveBarrelNew : ExplosiveBarrel replaces ExplosiveBarrel
{
+PUSHABLE
DamageType "Explosive"
+PUSHABLE
DamageType "Explosive"
DamageFactor "Dashing", 0
Painchance "Dashing", 0
States
{
Spawn:
Expand All @@ -743,6 +745,8 @@ Actor ExplosiveBarrelNew : ExplosiveBarrel replaces ExplosiveBarrel
Actor TestExplosiveBarrel : ExplosiveBarrel
{
Mass 1000000000
DamageFactor "Dashing", 0
Painchance "Dashing", 0
States
{
Spawn:
Expand All @@ -764,4 +768,6 @@ Actor ExplosiveBarrelTelefraggingNew : ExplosiveBarrelNew 32500
{
+TELESTOMP
DamageType "Explosive"
DamageFactor "Dashing", 0
Painchance "Dashing", 0
}
13 changes: 8 additions & 5 deletions zscript/dvds-items.zc
Expand Up @@ -421,14 +421,17 @@ class AetheriusPowerMask : PowerIronFeet
Powerup.Duration -80;
Powerup.Color "00 00 00", 0;
+INVENTORY.HUBPOWER
Inventory.Icon "I_MASK";
Inventory.Icon "";
}

override void AbsorbDamage (int damage, Name damageType, out int newdamage)
{
if (damageType == 'Fire' || damageType == 'Drowning')
{
newdamage = 0;
}
if (damageType == 'Magma') newdamage = damage * 0.05;
if (damageType == 'Slime' || damageType == 'Drowning') newdamage = 0;
}

override void DoEffect ()
{
if (Owner.player != NULL) Owner.player.mo.ResetAirSupply();
}
}
10 changes: 10 additions & 0 deletions zscript/dvds-monsters.zc
Expand Up @@ -39,6 +39,7 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
Painchance "GravityHP", 256;
Painchance "GravityMP", 256;
Painchance "GravityHPMP", 256;
Painchance "Dashing", 0;
}

double oldVelZ;
Expand Down Expand Up @@ -325,6 +326,15 @@ class AetheriusMonsterZSC : AetheriusBaseZSC
// Ripper Detection
if (infl == "RagingSpirit" && random(1,6) != 1) CritResistChance = 200.0;
if (inflictor && inflictor.bRIPPER) { if (!singleripproj && !singlefastripproj && random(1,6) != 1) CritResistChance = 200.0; }
if (mod = 'Dashing')
{
CritResistChance = 200.0;
flags |= DMG_THRUSTLESS;
flags |= DMG_PLAYERATTACK;
flags |= DMG_NO_ARMOR;
flags |= DMG_NO_FACTOR;
flags |= DMG_NO_PROTECT;
}

if (CountInv("CheatCritUltimate", AAPTR_PLAYER1) > 0) CritResistChance = -200.0;
double CritResistRoll = frandom(0.1,100.0);
Expand Down

0 comments on commit 6338718

Please sign in to comment.