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

For most civs, made it so that Champions are unlocked by default in the Fortress at City Phase, but then also available for training at the Barracks, but after they are unlocked with a tech.

Browse Source 
Removed the minrange for all ranged units until minimum range bugs are
fixed. To fix it will require a multi-pronged approach that will need
discussed and Trac tickets created.

This was SVN commit r13494.
This commit is contained in:
Michael D. Hafer 2013-06-21 00:14:00 +00:00
parent 14990ea390
commit 5f78bb7318
33 changed files with 133 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
binaries/data/mods/public/simulation/templates/structures/brit_barracks.xml
View File

@ -22,10 +22,10 @@
units/brit_infantry_spearman_b units/brit_infantry_spearman_b
units/brit_infantry_javelinist_b units/brit_infantry_javelinist_b
units/brit_infantry_slinger_b units/brit_infantry_slinger_b
units/brit_champion_infantry_barracks
units/brit_cavalry_swordsman_b units/brit_cavalry_swordsman_b
units/brit_cavalry_javelinist_b units/brit_cavalry_javelinist_b
units/brit_champion_infantry units/brit_champion_cavalry_barracks
units/brit_champion_cavalry
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

3
binaries/data/mods/public/simulation/templates/structures/cart_barracks.xml
View File

@ -28,6 +28,9 @@
units/cart_infantry_archer_b units/cart_infantry_archer_b
units/cart_cavalry_javelinist_b units/cart_cavalry_javelinist_b
</Entities> </Entities>
<Technologies datatype="tokens">
-unlock_champion_units
</Technologies>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>
<Actor>structures/carthaginians/barracks.xml</Actor> <Actor>structures/carthaginians/barracks.xml</Actor>

4
binaries/data/mods/public/simulation/templates/structures/gaul_barracks.xml
View File

@ -22,10 +22,10 @@
units/gaul_infantry_spearman_b units/gaul_infantry_spearman_b
units/gaul_infantry_javelinist_b units/gaul_infantry_javelinist_b
units/gaul_infantry_slinger_b units/gaul_infantry_slinger_b
units/gaul_champion_infantry_barracks
units/gaul_cavalry_swordsman_b units/gaul_cavalry_swordsman_b
units/gaul_cavalry_javelinist_b units/gaul_cavalry_javelinist_b
units/gaul_champion_infantry units/gaul_champion_cavalry_barracks
units/gaul_champion_cavalry
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

3
binaries/data/mods/public/simulation/templates/structures/hele_barracks.xml
View File

@ -32,6 +32,9 @@
units/hele_cavalry_swordsman_b units/hele_cavalry_swordsman_b
units/hele_cavalry_javelinist_b units/hele_cavalry_javelinist_b
</Entities> </Entities>
<Technologies datatype="tokens">
-unlock_champion_units
</Technologies>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>
<Actor>structures/hellenes/barracks_new.xml</Actor> <Actor>structures/hellenes/barracks_new.xml</Actor>

4
binaries/data/mods/public/simulation/templates/structures/iber_barracks.xml
View File

@ -17,10 +17,10 @@
units/iber_infantry_swordsman_b units/iber_infantry_swordsman_b
units/iber_infantry_javelinist_b units/iber_infantry_javelinist_b
units/iber_infantry_slinger_b units/iber_infantry_slinger_b
units/iber_champion_infantry_barracks
units/iber_cavalry_spearman_b units/iber_cavalry_spearman_b
units/iber_cavalry_javelinist_b units/iber_cavalry_javelinist_b
units/iber_champion_infantry units/iber_champion_cavalry_barracks
units/iber_champion_cavalry
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

4
binaries/data/mods/public/simulation/templates/structures/mace_barracks.xml
View File

@ -29,10 +29,10 @@
units/mace_infantry_javelinist_b units/mace_infantry_javelinist_b
units/mace_infantry_archer_b units/mace_infantry_archer_b
units/mace_infantry_slinger_b units/mace_infantry_slinger_b
units/mace_champion_infantry_a_barracks
units/mace_cavalry_spearman_b units/mace_cavalry_spearman_b
units/mace_cavalry_javelinist_b units/mace_cavalry_javelinist_b
units/mace_champion_infantry_a_barracks units/mace_champion_cavalry_barracks
units/mace_champion_cavalry
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

6
binaries/data/mods/public/simulation/templates/structures/maur_barracks.xml
View File

@ -17,11 +17,11 @@
units/maur_infantry_spearman_b units/maur_infantry_spearman_b
units/maur_infantry_swordsman_b units/maur_infantry_swordsman_b
units/maur_infantry_archer_b units/maur_infantry_archer_b
units/maur_champion_infantry_barracks
units/maur_champion_maiden_barracks
units/maur_cavalry_swordsman_b units/maur_cavalry_swordsman_b
units/maur_cavalry_javelinist_b units/maur_cavalry_javelinist_b
units/maur_champion_infantry units/maur_champion_chariot_barracks
units/maur_champion_maiden
units/maur_champion_chariot
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

4
binaries/data/mods/public/simulation/templates/structures/rome_barracks.xml
View File

@ -26,9 +26,9 @@
units/rome_infantry_swordsman_b units/rome_infantry_swordsman_b
units/rome_infantry_spearman_a units/rome_infantry_spearman_a
units/rome_infantry_javelinist_b units/rome_infantry_javelinist_b
units/rome_champion_infantry_barracks
units/rome_cavalry_spearman_b units/rome_cavalry_spearman_b
units/rome_champion_infantry units/rome_champion_cavalry_barracks
units/rome_champion_cavalry
</Entities> </Entities>
</ProductionQueue> </ProductionQueue>
<VisualActor> <VisualActor>

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

@ -11,7 +11,7 @@
<Pierce>10.0</Pierce> <Pierce>10.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>16.0</MaxRange> <MaxRange>16.0</MaxRange>
<MinRange>10.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>25.0</ProjectileSpeed> <ProjectileSpeed>25.0</ProjectileSpeed>
<PrepareTime>900</PrepareTime> <PrepareTime>900</PrepareTime>
<RepeatTime>1500</RepeatTime> <RepeatTime>1500</RepeatTime>

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

@ -6,7 +6,7 @@
<Pierce>20.0</Pierce> <Pierce>20.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>56.0</MaxRange> <MaxRange>56.0</MaxRange>
<MinRange>20.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>75.0</ProjectileSpeed> <ProjectileSpeed>75.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -6,7 +6,7 @@
<Pierce>25.0</Pierce> <Pierce>25.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>44</MaxRange> <MaxRange>44</MaxRange>
<MinRange>16.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>50.0</ProjectileSpeed> <ProjectileSpeed>50.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -6,7 +6,7 @@
<Identity> <Identity>
<GenericName>Champion Unit</GenericName> <GenericName>Champion Unit</GenericName>
<Classes datatype="tokens">Champion Organic</Classes> <Classes datatype="tokens">Champion Organic</Classes>
<RequiredTechnology>unlock_champion_units</RequiredTechnology> <RequiredTechnology>phase_city</RequiredTechnology>
</Identity> </Identity>
<Loot> <Loot>
<xp>150</xp> <xp>150</xp>

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

@ -11,7 +11,7 @@
<Pierce>30.0</Pierce> <Pierce>30.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>58</MaxRange> <MaxRange>58</MaxRange>
<MinRange>10.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>75.0</ProjectileSpeed> <ProjectileSpeed>75.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>30.0</Pierce> <Pierce>30.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>56</MaxRange> <MaxRange>56</MaxRange>
<MinRange>16.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>50.0</ProjectileSpeed> <ProjectileSpeed>50.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>15.0</Pierce> <Pierce>15.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>58</MaxRange> <MaxRange>58</MaxRange>
<MinRange>10.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>75.0</ProjectileSpeed> <ProjectileSpeed>75.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>25.0</Pierce> <Pierce>25.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>48</MaxRange> <MaxRange>48</MaxRange>
<MinRange>12.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>50.0</ProjectileSpeed> <ProjectileSpeed>50.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>15.0</Pierce> <Pierce>15.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>50.0</MaxRange> <MaxRange>50.0</MaxRange>
<MinRange>10.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>75.0</ProjectileSpeed> <ProjectileSpeed>75.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>20.0</Pierce> <Pierce>20.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>36</MaxRange> <MaxRange>36</MaxRange>
<MinRange>10.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>50.0</ProjectileSpeed> <ProjectileSpeed>50.0</ProjectileSpeed>
<PrepareTime>1200</PrepareTime> <PrepareTime>1200</PrepareTime>
<RepeatTime>2000</RepeatTime> <RepeatTime>2000</RepeatTime>

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

@ -11,7 +11,7 @@
<Pierce>10.0</Pierce> <Pierce>10.0</Pierce>
<Crush>0.0</Crush> <Crush>0.0</Crush>
<MaxRange>48.0</MaxRange> <MaxRange>48.0</MaxRange>
<MinRange>16.0</MinRange> <MinRange>0.0</MinRange>
<ProjectileSpeed>60.0</ProjectileSpeed> <ProjectileSpeed>60.0</ProjectileSpeed>
<PrepareTime>900</PrepareTime> <PrepareTime>900</PrepareTime>
<RepeatTime>1500</RepeatTime> <RepeatTime>1500</RepeatTime>

7
binaries/data/mods/public/simulation/templates/units/brit_champion_cavalry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/brit_champion_cavalry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/brit_champion_cavalry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/brit_champion_infantry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/brit_champion_infantry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/brit_champion_infantry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/gaul_champion_cavalry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/gaul_champion_cavalry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/gaul_champion_cavalry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/gaul_champion_infantry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/gaul_champion_infantry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/gaul_champion_infantry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/iber_champion_cavalry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/iber_champion_cavalry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/iber_champion_cavalry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/iber_champion_infantry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/iber_champion_infantry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/iber_champion_infantry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/mace_champion_cavalry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/mace_champion_cavalry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/mace_champion_cavalry</SelectionGroupName>
</Identity>
</Entity>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/mace_champion_infantry_a"> <Entity parent="units/mace_champion_infantry_a">
<Identity> <Identity>
<SelectionGroupName>units/mace_champion_infantry_a</SelectionGroupName> <RequiredTechnology>unlock_champion_units</RequiredTechnology>
</Identity> </Identity>
<Promotion> <Promotion>
<Entity>units/mace_champion_infantry_e</Entity> <Entity>units/mace_champion_infantry_e</Entity>

7
binaries/data/mods/public/simulation/templates/units/maur_champion_chariot_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/maur_champion_chariot">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/maur_champion_chariot</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/maur_champion_infantry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/maur_champion_infantry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/maur_champion_infantry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/maur_champion_maiden_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/maur_champion_maiden">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/maur_champion_maiden</SelectionGroupName>
</Identity>
</Entity>

12
binaries/data/mods/public/simulation/templates/units/maur_support_female_citizen_topless.xml Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_support_female_citizen">
<Identity>
<Civ>maur</Civ>
<SpecificName>Naari</SpecificName>
<History>Mauryan Female Citizen</History>
<Icon>units/maur_support_female_citizen.png</Icon>
</Identity>
<VisualActor>
<Actor>units/mauryans/female_citizen_topless.xml</Actor>
</VisualActor>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/rome_champion_cavalry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/rome_champion_cavalry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/rome_champion_cavalry</SelectionGroupName>
</Identity>
</Entity>

7
binaries/data/mods/public/simulation/templates/units/rome_champion_infantry_barracks.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="units/rome_champion_infantry">
<Identity>
<RequiredTechnology>unlock_champion_units</RequiredTechnology>
<SelectionGroupName>units/rome_champion_infantry</SelectionGroupName>
</Identity>
</Entity>