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

Rename property. Refs #1717.

Browse Source 
This was SVN commit r12883.
This commit is contained in:
leper 2012-11-25 16:23:59 +00:00
parent a6f1620621
commit 1052cb9ee0
35 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
binaries/data/mods/public/simulation/components/ProductionQueue.js
View File

@ -6,12 +6,12 @@ function ProductionQueue() {}
ProductionQueue.prototype.Schema = ProductionQueue.prototype.Schema =
"<a:help>Allows the building to train new units and research technologies</a:help>" + "<a:help>Allows the building to train new units and research technologies</a:help>" +
"<a:example>" + "<a:example>" +
"<BatchTimeFactor>0.7</BatchTimeFactor>" + "<BatchTimeModifier>0.7</BatchTimeModifier>" +
"<Entities datatype='tokens'>" + "<Entities datatype='tokens'>" +
"\n units/{civ}_support_female_citizen\n units/{civ}_support_trader\n units/celt_infantry_spearman_b\n " + "\n units/{civ}_support_female_citizen\n units/{civ}_support_trader\n units/celt_infantry_spearman_b\n " +
"</Entities>" + "</Entities>" +
"</a:example>" + "</a:example>" +
"<element name='BatchTimeFactor' a:help='Factor that influences the time benefit for batch training'>" + "<element name='BatchTimeModifier' a:help='Modifier that influences the time benefit for batch training'>" +
"<ref name='nonNegativeDecimal'/>" + "<ref name='nonNegativeDecimal'/>" +
"</element>" + "</element>" +
"<optional>" + "<optional>" +
@ -404,13 +404,13 @@ ProductionQueue.prototype.GetBatchTime = function(batchSize)
{ {
var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player); var cmpPlayer = QueryOwnerInterface(this.entity, IID_Player);
var batchTimeFactor = +this.template.BatchTimeFactor; var batchTimeModifier = +this.template.BatchTimeModifier;
var cmpTechMan = QueryOwnerInterface(this.entity, IID_TechnologyManager); var cmpTechMan = QueryOwnerInterface(this.entity, IID_TechnologyManager);
if (cmpTechMan) if (cmpTechMan)
batchTimeFactor = cmpTechMan.ApplyModifications("ProductionQueue/BatchTimeFactor", batchTimeFactor, this.entity); batchTimeModifier = cmpTechMan.ApplyModifications("ProductionQueue/BatchTimeModifier", batchTimeModifier, this.entity);
// TODO: work out what equation we should use here. // TODO: work out what equation we should use here.
return Math.pow(batchSize, batchTimeFactor) * cmpPlayer.cheatTimeMultiplier; return Math.pow(batchSize, batchTimeModifier) * cmpPlayer.cheatTimeMultiplier;
}; };
ProductionQueue.prototype.OnOwnershipChanged = function(msg) ProductionQueue.prototype.OnOwnershipChanged = function(msg)

2
binaries/data/mods/public/simulation/templates/other/celt_tavern.xml
View File

@ -40,7 +40,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/celt_fanatic units/celt_fanatic
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/other/hellenic_royal_stoa.xml
View File

@ -49,7 +49,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/mace_thureophoros units/mace_thureophoros
units/mace_thorakites units/mace_thorakites

2
binaries/data/mods/public/simulation/templates/other/pers_apartment_block.xml
View File

@ -22,7 +22,7 @@
<Radius>25</Radius> <Radius>25</Radius>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/{civ}_support_female_citizen units/{civ}_support_female_citizen
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/other/pers_inn.xml
View File

@ -22,7 +22,7 @@
<Radius>26</Radius> <Radius>26</Radius>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/{civ}_support_female_citizen units/{civ}_support_female_citizen
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/structures/athen_gymnasion.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/athen_champion_infantry units/athen_champion_infantry
units/athen_champion_ranged units/athen_champion_ranged

2
binaries/data/mods/public/simulation/templates/structures/athen_prytaneion.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/athen_hero_themistocles units/athen_hero_themistocles
units/athen_hero_pericles units/athen_hero_pericles

2
binaries/data/mods/public/simulation/templates/structures/brit_kennel.xml
View File

@ -53,7 +53,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/brit_war_dog_b units/brit_war_dog_b
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/structures/cart_super_dock.xml
View File

@ -50,7 +50,7 @@
<TerritoryDecay disable=""/> <TerritoryDecay disable=""/>
<TerritoryInfluence disable=""/> <TerritoryInfluence disable=""/>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/cart_ship_bireme units/cart_ship_bireme
units/cart_ship_trireme units/cart_ship_trireme

2
binaries/data/mods/public/simulation/templates/structures/celt_kennel.xml
View File

@ -53,7 +53,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/celt_war_dog_b units/celt_war_dog_b
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/structures/hele_gymnasion.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/hele_champion_cavalry_mace units/hele_champion_cavalry_mace
units/hele_champion_infantry_mace units/hele_champion_infantry_mace

2
binaries/data/mods/public/simulation/templates/structures/hele_prytaneion.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/hele_hero_alexander units/hele_hero_alexander
units/hele_hero_demetrius units/hele_hero_demetrius

2
binaries/data/mods/public/simulation/templates/structures/mace_library.xml
View File

@ -19,7 +19,7 @@
<Static width="25.0" depth="30.0"/> <Static width="25.0" depth="30.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
hellenes/special_hellenistic_metropolis hellenes/special_hellenistic_metropolis
</Technologies> </Technologies>

2
binaries/data/mods/public/simulation/templates/structures/maur_elephant_stables.xml
View File

@ -28,7 +28,7 @@
<Static width="25.0" depth="25.0"/> <Static width="25.0" depth="25.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/maur_support_elephant units/maur_support_elephant
units/maur_cavalry_archer_b units/maur_cavalry_archer_b

2
binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml
View File

@ -34,7 +34,7 @@
<Radius>38</Radius> <Radius>38</Radius>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/pers_hero_cyrus units/pers_hero_cyrus
units/pers_hero_darius units/pers_hero_darius

2
binaries/data/mods/public/simulation/templates/structures/pers_sb2.xml
View File

@ -42,7 +42,7 @@ Train War Elephants and Kardakes mercenaries.</Tooltip>
<Radius>38</Radius> <Radius>38</Radius>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/pers_kardakes_hoplite units/pers_kardakes_hoplite
units/pers_kardakes_skirmisher units/pers_kardakes_skirmisher

2
binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
View File

@ -76,7 +76,7 @@
</TerritoryDecay> </TerritoryDecay>
<TerritoryInfluence disable=""/> <TerritoryInfluence disable=""/>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/rome_infantry_swordsman_b units/rome_infantry_swordsman_b
units/rome_infantry_spearman_a units/rome_infantry_spearman_a

2
binaries/data/mods/public/simulation/templates/structures/spart_gerousia.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/hele_hero_leonidas units/hele_hero_leonidas
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/structures/spart_syssiton.xml
View File

@ -35,7 +35,7 @@
</SoundGroups> </SoundGroups>
</Sound> </Sound>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/spart_hero_leonidas units/spart_hero_leonidas
units/spart_hero_agis units/spart_hero_agis

2
binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
View File

@ -82,7 +82,7 @@
<Static width="30.0" depth="30.0"/> <Static width="30.0" depth="30.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/{civ}_support_female_citizen units/{civ}_support_female_citizen
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml
View File

@ -74,7 +74,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/{civ}_support_healer_b units/{civ}_support_healer_b
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/template_structure_defense_defense_tower.xml
View File

@ -70,7 +70,7 @@
<Static width="7.0" depth="7.0"/> <Static width="7.0" depth="7.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
pair_tower_01 pair_tower_01
</Technologies> </Technologies>

2
binaries/data/mods/public/simulation/templates/template_structure_defense_outpost.xml
View File

@ -69,7 +69,7 @@
<Static width="6.5" depth="6.5"/> <Static width="6.5" depth="6.5"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
decay_outpost decay_outpost
</Technologies> </Technologies>

2
binaries/data/mods/public/simulation/templates/template_structure_economic_farmstead.xml
View File

@ -44,7 +44,7 @@
<Static width="12.0" depth="12.0"/> <Static width="12.0" depth="12.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
gather_farming_plough gather_farming_plough
</Technologies> </Technologies>

2
binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
View File

@ -57,7 +57,7 @@
<Weight>65536</Weight> <Weight>65536</Weight>
</TerritoryInfluence> </TerritoryInfluence>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
armor_trade_convoys armor_trade_convoys
</Technologies> </Technologies>

2
binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml
View File

@ -44,7 +44,7 @@
<Static width="13.0" depth="13.0"/> <Static width="13.0" depth="13.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
pair_gather_01 pair_gather_01
pair_gather_02 pair_gather_02

2
binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
View File

@ -52,7 +52,7 @@
<Static width="17.0" depth="17.0"/> <Static width="17.0" depth="17.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
pair_inf_01 pair_inf_01
pair_inf_02 pair_inf_02

2
binaries/data/mods/public/simulation/templates/template_structure_military_dock.xml
View File

@ -64,7 +64,7 @@
</Sound> </Sound>
<TerritoryDecay disable=""/> <TerritoryDecay disable=""/>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/{civ}_ship_fishing units/{civ}_ship_fishing
units/{civ}_ship_merchant units/{civ}_ship_merchant

2
binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
View File

@ -33,7 +33,7 @@
<Static width="16.0" depth="16.0"/> <Static width="16.0" depth="16.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
</ProductionQueue> </ProductionQueue>
<TerritoryInfluence> <TerritoryInfluence>
<Radius>25</Radius> <Radius>25</Radius>

2
binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
View File

@ -71,7 +71,7 @@
<Static width="25.0" depth="25.0"/> <Static width="25.0" depth="25.0"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Technologies datatype="tokens"> <Technologies datatype="tokens">
pair_champ_02 pair_champ_02
siege_attack siege_attack

2
binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
View File

@ -48,7 +48,7 @@
<Static width="9.5" depth="19.75"/> <Static width="9.5" depth="19.75"/>
</Obstruction> </Obstruction>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
gaia/fauna_sheep gaia/fauna_sheep
</Entities> </Entities>

2
binaries/data/mods/public/simulation/templates/units/athen_ship_trireme.xml
View File

@ -13,7 +13,7 @@ Ramming Secondary Attack.</Tooltip>
<Icon>units/hele_ship_trireme.png</Icon> <Icon>units/hele_ship_trireme.png</Icon>
</Identity> </Identity>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/athen_champion_marine units/athen_champion_marine
units/athen_infantry_archer_b units/athen_infantry_archer_b

2
binaries/data/mods/public/simulation/templates/units/maur_hero_ashoka.xml
View File

@ -16,7 +16,7 @@ Hero Aura: "TBD."</Tooltip>
<History>TBD.</History> <History>TBD.</History>
</Identity> </Identity>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/maur_champion_maiden units/maur_champion_maiden
units/maur_champion_maiden_archer units/maur_champion_maiden_archer

2
binaries/data/mods/public/simulation/templates/units/maur_hero_maurya.xml
View File

@ -67,7 +67,7 @@
<Icon>units/cart_hero_hannibal.png</Icon> <Icon>units/cart_hero_hannibal.png</Icon>
</Identity> </Identity>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/maur_champion_maiden units/maur_champion_maiden
units/maur_champion_maiden_archer units/maur_champion_maiden_archer

2
binaries/data/mods/public/simulation/templates/units/pers_hero_cyrus.xml
View File

@ -10,7 +10,7 @@ Hero Aura: "Lead from the Front." Boosts attack of nearby cavalry units.</Toolti
<History>(559 BC - 530 BC) The son of a Median princess and the ruler of Anshan; justly called the 'Father of the Empire', Cyrus the Great conquered Media, Lydia, Babylonia and Bactria, thereby establishing the Persian Empire. He was also renown as a benevolent conqueror. Technically the second ruler of the Persians by that name, and so appears as Kurush II on his documents and coins. Kurush I was his grandfather.</History> <History>(559 BC - 530 BC) The son of a Median princess and the ruler of Anshan; justly called the 'Father of the Empire', Cyrus the Great conquered Media, Lydia, Babylonia and Bactria, thereby establishing the Persian Empire. He was also renown as a benevolent conqueror. Technically the second ruler of the Persians by that name, and so appears as Kurush II on his documents and coins. Kurush I was his grandfather.</History>
</Identity> </Identity>
<ProductionQueue> <ProductionQueue>
<BatchTimeFactor>0.7</BatchTimeFactor> <BatchTimeModifier>0.7</BatchTimeModifier>
<Entities datatype="tokens"> <Entities datatype="tokens">
units/pers_champion_infantry units/pers_champion_infantry
</Entities> </Entities>