From b17d3c797717a0bce602f45c49681a64c7f5b6b3 Mon Sep 17 00:00:00 2001 From: Leonardo Bishop Date: Tue, 1 Aug 2023 02:42:46 +0100 Subject: Add temporary fixed clothing Skeleton & zombie avatars have busted hitbxes so I've enforced a fixed outfit. --- code/pawn/Player.cs | 10 ++++++++++ code/phase/AssignPhase.cs | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'code') diff --git a/code/pawn/Player.cs b/code/pawn/Player.cs index 7254023..3d92008 100644 --- a/code/pawn/Player.cs +++ b/code/pawn/Player.cs @@ -169,6 +169,16 @@ public partial class Player : AnimatedEntity PlayerClothingContainer.LoadFromClient( cl ); PlayerClothingContainer.DressEntity( this ); } + + public void Dress() + { + PlayerClothingContainer = new ClothingContainer(); + var trousers = new Clothing() { Model = "models/citizen_clothes/trousers/cargopants/models/cargo_pants.vmdl" }; + var tshirt = new Clothing() { Model = "models/citizen_clothes/shirt/Tshirt/Models/tshirt.vmdl" }; + PlayerClothingContainer.Clothing.Add( trousers ); + PlayerClothingContainer.Clothing.Add( tshirt ); + PlayerClothingContainer.DressEntity( this ); + } public override void Simulate( IClient cl ) { diff --git a/code/phase/AssignPhase.cs b/code/phase/AssignPhase.cs index f69ca7b..90a8000 100644 --- a/code/phase/AssignPhase.cs +++ b/code/phase/AssignPhase.cs @@ -92,8 +92,8 @@ public partial class AssignPhase : BasePhase pawn.Team = Team.Spectator; continue; } - pawn.DressFromClient( client ); - + pawn.Dress( ); + // re-use names and colours if needed if (natoNamesRemaining.Count == 0) { -- cgit v1.2.3-70-g09d2