diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml index 9ba503405b..47cea52767 100755 --- a/binaries/data/mods/official/entities/template_entity.xml +++ b/binaries/data/mods/official/entities/template_entity.xml @@ -4,7 +4,6 @@ + = evt.inflictor.traits.up.req) + { + // Notify the player. + if (this.traits.id.specific) + console.write(this.traits.id.specific + " has gained a promotion!"); + else + console.write("One of your units has gained a promotion!"); + + // Reset his upgrade points. + evt.inflictor.traits.up.curr = 0; + + // Transmogrify him into his next rank. +// evt.inflictor.template = getEntityTemplate(evt.inflictor.traits.up.newentity); + } + } +/* + // If the fallen is worth any loot, + if (this.traits.loot && (this.traits.loot.food || this.traits.loot.wood || this.traits.loot.stone || this.traits.loot.ore)) + { + // Give the inflictor his resources. + if (this.traits.loot.food) + GiveResources("Food", this.traits.loot.food); + if (this.traits.loot.wood) + GiveResources("Wood", this.traits.loot.wood); + if (this.traits.loot.stone) + GiveResources("Stone", this.traits.loot.stone); + if (this.traits.loot.ore) + GiveResources("Ore", this.traits.loot.ore); + } +*/ + // Notify player. if( evt.inflictor ) console.write( this.traits.id.generic + " got the point of " + evt.inflictor.traits.id.generic + "'s Gladius." ); else console.write( this.traits.id.generic + " died in mysterious circumstances." ); + + // We've taken what we need. Kill the swine. + this.kill(); } else if( evt.inflictor && this.actions.attack ) { diff --git a/binaries/data/mods/official/entities/units/combat_dude_roman.xml b/binaries/data/mods/official/entities/units/combat_dude_roman.xml index 1d45b42c54..d3777836d2 100755 --- a/binaries/data/mods/official/entities/units/combat_dude_roman.xml +++ b/binaries/data/mods/official/entities/units/combat_dude_roman.xml @@ -9,8 +9,7 @@ internal_only="false" specific="Dude" - ranked="Advanced Dude" - rank="2" + ranked="Basic Dude" personal="Vercinius Testiuso" personal1="rome_male_names_1st.csv" personal2="rome_male_names_2nd.csv" @@ -25,6 +24,9 @@ hack="0.5" pierce="0.5" /> + diff --git a/binaries/data/mods/official/entities/units/combat_dude_roman_a.xml b/binaries/data/mods/official/entities/units/combat_dude_roman_a.xml new file mode 100755 index 0000000000..9d1dbca064 --- /dev/null +++ b/binaries/data/mods/official/entities/units/combat_dude_roman_a.xml @@ -0,0 +1,17 @@ + + + + Roman Dude + + + + + + + + diff --git a/binaries/data/mods/official/entities/units/combat_dude_roman_u.xml b/binaries/data/mods/official/entities/units/combat_dude_roman_u.xml new file mode 100755 index 0000000000..5049433a9a --- /dev/null +++ b/binaries/data/mods/official/entities/units/combat_dude_roman_u.xml @@ -0,0 +1,17 @@ + + + + Roman Dude + + + + + + + + diff --git a/binaries/data/mods/official/entities/units/template_unit.xml b/binaries/data/mods/official/entities/units/template_unit.xml index 140ab46224..752213bd4b 100755 --- a/binaries/data/mods/official/entities/units/template_unit.xml +++ b/binaries/data/mods/official/entities/units/template_unit.xml @@ -13,13 +13,14 @@ type.unit.group="true" type.unit.material="true" type.unit.attack="true" - - rank="0" /> + diff --git a/binaries/data/mods/official/entities/units/template_unit_cavalry.xml b/binaries/data/mods/official/entities/units/template_unit_cavalry.xml index 1a1bd2c0f5..0c121d8327 100755 --- a/binaries/data/mods/official/entities/units/template_unit_cavalry.xml +++ b/binaries/data/mods/official/entities/units/template_unit_cavalry.xml @@ -7,8 +7,6 @@ class2="Cavalry" - rank="1" - type.unit.group.military="true" type.unit.mounted="true" type.unit.material.organic="true" @@ -16,17 +14,18 @@ type.unit.group.citizensoldier="true" type.unit.group.worker="true" /> - + diff --git a/binaries/data/mods/official/entities/units/template_unit_infantry.xml b/binaries/data/mods/official/entities/units/template_unit_infantry.xml index 8922059669..9ddcd32588 100755 --- a/binaries/data/mods/official/entities/units/template_unit_infantry.xml +++ b/binaries/data/mods/official/entities/units/template_unit_infantry.xml @@ -7,8 +7,6 @@ class2="Infantry" - rank="1" - type.unit.group.military="true" type.unit.foot="true" type.unit.material.organic="true" @@ -16,16 +14,17 @@ type.unit.group.citizensoldier="true" type.unit.group.worker="true" /> - + \ No newline at end of file diff --git a/binaries/data/mods/official/gui/test/functions_manual.js b/binaries/data/mods/official/gui/test/functions_manual.js index 6f80c62a66..c69b7ce4c9 100755 --- a/binaries/data/mods/official/gui/test/functions_manual.js +++ b/binaries/data/mods/official/gui/test/functions_manual.js @@ -53,12 +53,12 @@ function manualDisplay() ManualRollover.caption += "Hitpoints: " + selection[0].traits.health.curr + "/" + selection[0].traits.health.hitpoints + "\n"; // Display rank. - if (selection[0].traits.id.rank) - ManualRollover.caption += "Rank: " + selection[0].traits.id.rank + "\n"; + if (selection[0].traits.up.rank) + ManualRollover.caption += "Rank: " + selection[0].traits.up.rank + "\n"; // Display experience. - if (selection[0].traits.transform && selection[0].traits.transform.upcurr && selection[0].traits.transform.upreq) - ManualRollover.caption += "XP: " + selection[0].traits.transform.upcurr + "/" + selection[0].traits.transform.upreq + "\n"; + if (selection[0].traits.up && selection[0].traits.up.curr && selection[0].traits.up.req) + ManualRollover.caption += "XP: " + selection[0].traits.up.curr + "/" + selection[0].traits.up.req + "\n"; // Display UP on death. if (selection[0].traits.loot.up) diff --git a/binaries/data/mods/official/gui/test/functions_session_resource_pool.js b/binaries/data/mods/official/gui/test/functions_session_resource_pool.js index 29ed0cb38b..f3e96299d7 100755 --- a/binaries/data/mods/official/gui/test/functions_session_resource_pool.js +++ b/binaries/data/mods/official/gui/test/functions_session_resource_pool.js @@ -56,6 +56,8 @@ function GiveResources(resourceName, resourceQty) default: break; } + + console.write("Earned " + resourceQty + " resources."); } // ==================================================================== 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 2633f5ac47..844b604947 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 @@ -132,9 +132,9 @@ function UpdateStatusOrb() } // Update rank. - if (selection[0].traits.id.rank > 1) + if (selection[0].traits.up.rank > 1) { - getGUIObjectByName("session_panel_status_icon_rank").sprite = "statistic_rank" + (selection[0].traits.id.rank-1); + getGUIObjectByName("session_panel_status_icon_rank").sprite = "statistic_rank" + (selection[0].traits.up.rank-1); } else getGUIObjectByName("session_panel_status_icon_rank").sprite = ""; @@ -154,11 +154,11 @@ function UpdateStatusOrb() } // Update upgrade points - if (selection[0].traits.transform && selection[0].traits.transform.upcurr && selection[0].traits.transform.upreq) + if (selection[0].traits.up && selection[0].traits.up.curr && selection[0].traits.up.req) { - getGUIObjectByName("session_panel_status_icon_xp_text").caption = Math.round(selection[0].traits.transform.upcurr) + "/" + Math.round(selection[0].traits.transform.upreq); + getGUIObjectByName("session_panel_status_icon_xp_text").caption = Math.round(selection[0].traits.up.curr) + "/" + Math.round(selection[0].traits.up.req); getGUIObjectByName("session_panel_status_icon_xp_text").hidden = false; - getGUIObjectByName("session_panel_status_icon_xp_bar").caption = ((Math.round(selection[0].traits.transform.upcurr) * 100 ) / Math.round(selection[0].traits.transform.upreq)); + getGUIObjectByName("session_panel_status_icon_xp_bar").caption = ((Math.round(selection[0].traits.up.curr) * 100 ) / Math.round(selection[0].traits.up.req)); getGUIObjectByName("session_panel_status_icon_xp_bar").hidden = false; } else diff --git a/binaries/data/mods/official/gui/test/sprite1.xml b/binaries/data/mods/official/gui/test/sprite1.xml index 7dffa35b43..3a89329b04 100755 --- a/binaries/data/mods/official/gui/test/sprite1.xml +++ b/binaries/data/mods/official/gui/test/sprite1.xml @@ -115,7 +115,7 @@ - + @@ -158,6 +158,10 @@ + + + + - +