diff --git a/TowerForge/TowerForge/GameModule/Events/GameEvents/DamageEvent.swift b/TowerForge/TowerForge/GameModule/Events/GameEvents/DamageEvent.swift index 0cc76393..24fe1e46 100644 --- a/TowerForge/TowerForge/GameModule/Events/GameEvents/DamageEvent.swift +++ b/TowerForge/TowerForge/GameModule/Events/GameEvents/DamageEvent.swift @@ -27,9 +27,7 @@ struct DamageEvent: TFEvent { } if let statsSystem = target.system(ofType: StatisticSystem.self) { - if player != .ownPlayer { - statsSystem.notify(for: self) - } + statsSystem.notify(for: self) } return EventOutput() diff --git a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDamageDealtStatistic.swift b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDamageDealtStatistic.swift index c73a5b0a..4630d41f 100644 --- a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDamageDealtStatistic.swift +++ b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDamageDealtStatistic.swift @@ -26,15 +26,6 @@ final class TotalDamageDealtStatistic: Statistic { self.maximumCurrentValue = maxCurrentValue } - /*func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { - let eventType = TFEventTypeWrapper(type: DamageEvent.self) - let updateActor: StatisticUpdateActor = { statistic in statistic.updateCurrentValue(by: ) } - let eventUpdateDictionary = [eventType: updateActor] - let statsLink = StatisticUpdateLinkDatabase(statisticUpdateLinks: eventUpdateDictionary) - - return statsLink - }*/ - func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { let eventType = TFEventTypeWrapper(type: DamageEvent.self) let eventUpdateClosure: (Statistic, DamageEvent?) -> Void = { statistic, event in diff --git a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDeathsStatistic.swift b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDeathsStatistic.swift index 1034beb1..0f6b30fa 100644 --- a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDeathsStatistic.swift +++ b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalDeathsStatistic.swift @@ -24,15 +24,6 @@ final class TotalDeathsStatistic: Statistic { self.maximumCurrentValue = maxCurrentValue } - /*func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { - let eventType = TFEventTypeWrapper(type: DeathEvent.self) - let updateActor: StatisticUpdateActor = { statistic in statistic.updateCurrentValue(by: 1.0) } - let eventUpdateDictionary = [eventType: updateActor] - let statsLink = StatisticUpdateLinkDatabase(statisticUpdateLinks: eventUpdateDictionary) - - return statsLink - }*/ - /// The total deaths statistic no longer requires the DeathEvent, it is able /// to directly parse a KillEvent to determine whe func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { @@ -47,8 +38,7 @@ final class TotalDeathsStatistic: Statistic { let statisticUpdateActor = StatisticUpdateActor(action: eventUpdateClosure) let anyStatisticUpdateActorWrapper = AnyStatisticUpdateActorWrapper(statisticUpdateActor) - // let anyStatisticUpdateActorWrapper = - // AnyStatisticUpdateActorWrapper(updateStatistic: eventUpdateClosure) + var statisticUpdateLinksMap: [TFEventTypeWrapper: AnyStatisticUpdateActor] = [:] statisticUpdateLinksMap[eventType] = anyStatisticUpdateActorWrapper return StatisticUpdateLinkDatabase(statisticUpdateLinks: statisticUpdateLinksMap) diff --git a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalGamesStatistic.swift b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalGamesStatistic.swift index baa4d393..fd05c8f8 100644 --- a/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalGamesStatistic.swift +++ b/TowerForge/TowerForge/Metrics/Statistics/Implemented/TotalGamesStatistic.swift @@ -25,15 +25,6 @@ final class TotalGamesStatistic: Statistic { self.maximumCurrentValue = maxCurrentValue } - /*func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { - let eventType = TFEventTypeWrapper(type: GameStartEvent.self) - let updateActor: StatisticUpdateActor = { statistic in statistic.updateCurrentValue(by: 1.0) } - let eventUpdateDictionary = [eventType: updateActor] - let statsLink = StatisticUpdateLinkDatabase(statisticUpdateLinks: eventUpdateDictionary) - - return statsLink - }*/ - func getStatisticUpdateLinks() -> StatisticUpdateLinkDatabase { let eventType = TFEventTypeWrapper(type: GameStartEvent.self) let eventUpdateClosure: (Statistic, GameStartEvent?) -> Void = { statistic, event in @@ -43,7 +34,7 @@ final class TotalGamesStatistic: Statistic { let statisticUpdateActor = StatisticUpdateActor(action: eventUpdateClosure) let anyStatisticUpdateActorWrapper = AnyStatisticUpdateActorWrapper(statisticUpdateActor) - + var statisticUpdateLinksMap: [TFEventTypeWrapper: AnyStatisticUpdateActor] = [:] statisticUpdateLinksMap[eventType] = anyStatisticUpdateActorWrapper return StatisticUpdateLinkDatabase(statisticUpdateLinks: statisticUpdateLinksMap)