Skip to content

Commit

Permalink
- Misc :V
Browse files Browse the repository at this point in the history
  • Loading branch information
LordMisfit committed Dec 8, 2018
1 parent 8e6bbb4 commit 45f26cc
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 14 deletions.
43 changes: 29 additions & 14 deletions decorate/WeaponsAmmo.dec
Original file line number Diff line number Diff line change
Expand Up @@ -16674,20 +16674,29 @@ actor PoisonNeedle : FloraWeapon 31253
return state("");
}
AltFireThrow:
PSND B 2 // B [Left] or G [Right]
PSNT B 2 // B [Left] or M [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 5) { A_SetTics(0); }
else if (CallACS("MiscVarCheckDECORATE",10035) >= 1) { A_SetTics(1); }
}
PSNT C 2 // C [Left] or N [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 2) { A_SetTics(1); }
}
PSND C 2 // C [Left] or H [Right]
PSNT D 2 // D [Left] or O [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 3) { A_SetTics(1); }
if (CallACS("MiscVarCheckDECORATE",10035) >= 3) { A_PlaySound("fistswingmedium0",1); } else { A_PlaySound("fistswinglight0",1); }
}
PSND D 2 // D [Left] or I [Right]
PSNT E 2 // E [Left] or P [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 4) { A_SetTics(1); }
if (CallACS("MiscVarCheckDECORATE",10035) >= 3) { A_PlaySound("fistswingmedium0",1); } else { A_PlaySound("fistswinglight0",1); }
}
PSND E 2 // E [Left] or J [Right]
PSNT F 2 // F [Left] or Q [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 5) { A_SetTics(1); }
}
PSNT G 2 // G [Left] or R [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 5) { A_SetTics(1); }
CallACS("StartTensionCountDown");
Expand All @@ -16703,17 +16712,22 @@ actor PoisonNeedle : FloraWeapon 31253
A_SpreadAuraFireProjectileAoE("PoisonNeedleProj","PoisonNeedleProjExtra",0.0,1,"PoisonNeedleAmmo",0,0,0,0);
}
}
PSND D 2 // D [Left] or I [Right]
PSNT H 2 // H [Left] or S [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 2) { A_SetTics(1); }
if (CallACS("MiscVarCheckDECORATE",10035) >= 4) { A_SetTics(1); }
}
PSND C 2 // C [Left] or H [Right]
PSNT I 2 // I [Left] or T [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 3) { A_SetTics(1); }
}
PSND B 2 // B [Left] or G [Right]
PSNT J 2 // J [Left] or U [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 4) { A_SetTics(1); }
if (CallACS("MiscVarCheckDECORATE",10035) >= 2) { A_SetTics(1); }
}
PSNT K 2 // K [Left] or V [Right]
{
if (CallACS("MiscVarCheckDECORATE",10035) >= 5) { A_SetTics(0); }
else if (CallACS("MiscVarCheckDECORATE",10035) >= 1) { A_SetTics(1); }
A_SetInventory("MartArtsMaster1",0);
A_SetInventory("MartArtsMaster2",0);
A_ReFire;
Expand Down Expand Up @@ -16920,6 +16934,7 @@ actor PoisonNeedleProj : AetheriusProjectileZSC
species "Players"
Radius 5 // 11
Height 4 // 8
Scale 0.8
Speed 60
Damage ((finaldamagedealt))
DamageType "PoisonNeedle"
Expand All @@ -16928,7 +16943,7 @@ actor PoisonNeedleProj : AetheriusProjectileZSC
states
{
Spawn:
DGGR A 0 NoDelay
TPSN A 0 NoDelay
{
if (CountInv("PowerStrength", AAPTR_PLAYER1) > 0) { A_ScaleVelocity(2.5); }
A_GetPlayerAttackDamage(59,0);
Expand All @@ -16941,11 +16956,11 @@ actor PoisonNeedleProj : AetheriusProjectileZSC
if (random(1,100) <= user_randompain) { A_ChangeFlag("FORCEPAIN", TRUE); }
}
Idle:
DGGR AAAAAAAAA 2 { A_GetPlayerAttackDamage(59,0); }
DGGR A 0 A_ChangeFlag ("NOGRAVITY",0)
TPSN AAAAAAAAA 2 { A_GetPlayerAttackDamage(59,0); }
TPSN A 0 A_ChangeFlag ("NOGRAVITY",0)
goto Falling
Falling:
DGGR A 2 { A_GetPlayerAttackDamage(59,0); }
TPSN A 2 { A_GetPlayerAttackDamage(59,0); }
loop
Death:
TNT1 A 0
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions zscript/dvds-actorclass.zc
Original file line number Diff line number Diff line change
Expand Up @@ -2312,9 +2312,15 @@ class AetheriusTimeFreezer : PowerTimeFreezer
S_ResumeSound(false);
}

override void DoEffect()
{
Super.DoEffect();
}

override void Tick()
{
Super.Tick();
EffectTics = 350;
S_ResumeSound(false);
}
}
Expand Down

0 comments on commit 45f26cc

Please sign in to comment.