mirror of
https://github.com/Jackzmc/sourcemod-plugins.git
synced 2025-05-06 11:53:21 +00:00
Fix some ftt bugs
This commit is contained in:
parent
caf5e95fd1
commit
29b7d12060
4 changed files with 7 additions and 12 deletions
Binary file not shown.
|
@ -486,7 +486,6 @@ public Action Event_ItemPickup(int client, int weapon) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if(Trolls[SpicyGasIndex].IsActive(client)) {
|
} else if(Trolls[SpicyGasIndex].IsActive(client)) {
|
||||||
PrintToChat(client, "spice active");
|
|
||||||
if(GetEntityClassname(weapon, wpnName, sizeof(wpnName))) {
|
if(GetEntityClassname(weapon, wpnName, sizeof(wpnName))) {
|
||||||
float max = 1.0;
|
float max = 1.0;
|
||||||
if(Trolls[SpicyGasIndex].activeFlagClients[client] & 2) max = 0.5;
|
if(Trolls[SpicyGasIndex].activeFlagClients[client] & 2) max = 0.5;
|
||||||
|
@ -495,7 +494,7 @@ public Action Event_ItemPickup(int client, int weapon) {
|
||||||
if(StrEqual(wpnName, "weapon_gascan")) {
|
if(StrEqual(wpnName, "weapon_gascan")) {
|
||||||
AcceptEntityInput(weapon, "Ignite", client, client);
|
AcceptEntityInput(weapon, "Ignite", client, client);
|
||||||
} else if(StrEqual(wpnName, "weapon_propanetank") || StrEqual(wpnName, "weapon_oxygentank")) {
|
} else if(StrEqual(wpnName, "weapon_propanetank") || StrEqual(wpnName, "weapon_oxygentank")) {
|
||||||
ExplodeProjectile(weapon);
|
ExplodeProjectile(weapon, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -568,10 +567,6 @@ public Action Event_TakeDamage(int victim, int& attacker, int& inflictor, float&
|
||||||
if(reverseFF == 0) reverseFF = GetTrollID("Reverse FF");
|
if(reverseFF == 0) reverseFF = GetTrollID("Reverse FF");
|
||||||
if(attacker > 0 && attacker <= MaxClients && GetClientTeam(attacker) == 4 && IsFakeClient(attacker)) return Plugin_Continue;
|
if(attacker > 0 && attacker <= MaxClients && GetClientTeam(attacker) == 4 && IsFakeClient(attacker)) return Plugin_Continue;
|
||||||
|
|
||||||
if (victim > 0 && victim <= MaxClients && damagetype != 263168 && damagetype != 265216) {
|
|
||||||
PrintToChat(victim, "you are in spit.");
|
|
||||||
}
|
|
||||||
|
|
||||||
if(attacker > 0 && victim <= MaxClients && attacker <= MaxClients && IsClientInGame(attacker) && IsPlayerAlive(attacker)) {
|
if(attacker > 0 && victim <= MaxClients && attacker <= MaxClients && IsClientInGame(attacker) && IsPlayerAlive(attacker)) {
|
||||||
if(shootAtTarget[attacker] == victim) return Plugin_Continue;
|
if(shootAtTarget[attacker] == victim) return Plugin_Continue;
|
||||||
if(g_PendingBanTroll[attacker] > 0 && GetClientTeam(attacker) == 2 && GetClientTeam(victim) == 2) {
|
if(g_PendingBanTroll[attacker] > 0 && GetClientTeam(attacker) == 2 && GetClientTeam(victim) == 2) {
|
||||||
|
|
|
@ -370,9 +370,10 @@ bool SetBotTarget(int bot, int target, int targetHP, int loops = 15) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Taken from https://forums.alliedmods.net/showthread.php?t=220132&page=2
|
// Taken from https://forums.alliedmods.net/showthread.php?t=220132&page=2
|
||||||
stock void ExplodeProjectile(int entity) {
|
stock void ExplodeProjectile(int entity, bool smoke = true) {
|
||||||
SetEntProp(entity, Prop_Data, "m_takedamage", 2);
|
SetEntProp(entity, Prop_Data, "m_takedamage", 2);
|
||||||
SetEntProp(entity, Prop_Data, "m_iHealth", 1);
|
SetEntProp(entity, Prop_Data, "m_iHealth", 1);
|
||||||
SDKHooks_TakeDamage(entity, 0, 0, 1.0);
|
SDKHooks_TakeDamage(entity, 0, 0, 1.0);
|
||||||
SetEntProp(entity, Prop_Data, "m_nNextThinkTick", 1); //for smoke
|
if(smoke)
|
||||||
|
SetEntProp(entity, Prop_Data, "m_nNextThinkTick", 1); //for smoke
|
||||||
}
|
}
|
||||||
|
|
|
@ -239,7 +239,6 @@ bool ApplyAffect(int victim, const Troll troll, int activator, trollModifier mod
|
||||||
} else if(StrEqual(troll.name, "Amazon Special Combo")) {
|
} else if(StrEqual(troll.name, "Amazon Special Combo")) {
|
||||||
SpecialSpawnFlags spawnFlag = Special_Anywhere;
|
SpecialSpawnFlags spawnFlag = Special_Anywhere;
|
||||||
if(flags & (1 << 8)) spawnFlag = Special_OnTarget;
|
if(flags & (1 << 8)) spawnFlag = Special_OnTarget;
|
||||||
PrintToChatAll("spawnFlag: %d", spawnFlag);
|
|
||||||
for(int i = 1; i < 7; i++) {
|
for(int i = 1; i < 7; i++) {
|
||||||
if(flags & (1 << i)) {
|
if(flags & (1 << i)) {
|
||||||
SpawnSpecialForTarget(view_as<SpecialType>(i), victim, spawnFlag);
|
SpawnSpecialForTarget(view_as<SpecialType>(i), victim, spawnFlag);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue