diff --git a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml index 70cc968751..f442f5c619 100755 --- a/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml +++ b/binaries/data/mods/official/entities/structures/template_structure_norm_civic_cc.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml index 5c0224fc13..818107b254 100755 --- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml +++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_mer.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml index 6d9ba604bc..25913cbc15 100755 --- a/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml +++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_ship_tri.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml index ed321a1e91..c09eb27ac7 100755 --- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml +++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_bal.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml index 8a1b205969..a09c097b7f 100755 --- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml +++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ong.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml index edd677b598..9672212fba 100755 --- a/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml +++ b/binaries/data/mods/official/entities/units/template_unit_mechanical_siege_ram.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml b/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml index 4d78524a21..35c1487cdf 100755 --- a/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml +++ b/binaries/data/mods/official/entities/units/template_unit_superunit_scu.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/entities/units/template_unit_support_med.xml b/binaries/data/mods/official/entities/units/template_unit_support_med.xml index 960a711e36..9727f4b501 100755 --- a/binaries/data/mods/official/entities/units/template_unit_support_med.xml +++ b/binaries/data/mods/official/entities/units/template_unit_support_med.xml @@ -5,7 +5,7 @@ \ No newline at end of file diff --git a/binaries/data/mods/official/entities/units/template_unit_support_trd.xml b/binaries/data/mods/official/entities/units/template_unit_support_trd.xml index cc836a0454..10d82c206b 100755 --- a/binaries/data/mods/official/entities/units/template_unit_support_trd.xml +++ b/binaries/data/mods/official/entities/units/template_unit_support_trd.xml @@ -5,7 +5,7 @@ diff --git a/binaries/data/mods/official/gui/test/functions_manual.js b/binaries/data/mods/official/gui/test/functions_manual.js index 51fe18928f..68e9573edb 100755 --- a/binaries/data/mods/official/gui/test/functions_manual.js +++ b/binaries/data/mods/official/gui/test/functions_manual.js @@ -12,7 +12,7 @@ function manualDisplay() if (selection[0].traits.id.icon) { if (selection[0].traits.id.icon_cell && selection[0].traits.id.icon_cell != "") - setPortrait("manual_portrait", selection[0].traits.id.icon + "_" + selection[0].traits.id.icon_cell); + setPortrait("manual_portrait", selection[0].traits.id.icon, selection[0].traits.id.icon_cell); else setPortrait("manual_portrait", selection[0].traits.id.icon); } diff --git a/binaries/data/mods/official/gui/test/functions_session.js b/binaries/data/mods/official/gui/test/functions_session.js index 0adab1cc6c..20399e9514 100755 --- a/binaries/data/mods/official/gui/test/functions_session.js +++ b/binaries/data/mods/official/gui/test/functions_session.js @@ -46,7 +46,7 @@ function loadSession() // ==================================================================== -function setPortrait(objectName, portraitString) +function setPortrait(objectName, portraitString, portraitCell) { // Use this function as a shortcut to change a portrait object to a different portrait image. @@ -64,6 +64,10 @@ function setPortrait(objectName, portraitString) // Note we need to use a special syntax here (object["param"] instead of object.param because dashes aren't actually in JS's variable-naming conventions. GUIObject["sprite-over"] = GUIObject.sprite + "-lit"; GUIObject["sprite-disabled"] = GUIObject.sprite + "-grey"; + + // If the source texture is a multi-frame image (icon sheet), specify correct cell. + if (portraitCell) + GUIObject["icon-id"] = portraitCell; } // ==================================================================== diff --git a/binaries/data/mods/official/gui/test/functions_session_group_pane.js b/binaries/data/mods/official/gui/test/functions_session_group_pane.js index 0c4e018471..ef1f79ec92 100755 --- a/binaries/data/mods/official/gui/test/functions_session_group_pane.js +++ b/binaries/data/mods/official/gui/test/functions_session_group_pane.js @@ -187,11 +187,11 @@ function UpdateGroupPane() groupPanePortrait.hidden = false; groupPaneBar.hidden = false; // Set progress bar for hitpoints. - if (selection[groupPaneLoop-1].traits.health.curr && selection[groupPaneLoop-1].traits.health.hitpoints) - groupPaneBar.caption = ((Math.round(selection[groupPaneLoop-1].traits.health.curr) * 100 ) / Math.round(selection[groupPaneLoop-1].traits.health.hitpoints)); + if (selection[groupPaneLoop-1].traits.health.curr && selection[groupPaneLoop-1].traits.health.max) + groupPaneBar.caption = ((Math.round(selection[groupPaneLoop-1].traits.health.curr) * 100 ) / Math.round(selection[groupPaneLoop-1].traits.health.max)); // Set portrait. if (selection[groupPaneLoop-1].traits.id.icon_cell && selection[groupPaneLoop-1].traits.id.icon_cell != "") - setPortrait("session_group_pane_portrait_" + groupPaneLoop, selection[groupPaneLoop-1].traits.id.icon + "_" + selection[groupPaneLoop-1].traits.id.icon_cell); + setPortrait("session_group_pane_portrait_" + groupPaneLoop, selection[groupPaneLoop-1].traits.id.icon, selection[groupPaneLoop-1].traits.id.icon_cell); else setPortrait("session_group_pane_portrait_" + groupPaneLoop, selection[groupPaneLoop-1].traits.id.icon); } diff --git a/binaries/data/mods/official/gui/test/functions_session_status_orb.js b/binaries/data/mods/official/gui/test/functions_session_status_orb.js index 1cb3bc921e..be2dd2fb24 100755 --- a/binaries/data/mods/official/gui/test/functions_session_status_orb.js +++ b/binaries/data/mods/official/gui/test/functions_session_status_orb.js @@ -619,7 +619,7 @@ function UpdateList(listIcon, listCol) if (createLoop < listArray.length+1) { if (getEntityTemplate(listArray[createLoop-1]).traits.id.icon_cell && getEntityTemplate(listArray[createLoop-1]).traits.id.icon_cell != "") - setPortrait("session_panel_status_command_pri_" + listCol + "_" + createLoop, getEntityTemplate(listArray[createLoop-1]).traits.id.icon + "_" + getEntityTemplate(listArray[createLoop-1]).traits.id.icon_cell); + setPortrait("session_panel_status_command_pri_" + listCol + "_" + createLoop, getEntityTemplate(listArray[createLoop-1]).traits.id.icon, getEntityTemplate(listArray[createLoop-1]).traits.id.icon_cell); else setPortrait("session_panel_status_command_pri_" + listCol + "_" + createLoop, getEntityTemplate(listArray[createLoop-1]).traits.id.icon); GUIObjectUnhide("session_panel_status_command_pri_" + listCol + "_" + createLoop); @@ -734,7 +734,7 @@ function UpdateStatusOrb() if (selection[0].traits.id.icon) { if (selection[0].traits.id.icon_cell && selection[0].traits.id.icon_cell != "") - setPortrait("session_panel_status_portrait", selection[0].traits.id.icon + "_" + selection[0].traits.id.icon_cell); + setPortrait("session_panel_status_portrait", selection[0].traits.id.icon, selection[0].traits.id.icon_cell); else setPortrait("session_panel_status_portrait", selection[0].traits.id.icon); } diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml index 66b5d95aaf..7023cbba48 100755 --- a/binaries/data/mods/official/gui/test/sprite1.xml +++ b/binaries/data/mods/official/gui/test/sprite1.xml @@ -227,7 +227,7 @@ ========================================== --> - + @@ -710,581 +710,14 @@ ========================================== --> - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +