Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json (revision 24468) +++ ps/trunk/binaries/data/mods/public/simulation/data/civs/iber.json (revision 24469) @@ -1,143 +1,138 @@ { "Code": "iber", "Culture": "iber", "Name": "Iberians", "Emblem": "session/portraits/emblems/emblem_iberians.png", "History": "The Iberians were a people of mysterious origins and language, with a strong tradition of horsemanship and metalworking. A relatively peaceful culture, they usually fought in other's battles only as mercenaries. However, they proved tenacious when Rome sought to take their land and freedom from them, and employed pioneering guerrilla tactics and flaming javelins as they fought back.", "Music": [ { "File": "An_old_Warhorse_goes_to_Pasture.ogg", "Type": "peace" }, { "File": "Celtica.ogg", "Type": "peace" }, { "File": "Harsh_Lands_Rugged_People.ogg", "Type": "peace" } ], "Factions": [ { "Name": "", "Description": "", "Technologies": [ { - "Name": "Suzko Txabalina", - "History": "Iberian tribesmen were noted for wrapping bundles of grass about the shafts of their throwing spears, soaking that in some sort of flammable pitch, then setting it afire just before throwing.", - "Description": "Causes targets struck to become inflamed and lose hitpoints at a constant rate until and if either healed or repaired, as appropriate." - }, - { - "Name": "Maisu Burdina Langileak", - "History": "The Iberians were known to produce the finest iron and steel implements and weapons of the age. The famous 'Toledo Steel.'", - "Description": "Metal costs for units and technologies reduced by 50%." + "Name": "Toledo Steel", + "History": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", + "Description": "Swordsmen +20% attack damage." } ], "Heroes": [ { "Name": "Viriato", "Class": "", "Armament": "", "Emblem": "", "History": "Viriato, like Vercingetorix amongst the Gauls, was the most famous of the Iberian tribal war leaders, having conducted at least 7 campaigns against the Romans in the southern half of the peninsula during the 'Lusitani Wars' from 147-139 B.C. He surfaced as a survivor of the treacherous massacre of 9,000 men and the selling into slavery of 21,000 elderly, women, and children of the Lusitani. They had signed a treaty of peace with the Romans, conducted by Servius Sulpicius Galba, governor of Hispania Ulterior, as the 'final solution' to the Lusitani problem. He emerged from humble beginnings in 151 B.C. to become war chief of the Lusitani. He was intelligent and a superior tactician, never really defeated in any encounter (though suffered losses in some requiring retreat). He succumbed instead to another treachery arranged by a later Roman commander, Q. Servilius Caepio, to have him assassinated by three comrades that were close to him." }, { "Name": "Karos", "Class": "", "Armament": "", "Emblem": "", "History": "Karos was a chief of the Belli tribe located just east of the Celtiberi (Numantines at the center). Leading the confederated tribes of the meseta central (central upland plain) he concealed 20,000 foot and 5,000 mounted troops along a densely wooded track. Q. Fulvius Nobilior neglected proper reconnaissance and lead his army into the trap strung out in a long column. Some 10,000 of 15,000 Roman legionaries fell in the massive ambush that was sprung upon them. The date was 23 August of 153 B.C., the day when Rome celebrated the feast of Vulcan. By later Senatorial Decree it was ever thereafter known as dies ater, a 'sinister day', and Rome never again fought a battle on the 23rd of August. Karos was wounded in an after battle small cavalry action the same evening and soon died thereafter, but he had carried off one of the most humiliating defeats that Rome ever suffered." }, { "Name": "Indibil", "Class": "", "Armament": "", "Emblem": "", "History": "Indibil was king of the Ilergetes, a large federation ranged principally along the Ebro River in the northwest of the Iberian Peninsula. During the Barcid expansion, from 212 B.C. he had initially been talked into allying himself with the Carthaginians who had taken control of a lot of territory to the south and west, however after loss and his capture in a major battle he was convinced, some say tricked, to switch to the Roman side by Scipio Africanus. But that alliance didn't last long, as Roman promises were hollow and the Romans acted more like conquerors than allies. So, while the Romans and their allies had ended Carthaginian presence in 'Hispania' in 206 B.C., Indibil and another tribal prince by the name of Mandonio, who may have been his brother, rose up in rebellion against the Romans. They were defeated in battle, but rose up in a 2nd even larger rebellion that had unified all the Ilergetes again in 205 B.C. Outnumbered and outarmed they were again defeated, Indibil losing his life in the final battle and Mandonio being captured then later put to death. From that date onward the Ilergetes remained a pacified tribe under Roman rule." } ] } ], "CivBonuses": [ { "Name": "Harritsu Leku", "History": "With exception to alluvial plains and river valleys, stone is abundant in the Iberian Peninsula and was greatly used in construction of structures of all types.", "Description": "Iberians start with a powerful prefabricated circuit of stone walls." } ], "TeamBonuses": [ { "Name": "Saripeko", "History": "The Iberians were long known to provide mercenaries to other nations to serve as auxiliaries to their armies in foreign wars. Carthage is the most well known example, and we have evidence of them serving in such a capacity in Aquitania.", "Description": "Allied Citizen Javelineers −10% resource costs." } ], "Structures": [ { "Name": "Gur Oroigarri", "Class": "", "Emblem": "", "History": "'Revered Monument' The Iberians were a religious people who built small monuments to their various gods. These monuments could also serve as family tombs.", "Requirements": "", "Phase": "", "Special": "Defensive Aura - Gives all Iberian units and buildings within vision range of the monument a 10-15% attack boost. Build Limit: Only 5 may be built per map." } ], "WallSets": [ "structures/wallset_palisade", "structures/iber/wallset_stone" ], "StartEntities": [ { "Template": "structures/iber/civil_centre" }, { "Template": "units/iber/support_female_citizen", "Count": 4 }, { "Template": "units/iber/infantry_swordsman_b", "Count": 2 }, { "Template": "units/iber/infantry_javelineer_b", "Count": 2 }, { "Template": "units/iber/cavalry_javelineer_b" } ], "Formations": [ "special/formations/null", "special/formations/box", "special/formations/column_closed", "special/formations/line_closed", "special/formations/column_open", "special/formations/line_open", "special/formations/flank", "special/formations/battle_line", "special/formations/skirmish", "special/formations/wedge" ], "AINames": [ "Viriato", "Viriato", "Karos", "Indibil", "Audax", "Ditalcus", "Minurus", "Tautalus" ], "SkirmishReplacements": { "skirmish/units/default_infantry_melee_b": "units/iber/infantry_swordsman_b", "skirmish/structures/default_house_5": "structures/{civ}/house", "skirmish/structures/iber/wall_short": "structures/iber/wall_short", "skirmish/structures/iber/wall_medium": "structures/iber/wall_medium", "skirmish/structures/iber/wall_long": "structures/iber/wall_long", "skirmish/structures/iber/wall_gate": "structures/iber/wall_gate", "skirmish/structures/iber/wall_tower": "structures/iber/wall_tower" }, "SelectableInGameSetup": true } Index: ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json (revision 24468) +++ ps/trunk/binaries/data/mods/public/simulation/data/civs/maur.json (revision 24469) @@ -1,158 +1,163 @@ { "Code": "maur", "Culture": "maur", "Name": "Mauryas", "Emblem": "session/portraits/emblems/emblem_mauryas.png", "History": "Founded in 322 B.C. by Chandragupta Maurya, the Mauryan Empire was the first to rule most of the Indian subcontinent, and was one of the largest and most populous empires of antiquity. Its military featured bowmen who used the long-range bamboo longbow, fierce female warriors, chariots, and thousands of armored war elephants. Its philosophers, especially the famous Acharya Chanakya, contributed to such varied fields such as economics, religion, diplomacy, warfare, and good governance. Under the rule of Ashoka the Great, the empire saw 40 years of peace, harmony, and prosperity.", "Music": [ { "File": "An_old_Warhorse_goes_to_Pasture.ogg", "Type": "peace" }, { "File": "Land_between_the_two_Seas.ogg", "Type": "peace" }, { "File": "Eastern_Dreams.ogg", "Type": "peace" }, { "File": "Karmic_Confluence.ogg", "Type": "peace" } ], "Factions": [ { "Name": "Mauryan Indians", "Description": "", "Technologies": [ { "Name": "Archery Tradition", "History": "The Indian peoples had a tradition of fine archery and a penchant for using massed archers in battle.", "Description": "Archers −10% training time, +8 attack range, and −10% ranged attack spread." + }, + { + "Name": "Wootz Steel", + "History": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", + "Description": "Swordsmen +20% attack damage." } ], "Heroes": [ { "Name": "Chandragupta Maurya", "Class": "", "Armament": "", "Emblem": "", "History": "Founder of the Mauryan Empire." }, { "Name": "Ashoka the Great", "Class": "", "Armament": "", "Emblem": "", "History": "Last great emperor of the Mauryan dynasty." }, { "Name": "Acharya Chāṇakya", "Class": "", "Armament": "", "Emblem": "", "History": "Great teacher and advisor to Chandragupta Maurya." } ] } ], "CivBonuses": [ { "Name": "Emperor of Emperors.", "History": "The Mauryan Empire encompassed dozens of formerly independent kingdoms over an area of 5 million square kilometers, with a population of close to 60 million people. The Mauryan rulers held the title Emperor of Emperors and commanded a standing army of 600,000 infantry, 9000 elephants, 8000 chariots, and 30,000 cavalry, making it arguably the largest army of its time.", "Description": "Mauryas have a +10% population cap bonus (e.g., 330 pop cap instead of the usual 300)." }, { "Name": "Elephant Tradition", "History": "India is the land of the elephants. Elephant warfare originated in India and continued for millennia. It was also the source of elephants for the eastern Mediterranean. Indian kings were able to field large numbers of war elephants.", "Description": "Elephants −30% training time." } ], "TeamBonuses": [ { "Name": "Ashoka's Religious Support", "History": "Ashoka the Great sent embassies West to spread knowledge of the Buddha.", "Description": "Allied Temples −50% resource costs and building time; Temple technologies −50% resource costs and research time." } ], "Structures": [ { "Name": "Elephant Stable", "Class": "", "Emblem": "", "History": "", "Phase": "Town", "Requirements": "", "Special": "Train Elephants and research Elephant technologies." }, { "Name": "Edict Pillar of Ashoka", "Class": "", "Emblem": "", "History": "", "Phase": "City", "Requirements": "Ashoka Hero.", "Special": "Contentment: +10% Health and +10% resource gathering rates for all citizens and allied citizens within its range. Can be built anywhere except in enemy territory. Max Built: 10." } ], "WallSets": [ "structures/wallset_palisade", "structures/maur/wallset_stone" ], "StartEntities": [ { "Template": "structures/maur/civil_centre" }, { "Template": "units/maur/support_female_citizen", "Count": 4 }, { "Template": "units/maur/infantry_spearman_b", "Count": 2 }, { "Template": "units/maur/infantry_archer_b", "Count": 2 }, { "Template": "units/maur/cavalry_javelineer_b", "Count": 1 }, { "Template": "units/maur/support_elephant", "Count": 1 } ], "Formations": [ "special/formations/null", "special/formations/box", "special/formations/column_closed", "special/formations/line_closed", "special/formations/column_open", "special/formations/line_open", "special/formations/flank", "special/formations/battle_line", "special/formations/skirmish", "special/formations/wedge" ], "AINames": [ "Chandragupta Maurya", "Bindusara Maurya", "Ashoka the Great", "Dasharatha Maurya", "Samprati Maurya", "Shalishuka Maurya", "Devavarman Maurya", "Shatadhanvan Maurya", "Brihadratha Maurya" ], "SkirmishReplacements": { "skirmish/units/default_infantry_ranged_b": "units/maur/infantry_archer_b", "skirmish/units/special_starting_unit": "units/maur/support_elephant", "skirmish/structures/default_house_5": "structures/{civ}/house" }, "SelectableInGameSetup": true } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json (revision 24468) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/attack_steel_working.json (revision 24469) @@ -1,20 +1,31 @@ { "genericName": "Steel Working", "specificName": { "maur": "Wootz Steel", "iber": "Toledo Steel" }, "description": "Secret steel working techniques give sword blades distinctive and beautiful markings. Not only that, but the steel's hardness is unparalleled.", "cost": { "food": 0, "wood": 200, "stone": 0, "metal": 200 }, - "requirements": { "all": [{ "tech": "phase_city" }, { "any": [{ "civ": "iber" }, { "civ": "maur" }] }] }, + "requirements": { + "all": [ + { "tech": "phase_city" }, + { + "any": [ + { "civ": "iber" }, + { "civ": "maur" } + ] + } + ] + }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "metalworker.png", "researchTime": 60, - "tooltip": "+20% Hack attack for all swordsmen and macemen.", + "tooltip": "Swordsmen +20% attack damage.", "modifications": [ { "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 }, + { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 }, { "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 } ], - "affects": ["Swordsman", "Maceman"], + "affects": ["Swordsman"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml (revision 24468) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml (revision 24469) @@ -1,34 +1,31 @@ Mace 0 0 - 10.5 + 14 - 3.5 - 375 - 750 + 3 + 500 + 1000 200 Melee Maceman Champion Maceman - - special/formations/testudo - 1 1 Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml (revision 24468) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml (revision 24469) @@ -1,44 +1,48 @@ Mace - 3.0 - 2.5 + 0 + 0 + 7 + 3 + 500 + 1000 structures/kush/pyramid_small structures/kush/pyramid_large structures/kush/temple_amun structures/kush/camp_blemmye structures/kush/camp_noba kush napatan units/kush/infantry_maceman_b Noba Maceman nhw Noba -Swordsman Maceman Mercenary units/kush_infantry_maceman.png phase_town units/kush/infantry_maceman_merc_a -1 units/kushites/infantry_maceman_b.xml