griffkid4/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Used Hele portrait sheet for units that begin with "camp"

Browse Source 
Made button layout ever so slightly more efficient
Fixed some more Hellene animation speeds

This was SVN commit r7713.
This commit is contained in:
WhiteTreePaladin 2010-07-07 13:28:37 +00:00
parent 7a58980ad6
commit db8dda7bda
6 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_a_r.xml
View File

@ -7,11 +7,11 @@
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/> <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="18"/> <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="8"/> <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/> <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="100"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="100"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
</animations> </animations>
<mesh>skeletal/m_tunic_short.dae</mesh> <mesh>skeletal/m_tunic_short.dae</mesh>
<props> <props>

8
binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_b_r.xml
View File

@ -7,11 +7,11 @@
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/> <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="18"/> <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="8"/> <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/> <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="100"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="100"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
</animations> </animations>
<mesh>skeletal/m_tunic_short.dae</mesh> <mesh>skeletal/m_tunic_short.dae</mesh>
<props> <props>

8
binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e_r.xml
View File

@ -7,11 +7,11 @@
<animation file="biped/cavalryidle.psa" name="Idle" speed="50"/> <animation file="biped/cavalryidle.psa" name="Idle" speed="50"/>
<animation file="biped/cavalryidle.psa" name="Walk" speed="18"/> <animation file="biped/cavalryidle.psa" name="Walk" speed="18"/>
<animation file="biped/rider_gallop.psa" name="Run" speed="8"/> <animation file="biped/rider_gallop.psa" name="Run" speed="8"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="200"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="Melee" speed="250"/>
<animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/> <animation file="biped/rider_sword_death_a.psa" name="death" speed="230"/>
<animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="120"/> <animation file="cavalry/sword/attack/rider_sword_shield_atk_a.psa" name="gather_meat" speed="250"/>
<animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="120"/> <animation file="cavalry/spear/attack/rider_spear_shield_atk_a.psa" name="gather_meat" speed="250"/>
</animations> </animations>
<mesh>skeletal/m_tunic_short.dae</mesh> <mesh>skeletal/m_tunic_short.dae</mesh>
<props> <props>

2
binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
View File

@ -13,7 +13,7 @@
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/> <animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/> <animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/> <animation file="infantry/general/forage.psa" name="gather_fruit" speed="110"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="50"/> <animation file="infantry/general/forage.psa" name="gather_meat" speed="110"/>
<animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/> <animation file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/> <animation file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/> <animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/>

3
binaries/data/mods/public/gui/session_new/session.js
View File

@ -2,6 +2,7 @@ const GEOLOGY = "geology";
const FLORA = "flora"; const FLORA = "flora";
const FAUNA = "fauna"; const FAUNA = "fauna";
const SPECIAL = "special"; const SPECIAL = "special";
const CAMP = "camp";
const GAIA = "Gaia" const GAIA = "Gaia"
const CART = "Cart"; const CART = "Cart";
@ -268,6 +269,8 @@ function getPortraitSheetName(type)
return portraitSheetName += "AnimalGaia"; return portraitSheetName += "AnimalGaia";
case SPECIAL: case SPECIAL:
return portraitSheetName += "SpecialGaia"; return portraitSheetName += "SpecialGaia";
case CAMP:
return portraitSheetName += "Hele"; // not sure what sheet should be used with the "camp" category
default: default:
return portraitSheetName += toTitleCase(type); return portraitSheetName += toTitleCase(type);
} }

10
binaries/data/mods/public/gui/session_new/unit_commands.js
View File

@ -104,7 +104,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
button.onpress = (function(e) { return function() { callback(e) } })(item); // (need nested functions to get the closure right) button.onpress = (function(e) { return function() { callback(e) } })(item); // (need nested functions to get the closure right)
// Get icon sheet // Get icon sheet
icon.sprite = getPortraitSheetName(getTemplateCategory(entType)); icon.sprite = getPortraitSheetName(getTemplateCategory(entType)); // unit specific icon sheet
if (typeof template.icon_cell == "undefined") if (typeof template.icon_cell == "undefined")
icon.cell_id = 0; icon.cell_id = 0;
@ -118,13 +118,13 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom; var buttonSideLength = getGUIObjectByName("unit"+guiName+"Button[0]").size.bottom;
var numButtons = i; var numButtons = i;
var buttonSpacer = ((guiName == "Selection")? 37 : 45); var buttonSpacer = ((guiName == "Selection")? 37 : 45);
if (numButtons < 9) // Row 0 if (numButtons < 9) // Row 0
{ {
if ((guiName == "Queue")) // or garrison if ((guiName == "Queue")) // or garrison
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -60 100% 100%-166"; getGUIObjectByName("unit"+guiName+"Panel").size = "0 -60 100% 100%-166";
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8); layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, numButtons);
} }
else if (numButtons < 17) // Row 1 else if (numButtons < 17) // Row 1
{ {
@ -132,7 +132,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
getGUIObjectByName("unit"+guiName+"Panel").size = "0 -105 100% 100%-166"; getGUIObjectByName("unit"+guiName+"Panel").size = "0 -105 100% 100%-166";
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8); layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8);
layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, 16); layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, numButtons);
} }
else // Row 2 else // Row 2
{ {
@ -142,7 +142,7 @@ function setupUnitPanel(guiName, usedPanels, playerState, unitEntState, items, c
layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8); layoutButtonRow(0, guiName, buttonSideLength, buttonSpacer, 0, 8);
layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, 16); layoutButtonRow(1, guiName, buttonSideLength, buttonSpacer, 8, 16);
if (guiName != "Selection") if (guiName != "Selection")
layoutButtonRow(2, guiName, buttonSideLength, buttonSpacer, 16, 24); layoutButtonRow(2, guiName, buttonSideLength, buttonSpacer, 16, numButtons);
} }
// Hide any buttons we're no longer using // Hide any buttons we're no longer using