gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Fix broken templates following 33042ad23d while retaining the same functionnality

Browse Source 
Patch by: @Nescio
Differential Revision: https://code.wildfiregames.com/D2864
This was SVN commit r23810.
This commit is contained in:
Stan
2020-07-08 11:21:10 +00:00
parent b2842e8021
commit d4b567ca85
12 changed files with 58 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/art/variants/biped/female_base_walk.xml
+3 -5
View File
@@ -1,11 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant frequency="1" name="Base">
<animations>
<animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
<animation file="biped/citizen/idle_relax_f_short.dae" name="Idle" speed="100"/>
<animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
<animation file="biped/citizen/idle_relax_f.dae" name="Idle" speed="100"/>
<animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" speed="100"/>
<animation file="biped/citizen/idle_relax_f_long.dae" name="Idle" id="idle1" speed="100"/>
<animation file="biped/citizen/idle_relax_f_short.dae" name="Idle" id="idle2" speed="100"/>
<animation file="biped/citizen/idle_relax_f.dae" name="Idle" id="idle3" speed="100"/>
<animation file="biped/citizen/walk_relax_f.dae" name="Walk" speed="20"/>
<animation file="biped/citizen/run.dae" name="Run" id="run1" speed="8"/>
<animation file="biped/citizen/run.dae" name="Run" id="run2" speed="9"/>
binaries/data/mods/public/simulation/components/Identity.js
+1 -1
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: Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
"<element name='Classes' a:help='Optional list of space-separated classes applying to this entity. Choices include: AfricanElephant, Animal, Apadana, ArmyCamp, Ashoka, BarterMarket, Celt, CitizenSoldier, CivCentre, Colony, ConquestCritical, Defensive, Domestic, DropsiteFood, DropsiteMetal, DropsiteStone, DropsiteWood, FemaleCitizen, FishingBoat, ForestPlant, Fortress, GarrisonFortress, GarrisonTower, Gates, Human, Iberian, Immortal, IndianElephant, Italian, Juggernaut, Kennel, Lighthouse, LongWall, MercenaryCamp, Naval, NavalMarket, Organic, Palace, Palisade, Player, PtolemyIV, SeaCreature, SiegeWall, SpecialBuilding, StoneWall, Structure, Syssiton, Theater, Tower, Unit.'>" +
"<attribute name='datatype'>" +
"<value>tokens</value>" +
"</attribute>" +
binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
+21
View File
@@ -0,0 +1,21 @@
{
"autoResearch": true,
"tooltip": "African Elephants −10% resource costs, training time, health, attack damage, and loot.",
"modifications": [
{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 0.9 },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 0.9 },
{ "value": "Cost/BuildTime", "multiply": 0.9 },
{ "value": "Cost/Resources/food", "multiply": 0.9 },
{ "value": "Cost/Resources/wood", "multiply": 0.9 },
{ "value": "Cost/Resources/stone", "multiply": 0.9 },
{ "value": "Cost/Resources/metal", "multiply": 0.9 },
{ "value": "Health/Max", "multiply": 0.9 },
{ "value": "Loot/food", "multiply": 0.9 },
{ "value": "Loot/wood", "multiply": 0.9 },
{ "value": "Loot/stone", "multiply": 0.9 },
{ "value": "Loot/metal", "multiply": 0.9 },
{ "value": "Loot/xp", "multiply": 0.9 }
],
"affects": ["AfricanElephant"]
}
binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
+21
View File
@@ -0,0 +1,21 @@
{
"autoResearch": true,
"tooltip": "Indian Elephants +10% resource costs, training time, health, attack damage, and loot.",
"modifications": [
{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
{ "value": "Cost/BuildTime", "multiply": 1.1 },
{ "value": "Cost/Resources/food", "multiply": 1.1 },
{ "value": "Cost/Resources/wood", "multiply": 1.1 },
{ "value": "Cost/Resources/stone", "multiply": 1.1 },
{ "value": "Cost/Resources/metal", "multiply": 1.1 },
{ "value": "Health/Max", "multiply": 1.1 },
{ "value": "Loot/food", "multiply": 1.1 },
{ "value": "Loot/wood", "multiply": 1.1 },
{ "value": "Loot/stone", "multiply": 1.1 },
{ "value": "Loot/metal", "multiply": 1.1 },
{ "value": "Loot/xp", "multiply": 1.1 }
],
"affects": ["IndianElephant"]
}
binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_african.xml
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee">
<Attack>
<Melee>
<Damage>
<Hack op="mul">0.9</Hack>
<Crush op="mul">0.9</Crush>
</Damage>
</Melee>
</Attack>
<Cost>
<BuildTime op="mul">0.9</BuildTime>
<Resources>
<food op="mul">0.9</food>
<metal op="mul">0.9</metal>
</Resources>
</Cost>
<Health>
<Max op="mul">0.9</Max>
</Health>
<Identity>
<GenericName>African War Elephant</GenericName>
</Identity>
<Loot>
<food op="mul">0.9</food>
<metal op="mul">0.9</metal>
</Loot>
</Entity>
binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee_indian.xml
-28
View File
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee">
<Attack>
<Melee>
<Damage>
<Hack op="mul">1.1</Hack>
<Crush op="mul">1.1</Crush>
</Damage>
</Melee>
</Attack>
<Cost>
<BuildTime op="mul">1.1</BuildTime>
<Resources>
<food op="mul">1.1</food>
<metal op="mul">1.1</metal>
</Resources>
</Cost>
<Health>
<Max op="mul">1.1</Max>
</Health>
<Identity>
<GenericName>Indian War Elephant</GenericName>
</Identity>
<Loot>
<food op="mul">1.1</food>
<metal op="mul">1.1</metal>
</Loot>
</Entity>
binaries/data/mods/public/simulation/templates/units/cart_champion_elephant.xml
+2 -1
View File
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_african">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>cart</Civ>
<GenericName>North African War Elephant</GenericName>
<SpecificName>Pil Malḥamit</SpecificName>
<Classes datatype="tokens">AfricanElephant</Classes>
<Icon>units/cart_champion_elephant.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/units/kush_champion_elephant.xml
+2 -1
View File
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_african">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>kush</Civ>
<GenericName>Meroitic War Elephant</GenericName>
<SpecificName>Abore ʿhȝ</SpecificName>
<Classes datatype="tokens">AfricanElephant</Classes>
<Icon>units/kush_champion_elephant.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/units/maur_champion_elephant.xml
+2 -1
View File
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_indian">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>maur</Civ>
<GenericName>Indian War Elephant</GenericName>
<SpecificName>Gajendra</SpecificName>
<Classes datatype="tokens">IndianElephant</Classes>
<Icon>units/maur_champion_elephant.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/units/pers_champion_elephant.xml
+2 -1
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_indian">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>pers</Civ>
<Lang>persian</Lang>
<GenericName>Indian War Elephant</GenericName>
<SpecificName>Pila Hinduya</SpecificName>
<Classes datatype="tokens">IndianElephant</Classes>
<Icon>units/pers_champion_elephant.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/units/ptol_champion_elephant.xml
+2 -1
View File
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_african">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>ptol</Civ>
<GenericName>Towered War Elephant</GenericName>
<SpecificName>Polémou Eléphantos</SpecificName>
<Classes datatype="tokens">AfricanElephant</Classes>
<Icon>units/ptol_champion_elephant.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/units/sele_champion_elephant.xml
+2 -1
View File
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_champion_elephant_melee_indian">
<Entity parent="template_unit_champion_elephant_melee">
<Identity>
<Civ>sele</Civ>
<Lang>greek</Lang>
<GenericName>Armored War Elephant</GenericName>
<SpecificName>Thorakisménos Eléphantos</SpecificName>
<Classes datatype="tokens">IndianElephant</Classes>
<Icon>units/sele_champion_elephant.png</Icon>
</Identity>
<VisualActor>