diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_spear.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_spear.png new file mode 100644 index 0000000000..84385a001d --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_spear.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db1a3e3daf45b12a14e76ee00a7d46bb912f790a53abfd40364a15441ded826f +size 31855 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_swords.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_swords.png new file mode 100644 index 0000000000..9c6ee2556d --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_iron_swords.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58a9ff9032a17feba338a2a1d7a58be9a330d26a8ca70934ab99ddf494de7185 +size 31938 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_spear.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_spear.png new file mode 100644 index 0000000000..cf37119efc --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_spear.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:290761183bcb0aba6c1dd0f5f4ffae69ec4f0bd1b8aee1933740da9d3166bbfa +size 41656 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_swords.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_swords.png new file mode 100644 index 0000000000..0ae8b75d71 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/armor_plates_swords.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75062055e9f34ef94248c502fb288349d55700bb84483adbdc3430ef1a53cc52 +size 41088 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/arrow.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/arrow.png index c2f614b532..a7932f4227 100644 --- a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/arrow.png +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/arrow.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:10af4a2a4bc68d3c50d049c88df02a1695687b36a3541c7e385cb4827321ea09 -size 21754 +oid sha256:50a2641239c1ad4efcadfb876abc076c413bd6f68970f615ca6c4757ea0f8ce5 +size 24527 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear.png index 92b6509122..77281c9bd1 100644 --- a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear.png +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:14d6607984e2aec9ca59310071a197bf71e69bc1d408299084d522925dc7322b -size 20987 +oid sha256:36d208e1c2657549ea5482a0f98d640d3140159c893761897ccd48f17c750afa +size 23110 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear_cavalry.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear_cavalry.png index 385626d598..7c0b60d537 100644 --- a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear_cavalry.png +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/spear_cavalry.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d2cf3a7f38b628489ad8064a432b1b2ea74637f9c9929c6d4ff2836b6d65a5b -size 36531 +oid sha256:71b6cd0a0c2bf4da1495350c62089e30b32d9af04fe4fd139d7f8ccdb24bfdc2 +size 36386 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword.png index c19fa6f467..7e76384359 100644 --- a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword.png +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:317dee10996718c8be2080bc4f95a43877bd0032993a058bf7cdd1d675372277 -size 18967 +oid sha256:396f553e44b047451b52c1c436ca6f7c9e616e38c934ca92fb0e382496562e9c +size 19816 diff --git a/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword_cross.png b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword_cross.png new file mode 100644 index 0000000000..90529764b6 --- /dev/null +++ b/binaries/data/mods/public/art/textures/ui/session/portraits/technologies/sword_cross.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b39c9cacc23c15fa8b9f8ee483b40e09233fda663b2ac3fb2d9ac3f43d42cc1 +size 27502 diff --git a/binaries/data/mods/public/civs/athen.json b/binaries/data/mods/public/civs/athen.json index 4262dda973..8b507192ae 100644 --- a/binaries/data/mods/public/civs/athen.json +++ b/binaries/data/mods/public/civs/athen.json @@ -61,7 +61,7 @@ { "Name":"Delian League", "History":"Tribute from Athens' allies contributed to the construction of vast fleets of warships numbering into the hundreds.", - "Description":"Warships construct 25% faster." + "Description":"Ships construct 25% faster." }, { "Name":"Hellenisation", diff --git a/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json b/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json index 96ef367059..7fee414071 100644 --- a/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json +++ b/binaries/data/mods/public/simulation/data/technologies/armor_cav_chamfron.json @@ -11,7 +11,7 @@ "cost": {"food": 0, "wood": 0, "stone": 0, "metal": 155}, "requirements": {"tech": "phase_city"}, "requirementsTooltip": "Unlocked in City Phase.", - "icon": "horseshoe_gold.png", + "icon": "armor_plates_cavalry.png", "researchTime": 20, "tooltip": "Equip your cavalry mounts with armour. All Cavalry +1 Hack Armour.", "modifications": [{"value": "Armour/Hack", "add": 1.0}], diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_city.json b/binaries/data/mods/public/simulation/data/technologies/phase_city.json index 20773685a3..10bb0ebdbf 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_city.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_city.json @@ -9,8 +9,8 @@ }, "description": "Advances from a bustling town to a veritable metropolis, full of the wonders of modern technology.", "cost": {"food": 0, "wood": 0, "stone": 1000, "metal": 1000}, - "requirements": { "class": "Town", "numberOfTypes": 3 }, - "requirementsTooltip": "Requires any 3 different types of town structures.", + "requirements": { "class": "Town", "number": 4 }, + "requirementsTooltip": "Requires 4 town structures of any type. Walls and Civ Centres do not count.", "supersedes": "phase_town", "icon": "city_phase.png", "researchTime": 60, diff --git a/binaries/data/mods/public/simulation/data/technologies/phase_town.json b/binaries/data/mods/public/simulation/data/technologies/phase_town.json index 3030588a86..ebf37772f7 100644 --- a/binaries/data/mods/public/simulation/data/technologies/phase_town.json +++ b/binaries/data/mods/public/simulation/data/technologies/phase_town.json @@ -2,8 +2,8 @@ "genericName": "Town Phase", "description": "Advances from a small village to a bustling town, ready to expand rapidly.", "cost": { "food": 500, "wood": 500, "stone": 0, "metal": 0 }, - "requirements": { "class": "Village", "numberOfTypes": 4 }, - "requirementsTooltip": "Requires any 3 different types of village structures (Farm fields do not count).", + "requirements": { "class": "Village", "number": 6 }, + "requirementsTooltip": "Requires 5 village structures of any type. Farm fields and palisades do not count.", "supersedes": "phase_village", "icon": "town_phase.png", "researchTime": 30, diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml index 2f553fb9dd..c434e550f1 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml @@ -22,7 +22,7 @@ 3000 - Town -ConquestCritical Defensive Wall + -ConquestCritical Defensive Wall Stone Wall Wall off your town for a stout defense. structures/wall.png diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml index 3bc044fb9f..14e33fd057 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml @@ -24,7 +24,7 @@ City Gate Allow units access through a city wall. (Currently not a working feature). - Town -ConquestCritical Defensive Wall Gates + -ConquestCritical Defensive Wall Gates structures/gate.png phase_town diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml index 602fc45f35..d3e8910b0d 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_tower.xml @@ -47,7 +47,7 @@ Wall Turret Shoots arrows. Garrison to defend a city wall against attackers. - Town Defensive -ConquestCritical Wall Tower + Defensive -ConquestCritical Wall Tower structures/tower.png phase_town