Merge pull request #11627 from obrakmann/player-experience2

Enable tracking of player experience in all mods
This commit is contained in:
Matthias Mailänder
2016-07-23 15:53:22 +02:00
committed by GitHub
43 changed files with 470 additions and 244 deletions

View File

@@ -35,38 +35,23 @@ Container@SKIRMISH_STATS:
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
Text: Player
Font: Bold
Label@FACTION:
X: 150
Width: 80
X: 230
Width: 120
Height: 25
Text: Faction
Font: Bold
Align: Center
Label@STANCE:
X: 240
Width: 70
Label@SCORE:
X: 360
Width: 75
Height: 25
Text: Team
Text: Score
Font: Bold
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Text: Kills
Font: Bold
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Text: Deaths
Font: Bold
Align: Center
Align: Right
ScrollPanel@PLAYER_LIST:
X: 15
Y: 105
@@ -75,43 +60,51 @@ Container@SKIRMISH_STATS:
TopBottomSpacing: 5
ItemSpacing: 5
Children:
ScrollItem@TEAM_TEMPLATE:
Width: PARENT_RIGHT - 27
Height: 20
X: 2
Visible: false
Children:
Label@TEAM:
X: 2
Y: 0-2
Width: 160
Height: 20
Font: Bold
Label@TEAM_SCORE:
X: 360
Y: 0-2
Width: 75
Height: 20
Font: Bold
Align: Right
Container@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
X: 10
Width: 150
Width: 210
Height: 25
Image@FACTIONFLAG:
X: 159
X: 230
Y: 6
Width: 32
Height: 16
Label@FACTION:
X: 195
Width: 40
X: 264
Width: 86
Height: 25
Label@TEAM:
X: 240
Width: 70
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Align: Center
Align: Right

View File

@@ -2,7 +2,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
X: (WINDOW_RIGHT - WIDTH) / 2
Y: (WINDOW_BOTTOM - HEIGHT) / 2
Width: 940
Width: 1005
Height: 500
Children:
Background@BACKGROUND:
@@ -59,41 +59,49 @@ Background@INGAME_OBSERVERSTATS_BG:
Font: Bold
Text: Power
Label@KILLS_HEADER:
X: 495
X: 475
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Kills
Align: Right
Label@DEATHS_HEADER:
X: 555
X: 535
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Deaths
Align: Right
Label@ASSETS_DESTROYED_HEADER:
X: 625
X: 595
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Destroyed
Align: Right
Label@ASSETS_LOST_HEADER:
X: 685
X: 675
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Lost
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 805
Label@EXPERIENCE_HEADER:
X: 755
Y: 40
Width: 40
Width: 94
Height: 25
Font: Bold
Text: Experience
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 850
Y: 40
Width: 90
Height: 25
Font: Bold
Text: Actions/min
@@ -316,33 +324,39 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 80
Height: PARENT_BOTTOM
Label@KILLS:
X: 475
X: 455
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@DEATHS:
X: 535
X: 515
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_DESTROYED:
X: 595
X: 575
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_LOST:
X: 660
X: 655
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Label@ACTIONS_MIN:
X: 775
X: 830
Y: 0
Width: 40
Width: 90
Height: PARENT_BOTTOM
Align: Right
ScrollItem@ECONOMY_PLAYER_TEMPLATE:

View File

@@ -0,0 +1,23 @@
^ExistsInWorld:
GivesExperience:
PlayerExperienceModifier: 0
^BaseBuilding:
RepairableBuilding:
PlayerExperience: 0
^TechBuilding:
RepairableBuilding:
PlayerExperience: 0
E6:
Captures:
PlayerExperience: 0
HPAD:
RepairsUnits:
PlayerExperience: 0
FIX:
RepairsUnits:
PlayerExperience: 0

View File

@@ -3,6 +3,7 @@
UpdatesPlayerStatistics:
CombatDebugOverlay:
GivesExperience:
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
@@ -515,6 +516,7 @@
RepairableBuilding:
RepairPercent: 40
RepairStep: 14
PlayerExperience: 15
WithDeathAnimation:
DeathSequence: dead
UseDeathTypeSuffix: false
@@ -560,6 +562,7 @@
RepairableBuilding:
RepairPercent: 40
RepairStep: 14
PlayerExperience: 15
EngineerRepairable:
RevealsShroud:
Range: 3c0

View File

@@ -146,6 +146,7 @@ E6:
RepairsBridges:
Captures:
CaptureTypes: building, husk
PlayerExperience: 50
-AutoTarget:
-GainsExperience:

View File

@@ -34,3 +34,4 @@ Player:
Id: unrestricted
GlobalUpgradeManager:
ResourceStorageWarning:
PlayerExperience:

View File

@@ -425,6 +425,7 @@ HPAD:
Produces: Aircraft.GDI, Aircraft.Nod
Reservable:
RepairsUnits:
PlayerExperience: 25
WithRepairAnimation:
RallyPoint:
ProductionQueue@GDI:
@@ -532,6 +533,7 @@ FIX:
Reservable:
RepairsUnits:
Interval: 15
PlayerExperience: 25
RallyPoint:
WithRepairAnimation:
Power:

View File

@@ -35,38 +35,23 @@ Container@SKIRMISH_STATS:
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
Text: Player
Font: Bold
Label@FACTION:
X: 150
Width: 80
X: 230
Width: 120
Height: 25
Text: Faction
Font: Bold
Align: Center
Label@STANCE:
X: 280
Width: 50
Label@SCORE:
X: 360
Width: 75
Height: 25
Text: Team
Text: Score
Font: Bold
Align: Center
Label@KILLS:
X: 330
Width: 60
Height: 25
Text: Kills
Font: Bold
Align: Center
Label@DEATHS:
X: 390
Width: 60
Height: 25
Text: Deaths
Font: Bold
Align: Center
Align: Right
ScrollPanel@PLAYER_LIST:
X: 20
Y: 105
@@ -75,43 +60,52 @@ Container@SKIRMISH_STATS:
TopBottomSpacing: 5
ItemSpacing: 5
Children:
ScrollItem@TEAM_TEMPLATE:
BaseName: scrollheader
Width: PARENT_RIGHT - 27
Height: 20
X: 2
Visible: false
Children:
Label@TEAM:
X: 2
Y: 0-2
Width: 160
Height: 20
Font: Bold
Label@TEAM_SCORE:
X: 360
Y: 0-2
Width: 75
Height: 20
Font: Bold
Align: Right
Container@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
X: 10
Width: 150
Width: 210
Height: 25
Image@FACTIONFLAG:
X: 159
Y: 3
X: 230
Y: 6
Width: 32
Height: 16
Label@FACTION:
X: 195
Width: 85
X: 264
Width: 86
Height: 25
Label@TEAM:
X: 280
Width: 50
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Center
Label@KILLS:
X: 330
Width: 60
Height: 25
Align: Center
Label@DEATHS:
X: 390
Width: 60
Height: 25
Align: Center
Align: Right

View File

@@ -0,0 +1,15 @@
^ExistsInWorld:
GivesExperience:
PlayerExperienceModifier: 0
^Building:
RepairableBuilding:
PlayerExperience: 0
engineer:
Captures:
PlayerExperience: 0
repair_pad:
RepairsUnits:
PlayerExperience: 0

View File

@@ -3,6 +3,7 @@
UpdatesPlayerStatistics:
CombatDebugOverlay:
GivesExperience:
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
@@ -262,6 +263,7 @@
WithBuildingExplosion:
Sequences: building, self_destruct, large_explosion
RepairableBuilding:
PlayerExperience: 25
EmitInfantryOnSell:
ActorTypes: light_inf
MustBeDestroyed:

View File

@@ -44,6 +44,7 @@ engineer:
EngineerRepair:
Captures:
CaptureTypes: building, husk
PlayerExperience: 50
-AutoTarget:
Voiced:
VoiceSet: EngineerVoice

View File

@@ -91,3 +91,4 @@ Player:
GlobalUpgradeManager:
ResourceStorageWarning:
AdviceInterval: 26
PlayerExperience:

View File

@@ -769,6 +769,7 @@ repair_pad:
Interval: 10
HpPerStep: 80
FinishRepairingNotification: UnitRepaired
PlayerExperience: 15
RallyPoint:
Offset: 1,3
RenderSprites:

View File

@@ -35,38 +35,23 @@ Container@SKIRMISH_STATS:
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
Text: Player
Font: Bold
Label@FACTION:
X: 150
Width: 80
X: 230
Width: 120
Height: 25
Text: Faction
Font: Bold
Align: Center
Label@STANCE:
X: 260
Width: 50
Label@SCORE:
X: 360
Width: 75
Height: 25
Text: Team
Text: Score
Font: Bold
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Text: Kills
Font: Bold
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Text: Deaths
Font: Bold
Align: Center
Align: Right
ScrollPanel@PLAYER_LIST:
X: 20
Y: 105
@@ -75,43 +60,52 @@ Container@SKIRMISH_STATS:
TopBottomSpacing: 5
ItemSpacing: 5
Children:
ScrollItem@TEAM_TEMPLATE:
BaseName: scrollheader
Width: PARENT_RIGHT - 27
Height: 20
X: 2
Visible: false
Children:
Label@TEAM:
X: 2
Y: 0-2
Width: 160
Height: 20
Font: Bold
Label@TEAM_SCORE:
X: 360
Y: 0-2
Width: 75
Height: 20
Font: Bold
Align: Right
Container@PLAYER_TEMPLATE:
Width: PARENT_RIGHT-27
Height: 25
X: 2
Y: 0
Children:
Label@NAME:
X: 10
Width: 150
Width: 210
Height: 25
ClientTooltipRegion@CLIENT_REGION:
TooltipContainer: TOOLTIP_CONTAINER
Template: INGAME_CLIENT_TOOLTIP
X: 10
Width: 150
Width: 210
Height: 25
Image@FACTIONFLAG:
X: 159
X: 230
Y: 6
Width: 32
Height: 16
Label@FACTION:
X: 195
Width: 65
X: 264
Width: 86
Height: 25
Label@TEAM:
X: 260
Width: 50
Label@SCORE:
X: 360
Width: 75
Height: 25
Align: Center
Label@KILLS:
X: 310
Width: 70
Height: 25
Align: Center
Label@DEATHS:
X: 380
Width: 70
Height: 25
Align: Center
Align: Right

View File

@@ -2,7 +2,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
X: 25
Y: 50
Width: 950
Width: 1025
Height: 500
Background: dialog
Children:
@@ -54,30 +54,30 @@ Background@INGAME_OBSERVERSTATS_BG:
Label@POWER_HEADER:
X: 425
Y: 40
Width: 80
Width: 60
Height: 25
Font: Bold
Text: Power
Label@KILLS_HEADER:
X: 505
X: 485
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Kills
Align: Right
Label@DEATHS_HEADER:
X: 565
X: 545
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Deaths
Align: Right
Label@ASSETS_DESTROYED_HEADER:
X: 625
X: 605
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Destroyed
@@ -85,15 +85,23 @@ Background@INGAME_OBSERVERSTATS_BG:
Label@ASSETS_LOST_HEADER:
X: 685
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Lost
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 805
Label@EXPERIENCE_HEADER:
X: 765
Y: 40
Width: 40
Width: 95
Height: 25
Font: Bold
Text: Experience
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 860
Y: 40
Width: 90
Height: 25
Font: Bold
Text: Actions/min
@@ -316,33 +324,39 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 80
Height: PARENT_BOTTOM
Label@KILLS:
X: 475
X: 455
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@DEATHS:
X: 535
X: 515
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_DESTROYED:
X: 595
X: 575
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_LOST:
X: 660
X: 655
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Label@ACTIONS_MIN:
X: 775
X: 830
Y: 0
Width: 40
Width: 90
Height: PARENT_BOTTOM
Align: Right
ScrollItem@ECONOMY_PLAYER_TEMPLATE:

View File

@@ -33,6 +33,8 @@ BADR:
Interval: 2
-EjectOnDeath:
RejectsOrders:
GivesExperience:
Experience: 1000
BADR.Bomber:
Inherits: ^Plane
@@ -72,6 +74,8 @@ BADR.Bomber:
RejectsOrders:
RenderSprites:
Image: badr
GivesExperience:
Experience: 1000
MIG:
Inherits: ^Plane

View File

@@ -0,0 +1,43 @@
^ExistsInWorld:
GivesExperience:
PlayerExperienceModifier: 0
^Building:
RepairableBuilding:
PlayerExperience: 0
E6:
Captures:
PlayerExperience: 0
SPY:
Infiltrates:
PlayerExperience: 0
MECH:
Captures:
PlayerExperience: 0
THF:
Infiltrates:
PlayerExperience: 0
HIJACKER:
Captures:
PlayerExperience: 0
SPEN:
RepairsUnits:
PlayerExperience: 0
SYRD:
RepairsUnits:
PlayerExperience: 0
FIX:
RepairsUnits:
PlayerExperience: 0
TRUK:
SupplyTruck:
PlayerExperience: 0

View File

@@ -2,6 +2,7 @@
AppearsOnRadar:
CombatDebugOverlay:
GivesExperience:
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
@@ -449,6 +450,7 @@
UpdatesPlayerStatistics:
GivesBuildableArea:
RepairableBuilding:
PlayerExperience: 25
EngineerRepairable:
AcceptsSupplies:
WithMakeAnimation:

View File

@@ -179,6 +179,7 @@ E6:
RepairsBridges:
ExternalCaptures:
Type: building
PlayerExperience: 25
-AutoTarget:
Voiced:
VoiceSet: EngineerVoice
@@ -209,6 +210,7 @@ SPY:
Voice: Move
Infiltrates:
Types: SpyInfiltrate
PlayerExperience: 50
-AutoTarget:
-WithInfantryBody:
WithDisguisingInfantryBody:
@@ -240,6 +242,8 @@ SPY.England:
Prerequisites: ~infantry.england, dome, ~tent, ~techlevel.medium
Valued:
Cost: 250
GivesExperience:
Experience: 500
DisguiseToolTip:
Name: British Spy
RenderSprites:
@@ -354,6 +358,7 @@ MECH:
Voice: Move
Captures:
CaptureTypes: husk
PlayerExperience: 25
WithInfantryBody:
AttackSequence: repair
StandSequences: stand
@@ -424,6 +429,7 @@ THF:
PipType: Yellow
Infiltrates:
InfiltrateTypes: Cash
PlayerExperience: 50
-AutoTarget:
Voiced:
VoiceSet: ThiefVoice
@@ -451,6 +457,7 @@ HIJACKER:
PipType: Yellow
Captures:
CaptureTypes: vehicle
PlayerExperience: 50
-AutoTarget:
Voiced:
VoiceSet: ThiefVoice

View File

@@ -81,3 +81,4 @@ Player:
Image: iconchevrons
Sequence: veteran
ResourceStorageWarning:
PlayerExperience:

View File

@@ -136,6 +136,7 @@ SPEN:
-EmitInfantryOnSell:
RepairsUnits:
FinishRepairingNotification: UnitRepaired
PlayerExperience: 15
RallyPoint:
ProductionBar:
Power:
@@ -225,6 +226,7 @@ SYRD:
-EmitInfantryOnSell:
RepairsUnits:
FinishRepairingNotification: UnitRepaired
PlayerExperience: 15
RallyPoint:
ProductionBar:
Power:
@@ -1569,6 +1571,7 @@ FIX:
RepairsUnits:
Interval: 10
FinishRepairingNotification: UnitRepaired
PlayerExperience: 15
WithRepairAnimation:
Power:
Amount: -30

View File

@@ -488,6 +488,7 @@ TRUK:
Range: 4c0
SupplyTruck:
Payload: 500
PlayerExperience: 50
SpawnActorOnDeath:
Actor: moneycrate

View File

@@ -2,7 +2,7 @@ Background@INGAME_OBSERVERSTATS_BG:
Logic: ObserverStatsLogic
X: 25
Y: 50
Width: 950
Width: 1025
Height: 500
Background: dialog
Children:
@@ -54,30 +54,30 @@ Background@INGAME_OBSERVERSTATS_BG:
Label@POWER_HEADER:
X: 425
Y: 40
Width: 80
Width: 60
Height: 25
Font: Bold
Text: Power
Label@KILLS_HEADER:
X: 505
X: 485
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Kills
Align: Right
Label@DEATHS_HEADER:
X: 565
X: 545
Y: 40
Width: 40
Width: 60
Height: 25
Font: Bold
Text: Deaths
Align: Right
Label@ASSETS_DESTROYED_HEADER:
X: 625
X: 605
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Destroyed
@@ -85,15 +85,23 @@ Background@INGAME_OBSERVERSTATS_BG:
Label@ASSETS_LOST_HEADER:
X: 685
Y: 40
Width: 60
Width: 80
Height: 25
Font: Bold
Text: Lost
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 805
Label@EXPERIENCE_HEADER:
X: 765
Y: 40
Width: 40
Width: 95
Height: 25
Font: Bold
Text: Experience
Align: Right
Label@ACTIONS_MIN_HEADER:
X: 860
Y: 40
Width: 90
Height: 25
Font: Bold
Text: Actions/min
@@ -316,33 +324,39 @@ Background@INGAME_OBSERVERSTATS_BG:
Width: 80
Height: PARENT_BOTTOM
Label@KILLS:
X: 475
X: 455
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@DEATHS:
X: 535
X: 515
Y: 0
Width: 40
Width: 60
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_DESTROYED:
X: 595
X: 575
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@ASSETS_LOST:
X: 660
X: 655
Y: 0
Width: 60
Width: 80
Height: PARENT_BOTTOM
Align: Right
Label@EXPERIENCE:
X: 735
Y: 0
Width: 95
Height: PARENT_BOTTOM
Align: Right
Label@ACTIONS_MIN:
X: 775
X: 830
Y: 0
Width: 40
Width: 90
Height: PARENT_BOTTOM
Align: Right
ScrollItem@ECONOMY_PLAYER_TEMPLATE:

View File

@@ -3,6 +3,7 @@
UpdatesPlayerStatistics:
CombatDebugOverlay:
GivesExperience:
PlayerExperienceModifier: 1
ScriptTriggers:
UpgradeManager:
Huntable:
@@ -125,6 +126,7 @@
Capturable:
RepairableBuilding:
IndicatorPalette: mouse
PlayerExperience: 25
WithDeathAnimation:
DeathSequence: dead
UseDeathTypeSuffix: false

View File

@@ -210,6 +210,7 @@ GAHPAD:
PrimaryBuilding:
Reservable:
RepairsUnits:
PlayerExperience: 15
ProductionBar:
WithIdleOverlay@PLATFORM:
Sequence: idle-platform
@@ -256,6 +257,7 @@ GADEPT:
Range: 5c0
Reservable:
RepairsUnits:
PlayerExperience: 15
RallyPoint:
Palette: mouse
IsPlayerPalette: false

View File

@@ -117,6 +117,7 @@ MHIJACK:
-Crushable:
Captures:
CaptureTypes: Vehicle
PlayerExperience: 50
RevealsShroud:
Range: 6c0
-AutoTarget:

View File

@@ -215,6 +215,7 @@ NAHPAD:
PrimaryBuilding:
Reservable:
RepairsUnits:
PlayerExperience: 15
ProductionBar:
WithIdleOverlay@PLATFORM:
Sequence: idle-platform

View File

@@ -52,3 +52,4 @@ Player:
PlayerStatistics:
PlaceSimpleBeacon:
ResourceStorageWarning:
PlayerExperience:

View File

@@ -58,6 +58,7 @@ ENGINEER:
RepairNotification: BridgeRepaired
Captures:
CaptureTypes: building
PlayerExperience: 50
-AutoTarget:
-GainsExperience:
RenderSprites: