Ticket #3113: total_carried_resources_v1.5.patch
File total_carried_resources_v1.5.patch, 2.4 KB (added by , 8 years ago) |
---|
-
binaries/data/mods/public/gui/session/selection_details.js
341 341 let maxCapturePoints = 0; 342 342 let capturePoints = (new Array(9)).fill(0); 343 343 let playerID = 0; 344 let totalResourcesCarried; 344 345 345 346 for (let i = 0; i < selection.length; i++) 346 347 { … … 358 359 maxCapturePoints += entState.maxCapturePoints; 359 360 capturePoints = entState.capturePoints.map((v, i) => v + capturePoints[i]); 360 361 } 362 363 if (entState.resourceCarrying && entState.resourceCarrying.length !== 0) 364 { 365 if (!totalResourcesCarried) 366 totalResourcesCarried = {}; 367 368 let carrying = entState.resourceCarrying[0]; 369 if (totalResourcesCarried[carrying.type]) 370 totalResourcesCarried[carrying.type] += carrying.amount; 371 else 372 totalResourcesCarried[carrying.type] = carrying.amount; 373 } 361 374 } 362 375 363 376 Engine.GetGUIObjectByName("healthMultiple").hidden = averageHealth <= 0; … … 407 420 }); 408 421 } 409 422 410 Engine.GetGUIObjectByName("numberOfUnits").caption = selection.length; 423 let numberOfUnits = Engine.GetGUIObjectByName("numberOfUnits"); 424 numberOfUnits.caption = selection.length; 411 425 426 let str = ""; 427 if (totalResourcesCarried) 428 for (let res of RESOURCES) 429 if (totalResourcesCarried[res]) 430 str += getCostComponentDisplayName(res) + totalResourcesCarried[res] + " "; 431 numberOfUnits.tooltip = str.substr(0, str.length - 1); 432 412 433 // Unhide Details Area 413 434 Engine.GetGUIObjectByName("detailsAreaMultiple").hidden = false; 414 435 Engine.GetGUIObjectByName("detailsAreaSingle").hidden = true; -
binaries/data/mods/public/gui/session/selection_panels_middle/multiple_details_area.xml
19 19 20 20 <!-- Total --> 21 21 <object size="100%-42 12 100%-8 46" type="image" sprite="groupsIcon"> 22 <object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits" />22 <object size="0 0 100% 100%" type="text" style="largeCenteredOutlinedText" name="numberOfUnits" tooltip_style="sessionToolTipBold"/> 23 23 </object> 24 24 25 25 <!-- Stats Bars -->