Grenades! #68
Grenades! #68
Conversation
| function ENT:BubbleStartTouch( ent ) | ||
| if not ent:IsPlayer() then return end | ||
| if not ent:Alive() then return end | ||
|
|
||
| -- Check if we're allowed to affect the player (there might be a build/pvp system, etc) | ||
| local allowed = false | ||
|
|
||
| hook.Add( "EntityTakeDamage", "CFC_PvPWeapons_AntiGravityGrenade_CheckIfDamageIsAllowed", function() | ||
| allowed = true | ||
|
|
||
| return true | ||
| end, HOOK_LOW ) | ||
|
|
||
| local dmgInfo = DamageInfo() | ||
| dmgInfo:SetAttacker( self:GetOwner() ) | ||
| dmgInfo:SetInflictor( self ) | ||
| dmgInfo:SetDamage( 100 ) | ||
| dmgInfo:SetDamageType( ent:InVehicle() and DMG_VEHICLE or DMG_GENERIC ) | ||
|
|
||
| ent:TakeDamageInfo( dmgInfo ) | ||
| hook.Remove( "EntityTakeDamage", "CFC_PvPWeapons_AntiGravityGrenade_CheckIfDamageIsAllowed" ) | ||
|
|
||
| if not allowed then return end | ||
|
|
||
| -- Apply the effect | ||
| ent:SetGravity( self.GravityMult ) | ||
|
|
||
| if ent:IsOnGround() then | ||
| ent:SetVelocity( Vector( 0, 0, self.PushStrength ) ) | ||
| end | ||
|
|
||
| ent._cfcPvPWeapons_AntiGravityGrenade = self | ||
|
|
||
| local rf = RecipientFilter() | ||
| rf:AddPlayer( ent ) | ||
|
|
||
| sound.Play( "ambient/machines/machine1_hit2.wav", ent:EyePos(), 75, 120 ) | ||
| util.ScreenShake( ent:EyePos(), 3, 5, 1.5, 500, true, ent ) | ||
|
|
||
| return true | ||
| end |
There was a problem hiding this comment.
I don't think this is going to work like you think it will.
A much simpler and more reliable option:
- Simply deal the damage here
- Have a new
PostEntityTakeDamagehook that checks forcfc_simple_ent_antigrav_grenadeas the inflictor, and thattook == true, and then run the second part of the effect
I believe the only difference will be that the bubbles will pop on non-pvpers, but I think that's fine
There was a problem hiding this comment.
I can't use PETD because I don't want to actually deal damage, merely check to see if it would otherwise pass damage checks. Note how it adds a temporary, low-priority hook which blocks the damage.
Also it does work, it's been tested live on the server for over a week straight.
There was a problem hiding this comment.
I was saying you could deal 0 damage, and use PETD to verify that it actually passes all damage filters rather than toggling a hook in a Touch callback
There was a problem hiding this comment.
But if I do that, it'll create a hitmarker, and potentially other strange behavior from having the damage event make it all the way to PETD.
| if not setModelScale then | ||
| local entMeta = FindMetaTable( "Entity" ) | ||
|
|
||
| -- Get the original function, in case the server wraps it for anticrash purposes. | ||
| setModelScale = entMeta._SetModelScale or entMeta.SetModelScale | ||
| end |
There was a problem hiding this comment.
Why not just use the function, wrapped or not?
There was a problem hiding this comment.
What? It is being used. This unwrap is needed here because of our own anticrash.
There was a problem hiding this comment.
What does our anticrash wrap do that doesn't work here?
There was a problem hiding this comment.
It blocks scales above 3, and the bubbles go above that.
There was a problem hiding this comment.
Maybe we could exclude this on the anticrash side then? What if there are multiple wraps with different names and you don't actually get the unwrapped one you want
There was a problem hiding this comment.
I could, but the only two ways I can think of aren't pretty. Either Making a hyper-specific name for the unwrapped function, or stuffing the wrapped function with a new argument into to force-ignore the limit, which wouldn't be accessible by e2 or sf due to them not accounting for more arguments.
There was a problem hiding this comment.
What about just
if ent:GetClass() == "cfc_simple_ent_bubble" then return og( ... ) end
?
There was a problem hiding this comment.
That would be painfully specific, and add an __index call and long string comparison to every SetModelScale() call. If we do things on the anticrash's end, it should be generalizable.
| -- Remove the bubble. | ||
| -- Without the extra 1-tick delay, this will sometime cause a MASSIVE lag spike due to the cosmetic bubbles being removed while SetModelScale's deltatime is still running. | ||
| -- No idea why that would happen, nor why it only happens with the cosmetic bubbles, but this fixes it. |
There was a problem hiding this comment.
Could you isolate and report this? Sounds like an easy bug report for rubat
| if not setModelScale then | ||
| local entMeta = FindMetaTable( "Entity" ) | ||
|
|
||
| -- Get the original function, in case the server wraps it for anticrash purposes. | ||
| setModelScale = entMeta._SetModelScale or entMeta.SetModelScale | ||
| end |
There was a problem hiding this comment.
What about just
if ent:GetClass() == "cfc_simple_ent_bubble" then return og( ... ) end
?
Makes some improvements/fixes to the throwable and grenade bases, and adds some new grenades: discombob, impact discombob, cluster, super cluster, curse, and anti-gravity.
Requires CFC-Servers/cfc_ulx_commands#159 to be merged.