diff --git a/Classes/ICCME_EventBase.uc b/Classes/ICCME_EventBase.uc index 4750b3b..e9c661a 100644 --- a/Classes/ICCME_EventBase.uc +++ b/Classes/ICCME_EventBase.uc @@ -4,16 +4,24 @@ class ICCME_EventBase extends RelationalClasses // time the event was created (relative to game start) var float createdTime; +// Is this event reliable ? Setted for some emulated event that might not be accurates +var bool bReliable; + // Tell the engine this event must be treated in the current Tick() context and not the next one var bool bUrgent; var array _ar_AttachedEventListener; var bool _bBroadcast; + // print Event relevent informations in the main UT log file function doLog() { + log(""); log("===== Event:"@Self.Class@"["$createdTime$"]"@"====="); + log("Self:"@Self); + log("bReliable:"@bReliable); + log("bUrgent:"@bUrgent); } static function attach(ICCME_EventListenerBase EventListener) @@ -51,4 +59,9 @@ function RunAttached() { default._ar_AttachedEventListener[i].ProcessEvent(Self); } +} + +defaultproperties +{ + bReliable=True } \ No newline at end of file diff --git a/Classes/ICCME_EventListenerBase.uc b/Classes/ICCME_EventListenerBase.uc index e02d3f1..dcda6f4 100644 --- a/Classes/ICCME_EventListenerBase.uc +++ b/Classes/ICCME_EventListenerBase.uc @@ -25,9 +25,9 @@ function private AddEvent(ICCME_Event_CustomBase Event) GameState.API_AddCustomPostEvent(Event); } // Helper function to tell the engine to check EndGame conditions (Designed for OverTime) -function private CheckEndGame() +function private CheckEndGame(optional bool ForceEndGame) { - GameState.API_CheckEndGame(); + GameState.API_CheckEndGame(ForceEndGame); } // Attach this EventListener to an Event function private attachEvent(class TEvent) diff --git a/Classes/ICCME_Event_CTFGame_FlagBase.uc b/Classes/ICCME_Event_CTFGame_FlagBase.uc index 1e9c680..9b6ca51 100644 --- a/Classes/ICCME_Event_CTFGame_FlagBase.uc +++ b/Classes/ICCME_Event_CTFGame_FlagBase.uc @@ -8,22 +8,18 @@ var enum T_eType{ FLAG_RETURNED, }eType; - -var FlagBase fb; -var CTFFlag flg; -var int FlagIdx; -var bool ReTaken; - var ICCME_Stats_Flag FlagStats; +var bool bReTaken; + function doLog() { super.doLog(); log("eType:"@eType); - log("fb:"@fb); - log("flg:"@flg); - log("FlagIdx:"@FlagIdx); - log("ReTaken:"@ReTaken); log("FlagStats:"@FlagStats); + log("FlagStats.FlagBase:"@FlagStats.FlagBase); + log("FlagStats.Flag:"@FlagStats.Flag); + log("FlagStats.Flag.Team:"@FlagStats.Flag.Team); + log("bReTaken:"@bReTaken); } diff --git a/Classes/ICCME_Event_DeathMatch_Shoot.uc b/Classes/ICCME_Event_DeathMatch_Shoot.uc new file mode 100644 index 0000000..34a2385 --- /dev/null +++ b/Classes/ICCME_Event_DeathMatch_Shoot.uc @@ -0,0 +1,25 @@ +class ICCME_Event_DeathMatch_Shoot extends ICCME_Event_DeathMatchBase; + +var class WeaponCls; +var Pawn InstigatedBy; +var ICCME_Stats_Player_DeathMatch InstigatorStats; +var bool bAlt; +var bool bIsComboShock; +var float Amount; + +function doLog() +{ + super.doLog(); + log("WeaponCls:"@WeaponCls); + log("InstigatedBy:"@InstigatedBy); + log("InstigatorStats:"@InstigatorStats); + log("bAlt:"@bAlt); + log("bIsComboShock:"@bIsComboShock); + log("Amount:"@Amount); +} + + +defaultproperties +{ + Amount=1 +} \ No newline at end of file diff --git a/Classes/ICCME_Event_DeathMatch_Shoot_Confirmed.uc b/Classes/ICCME_Event_DeathMatch_Shoot_Confirmed.uc new file mode 100644 index 0000000..20ebf69 --- /dev/null +++ b/Classes/ICCME_Event_DeathMatch_Shoot_Confirmed.uc @@ -0,0 +1,18 @@ +class ICCME_Event_DeathMatch_Shoot_Confirmed extends ICCME_Event_DeathMatch_Shoot; + +var bool bConfirmed; +var Actor Victim; +var ICCME_Stats_Player_DeathMatch VictimStats; + + +function doLog() +{ + super.doLog(); + log("bConfirmed:"@bConfirmed); +} + + +defaultproperties +{ + bConfirmed=False +} \ No newline at end of file diff --git a/Classes/ICCME_Event_DeathMatch_TakeDamage.uc b/Classes/ICCME_Event_DeathMatch_TakeDamage.uc index 98fe138..ff1cf70 100644 --- a/Classes/ICCME_Event_DeathMatch_TakeDamage.uc +++ b/Classes/ICCME_Event_DeathMatch_TakeDamage.uc @@ -8,6 +8,15 @@ var ICCME_Stats_Player_DeathMatch InstigatorStats; var Vector HitLocation; var Vector Momentum; var name DamageType; +var ICCME_Event_DeathMatch_TakeDamage RelatedEvent; + +var class InstigatorWeapon; +var bool bAltFire; +var bool bIsCombo; +var bool bIsComboGib; +var bool bIsHeadShot; +var bool bIsDecapitated; + function doLog() { @@ -20,4 +29,11 @@ function doLog() log("HitLocation:"@HitLocation); log("Momentum:"@Momentum); log("DamageType:"@DamageType); + log("RelatedEvent:"@RelatedEvent); + log("InstigatorWeapon:"@InstigatorWeapon); + log("bAltFire:"@bAltFire); + log("bIsCombo:"@bIsCombo); + log("bIsComboGib:"@bIsComboGib); + log("bIsHeadShot:"@bIsHeadShot); + log("bIsDecapitated:"@bIsDecapitated); } \ No newline at end of file diff --git a/Classes/ICCME_GameStateBase.uc b/Classes/ICCME_GameStateBase.uc index 93747f8..7630c68 100644 --- a/Classes/ICCME_GameStateBase.uc +++ b/Classes/ICCME_GameStateBase.uc @@ -2,9 +2,13 @@ class ICCME_GameStateBase extends Object abstract; // Interface definition -function ICCME_EventListenerBase API_AddEventListeners(class TEventListener); +function ICCME_EventListenerBase API_AddEventListeners(class TEventListener); function API_AddCustomPostEvent(ICCME_Event_CustomBase Event); -function API_CheckEndGame(); +function API_CheckEndGame(optional bool ForceEndGame); +function ICCME_Stats_Player API_GetPlayerStats(int PlayerIdx); +function int API_GetNbPlayer(); +function ICCME_Stats_Flag API_GetFlagStats(int TeamIdx); +function int API_GetNbFlag(); // Static helpers libs static function ICCME_GameStateBase GetInstance(LevelInfo BaseLevel) diff --git a/Classes/ICCME_Stats_Flag.uc b/Classes/ICCME_Stats_Flag.uc index b180783..8cca793 100644 --- a/Classes/ICCME_Stats_Flag.uc +++ b/Classes/ICCME_Stats_Flag.uc @@ -1,5 +1,9 @@ class ICCME_Stats_Flag extends Object; + +var FlagBase FlagBase; +var CTFFlag Flag; + struct T_sHolderRecord{ var Pawn Holder; var Pawn Killer; diff --git a/Classes/ICCME_Stats_Player.uc b/Classes/ICCME_Stats_Player.uc index 3a60742..de58de5 100644 --- a/Classes/ICCME_Stats_Player.uc +++ b/Classes/ICCME_Stats_Player.uc @@ -1,6 +1,7 @@ class ICCME_Stats_Player extends Object; var Pawn P; +var String country; defaultproperties { diff --git a/Classes/ICCME_Stats_Player_CTFGame.uc b/Classes/ICCME_Stats_Player_CTFGame.uc index 2152d52..506093c 100644 --- a/Classes/ICCME_Stats_Player_CTFGame.uc +++ b/Classes/ICCME_Stats_Player_CTFGame.uc @@ -15,4 +15,7 @@ var int NbAssit; var int CoverSpreeLevel; var int DefenseSpreeLevel; -var int SealSpreeLevel; \ No newline at end of file +var int SealSpreeLevel; + +var float LastTimeTakeFlag; +var CTFFlag LastTakenFlag; \ No newline at end of file diff --git a/Classes/ICCME_Stats_Player_DeathMatch.uc b/Classes/ICCME_Stats_Player_DeathMatch.uc index 11ed4c4..3a038a0 100644 --- a/Classes/ICCME_Stats_Player_DeathMatch.uc +++ b/Classes/ICCME_Stats_Player_DeathMatch.uc @@ -9,16 +9,146 @@ var int FriendKillNum; var int DeathNum; var int HeadShotNum; +var bool bUnderAttack; +var bool bIsDead; + var float LastKillTime; +var float LastAttackedTime; var float LastKilledTime; var Pawn LastKiller; var Pawn LastVictim; +var float NbShoot_Try; + +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 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