demostf/parser
1
0
Fork 0
mirror of https://codeberg.org/demostf/parser.git synced 2026-06-03 18:24:05 +02:00
Code Issues Releases Wiki Activity

formatting

Browse source
This commit is contained in:
Robin Appelman 2025-07-12 22:53:22 +02:00
commit 2ab3e91774
4 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/demo/parser/gamestateanalyser/building.rs
View file

@ -12,8 +12,7 @@ pub fn handle_sentry_entity(
entity: &PacketEntity,
parser_state: &ParserState,
) {
const ROTATION: SendPropIdentifier =
SendPropIdentifier::new("DT_BaseEntity", "m_angRotation");
const ROTATION: SendPropIdentifier = SendPropIdentifier::new("DT_BaseEntity", "m_angRotation");
const ANGLE: SendPropIdentifier =
SendPropIdentifier::new("DT_TFNonLocalPlayerExclusive", "m_angEyeAngles[1]");
const MINI: SendPropIdentifier = SendPropIdentifier::new("DT_BaseObject", "m_bMiniBuilding");
@ -28,8 +27,10 @@ pub fn handle_sentry_entity(
const SHIELD: SendPropIdentifier =
SendPropIdentifier::new("DT_ObjectSentrygun", "m_nShieldLevel");
#[allow(dead_code)]
const POSE_PARAMETER_PITCH: SendPropIdentifier = SendPropIdentifier::new("m_flPoseParameter", "000");
const POSE_PARAMETER_YAW: SendPropIdentifier = SendPropIdentifier::new("m_flPoseParameter", "001");
const POSE_PARAMETER_PITCH: SendPropIdentifier =
SendPropIdentifier::new("m_flPoseParameter", "000");
const POSE_PARAMETER_YAW: SendPropIdentifier =
SendPropIdentifier::new("m_flPoseParameter", "001");
if entity.update_type == UpdateType::Delete {
state.remove_building(entity.entity_index);

39
src/demo/parser/gamestateanalyser/player.rs
View file

@ -1,19 +1,21 @@
use std::str::FromStr;
use crate::demo::data::game_state::{GameState, Handle, PlayerClassData, PlayerState};
use crate::demo::message::{EntityId, PacketEntity};
use crate::demo::parser::analyser::{Class, Team};
use crate::demo::sendprop::SendPropIdentifier;
use crate::demo::vector::{Vector, VectorXY};
use crate::ParserState;
use std::str::FromStr;
pub fn handle_player_entity(state: &mut GameState, entity: &PacketEntity, parser_state: &ParserState) {
pub fn handle_player_entity(
state: &mut GameState,
entity: &PacketEntity,
parser_state: &ParserState,
) {
let player = state.get_or_create_player(entity.entity_index);
const OUTER: SendPropIdentifier =
SendPropIdentifier::new("DT_AttributeContainer", "m_hOuter");
const OUTER: SendPropIdentifier = SendPropIdentifier::new("DT_AttributeContainer", "m_hOuter");
const HEALTH_PROP: SendPropIdentifier =
SendPropIdentifier::new("DT_BasePlayer", "m_iHealth");
const HEALTH_PROP: SendPropIdentifier = SendPropIdentifier::new("DT_BasePlayer", "m_iHealth");
const MAX_HEALTH_PROP: SendPropIdentifier =
SendPropIdentifier::new("DT_BasePlayer", "m_iMaxHealth");
const LIFE_STATE_PROP: SendPropIdentifier =
@ -71,9 +73,7 @@ pub fn handle_player_entity(state: &mut GameState, entity: &PacketEntity, parser
OUTER => {
player.handle = Handle::try_from(&prop.value).unwrap_or_default();
}
HEALTH_PROP => {
player.health = i64::try_from(&prop.value).unwrap_or_default() as u16
}
HEALTH_PROP => player.health = i64::try_from(&prop.value).unwrap_or_default() as u16,
MAX_HEALTH_PROP => {
player.max_health = i64::try_from(&prop.value).unwrap_or_default() as u16
}
@ -145,8 +145,7 @@ pub fn handle_player_entity(state: &mut GameState, entity: &PacketEntity, parser
}
DISGUISE_CLASS => {
if let PlayerClassData::Spy { disguise_class, .. } = &mut player.class_data {
*disguise_class =
Class::new(i64::try_from(&prop.value).unwrap_or_default());
*disguise_class = Class::new(i64::try_from(&prop.value).unwrap_or_default());
}
}
CLOAK_LEVEL => {
@ -159,7 +158,11 @@ pub fn handle_player_entity(state: &mut GameState, entity: &PacketEntity, parser
}
}
pub fn handle_player_resource(state: &mut GameState, entity: &PacketEntity, parser_state: &ParserState) {
pub fn handle_player_resource(
state: &mut GameState,
entity: &PacketEntity,
parser_state: &ParserState,
) {
for prop in entity.props(parser_state) {
if let Some((table_name, prop_name)) = prop.identifier.names() {
if let Ok(player_id) = u32::from_str(prop_name.as_str()) {
@ -171,25 +174,21 @@ pub fn handle_player_resource(state: &mut GameState, entity: &PacketEntity, pars
{
match table_name.as_str() {
"m_iTeam" => {
player.team =
Team::new(i64::try_from(&prop.value).unwrap_or_default())
player.team = Team::new(i64::try_from(&prop.value).unwrap_or_default())
}
"m_iMaxHealth" => {
player.max_health =
i64::try_from(&prop.value).unwrap_or_default() as u16
}
"m_iPlayerClass" => {
let class =
Class::new(i64::try_from(&prop.value).unwrap_or_default());
let class = Class::new(i64::try_from(&prop.value).unwrap_or_default());
if player.class != class {
player.class = class;
player.class_data = PlayerClassData::default_for_class(class);
}
}
"m_iChargeLevel" => {
if let PlayerClassData::Medic { charge, .. } =
&mut player.class_data
{
if let PlayerClassData::Medic { charge, .. } = &mut player.class_data {
*charge = i64::try_from(&prop.value).unwrap_or_default() as u8
}
}
@ -202,4 +201,4 @@ pub fn handle_player_resource(state: &mut GameState, entity: &PacketEntity, pars
}
}
}
}
}

16
src/demo/parser/gamestateanalyser/projectile.rs
View file

@ -6,7 +6,12 @@ use crate::demo::sendprop::SendPropIdentifier;
use crate::demo::vector::Vector;
use crate::ParserState;
pub fn handle_projectile_entity(state: &mut GameState, entity: &PacketEntity, parser_state: &ParserState, class_names: &[ServerClassName]) {
pub fn handle_projectile_entity(
state: &mut GameState,
entity: &PacketEntity,
parser_state: &ParserState,
class_names: &[ServerClassName],
) {
let Some(class_name) = class_names.get(usize::from(entity.server_class)) else {
return;
};
@ -44,9 +49,7 @@ pub fn handle_projectile_entity(state: &mut GameState, entity: &PacketEntity, pa
let projectile = state
.projectiles
.entry(entity.entity_index)
.or_insert_with(|| {
Projectile::new(entity.entity_index, entity.server_class, class_name)
});
.or_insert_with(|| Projectile::new(entity.entity_index, entity.server_class, class_name));
// todo: bounds for grenades
@ -70,8 +73,7 @@ pub fn handle_projectile_entity(state: &mut GameState, entity: &PacketEntity, pa
}
PIPE_TYPE => {
let pipe_type = PipeType::new(i64::try_from(&prop.value).unwrap_or_default());
if let Some(class_name) = class_names.get(usize::from(entity.server_class))
{
if let Some(class_name) = class_names.get(usize::from(entity.server_class)) {
let ty = ProjectileType::new(class_name, Some(pipe_type));
projectile.ty = ty;
}
@ -87,4 +89,4 @@ pub fn handle_projectile_entity(state: &mut GameState, entity: &PacketEntity, pa
_ => {}
}
}
}
}

13
src/demo/parser/gamestateanalyser/weapon.rs
View file

@ -1,12 +1,15 @@
use std::collections::HashMap;
use crate::demo::data::attributes::{has_attribute, Attribute};
use crate::demo::data::game_state::{GameState, Handle, MedigunType, PlayerClassData};
use crate::demo::message::{EntityId, PacketEntity, UpdateType};
use crate::demo::sendprop::SendPropIdentifier;
use std::collections::HashMap;
pub fn handle_medigun_entity(state: &mut GameState, entity: &PacketEntity, outer_map_rev: &HashMap<EntityId, Handle>) {
const OUTER: SendPropIdentifier =
SendPropIdentifier::new("DT_AttributeContainer", "m_hOuter");
pub fn handle_medigun_entity(
state: &mut GameState,
entity: &PacketEntity,
outer_map_rev: &HashMap<EntityId, Handle>,
) {
const OUTER: SendPropIdentifier = SendPropIdentifier::new("DT_AttributeContainer", "m_hOuter");
const TARGET: SendPropIdentifier =
SendPropIdentifier::new("DT_WeaponMedigun", "m_hHealingTarget");
@ -50,4 +53,4 @@ pub fn handle_medigun_entity(state: &mut GameState, entity: &PacketEntity, outer
}
}
}
}
}