Skip to content

Commit

Permalink
- Misc :V
Browse files Browse the repository at this point in the history
  • Loading branch information
LordMisfit committed Jul 19, 2018
1 parent 0131da3 commit 73a6213
Show file tree
Hide file tree
Showing 8 changed files with 38 additions and 8 deletions.
Binary file modified acs/spelllib.o
Binary file not shown.
2 changes: 2 additions & 0 deletions decorate/TechnicalStuff.dec
Expand Up @@ -158,6 +158,8 @@ actor DealCriticalHit : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates t
actor ResistCriticalHit : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates the the holder will resist a critical hit [for damage-indicator script checks]
actor TookCriticalHit : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates the the holder was dealt a critical hit [for damage-indicator script checks]
actor TookNoDamage : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates the the holder was dealt a critical hit [for damage-indicator script checks]
actor TookNoDamageInvuln : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates the the holder was dealt a critical hit [for damage-indicator script checks]
actor AbsorbedDamage : PlaceHolderItem { Inventory.MaxAmount 1 } // Indicates the the holder was dealt a critical hit [for damage-indicator script checks]

actor SauronGauntletsItem : PlaceholderItem { } // For SBARINFO so the HUD shows the extra icon for having the Gauntlets regardless of which type/character.

Expand Down
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 33 additions & 6 deletions scripts/SPELLSRC.acs
Expand Up @@ -3667,6 +3667,7 @@ script "HUDDisplay" ENTER
int PopupFadeOutDuration = 0.0;
int xposmod = 0.0;
int yposmod = 0.0;
int nodmgcheck = 0;
int MonsterCrit;

int damageburstratios = GetCVar("dvdsnewhud_damageburstsratios");
Expand Down Expand Up @@ -3780,13 +3781,38 @@ script "HUDDisplay" ENTER
}
}
else
if (CheckActorInventory(Player1TID,"Missed") > 0)
{
yposmod = 0.0; // 9.0
SetFont("BBURMISS");
PopupHoldDuration = 0.375; PopupFadeOutDuration = 0.25;
HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_white,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,0.75+PopupHoldDuration,0.5+PopupFadeOutDuration,0.834);
TakeActorInventory(Player1TID,"Missed",9999);
nodmgcheck = 0;
if (CheckActorInventory(Player1TID,"Missed") > 0)
{
TakeActorInventory(Player1TID,"Missed",9999);
SetFont("BBURMIS3"); // BBURMISS
nodmgcheck++;
}
if (CheckActorInventory(Player1TID,"TookNoDamage") > 0)
{
TakeActorInventory(Player1TID,"TookNoDamage",9999);
SetFont("BBURNDM2");
nodmgcheck++;
}
if (CheckActorInventory(Player1TID,"TookNoDamageInvuln") > 0)
{
TakeActorInventory(Player1TID,"TookNoDamageInvuln",9999);
SetFont("BBURINV2");
nodmgcheck++;
}
if (CheckActorInventory(Player1TID,"AbsorbedDamage") > 0)
{
TakeActorInventory(Player1TID,"AbsorbedDamage",9999);
SetFont("BBURASR2");
nodmgcheck++;
}
if (nodmgcheck > 0)
{
yposmod = 0.0; // 9.0
PopupHoldDuration = 0.375; PopupFadeOutDuration = 0.25;
HudMessage(s:"A";HUDMSG_ALPHA|HUDMSG_FADEOUT,0,cr_white,xpos+xposmod+PopUpXPlacement,ypos+yposmod+PopUpYPlacement,0.75+PopupHoldDuration,0.5+PopupFadeOutDuration,0.834);
}
}

// Armor
Expand Down Expand Up @@ -31708,6 +31734,7 @@ script "MeleeImpactRadius" (int attacktype)
radius = 36 + (MiscellaneousVars[35] / 3);
}
int baseradius = radius;
//****************
if (MiscellaneousVars[100001] > 0) PrintBold(s:"EXPLRadius [Base]: ",d:radius);
if (MiscellaneousVars[317] > 0) radius = (radius * (8 + (MiscellaneousVars[317] * 3)) / 8);
if (MiscellaneousVars[100001] > 0) PrintBold(s:"EXPLRadius [StaminaUpgrades]: ",d:radius);
Expand Down
5 changes: 3 additions & 2 deletions zscript/dvds-playerclass.zc
Expand Up @@ -1501,13 +1501,14 @@ class AetheriusPlayerPawn : PlayerPawn
{
if (mod != 'falling' || mod != 'Drowning')
{
if (CallACS("GetBuffTimer",4) > 0)
if (CallACS("GetBuffTimer",4) > 0 || bINVULNERABLE || player.cheats & CF_GODMODE2 || player.cheats & CF_GODMODE || CountInv("InvulnerabilitySpell",AAPTR_PLAYER1) > 0 || CountInv("IsInvulnerable",AAPTR_PLAYER1) > 0)
{
A_GiveInventory("TookNoDamageInvuln",1);
A_PlaySound("Player/TookNoDamageInvuln",CHAN_BODY,frandom(0.375,0.625),0,ATTN_NORM);
}
else
{
//A_GiveInventory("TookNoDamage",1);
A_GiveInventory("TookNoDamage",1);
A_PlaySound("Player/TookNoDamage",CHAN_BODY,frandom(0.375,0.625),0,ATTN_NORM);
}
}
Expand Down

0 comments on commit 73a6213

Please sign in to comment.