From cd6925282e8fbd1717fc7b392a943ef971c026b2 Mon Sep 17 00:00:00 2001 From: cclecle Date: Mon, 25 Aug 2025 22:27:39 +0200 Subject: [PATCH] commit unsaved work --- Classes/ICCME_Event_DeathMatch_Shoot.uc | 4 + Classes/ICCME_Stats_Player_DeathMatch.uc | 196 +++++++---------------- 2 files changed, 63 insertions(+), 137 deletions(-) diff --git a/Classes/ICCME_Event_DeathMatch_Shoot.uc b/Classes/ICCME_Event_DeathMatch_Shoot.uc index 34a2385..1b5263e 100644 --- a/Classes/ICCME_Event_DeathMatch_Shoot.uc +++ b/Classes/ICCME_Event_DeathMatch_Shoot.uc @@ -5,6 +5,8 @@ var Pawn InstigatedBy; var ICCME_Stats_Player_DeathMatch InstigatorStats; var bool bAlt; var bool bIsComboShock; +var bool bIsSelfComboShock; +var bool bIsComboGib; var float Amount; function doLog() @@ -15,6 +17,8 @@ function doLog() log("InstigatorStats:"@InstigatorStats); log("bAlt:"@bAlt); log("bIsComboShock:"@bIsComboShock); + log("bIsSelfComboShock:"@bIsSelfComboShock); + log("bIsComboGib:"@bIsComboGib); log("Amount:"@Amount); } diff --git a/Classes/ICCME_Stats_Player_DeathMatch.uc b/Classes/ICCME_Stats_Player_DeathMatch.uc index 3a038a0..3ddf3ef 100644 --- a/Classes/ICCME_Stats_Player_DeathMatch.uc +++ b/Classes/ICCME_Stats_Player_DeathMatch.uc @@ -18,147 +18,69 @@ var float LastKilledTime; var Pawn LastKiller; var Pawn LastVictim; -var float NbShoot_Try; +struct T_sWeaponStats{ + var string szName; + //var float NbPickupTaken; + var float fNbShoot_Try; + var float fNbShoot_Taken; + var float fNbShoot_Given; + var float fNbAltShoot_Try; + var float fNbAltShoot_Taken; + var float fNbAltShoot_Given; + var float fDamageAmount_Taken; + var float fDamageAmount_Given; +}; -var float NbShoot_Try_Enforcer; -var float NbShoot_Try_ImpactHammer; -var float NbShoot_Try_Minigun2; -var float NbShoot_Try_PulseGun; -var float NbShoot_Try_Ripper; -var float NbShoot_Try_ShockRifle; -var float NbShoot_Try_SuperShockRifle; -var float NbShoot_Try_SniperRifle; -var float NbShoot_Try_Translocator; -var float NbShoot_Try_UT_BioRifle; -var float NbShoot_Try_UT_Eightball; -var float NbShoot_Try_UT_FlakCannon; -var float NbShoot_Try_WarHeadLauncher; -var float NbShoot_Try_ComboShock; - -var float NbAltShoot_Try_ChainSaw; -var float NbAltShoot_Try_Enforcer; -var float NbAltShoot_Try_ImpactHammer; -var float NbAltShoot_Try_Minigun2; -var float NbAltShoot_Try_PulseGun; -var float NbAltShoot_Try_Ripper; -var float NbAltShoot_Try_ShockRifle; -var float NbAltShoot_Try_Translocator; -var float NbAltShoot_Try_UT_BioRifle; -var float NbAltShoot_Try_UT_Eightball; -var float NbAltShoot_Try_UT_FlakCannon; - -var float NbShoot_Taken; - -var float NbShoot_Taken_Enforcer; -var float NbShoot_Taken_ImpactHammer; -var float NbShoot_Taken_Minigun2; -var float NbShoot_Taken_PulseGun; -var float NbShoot_Taken_Ripper; -var float NbShoot_Taken_ShockRifle; -var float NbShoot_Taken_SuperShockRifle; -var float NbShoot_Taken_SniperRifle; -var float NbShoot_Taken_Translocator; -var float NbShoot_Taken_UT_BioRifle; -var float NbShoot_Taken_UT_Eightball; -var float NbShoot_Taken_UT_FlakCannon; -var float NbShoot_Taken_WarHeadLauncher; -var float NbShoot_Taken_ComboShock; - -var float NbAltShoot_Taken_ChainSaw; -var float NbAltShoot_Taken_Enforcer; -var float NbAltShoot_Taken_ImpactHammer; -var float NbAltShoot_Taken_Minigun2; -var float NbAltShoot_Taken_PulseGun; -var float NbAltShoot_Taken_Ripper; -var float NbAltShoot_Taken_ShockRifle; -var float NbAltShoot_Taken_Translocator; -var float NbAltShoot_Taken_UT_BioRifle; -var float NbAltShoot_Taken_UT_Eightball; -var float NbAltShoot_Taken_UT_FlakCannon; - -var float NbShoot_Given; - -var float NbShoot_Given_Enforcer; -var float NbShoot_Given_ImpactHammer; -var float NbShoot_Given_Minigun2; -var float NbShoot_Given_PulseGun; -var float NbShoot_Given_Ripper; -var float NbShoot_Given_ShockRifle; -var float NbShoot_Given_SuperShockRifle; -var float NbShoot_Given_SniperRifle; -var float NbShoot_Given_Translocator; -var float NbShoot_Given_UT_BioRifle; -var float NbShoot_Given_UT_Eightball; -var float NbShoot_Given_UT_FlakCannon; -var float NbShoot_Given_WarHeadLauncher; -var float NbShoot_Given_ComboShock; - -var float NbAltShoot_Given_ChainSaw; -var float NbAltShoot_Given_Enforcer; -var float NbAltShoot_Given_ImpactHammer; -var float NbAltShoot_Given_Minigun2; -var float NbAltShoot_Given_PulseGun; -var float NbAltShoot_Given_Ripper; -var float NbAltShoot_Given_ShockRifle; -var float NbAltShoot_Given_SuperShockRifle; -var float NbAltShoot_Given_Translocator; -var float NbAltShoot_Given_UT_BioRifle; -var float NbAltShoot_Given_UT_Eightball; -var float NbAltShoot_Given_UT_FlakCannon; - -var float AmountDamage_Taken; - -var float AmountDamage_Taken_ChainSaw; -var float AmountDamage_Taken_Enforcer; -var float AmountDamage_Taken_ImpactHammer; -var float AmountDamage_Taken_Minigun2; -var float AmountDamage_Taken_PulseGun; -var float AmountDamage_Taken_Ripper; -var float AmountDamage_Taken_ShockRifle; -var float AmountDamage_Taken_SuperShockRifle; -var float AmountDamage_Taken_SniperRifle; -var float AmountDamage_Taken_Translocator; -var float AmountDamage_Taken_UT_BioRifle; -var float AmountDamage_Taken_UT_Eightball; -var float AmountDamage_Taken_UT_FlakCannon; -var float AmountDamage_Taken_WarHeadLauncher; -var float AmountDamage_Taken_ComboShock; - -var float AmountDamage_Given; - -var float AmountDamage_Given_ChainSaw; -var float AmountDamage_Given_Enforcer; -var float AmountDamage_Given_ImpactHammer; -var float AmountDamage_Given_Minigun2; -var float AmountDamage_Given_PulseGun; -var float AmountDamage_Given_Ripper; -var float AmountDamage_Given_ShockRifle; -var float AmountDamage_Given_SuperShockRifle; -var float AmountDamage_Given_SniperRifle; -var float AmountDamage_Given_Translocator; -var float AmountDamage_Given_UT_BioRifle; -var float AmountDamage_Given_UT_Eightball; -var float AmountDamage_Given_UT_FlakCannon; -var float AmountDamage_Given_WarHeadLauncher; -var float AmountDamage_Given_ComboShock; +var T_sWeaponStats WeaponStats_AllWeapons; +var T_sWeaponStats WeaponStats_Translocator; +var T_sWeaponStats WeaponStats_ChainSaw; +var T_sWeaponStats WeaponStats_Enforcer; +var T_sWeaponStats WeaponStats_ImpactHammer; +var T_sWeaponStats WeaponStats_PulseGun; +var T_sWeaponStats WeaponStats_Ripper; +var T_sWeaponStats WeaponStats_ShockRifle; +var T_sWeaponStats WeaponStats_ComboShock; +var T_sWeaponStats WeaponStats_ComboGibRifle; +var T_sWeaponStats WeaponStats_SuperShockRifle; +var T_sWeaponStats WeaponStats_Minugun2; +var T_sWeaponStats WeaponStats_UT_BioRifle; +var T_sWeaponStats WeaponStats_UT_Eightball; +var T_sWeaponStats WeaponStats_UT_FlakCannon; +var T_sWeaponStats WeaponStats_WarHeadLauncher; +var T_sWeaponStats WeaponStats_SniperRifle; var array ar_Event_TakeDamage; var array ar_Event_PotentialDeath; defaultproperties { - eWeaponState=S_WP_ST__IDLE - eLastUsedWeaponState=S_WP_ST__IDLE - MultiKillLevel=0 - KillSpreeLevel=0 - HeadShotSpreeLevel=0 - SuicideNum=0 - KillNum=0 - FriendKillNum=0 - DeathNum=0 - HeadShotNum=0 - LastKillTime=-1.f - LastKilledTime=-1.f - LastKiller=None - LastVictim=None -} +MultiKillLevel=0 +KillSpreeLevel=0 +HeadShotSpreeLevel=0 +SuicideNum=0 +KillNum=0 +FriendKillNum=0 +DeathNum=0 +HeadShotNum=0 +LastKillTime=-1.f +LastKilledTime=-1.f +LastKiller=None +LastVictim=None +WeaponStats_AllWeapons=(szName="All Weapons") +WeaponStats_Translocator=(szName="Trnaslocator") +WeaponStats_ChainSaw=(szName="ChainSaw") +WeaponStats_Enforcer=(szName="Enforcer") +WeaponStats_ImpactHammer=(szName="ImpactHammer") +WeaponStats_PulseGun=(szName="PulseGun") +WeaponStats_Ripper=(szName="Ripper") +WeaponStats_ShockRifle=(szName="ShockRifle") +WeaponStats_SuperShockRifle=(szName="InstaGib") +WeaponStats_ComboShock=(szName="Combo Shock") +WeaponStats_ComboGibRifle=(szName="ComboGib") +WeaponStats_Minugun2=(szName="Minigun") +WeaponStats_UT_BioRifle=(szName="BioRifle") +WeaponStats_UT_Eightball=(szName="RocketLauncher") +WeaponStats_UT_FlakCannon=(szName="FlakCannon") +WeaponStats_WarHeadLauncher=(szName="Redeemer") +WeaponStats_SniperRifle=(szName="SniperRifle") +)