Ticket #3311: ticket3311patch.txt

File ticket3311patch.txt, 6.6 KB (added by bb, 9 years ago)

Here the patch as text-file (i don't know how to create a ".patch" file)

Line 
1Index: binaries/data/mods/public/gui/session/session.js
2===================================================================
3--- binaries/data/mods/public/gui/session/session.js (revision 16859)
4+++ binaries/data/mods/public/gui/session/session.js (working copy)
5@@ -912,7 +912,8 @@
6 "Cavalry",
7 "Champion",
8 "Hero",
9- "Ship"
10+ "Ship",
11+ "Trader"
12 ];
13 var unitsCountersTypes = [
14 "unitsTrained",
15
16
17Index: binaries/data/mods/public/gui/summary/layout.js
18===================================================================
19--- binaries/data/mods/public/gui/summary/layout.js (revision 16859)
20+++ binaries/data/mods/public/gui/summary/layout.js (working copy)
21@@ -29,7 +29,7 @@
22 { "caption": translate("Wonders"), "yStart": 34, "width": 85 }
23 ],
24 "titleHeadings": [
25- { "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) }, // width = 735
26+ { "caption": translate("Buildings Statistics (Constructed / Lost / Destroyed)"), "yStart": 16, "width": (85 * 7 + 105) }, // width = 700
27 ],
28 "counters": [ // counters on buildings panel
29 {"width": 105, "fn": calculateBuildings},
30@@ -52,10 +52,11 @@
31 { "caption": translate("Cavalry"), "yStart": 34, "width": 100 },
32 { "caption": translate("Champion"), "yStart": 34, "width": 100 },
33 { "caption": translate("Heroes"), "yStart": 34, "width": 100 },
34- { "caption": translate("Navy"), "yStart": 34, "width": 100 }
35+ { "caption": translate("Navy"), "yStart": 34, "width": 100 },
36+ { "caption": translate("Traders"), "yStart": 34, "width": 100 }
37 ],
38 "titleHeadings": [
39- { "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 6 + 120) }, // width = 720
40+ { "caption": translate("Units Statistics (Trained / Lost / Killed)"), "yStart": 16, "width": (100 * 7 + 120) }, // width = 820
41 ],
42 "counters": [ // counters on units panel
43 {"width": 120, "fn": calculateUnits},
44@@ -64,6 +65,7 @@
45 {"width": 100, "fn": calculateUnits},
46 {"width": 100, "fn": calculateUnits},
47 {"width": 100, "fn": calculateUnits},
48+ {"width": 100, "fn": calculateUnits},
49 {"width": 100, "fn": calculateUnits}
50 ],
51 "teamCounterFn": calculateColorsTeam
52
53
54Index: binaries/data/mods/public/gui/summary/summary.js
55===================================================================
56--- binaries/data/mods/public/gui/summary/summary.js (revision 16859)
57+++ binaries/data/mods/public/gui/summary/summary.js (working copy)
58@@ -21,7 +21,7 @@
59 const KILLED_COLOR = '[color="196 198 255"]';
60
61 const BUILDINGS_TYPES = [ "total", "House", "Economic", "Outpost", "Military", "Fortress", "CivCentre", "Wonder" ];
62-const UNITS_TYPES = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship" ];
63+const UNITS_TYPES = [ "total", "Infantry", "Worker", "Cavalry", "Champion", "Hero", "Ship", "Trader" ];
64 const RESOURCES_TYPES = [ "food", "wood", "stone", "metal" ];
65
66 // Colors used for gathered and traded resources
67
68
69Index: source/tools/XpartaMuPP/LobbyRanking.py
70===================================================================
71--- source/tools/XpartaMuPP/LobbyRanking.py (revision 16859)
72+++ source/tools/XpartaMuPP/LobbyRanking.py (working copy)
73@@ -87,6 +87,9 @@
74 shipUnitsTrained = Column(Integer)
75 shipUnitsLost = Column(Integer)
76 enemyShipUnitsKilled = Column(Integer)
77+ traderUnitsTrained = Column(Integer)
78+ traderUnitsLost = Column(Integer)
79+ enemyTraderUnitsKilled = Column(Integer)
80 totalBuildingsConstructed = Column(Integer)
81 totalBuildingsLost = Column(Integer)
82 enemytotalBuildingsDestroyed = Column(Integer)
83
84
85Index: source/tools/XpartaMuPP/XpartaMuPP.py
86===================================================================
87--- source/tools/XpartaMuPP/XpartaMuPP.py (revision 16859)
88+++ source/tools/XpartaMuPP/XpartaMuPP.py (working copy)
89@@ -128,7 +128,7 @@
90 'enemyWorkerUnitsKilled', 'femaleUnitsTrained', 'femaleUnitsLost', 'enemyFemaleUnitsKilled',
91 'cavalryUnitsTrained', 'cavalryUnitsLost', 'enemyCavalryUnitsKilled', 'championUnitsTrained',
92 'championUnitsLost', 'enemyChampionUnitsKilled', 'heroUnitsTrained', 'heroUnitsLost',
93- 'enemyHeroUnitsKilled', 'shipUnitsTrained', 'shipUnitsLost', 'enemyShipUnitsKilled'}
94+ 'enemyHeroUnitsKilled', 'shipUnitsTrained', 'shipUnitsLost', 'enemyShipUnitsKilled', 'traderUnitsTrained', 'traderUnitsLost', 'enemyTraderUnitsKilled'}
95 buildingsStats = {'totalBuildingsConstructed', 'totalBuildingsLost', 'enemytotalBuildingsDestroyed',
96 'civCentreBuildingsConstructed', 'civCentreBuildingsLost', 'enemyCivCentreBuildingsDestroyed',
97 'houseBuildingsConstructed', 'houseBuildingsLost', 'enemyHouseBuildingsDestroyed',
98
99
100Index: binaries/data/mods/public/simulation/components/StatisticsTracker.js
101===================================================================
102--- binaries/data/mods/public/simulation/components/StatisticsTracker.js (revision 16859)
103+++ binaries/data/mods/public/simulation/components/StatisticsTracker.js (working copy)
104@@ -3,120 +3,124 @@
105 StatisticsTracker.prototype.Schema =
106 "<a:component type='system'/><empty/>";
107
108-StatisticsTracker.prototype.Init = function()
109-{
110- // units
111- this.unitsClasses = [
112- "Infantry",
113- "Worker",
114- "Female",
115- "Cavalry",
116- "Champion",
117- "Hero",
118- "Ship"
119- ];
120- this.unitsTrained = {
121- "Infantry": 0,
122- "Worker": 0,
123- "Female": 0,
124- "Cavalry": 0,
125- "Champion": 0,
126- "Hero": 0,
127- "Ship": 0,
128- "total": 0
129- };
130- this.unitsLost = {
131- "Infantry": 0,
132- "Worker": 0,
133- "Female": 0,
134- "Cavalry": 0,
135- "Champion": 0,
136- "Hero": 0,
137- "Ship": 0,
138- "total": 0
139- };
140- this.unitsLostValue = 0;
141- this.enemyUnitsKilled = {
142- "Infantry": 0,
143- "Worker": 0,
144- "Female": 0,
145- "Cavalry": 0,
146- "Champion": 0,
147- "Hero": 0,
148- "Ship": 0,
149- "total": 0
150- };
151
152- this.enemyUnitsKilledValue = 0;
153+StatisticsTracker.prototype.Init = function()
154+{
155+ // units
156+ this.unitsClasses = [
157+ "Infantry",
158+ "Worker",
159+ "Female",
160+ "Cavalry",
161+ "Champion",
162+ "Hero",
163+ "Ship",
164+ "Trader"
165+ ];
166+ this.unitsTrained = {
167+ "Infantry": 0,
168+ "Worker": 0,
169+ "Female": 0,
170+ "Cavalry": 0,
171+ "Champion": 0,
172+ "Hero": 0,
173+ "Ship": 0,
174+ "Trader": 0,
175+ "total": 0
176+ };
177+ this.unitsLost = {
178+ "Infantry": 0,
179+ "Worker": 0,
180+ "Female": 0,
181+ "Cavalry": 0,
182+ "Champion": 0,
183+ "Hero": 0,
184+ "Ship": 0,
185+ "Trader": 0,
186+ "total": 0
187+ };
188+ this.unitsLostValue = 0;
189+ this.enemyUnitsKilled = {
190+ "Infantry": 0,
191+ "Worker": 0,
192+ "Female": 0,
193+ "Cavalry": 0,
194+ "Champion": 0,
195+ "Hero": 0,
196+ "Ship": 0,
197+ "Trader": 0,
198+ "total": 0
199+ };
200+ this.enemyUnitsKilledValue = 0;
201