Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #85

Merged
merged 5 commits into from
Mar 25, 2024
Merged

Dev #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49c11eb
Mark prisoners blue when warden dies
MSWS Mar 24, 2024
36ed0fa
Move rebel before warden
MSWS Mar 24, 2024
3887cc1
Add [WARDEN] prefix
MSWS Mar 25, 2024
cedd2c4
Fix rebel not working
MSWS Mar 25, 2024
b5bd686
Merge branch 'dev' of https://github.com/edgegamers/Jailbreak into dev
MSWS Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mod/Jailbreak.Rebel/RebelListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public RebelListener(IRebelService rebelService, ILastRequestManager lastRequest
}

[GameEventHandler]
private HookResult OnPlayerHurt(EventPlayerHurt @event, GameEventInfo info)
public HookResult OnPlayerHurt(EventPlayerHurt @event, GameEventInfo info)
{
var player = @event.Userid;
if (!player.IsReal())
Expand Down
3 changes: 3 additions & 0 deletions mod/Jailbreak.Warden/Global/WardenBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public bool TrySetWarden(CCSPlayerController controller)

_hasWarden = true;
_warden = controller;

_warden.PlayerName = "[WARDEN] " + _warden.PlayerName;

if (_warden.Pawn.Value != null)
{
Expand Down Expand Up @@ -92,6 +94,7 @@ public bool TryRemoveWarden()

if (_warden != null && _warden.Pawn.Value != null)
{
_warden.PlayerName = _warden.PlayerName.Replace("[WARDEN] ", "");
_warden.Pawn.Value.RenderMode = RenderMode_t.kRenderTransColor;
_warden.Pawn.Value.Render = Color.FromArgb(254, 255, 255, 255);
Utilities.SetStateChanged(_warden.Pawn.Value, "CBaseModelEntity", "m_clrRender");
Expand Down
Loading