1
0
forked from 0ad/0ad

Rename italiote to italic

Differential Revision: D2796
Patch by: Nescio
Reviewed by: Angen, Stan
0 A.D. currently uses the term "Italiote" [sic]. It's best to use
precise language:

Italic refers to a branch of Indo-European and the peoples that speak it
(cf. Celtic).
Italian refers to the modern language, descendant from Latin, the people
that speak it, and their country (cf. Romanian).
Italiot (from Ἰταλιώτης) refers to Greeks living in Italy (cf. Cypriot).
From the context it's clear what 0 A.D. actually means (Samnites etc.)
is Italic.

This patch therefore:

Corrects the art file names.
Also renames the other embassy icons for consistency (cf. D2551).
Corrects the embassy template file name.
Adjusts the affected templates, AI, and map file.
Deletes the unused Celt, Iberian, Italian classes.
Updates the embassy template tooltips (cf. D2578) and cart.json civ file
entries.
Orders the <Identity> node in the templates as specified in Identity.js.

This was SVN commit r23949.
This commit is contained in:
Angen 2020-08-08 11:23:34 +00:00
parent 26ae55cad0
commit d503363e83
27 changed files with 93 additions and 101 deletions

View File

@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="Carthage embassy italiote">
<mesh>structural/kart_embassy_italiote.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/rome_struct.png" name="baseTex"/>
<texture file="structural/ao/kart_embassy_italiote.png" name="aoTex"/>
<texture file="structural/rome_struct_norm.png" name="normTex"/>
<texture file="structural/rome_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="1" name="kart_embassy_italic">
<mesh>structural/kart_embassy_italic.dae</mesh>
<props>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
<textures>
<texture file="structural/rome_struct.png" name="baseTex"/>
<texture file="structural/ao/kart_embassy_italic.png" name="aoTex"/>
<texture file="structural/rome_struct_norm.png" name="normTex"/>
<texture file="structural/rome_struct_spec.png" name="specTex"/>
</textures>
</variant>
</group>
<group>
<variant name="alive" frequency="1"/>
<variant name="death">
<props>
<prop actor="particle/destruction_smoke_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small.xml" attachpoint="root"/>
<prop actor="particle/destruction_dust_small_gray.xml" attachpoint="root"/>
<prop actor="props/structures/decals/dirt_small.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>player_trans_ao_parallax_spec.xml</material>
</actor>

Binary file not shown.

Binary file not shown.

View File

@ -66,7 +66,7 @@ PETRA.Config = function(difficulty, behavior)
"cart": [
"structures/{civ}_embassy_celtic",
"structures/{civ}_embassy_iberian",
"structures/{civ}_embassy_italiote"
"structures/{civ}_embassy_italic"
],
"gaul": [
"structures/{civ}_tavern"

View File

@ -57,7 +57,7 @@ Identity.prototype.Schema =
"</element>" +
"</optional>" +
"<optional>" +
"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, Celt, CitizenSoldier, CivCentre, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, ForestPlant, GarrisonFortress, Human, Iberian, Immortal, IndianElephant, Italian, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, AmunGuard, Animal, ApedemakGuard, Ashoka, Barter, CitizenSoldier, CivCentre, ConquestCritical, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FastMoving, FemaleCitizen, ForestPlant, GarrisonFortress, Human, Immortal, IndianElephant, Juggernaut, KushTrireme, MercenaryCamp, Organic, Player, PtolemyIV, SeaCreature, Spy, Structure, Unit, WallLong, WallMedium, WallShort, WallTower.'>" +
"<attribute name='datatype'>" +
"<value>tokens</value>" +
"</attribute>" +

View File

@ -79,8 +79,8 @@
"Class": "",
"Emblem": "",
"History": "The structure is based upon the center island of the inner harbour constructed to house the war fleet of the Carthaginian navy at Carthage.",
"Requirements": "",
"Phase": "",
"Requirements": "",
"Special": "Construct the powerful warships of the Carthaginian navy."
},
{
@ -90,25 +90,25 @@
"History": "The Celts supplied fierce warrior mercenaries for Carthaginian armies.",
"Requirements": "",
"Phase": "",
"Special": "Hire Celtic mercenaries."
},
{
"Name": "Italiote Embassy",
"Class": "",
"Emblem": "",
"History": "When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.",
"Requirements": "",
"Phase": "",
"Special": "Hire Italian mercenaries."
"Special": "Train Celtic Mercenaries."
},
{
"Name": "Iberian Embassy",
"Class": "",
"Emblem": "",
"History": "The Iberians were known as fierce mercenaries, loyal to their paymasters.",
"Requirements": "",
"Phase": "",
"Special": "Hire Iberian mercenaries."
"Requirements": "",
"Special": "Train Iberian Mercenaries."
},
{
"Name": "Italiote Embassy",
"Class": "",
"Emblem": "",
"History": "When Hannibal invaded Italy and defeated the Romans in a series of battles, many of the Italian peoples subject to Rome, including the Italian Greeks and powerful Samnites, revolted and joined the Carthaginian cause.",
"Phase": "",
"Requirements": "",
"Special": "Train Italic Mercenaries."
}
],
"WallSets": [

View File

@ -16,8 +16,8 @@
<Identity>
<Civ>cart</Civ>
<GenericName>Embassy</GenericName>
<Tooltip>Hire mercenaries.</Tooltip>
<Icon>structures/italian_embassy.png</Icon>
<Tooltip>Train Mercenaries and research Mercenary technologies.</Tooltip>
<Icon>structures/embassy_italic.png</Icon>
</Identity>
<Loot>
<wood>80</wood>

View File

@ -15,8 +15,8 @@
<Identity>
<Civ>cart</Civ>
<SpecificName>Celtic Embassy</SpecificName>
<Tooltip>Hire Celtic mercenaries. Research improvements for these mercenaries.</Tooltip>
<Icon>structures/celtic_embassy.png</Icon>
<Tooltip>Train Celtic Mercenaries and research Mercenary technologies.</Tooltip>
<Icon>structures/embassy_celtic.png</Icon>
</Identity>
<Loot>
<wood>40</wood>

View File

@ -8,8 +8,8 @@
<Identity>
<Civ>cart</Civ>
<SpecificName>Iberian Embassy</SpecificName>
<Tooltip>Hire Iberian mercenaries. Research improvements for these mercenaries.</Tooltip>
<Icon>structures/iberian_embassy.png</Icon>
<Tooltip>Train Iberian Mercenaries and research Mercenary technologies.</Tooltip>
<Icon>structures/embassy_iberian.png</Icon>
</Identity>
<Loot>
<stone>40</stone>

View File

@ -14,9 +14,9 @@
</Health>
<Identity>
<Civ>cart</Civ>
<SpecificName>Italian Embassy</SpecificName>
<Tooltip>Hire Italian mercenaries. Research improvements for these mercenaries.</Tooltip>
<Icon>structures/italian_embassy.png</Icon>
<SpecificName>Italic Embassy</SpecificName>
<Tooltip>Train Italic Mercenaries and research Mercenary technologies.</Tooltip>
<Icon>structures/embassy_italic.png</Icon>
</Identity>
<Loot>
<metal>40</metal>
@ -31,6 +31,6 @@
</Entities>
</ProductionQueue>
<VisualActor>
<Actor>structures/carthaginians/embassy_italiote.xml</Actor>
<Actor>structures/carthaginians/embassy_italic.xml</Actor>
</VisualActor>
</Entity>

View File

@ -21,9 +21,9 @@
<GenericName>Tavern</GenericName>
<SpecificName>Taberna</SpecificName>
<Tooltip>Recruit Naked Fanatics.</Tooltip>
<Icon>structures/celtic_embassy.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<VisibleClasses datatype="tokens">-Village Town</VisibleClasses>
<Icon>structures/embassy_celtic.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Loot>
<wood>20</wood>

View File

@ -8,13 +8,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Italian</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Italic Cavalry</GenericName>
<SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
<SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_cavalry_spearman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_cavalry_spearman_ital_b</SelectionGroupName>
<SpecificName>Ḥayyāl Romaḥ Raḫūv</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_cavalry_spearman_ital_a</Entity>

View File

@ -8,13 +8,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Celt</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Gallic Mercenary Cavalry</GenericName>
<SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
<SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_cavalry_swordsman_2.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_cavalry_swordsman_gaul_b</SelectionGroupName>
<SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_cavalry_swordsman_gaul_a</Entity>

View File

@ -8,13 +8,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Iberian</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Iberian Heavy Cavalry</GenericName>
<SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
<SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_cavalry_swordsman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_cavalry_swordsman_iber_b</SelectionGroupName>
<SpecificName>Ḥayyāl Ḥerev Raḫūv</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_cavalry_swordsman_iber_a</Entity>

View File

@ -5,7 +5,7 @@
structures/cart_super_dock
structures/cart_embassy_celtic
structures/cart_embassy_iberian
structures/cart_embassy_italiote
structures/cart_embassy_italic
</Entities>
</Builder>
<Identity>

View File

@ -5,7 +5,7 @@
structures/{civ}_super_dock
structures/{civ}_embassy_celtic
structures/{civ}_embassy_iberian
structures/{civ}_embassy_italiote
structures/{civ}_embassy_italic
</Entities>
</Builder>
<Cost>
@ -16,13 +16,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Iberian</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Iberian Mercenary Skirmisher</GenericName>
<SpecificName>Sǝḫīr Kidōn</SpecificName>
<SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_infantry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_infantry_javelinist_iber_b</SelectionGroupName>
<SpecificName>Sǝḫīr Kidōn</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_infantry_javelinist_iber_a</Entity>

View File

@ -5,7 +5,7 @@
structures/{civ}_super_dock
structures/{civ}_embassy_celtic
structures/{civ}_embassy_iberian
structures/{civ}_embassy_italiote
structures/{civ}_embassy_italic
</Entities>
</Builder>
<Cost>
@ -16,13 +16,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Iberian</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Balearic Slinger</GenericName>
<SpecificName>Qallāʿ Ibušimi</SpecificName>
<SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_infantry_slinger.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_infantry_slinger_iber_b</SelectionGroupName>
<SpecificName>Qallāʿ Ibušimi</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_infantry_slinger_iber_a</Entity>

View File

@ -5,7 +5,7 @@
structures/cart_super_dock
structures/cart_embassy_celtic
structures/cart_embassy_iberian
structures/cart_embassy_italiote
structures/cart_embassy_italic
</Entities>
</Builder>
<Identity>

View File

@ -5,7 +5,7 @@
structures/{civ}_super_dock
structures/{civ}_embassy_celtic
structures/{civ}_embassy_iberian
structures/{civ}_embassy_italiote
structures/{civ}_embassy_italic
</Entities>
</Builder>
<Cost>
@ -16,13 +16,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Celt</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Gallic Mercenary Swordsman</GenericName>
<SpecificName>Seḫīr Ḥerev</SpecificName>
<SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_infantry_swordsman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_infantry_swordsman_gaul_b</SelectionGroupName>
<SpecificName>Seḫīr Ḥerev</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_infantry_swordsman_gaul_a</Entity>

View File

@ -5,7 +5,7 @@
structures/{civ}_super_dock
structures/{civ}_embassy_celtic
structures/{civ}_embassy_iberian
structures/{civ}_embassy_italiote
structures/{civ}_embassy_italic
</Entities>
</Builder>
<Cost>
@ -16,13 +16,12 @@
</Cost>
<Identity>
<Civ>cart</Civ>
<Classes datatype="tokens">Italian</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<GenericName>Samnite Swordsman</GenericName>
<SpecificName>Seḫīr Romaḥ</SpecificName>
<SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_infantry_swordsman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
<SelectionGroupName>units/cart_infantry_swordsman_ital_b</SelectionGroupName>
<SpecificName>Seḫīr Romaḥ</SpecificName>
</Identity>
<Promotion>
<Entity>units/cart_infantry_swordsman_ital_a</Entity>

View File

@ -14,11 +14,10 @@
</Cost>
<Identity>
<Civ>ptol</Civ>
<Classes datatype="tokens">Celt</Classes>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol_infantry_swordsman_merc_b</SelectionGroupName>
<GenericName>Gallic Mercenary Swordsman</GenericName>
<SpecificName>Gallikós Mistophorós</SpecificName>
<SelectionGroupName>units/ptol_infantry_swordsman_merc_b</SelectionGroupName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/cart_infantry_swordsman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

View File

@ -3,9 +3,9 @@
<Identity>
<Civ>rome</Civ>
<Lang>latin</Lang>
<SelectionGroupName>units/rome_cavalry_javelinist_b</SelectionGroupName>
<GenericName>Italian Allied Cavalry</GenericName>
<GenericName>Allied Cavalry</GenericName>
<SpecificName>Eques Socius</SpecificName>
<SelectionGroupName>units/rome_cavalry_javelinist_b</SelectionGroupName>
<Icon>units/rome_cavalry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>