EGO/Jailbreak
1
0
Fork 1
mirror of https://github.com/edgegamers/Jailbreak.git synced 2025-12-05 20:40:29 -08:00
Code Issues Packages Projects Releases Wiki Activity

More dev stuff

Browse Source
This commit is contained in:
MSWS
2025-08-05 08:52:11 -07:00
parent 6844272ba2
commit b2f2411b1b
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mod/Jailbreak.LastRequest/LastRequestManager.cs
View File

@@ -64,30 +64,30 @@ public class LastRequestManager(ILRLocale messages, IServiceProvider provider)
private ILastRequestFactory? factory;
public bool IsLREnabledForRound { get; set; } = true;
public bool ShouldBlockDamage(CCSPlayerController player,
public bool ShouldBlockDamage(CCSPlayerController victim,
CCSPlayerController? attacker) {
if (!IsLREnabled) return false;
if (attacker == null || !attacker.IsReal()) return false;
var playerLR = ((ILastRequestManager)this).GetActiveLR(player);
var victimLR = ((ILastRequestManager)this).GetActiveLR(victim);
var attackerLR = ((ILastRequestManager)this).GetActiveLR(attacker);
if (playerLR == null && attackerLR == null)
if (victimLR == null && attackerLR == null)
// Neither of them is in an LR
return false;
if (playerLR == null != (attackerLR == null)) {
if (victimLR == null != (attackerLR == null)) {
// One of them is in an LR
messages.DamageBlockedInsideLastRequest.ToCenter(attacker);
return true;
}
// Both of them are in LR, verify they're in same LR
if (playerLR == null) return false;
if (victimLR == null) return false;
if (playerLR.Prisoner.Equals(attacker) || playerLR.Guard.Equals(attacker))
// Same LR, allow damage
if (victimLR.Prisoner.Equals(attacker) || victimLR.Guard.Equals(attacker))
// The person attacking is the victim's LR participant, allow damage
return false;
messages.DamageBlockedNotInSameLR.ToCenter(attacker);
@@ -108,8 +108,8 @@ public class LastRequestManager(ILRLocale messages, IServiceProvider provider)
stats?.Stats.Add(new LRStat());
basePlugin.RegisterListener<Listeners.OnEntityParentChanged>(OnDrop);
// VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage,
// HookMode.Pre);
VirtualFunctions.CBaseEntity_TakeDamageOldFunc.Hook(OnTakeDamage,
HookMode.Pre);
VirtualFunctions.CCSPlayer_ItemServices_CanAcquireFunc.Hook(OnCanAcquire,
HookMode.Pre);
}

9
mod/Jailbreak.Rebel/C4Bomb/C4Behavior.cs
View File

@@ -79,7 +79,7 @@ public class C4Behavior(IC4Locale ic4Locale, IRebelService rebelService,
Server.RunOnTick(Server.TickCount + (int)(64 * delay),
() => detonate(player, bombEntity));
tryEmitSound(player, "jb.jihad", 1);
player.EmitSound("jb.jihad");
}
public void TryGiveC4ToRandomTerrorist() {
@@ -279,7 +279,7 @@ public class C4Behavior(IC4Locale ic4Locale, IRebelService rebelService,
}
}
tryEmitSound(player, "jb.jihadExplosion", 1);
player.EmitSound("jb.jihadExplosion");
var particleSystemEntity =
Utilities.CreateEntityByName<CParticleSystem>("info_particle_system")!;
particleSystemEntity.EffectName =
@@ -293,11 +293,6 @@ public class C4Behavior(IC4Locale ic4Locale, IRebelService rebelService,
API.Stats?.PushStat(new ServerStat("JB_BOMB_EXPLODED", killed.ToString()));
}
private void tryEmitSound(CBaseEntity entity, string soundEventName,
int pitch) {
entity.EmitSound(soundEventName, pitch: pitch);
}
private class C4Metadata(bool isDetonating) {
public bool IsDetonating { get; set; } = isDetonating;
}