Add new ftt combo

This commit is contained in:
Jackz 2022-07-11 23:00:44 -05:00
parent 0b89cde2d5
commit de85c3321b
No known key found for this signature in database
GPG key ID: E0BBD94CF657F603
3 changed files with 9 additions and 2 deletions

Binary file not shown.

View file

@ -56,6 +56,10 @@ void SetupsTrollCombos() {
combo.AddTroll("Reverse FF", .flags=2); combo.AddTroll("Reverse FF", .flags=2);
combo.AddTroll("Vomit Player"); combo.AddTroll("Vomit Player");
SetupCombo(combo, "No more survival");
combo.AddTroll("No Pickup", .flags = 8)
combo.AddTroll("Throw It All", .flags = 1)
SetupCombo(combo, "Shut up"); SetupCombo(combo, "Shut up");
combo.AddTroll("Vocalize Gag"); combo.AddTroll("Vocalize Gag");
combo.AddTroll("Honk / Meow / Woof", .flags=1); combo.AddTroll("Honk / Meow / Woof", .flags=1);

View file

@ -225,8 +225,11 @@ bool ApplyAffect(int victim, const Troll troll, int activator, trollModifier mod
//TODO: Implement TrollMod_Constant //TODO: Implement TrollMod_Constant
return false; return false;
} else if(StrEqual(troll.name, "Throw It All")) { } else if(StrEqual(troll.name, "Throw It All")) {
if(modifier & TrollMod_Instant) if(modifier & TrollMod_Instant) {
ThrowAllItems(victim); if(flags & 1) { // Hacky, just throw their kit
ThrowItemToPlayer(victim, activator, 3);
} else ThrowAllItems(victim);
}
if(hThrowTimer == INVALID_HANDLE && modifier & TrollMod_Constant) { if(hThrowTimer == INVALID_HANDLE && modifier & TrollMod_Constant) {
hThrowTimer = CreateTimer(hThrowItemInterval.FloatValue, Timer_ThrowTimer, _, TIMER_REPEAT); hThrowTimer = CreateTimer(hThrowItemInterval.FloatValue, Timer_ThrowTimer, _, TIMER_REPEAT);
} }