Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js (revision 22810)
@@ -1,182 +1,182 @@
function Identity() {}
Identity.prototype.Schema =
"Specifies various names and values associated with the unit type, typically for GUI display to users." +
"" +
"athen" +
"Athenian Hoplite" +
"Hoplī́tēs Athēnaïkós" +
"units/athen_infantry_spearman.png" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"tokens" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"Basic" +
"Advanced" +
"Elite" +
"" +
"" +
"" +
"" +
"" +
"" +
"tokens" +
"" +
"" +
"" +
"" +
"" +
- "" +
+ "" +
"" +
"tokens" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"tokens" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"" +
"";
Identity.prototype.Init = function()
{
this.classesList = GetIdentityClasses(this.template);
this.visibleClassesList = GetVisibleIdentityClasses(this.template);
if (this.template.Phenotype)
this.phenotype = pickRandom(this.GetPossiblePhenotypes());
else
this.phenotype = "default";
};
Identity.prototype.GetCiv = function()
{
return this.template.Civ;
};
Identity.prototype.GetLang = function()
{
return this.template.Lang || "greek"; // ugly default
};
/**
* Get a list of possible Phenotypes.
* @return {string[]} A list of possible phenotypes.
*/
Identity.prototype.GetPossiblePhenotypes = function()
{
return this.template.Phenotype._string.split(/\s+/);
};
/**
* Get the current Phenotype.
* @return {string} The current phenotype.
*/
Identity.prototype.GetPhenotype = function()
{
return this.phenotype;
};
Identity.prototype.GetRank = function()
{
return this.template.Rank || "";
};
Identity.prototype.GetClassesList = function()
{
return this.classesList;
};
Identity.prototype.GetVisibleClassesList = function()
{
return this.visibleClassesList;
};
Identity.prototype.HasClass = function(name)
{
return this.GetClassesList().indexOf(name) != -1;
};
Identity.prototype.GetFormationsList = function()
{
if (this.template.Formations && this.template.Formations._string)
return this.template.Formations._string.split(/\s+/);
return [];
};
Identity.prototype.CanUseFormation = function(template)
{
return this.GetFormationsList().indexOf(template) != -1;
};
Identity.prototype.GetSelectionGroupName = function()
{
return this.template.SelectionGroupName || "";
};
Identity.prototype.GetGenericName = function()
{
return this.template.GenericName;
};
Identity.prototype.IsUndeletable = function()
{
return this.template.Undeletable == "true";
};
Engine.RegisterComponentType(IID_Identity, "Identity", Identity);
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/catafalques/mace_catafalque.json (revision 22810)
@@ -1,11 +1,10 @@
{
"type": "global",
- "affects": ["Human", "Mechanical", "Structure"],
+ "affects": ["Human", "Siege", "Ship", "Structure"],
"modifications": [
{ "value": "Looter/Resource/food", "add": 5 },
{ "value": "Looter/Resource/wood", "add": 5 }
-
],
"auraName": "Sacker of Cities",
"auraDescription": "During the First Macedonian War, Philip and his troops sacked Thermum, the religious and political center of Aetolia.\nHumans, Siege Engines, Ships, and Structures gain +5 food and wood loot."
}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_brennus.json (revision 22810)
@@ -1,10 +1,10 @@
{
"type": "range",
"radius": 60,
- "affects": ["Human", "Mechanical"],
+ "affects": ["Human", "Siege", "Ship"],
"modifications": [
{ "value": "Looter/Resource/metal", "add": 15 }
],
"auraName": "Sacker of Rome",
"auraDescription": "+15 Metal loot for every enemy unit killed."
}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/hero_garrison.json (revision 22810)
@@ -1,9 +1,9 @@
{
"type": "garrison",
- "affects": ["Structure", "Mechanical"],
+ "affects": ["Structure", "Siege"],
"modifications": [
{ "value": "Capturable/GarrisonRegenRate", "add": 2 }
],
"auraName": "Inspired Defense",
"auraDescription": "When garrisoned in a structure or a siege engine, the hero gives it a bonus of +2 capture points recovery rate."
}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/sele_hero_antiochus_righteous.json (revision 22810)
@@ -1,11 +1,11 @@
{
"type": "range",
"radius": 80,
- "affects": ["Structure", "Mechanical"],
+ "affects": ["Structure", "Ship", "Siege"],
"affectedPlayers": ["Enemy"],
"modifications": [
{ "value": "Health/Max", "multiply": 0.8 }
],
"auraName": "Renowned Conqueror",
"auraDescription": "-20% health for enemy buildings, siege engines and ships."
}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship.xml (revision 22810)
@@ -1,92 +1,92 @@
5
10
5
1
20
0
50
0
0
true
0.0
0.5
7.0
8.0
10
true
200
Ship
- Mechanical Ship
+ Ship
60
0
50
0
25
true
0.0
3.0
4.0
4.0
1.0
40
20
20
20
circle/256x256.png
circle/256x256_mask.png
interface/alarm/alarm_create_warship.xml
actor/ship/warship_move_01.xml
actor/ship/warship_move_01.xml
actor/ship/warship_move_01.xml
actor/ship/warship_death.xml
6.0
0.5
6.0
ship
90
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml (revision 22809)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege.xml (revision 22810)
@@ -1,61 +1,61 @@
1
50
5
500
10
10
3
0.0
0.0
2.0
true
- Mechanical Siege
+ Siege
Siege
phase_city
60
0
50
0
25
pitch-roll
4.0
attack/siege/ram_move.xml
attack/siege/ram_move.xml
attack/siege/ram_trained.xml
4.0
0.5
false
large
1