Skip to content

fix(gameevents): promote core.gameevents to have higher priority #819

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

Merged
roflmuffin merged 1 commit into from
Mar 24, 2025
Merged

fix(gameevents): promote core.gameevents to have higher priority #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
213 changes: 166 additions & 47 deletions managed/CounterStrikeSharp.API/Core/GameEvents.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,30 @@ public CCSPlayerController? Userid
get => GetPlayer("userid");
set => SetPlayer("userid", value);
}



public bool PlayerHeld
{
get => Get<bool>("player_held");
set => Set<bool>("player_held", value);
}



public bool PlayerThrown
{
get => Get<bool>("player_thrown");
set => Set<bool>("player_thrown", value);
}



public bool PlayerDropped
{
get => Get<bool>("player_dropped");
set => Set<bool>("player_dropped", value);
}
}

[EventName("broken_breakable")]
Expand Down Expand Up @@ -2053,10 +2077,10 @@ public CCSPlayerController? Userid


// Entindex of the entity they see
public int Subject
public long Subject
{
get => Get<int>("subject");
set => Set<int>("subject", value);
get => Get<long>("subject");
set => Set<long>("subject", value);
}


Expand Down Expand Up @@ -2334,6 +2358,14 @@ public string Mapname
get => Get<string>("mapname");
set => Set<string>("mapname", value);
}


// true if this is a transition from one map to another
public bool Transition
{
get => Get<bool>("transition");
set => Set<bool>("transition", value);
}
}

[EventName("game_phase_changed")]
Expand Down Expand Up @@ -3318,6 +3350,14 @@ public CCSPlayerController? Userid
}


// entity id of the env_instructor_hint that fired the event
public long HintEntindex
{
get => Get<long>("hint_entindex");
set => Set<long>("hint_entindex", value);
}


// what to name the hint. For referencing it again later (e.g. a kill command for the hint instead of a timeout)
public string HintName
{
Expand All @@ -3342,7 +3382,7 @@ public long HintTarget
}


// userid id of the activator
// playerslot of the activator
public CCSPlayerController? HintActivatorUserid
{
get => GetPlayer("hint_activator_userid");
Expand Down Expand Up @@ -3430,14 +3470,6 @@ public string HintBinding
}


// gamepad bindings to use when use_binding is the onscreen icon
public string HintGamepadBinding
{
get => Get<string>("hint_gamepad_binding");
set => Set<string>("hint_gamepad_binding", value);
}


// if false, the hint will dissappear if the target entity is invisible
public bool HintAllowNodrawTarget
{
Expand Down Expand Up @@ -3468,6 +3500,62 @@ public bool HintLocalPlayerOnly
get => Get<bool>("hint_local_player_only");
set => Set<bool>("hint_local_player_only", value);
}


// Game sound to play
public string HintStartSound
{
get => Get<string>("hint_start_sound");
set => Set<string>("hint_start_sound", value);
}


// Path for Panorama layout file
public string HintLayoutfile
{
get => Get<string>("hint_layoutfile");
set => Set<string>("hint_layoutfile", value);
}


// Attachment type for the Panorama panel
public int HintVrPanelType
{
get => Get<int>("hint_vr_panel_type");
set => Set<int>("hint_vr_panel_type", value);
}


// Height offset for attached panels
public float HintVrHeightOffset
{
get => Get<float>("hint_vr_height_offset");
set => Set<float>("hint_vr_height_offset", value);
}


// offset for attached panels
public float HintVrOffsetX
{
get => Get<float>("hint_vr_offset_x");
set => Set<float>("hint_vr_offset_x", value);
}


// offset for attached panels
public float HintVrOffsetY
{
get => Get<float>("hint_vr_offset_y");
set => Set<float>("hint_vr_offset_y", value);
}


// offset for attached panels
public float HintVrOffsetZ
{
get => Get<float>("hint_vr_offset_z");
set => Set<float>("hint_vr_offset_z", value);
}
}

[EventName("instructor_server_hint_stop")]
Expand All @@ -3484,6 +3572,14 @@ public string HintName
get => Get<string>("hint_name");
set => Set<string>("hint_name", value);
}


// entity id of the env_instructor_hint that fired the event
public long HintEntindex
{
get => Get<long>("hint_entindex");
set => Set<long>("hint_entindex", value);
}
}

[EventName("instructor_start_lesson")]
Expand Down Expand Up @@ -3549,6 +3645,21 @@ public EventInventoryUpdated(IntPtr pointer) : base(pointer){}
public EventInventoryUpdated(bool force) : base("inventory_updated", force){}




public int Itemdef
{
get => Get<int>("itemdef");
set => Set<int>("itemdef", value);
}



public long Itemid
{
get => Get<long>("itemid");
set => Set<long>("itemid", value);
}
}

[EventName("item_equip")]
Expand Down Expand Up @@ -4434,10 +4545,18 @@ public bool Teamonly


// chatting player
public int Userid
public CCSPlayerController? Userid
{
get => Get<int>("userid");
set => Set<int>("userid", value);
get => GetPlayer("userid");
set => SetPlayer("userid", value);
}


// chatting player ID
public int Playerid
{
get => Get<int>("playerid");
set => Set<int>("playerid", value);
}


Expand Down Expand Up @@ -5289,7 +5408,7 @@ public EventPlayerTeam(bool force) : base("player_team", force){}



// player

public CCSPlayerController? Userid
{
get => GetPlayer("userid");
Expand Down Expand Up @@ -5329,7 +5448,15 @@ public bool Silent
}


// true if player is a bot

public string Name
{
get => Get<string>("name");
set => Set<string>("name", value);
}



public bool Isbot
{
get => Get<bool>("isbot");
Expand Down Expand Up @@ -6877,42 +7004,18 @@ public EventVoteChanged(bool force) : base("vote_changed", force){}



public int VoteOption1
{
get => Get<int>("vote_option1");
set => Set<int>("vote_option1", value);
}



public int VoteOption2
public int Yesvotes
{
get => Get<int>("vote_option2");
set => Set<int>("vote_option2", value);
get => Get<int>("yesVotes");
set => Set<int>("yesVotes", value);
}



public int VoteOption3
public int Novotes
{
get => Get<int>("vote_option3");
set => Set<int>("vote_option3", value);
}



public int VoteOption4
{
get => Get<int>("vote_option4");
set => Set<int>("vote_option4", value);
}



public int VoteOption5
{
get => Get<int>("vote_option5");
set => Set<int>("vote_option5", value);
get => Get<int>("noVotes");
set => Set<int>("noVotes", value);
}


Expand Down Expand Up @@ -7078,6 +7181,14 @@ public string Param1



public string Votedata
{
get => Get<string>("votedata");
set => Set<string>("votedata", value);
}



public int Team
{
get => Get<int>("team");
Expand All @@ -7091,6 +7202,14 @@ public long Initiator
get => Get<long>("initiator");
set => Set<long>("initiator", value);
}


// this event is reliable
public int Reliable
{
get => Get<int>("reliable");
set => Set<int>("reliable", value);
}
}

[EventName("warmup_end")]
Expand Down
2 changes: 1 addition & 1 deletion managed/TestPlugin/TestPlugin.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ private void SetupGameEvents()
// Mirrors a chat message back to the player
RegisterEventHandler<EventPlayerChat>(((@event, _) =>
{
var player = Utilities.GetPlayerFromIndex(@event.Userid);
var player = @event.Userid;
if (player == null) return HookResult.Continue;

player.PrintToChat($"You said {@event.Text}");
Expand Down
2 changes: 1 addition & 1 deletion tooling/CodeGen.Natives/Scripts/GenerateGameEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public string Setter

private static List<string> GameEventFiles = new List<string>()
{
"game/core/pak01_dir/resource/core.gameevents",
"game/csgo/pak01_dir/resource/game.gameevents",
"game/core/pak01_dir/resource/core.gameevents",
"game/csgo/pak01_dir/resource/mod.gameevents"
};

Expand Down