Skip to content

Commit 41af18c

Browse files
authored
Merge pull request #113 from swiftly-solution/feat/few_schema_update
Few schema updates
2 parents 633a570 + b0d7c8d commit 41af18c

File tree

11 files changed

+80
-3
lines changed

11 files changed

+80
-3
lines changed
Binary file not shown.

managed/src/SwiftlyS2.Core/Modules/Schemas/Extensions/CBaseEntity.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using SwiftlyS2.Shared.Natives;
2+
using SwiftlyS2.Shared.Players;
23

34
namespace SwiftlyS2.Shared.SchemaDefinitions;
45

@@ -17,6 +18,12 @@ public partial interface CBaseEntity
1718
/// Gets the absolute rotation of the entity.
1819
/// </summary>
1920
public QAngle? AbsRotation { get; }
21+
22+
/// <summary>
23+
/// Gets the team of the entity.
24+
/// </summary>
25+
public Team Team { get; set; }
26+
2027
/// <summary>
2128
/// Teleports the entity to the specified position, orientation, and velocity.
2229
/// </summary>
@@ -25,7 +32,7 @@ public partial interface CBaseEntity
2532
/// <param name="position">The target position to move the entity to. If null, the entity's position is not changed.</param>
2633
/// <param name="angle">The target orientation to set for the entity. If null, the entity's orientation is not changed.</param>
2734
/// <param name="velocity">The velocity to apply to the entity after teleportation. If null, the entity's velocity is not changed.</param>
28-
public void Teleport(Vector? position, QAngle? angle, Vector? velocity);
35+
public void Teleport( Vector? position, QAngle? angle, Vector? velocity );
2936

3037

3138
/// <summary>

managed/src/SwiftlyS2.Core/Modules/Schemas/Extensions/CBaseEntityImpl.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using SwiftlyS2.Core.Natives;
22
using SwiftlyS2.Shared.Natives;
3+
using SwiftlyS2.Shared.Players;
34
using SwiftlyS2.Shared.SchemaDefinitions;
45

56
namespace SwiftlyS2.Core.SchemaDefinitions;
@@ -15,6 +16,11 @@ public CEntitySubclassVDataBase VData {
1516
public Vector? AbsOrigin => CBodyComponent?.SceneNode?.AbsOrigin;
1617
public QAngle? AbsRotation => CBodyComponent?.SceneNode?.AbsRotation;
1718

19+
public Team Team {
20+
get => (Team)TeamNum;
21+
set => TeamNum = (byte)value;
22+
}
23+
1824
public void Teleport( Vector? position, QAngle? angle, Vector? velocity )
1925
{
2026
unsafe

managed/src/SwiftlyS2.Core/Modules/Schemas/Extensions/CCSGameRules.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using SwiftlyS2.Shared.Natives;
1+
using SwiftlyS2.Shared.Misc;
2+
using SwiftlyS2.Shared.Natives;
23
using SwiftlyS2.Shared.SchemaDefinitions;
34
using SwiftlyS2.Shared.Schemas;
45

@@ -19,4 +20,6 @@ public partial interface CCSGameRules
1920
/// <param name="reason">The reason for ending the round</param>
2021
/// <param name="delay">The delay before ending the round</param>
2122
public void TerminateRound( RoundEndReason reason, float delay );
23+
24+
public GamePhase GamePhaseEnum { get; set; }
2225
}

managed/src/SwiftlyS2.Core/Modules/Schemas/Extensions/CCSGameRulesImpl.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using SwiftlyS2.Core.Natives;
2+
using SwiftlyS2.Shared.Misc;
23
using SwiftlyS2.Shared.Natives;
34
using SwiftlyS2.Shared.SchemaDefinitions;
45
using SwiftlyS2.Shared.Schemas;
@@ -17,4 +18,9 @@ public void TerminateRound( RoundEndReason reason, float delay )
1718
{
1819
GameFunctions.TerminateRound(Address, (uint)reason, delay);
1920
}
21+
22+
public GamePhase GamePhaseEnum {
23+
get => (GamePhase)GamePhase;
24+
set => GamePhase = (int)value;
25+
}
2026
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
namespace SwiftlyS2.Shared.SchemaDefinitions;
2+
3+
public partial interface CCSObserverPawn
4+
{
5+
public new CCSObserver_ObserverServices? ObserverServices { get; }
6+
public new CCSObserver_MovementServices? MovementServices { get; }
7+
public new CCSObserver_CameraServices? CameraServices { get; }
8+
public new CCSObserver_UseServices? UseServices { get; }
9+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using SwiftlyS2.Shared.SchemaDefinitions;
2+
3+
namespace SwiftlyS2.Core.SchemaDefinitions;
4+
5+
internal partial class CCSObserverPawnImpl : CCSObserverPawn
6+
{
7+
public new CCSObserver_ObserverServices? ObserverServices => base.ObserverServices?.As<CCSObserver_ObserverServices>();
8+
public new CCSObserver_MovementServices? MovementServices => base.MovementServices?.As<CCSObserver_MovementServices>();
9+
public new CCSObserver_CameraServices? CameraServices => base.CameraServices?.As<CCSObserver_CameraServices>();
10+
public new CCSObserver_UseServices? UseServices => base.UseServices?.As<CCSObserver_UseServices>();
11+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
namespace SwiftlyS2.Shared.SchemaDefinitions;
2+
3+
public partial interface CCSPlayerPawn
4+
{
5+
public new CCSPlayer_WeaponServices? WeaponServices { get; }
6+
public new CCSPlayer_ItemServices? ItemServices { get; }
7+
public new CCSPlayer_UseServices? UseServices { get; }
8+
public new CCSPlayer_WaterServices? WaterServices { get; }
9+
public new CCSPlayer_MovementServices? MovementServices { get; }
10+
public new CCSPlayer_CameraServices? CameraServices { get; }
11+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
using SwiftlyS2.Shared.SchemaDefinitions;
2+
3+
namespace SwiftlyS2.Core.SchemaDefinitions;
4+
5+
internal partial class CCSPlayerPawnImpl : CCSPlayerPawn
6+
{
7+
public new CCSPlayer_WeaponServices? WeaponServices => base.WeaponServices?.As<CCSPlayer_WeaponServices>();
8+
public new CCSPlayer_ItemServices? ItemServices => base.ItemServices?.As<CCSPlayer_ItemServices>();
9+
public new CCSPlayer_UseServices? UseServices => base.UseServices?.As<CCSPlayer_UseServices>();
10+
public new CCSPlayer_WaterServices? WaterServices => base.WaterServices?.As<CCSPlayer_WaterServices>();
11+
public new CCSPlayer_MovementServices? MovementServices => base.MovementServices?.As<CCSPlayer_MovementServices>();
12+
public new CCSPlayer_CameraServices? CameraServices => base.CameraServices?.As<CCSPlayer_CameraServices>();
13+
}

managed/src/SwiftlyS2.Generated/Schemas/Interfaces/CCSPlayerPawn.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ public partial interface CCSPlayerPawn : CCSPlayerPawnBase, ISchemaClass<CCSPlay
1212

1313
static CCSPlayerPawn ISchemaClass<CCSPlayerPawn>.From(nint handle) => new CCSPlayerPawnImpl(handle);
1414
static int ISchemaClass<CCSPlayerPawn>.Size => 7280;
15-
1615

1716
public CCSPlayer_BulletServices? BulletServices { get; }
1817

0 commit comments

Comments
 (0)