mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-23 11:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Converted resources:

Browse Source 
wood -> wood.tree
 stone -> stone.rock
 metal -> metal.ore
Added resource: metal.treasure
Renamed cursors and added placeholder treasure cursor
Fixed basic templates and Hellene actors to work with new resources
(need to fix Celt actors)
Fixed some warnings in the session scripts.
Added entity "Golden Fleece" placeholder

This was SVN commit r7778.
This commit is contained in:
WhiteTreePaladin
2010-07-21 18:51:27 +00:00
parent 7bf60c086e
commit 6af3f28ad4
29 changed files with 162 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/actors/units/hellenes/female_citizen.xml
+6 -6
View File
@@ -6,12 +6,12 @@
<animations>
<animation file="female/f_idle_01.dae" name="Idle" speed="100"/>
<animation file="female/f_walk_01.dae" name="Walk" speed="30"/>
<animation file="female/f_lumber_01.dae" name="gather_wood" speed="50"/>
<animation file="female/f_lumber_01.dae" name="gather_tree" speed="50"/>
<animation file="female/f_farm_01.dae" name="gather_grain" speed="75"/>
<animation file="female/f_gather_01.dae" name="gather_fruit" speed="25"/>
<animation file="female/f_gather_01.dae" name="gather_meat" speed="25"/>
<animation file="female/f_mine_01.dae" name="gather_stone" speed="140"/>
<animation file="female/f_mine_01.dae" name="gather_metal" speed="140"/>
<animation file="female/f_mine_01.dae" name="gather_rock" speed="140"/>
<animation file="female/f_mine_01.dae" name="gather_ore" speed="140"/>
<animation file="female/f_build_01.dae" name="Build" speed="40"/>
<animation file="female/f_death_01.dae" name="Death" speed="120"/>
</animations>
@@ -57,7 +57,7 @@
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
@@ -83,13 +83,13 @@
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_a.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation event="0.81" file="biped/inf_arch_atk_a.psa" load="0.16" name="Melee" speed="90"/>
<animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation event=".23" file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation event=".23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_stone" speed="250"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_metal" speed="250"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="250"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="250"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -49,7 +49,7 @@
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -75,13 +75,13 @@
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_b.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation event="0.84" file="biped/inf_arch_atk_a.psa" load="0.16" name="Melee" speed="90"/>
<animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -41,7 +41,7 @@
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -67,13 +67,13 @@
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_archer_e.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation event="0.81" file="biped/inf_arch_atk_a.psa" load="0.16" name="Melee" speed="90"/>
<animation file="infantry/general/dude/dudewalk.psa" name="Walk" speed="100"/>
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation event="0.23" file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<animation file="biped/hoe.psa" name="gather_grain" speed="300"/>
<animation file="infantry/general/forage.psa" name="gather_fruit" speed="125"/>
<animation file="infantry/general/forage.psa" name="gather_meat" speed="125"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_stone" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_metal" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_rock" speed="200"/>
<animation event="0.43" file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="250"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -42,7 +42,7 @@
<prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -72,14 +72,14 @@
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_a.xml
+28 -20
View File
@@ -10,12 +10,12 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -54,59 +54,67 @@
<variant frequency="100" name="Idle"/>
<variant name="Melee">
<props>
<prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
<prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="r_hand"/>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_grain">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_fruit">
<props>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop attachpoint="helmet"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_meat">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="r_hand"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint=""/>
</props>
</variant>
<variant name="Build">
<props>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop attachpoint="helmet"/>
<prop attachpoint="shield"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
</props>
</variant>
binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_b.xml
+20 -19
View File
@@ -10,12 +10,12 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -39,58 +39,59 @@
<variant frequency="100" name="Idle"/>
<variant name="Melee">
<props>
<prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
<prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
<prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_grain">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_fruit">
<props>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_meat">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="Build">
<props>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop attachpoint="shield"/>
<prop attachpoint="l_hand"/>
<prop actor="props/units/tools/mallet.xml" attachpoint="r_hand"/>
</props>
</variant>
binaries/data/mods/public/art/actors/units/hellenes/infantry_javelinist_e.xml
+19 -18
View File
@@ -10,12 +10,12 @@
<animation file="infantry/sword/move/run/isw_s_off_01.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_def_02.psa" name="Run" speed="30"/>
<animation file="infantry/sword/move/run/isw_s_em_03.psa" name="Run" speed="30"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="200"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -50,54 +50,55 @@
<variant frequency="100" name="Idle"/>
<variant name="Melee">
<props>
<prop actor="" attachpoint="r_hand"/>
<prop actor="props/units/weapons/jav.xml" attachpoint="l_hand"/>
<prop actor="props/units/weapons/jav.xml" attachpoint="loaded-r_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop actor="props/units/weapons/jav_projectile.xml" attachpoint="projectile"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_grain">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/hoe.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="gather_meat">
<props>
<prop attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_fruit">
<props>
<prop actor="" attachpoint="shield"/>
<prop actor="" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="l_hand"/>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="" attachpoint="shield"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop actor="" attachpoint="r_hand"/>
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop attachpoint="shield"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
<prop attachpoint="shield"/>
<prop attachpoint="helmet"/>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
</props>
</variant>
<variant name="Build">
binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_a.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
<animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
<animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -59,7 +59,7 @@
<prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -95,7 +95,7 @@
<prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -104,7 +104,7 @@
<prop actor="props/units/heads/head_hele_a.xml" attachpoint="head"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_b.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
<animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
<animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -48,7 +48,7 @@
<prop actor="props/units/shields/hele_round_b.xml" attachpoint="shield"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -80,7 +80,7 @@
<prop actor="props/units/tools/basket.xml" attachpoint="l_leg"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -88,7 +88,7 @@
<prop attachpoint="helmet"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/actors/units/hellenes/infantry_spearman_e.xml
+6 -6
View File
@@ -8,12 +8,12 @@
<animation file="biped/inf_hoplite_walk.psa" name="Walk" speed="130"/>
<animation file="biped/inf_hoplite_shield_run_a.psa" name="Run" speed="30"/>
<animation event="0.5" file="biped/inf_hoplite_atk_a.psa" name="Melee" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_wood" speed="200"/>
<animation file="infantry/general/chop.psa" name="gather_tree" speed="200"/>
<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_meat" speed="110"/>
<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_rock" speed="200"/>
<animation file="infantry/general/mine.psa" name="gather_ore" speed="200"/>
<animation file="infantry/general/dude/dudebuild.psa" name="Build" speed="220"/>
<animation file="infantry/general/death/inf_01.psa" name="Death" speed="400"/>
<animation file="infantry/general/death/inf_02.psa" name="Death" speed="700"/>
@@ -67,7 +67,7 @@
<prop actor="props/units/weapons/spear_hoplite.xml" attachpoint="r_hand"/>
</props>
</variant>
<variant name="gather_wood">
<variant name="gather_tree">
<props>
<prop actor="props/units/tools/axe.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -103,7 +103,7 @@
<prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
</props>
</variant>
<variant name="gather_stone">
<variant name="gather_rock">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
@@ -112,7 +112,7 @@
<prop actor="props/units/heads/head_hele_e.xml" attachpoint="head"/>
</props>
</variant>
<variant name="gather_metal">
<variant name="gather_ore">
<props>
<prop actor="props/units/tools/pick.xml" attachpoint="l_hand"/>
<prop attachpoint="r_hand"/>
binaries/data/mods/public/art/textures/cursors/action-gather-metal.dds → binaries/data/mods/public/art/textures/cursors/action-gather-ore.dds
View File
binaries/data/mods/public/art/textures/cursors/action-gather-metal.txt → binaries/data/mods/public/art/textures/cursors/action-gather-ore.txt
View File
binaries/data/mods/public/art/textures/cursors/action-gather-stone.dds → binaries/data/mods/public/art/textures/cursors/action-gather-rock.dds
View File
binaries/data/mods/public/art/textures/cursors/action-gather-stone.txt → binaries/data/mods/public/art/textures/cursors/action-gather-rock.txt
View File
binaries/data/mods/public/art/textures/cursors/action-gather-treasure.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/public/art/textures/cursors/action-gather-wood.txt → binaries/data/mods/public/art/textures/cursors/action-gather-treasure.txt
View File
binaries/data/mods/public/art/textures/cursors/action-gather-wood.dds → binaries/data/mods/public/art/textures/cursors/action-gather-tree.dds
View File
binaries/data/mods/public/art/textures/cursors/action-gather-tree.txt
+1
View File
@@ -0,0 +1 @@
1 1
binaries/data/mods/public/gui/session_new/selection.js
+5
View File
@@ -75,6 +75,7 @@ EntityGroups.prototype.getGroup = function(templateName)
// There was no match...
//console.write("Warning: Could not find either \"" + templateName + "\" or the more generic: \"" + thatGenericTemplateName + "\"");
return undefined;
};
EntityGroups.prototype.addGroup = function(templateName, typeCount, firstOfType)
@@ -93,6 +94,8 @@ EntityGroups.prototype.getGroupNumber = function(templateName)
for (var i = 0; i < this.groups.length; i++)
if (this.groups[i].templateName == templateName)
return i;
return -1;
};
EntityGroups.prototype.getTemplateNames = function()
@@ -192,6 +195,8 @@ EntitySelection.prototype.getPrimaryTemplateName = function()
if (entState)
return entState.template
return undefined;
};
EntitySelection.prototype.getPrimary = function()
binaries/data/mods/public/gui/session_new/unit_commands.js
+1 -1
View File
@@ -2,7 +2,7 @@
const UNIT_PANEL_HEIGHT = 63;
// The number of currently visible buttons (used to optimise showing/hiding)
var g_unitPanelButtons = { "Construction": 0, "Training": 0, "Queue": 0 };
var g_unitPanelButtons = { "Construction": 0, "Training": 0, "Queue": 0, "Selection": 0 };
// Unit panels are panels with row(s) of buttons
var g_unitPanels = ["Stance", "Formation", "Construction", "Research", "Training", "Queue", "Selection"];
binaries/data/mods/public/simulation/components/ResourceGatherer.js
+7 -3
View File
@@ -6,9 +6,9 @@ ResourceGatherer.prototype.Schema =
"<BaseSpeed>1.0</BaseSpeed>" +
"<Rates>" +
"<food.fish>1</food.fish>" +
"<metal>3</metal>" +
"<stone>3</stone>" +
"<wood>2</wood>" +
"<metal.ore>3</metal.ore>" +
"<stone.rock>3</stone.rock>" +
"<wood.tree>2</wood.tree>" +
"</Rates>" +
"</a:example>" +
"<element name='BaseSpeed' a:help='Base resource-gathering rate (in resource units per second)'>" +
@@ -25,6 +25,10 @@ ResourceGatherer.prototype.Schema =
"<optional><element name='food.grain' a:help='Grain gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='food.meat' a:help='Meat gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='food.milk' a:help='Milk gather rate (overrides \"food\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='wood.tree' a:help='Tree gather rate (overrides \"wood\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='stone.rock' a:help='Rock gather rate (overrides \"stone\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='metal.ore' a:help='Ore gather rate(overrides \"metal\")'><ref name='positiveDecimal'/></element></optional>" +
"<optional><element name='metal.treasure' a:help='Treasure gather rate(overrides \"metal\")'><ref name='positiveDecimal'/></element></optional>" +
"</interleave>" +
"</element>";
binaries/data/mods/public/simulation/components/ResourceSupply.js
+4 -3
View File
@@ -11,9 +11,10 @@ ResourceSupply.prototype.Schema =
"</element>" +
"<element name='Type' a:help='Type of resources'>" +
"<choice>" +
"<value>wood</value>" +
"<value>stone</value>" +
"<value>metal</value>" +
"<value>wood.tree</value>" +
"<value>stone.rock</value>" +
"<value>metal.ore</value>" +
"<value>metal.treasure</value>" +
"<value>food.fish</value>" +
"<value>food.fruit</value>" +
"<value>food.grain</value>" +
binaries/data/mods/public/simulation/templates/gaia/special_treasure_golden_fleece.xml
+20
View File
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_geo_mineral">
<Identity>
<Civ>gaia</Civ>
<SpecificName>Golden Fleece</SpecificName>
<IconSheet>snPortraitSheetRockGaia</IconSheet>
<IconCell>1</IconCell>
</Identity>
<ResourceSupply>
<Amount>5000</Amount>
<Type>metal.treasure</Type>
</ResourceSupply>
<VisualActor>
<Actor>fauna/goat.xml</Actor>
</VisualActor>
<Footprint>
<Circle radius="1.0"/>
<Height>2.5</Height>
</Footprint>
</Entity>
binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
+1 -1
View File
@@ -12,6 +12,6 @@
<Selectable/>
<ResourceSupply>
<Amount>100</Amount>
<Type>wood</Type>
<Type>wood.tree</Type>
</ResourceSupply>
</Entity>
binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
+1 -1
View File
@@ -12,6 +12,6 @@
<Selectable/>
<ResourceSupply>
<Amount>1000</Amount>
<Type>metal</Type>
<Type>metal.ore</Type>
</ResourceSupply>
</Entity>
binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
+1 -1
View File
@@ -12,6 +12,6 @@
<Selectable/>
<ResourceSupply>
<Amount>500</Amount>
<Type>stone</Type>
<Type>stone.rock</Type>
</ResourceSupply>
</Entity>
binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+1
View File
@@ -28,6 +28,7 @@
<BaseSpeed>1.0</BaseSpeed>
<Rates>
<food.meat>20</food.meat>
<metal.treasure>10000</metal.treasure>
</Rates>
</ResourceGatherer>
<Health>
binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+4 -3
View File
@@ -31,9 +31,10 @@
<food.fruit>1</food.fruit>
<food.grain>1</food.grain>
<food.meat>1</food.meat>
<metal>3</metal>
<stone>3</stone>
<wood>2</wood>
<metal.ore>3</metal.ore>
<metal.treasure>10000</metal.treasure>
<stone.rock>3</stone.rock>
<wood.tree>2</wood.tree>
</Rates>
</ResourceGatherer>
<Health>
binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+4 -3
View File
@@ -20,9 +20,10 @@
<food.fruit>3</food.fruit>
<food.grain>3</food.grain>
<food.meat>0.5</food.meat>
<metal>1</metal>
<stone>1</stone>
<wood>2</wood>
<metal.ore>1</metal.ore>
<metal.treasure>10000</metal.treasure>
<stone.rock>1</stone.rock>
<wood.tree>2</wood.tree>
</Rates>
</ResourceGatherer>
<Health>