Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_spearman_b.xml (revision 24687) @@ -1,24 +1,23 @@ structures/spart/syssiton - structures/spart/theater -structures/{civ}/wallset_stone spart greek units/spart/infantry_spearman_b Perioikoi Hoplite Hoplítēs Períoikos units/spart_infantry_spearman.png units/spart/infantry_spearman_a units/spartans/infantry_spearman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml (revision 24687) @@ -1,25 +1,19 @@ - - - structures/mace/theater - structures/mace/library - - mace greek units/mace/infantry_slinger_b Rhodian Slinger Sphendonḗtēs Rhódios Mercenary units/mace_infantry_slinger.png phase_town units/mace/infantry_slinger_a units/macedonians/infantry_slinger_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml (revision 24687) @@ -1,24 +1,19 @@ - - - structures/sele/library - - sele greek units/sele/infantry_archer_merc_b Syrian Archer Toxótēs Syrías Mercenary units/sele_infantry_archer.png phase_town units/sele/infantry_archer_merc_a units/seleucids/infantry_archer_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_pikeman_b.xml (revision 24687) @@ -1,22 +1,17 @@ - - - structures/sele/library - - sele greek units/sele/infantry_pikeman_b Phalangite Phalangitēs units/sele_infantry_spearman.png units/sele/infantry_pikeman_a units/seleucids/infantry_pikeman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/support_female_citizen.xml (revision 24687) @@ -1,18 +1,13 @@ - - - structures/sele/library - - sele greek Syrías Gýnē Syrian Woman units/sele_support_female.png units/seleucids/female_citizen.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/infantry_javelineer_b.xml (revision 24687) @@ -1,24 +1,23 @@ structures/spart/syssiton - structures/spart/theater -structures/{civ}/wallset_stone spart greek units/spart/infantry_javelineer_b Helot Skirmisher Akontistḗs Heílōs units/spart_infantry_javelinist.png units/spart/infantry_javelineer_a units/spartans/infantry_javelinist_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js (revision 24687) @@ -1,291 +1,291 @@ PETRA.Config = function(difficulty, behavior) { // 0 is sandbox, 1 is very easy, 2 is easy, 3 is medium, 4 is hard and 5 is very hard. this.difficulty = difficulty !== undefined ? difficulty : 3; // for instance "balanced", "aggressive" or "defensive" this.behavior = behavior || "random"; // debug level: 0=none, 1=sanity checks, 2=debug, 3=detailed debug, -100=serializatio debug this.debug = 0; this.chat = true; // false to prevent AI's chats this.popScaling = 1; // scale factor depending on the max population this.Military = { "towerLapseTime": 90, // Time to wait between building 2 towers "fortressLapseTime": 390, // Time to wait between building 2 fortresses "popForBarracks1": 25, "popForBarracks2": 95, "popForForge": 65, "numSentryTowers": 1 }; // Define damage type importance factors here. this.DamageTypeImportance = { "Hack": 0.085, "Pierce": 0.075, "Crush": 0.065 }; this.Economy = { "popPhase2": 38, // How many units we want before aging to phase2. "workPhase3": 65, // How many workers we want before aging to phase3. "workPhase4": 80, // How many workers we want before aging to phase4 or higher. "popForDock": 25, "targetNumWorkers": 40, // dummy, will be changed later "targetNumTraders": 5, // Target number of traders "targetNumFishers": 1, // Target number of fishers per sea "supportRatio": 0.35, // fraction of support workers among the workforce "provisionFields": 2 }; // Note: attack settings are set directly in attack_plan.js // defense this.Defense = { "defenseRatio": { "ally": 1.4, "neutral": 1.8, "own": 2 }, // ratio of defenders/attackers. "armyCompactSize": 2000, // squared. Half-diameter of an army. "armyBreakawaySize": 3500, // squared. "armyMergeSize": 1400 // squared. }; // Additional buildings that the AI does not yet know when to build // and that it will try to build on phase 3 when enough resources. this.buildings = { "default": [], "athen": [ "structures/{civ}/gymnasium", "structures/{civ}/prytaneion", "structures/{civ}/theater" ], "brit": [], "cart": [ "structures/{civ}/embassy_celtic", "structures/{civ}/embassy_iberian", "structures/{civ}/embassy_italic" ], "gaul": [ "structures/{civ}/assembly" ], "iber": [ "structures/{civ}/monument" ], "kush": [ "structures/{civ}/camp_blemmye", "structures/{civ}/camp_noba", "structures/{civ}/pyramid_large", "structures/{civ}/pyramid_small", "structures/{civ}/temple_amun" ], "mace": [ - "structures/{civ}/library", "structures/{civ}/theater" ], "maur": [ "structures/{civ}/palace", "structures/{civ}/pillar_ashoka" ], "pers": [ "structures/{civ}/apadana" ], "ptol": [ - "structures/{civ}/library" + "structures/{civ}/library", + "structures/{civ}/theater" ], "rome": [ "structures/{civ}/army_camp", "structures/{civ}/temple_vesta" ], "sele": [ - "structures/{civ}/library" + "structures/{civ}/theater" ], "spart": [ "structures/{civ}/syssiton", "structures/{civ}/theater" ] }; this.priorities = { "villager": 30, // should be slightly lower than the citizen soldier one to not get all the food "citizenSoldier": 60, "trader": 50, "healer": 20, "ships": 70, "house": 350, "dropsites": 200, "field": 400, "dock": 90, "corral": 100, "economicBuilding": 90, "militaryBuilding": 130, "defenseBuilding": 70, "civilCentre": 950, "majorTech": 700, "minorTech": 250, "wonder": 1000, "emergency": 1000 // used only in emergency situations, should be the highest one }; // Default personality (will be updated in setConfig) this.personality = { "aggressive": 0.5, "cooperative": 0.5, "defensive": 0.5 }; // See PETRA.QueueManager.prototype.wantedGatherRates() this.queues = { "firstTurn": { "food": 10, "wood": 10, "default": 0 }, "short": { "food": 200, "wood": 200, "default": 100 }, "medium": { "default": 0 }, "long": { "default": 0 } }; this.garrisonHealthLevel = { "low": 0.4, "medium": 0.55, "high": 0.7 }; }; PETRA.Config.prototype.setConfig = function(gameState) { if (this.difficulty > 0) { // Setup personality traits according to the user choice: // The parameter used to define the personality is basically the aggressivity or (1-defensiveness) // as they are anticorrelated, although some small smearing to decorelate them will be added. // And for each user choice, this parameter can vary between min and max let personalityList = { "random": { "min": 0, "max": 1 }, "defensive": { "min": 0, "max": 0.27 }, "balanced": { "min": 0.37, "max": 0.63 }, "aggressive": { "min": 0.73, "max": 1 } }; let behavior = randFloat(-0.5, 0.5); // make agressive and defensive quite anticorrelated (aggressive ~ 1 - defensive) but not completelety let variation = 0.15 * randFloat(-1, 1) * Math.sqrt(Math.square(0.5) - Math.square(behavior)); let aggressive = Math.max(Math.min(behavior + variation, 0.5), -0.5) + 0.5; let defensive = Math.max(Math.min(-behavior + variation, 0.5), -0.5) + 0.5; let min = personalityList[this.behavior].min; let max = personalityList[this.behavior].max; this.personality = { "aggressive": min + aggressive * (max - min), "defensive": 1 - max + defensive * (max - min), "cooperative": randFloat(0, 1) }; } // Petra usually uses the continuous values of personality.aggressive and personality.defensive // to define its behavior according to personality. But when discontinuous behavior is needed, // it uses the following personalityCut which should be set such that: // behavior="aggressive" => personality.aggressive > personalityCut.strong && // personality.defensive < personalityCut.weak // and inversely for behavior="defensive" this.personalityCut = { "weak": 0.3, "medium": 0.5, "strong": 0.7 }; if (gameState.playerData.teamsLocked) this.personality.cooperative = Math.min(1, this.personality.cooperative + 0.30); else if (gameState.getAlliedVictory()) this.personality.cooperative = Math.min(1, this.personality.cooperative + 0.15); // changing settings based on difficulty or personality this.Military.towerLapseTime = Math.round(this.Military.towerLapseTime * (1.1 - 0.2 * this.personality.defensive)); this.Military.fortressLapseTime = Math.round(this.Military.fortressLapseTime * (1.1 - 0.2 * this.personality.defensive)); this.priorities.defenseBuilding = Math.round(this.priorities.defenseBuilding * (0.9 + 0.2 * this.personality.defensive)); if (this.difficulty < 2) { this.Economy.supportRatio = 0.5; this.Economy.provisionFields = 1; this.Military.numSentryTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0; } else if (this.difficulty < 3) { this.Economy.supportRatio = 0.4; this.Economy.provisionFields = 1; this.Military.numSentryTowers = this.personality.defensive > this.personalityCut.strong ? 1 : 0; } else { if (this.difficulty == 3) this.Military.numSentryTowers = 1; else this.Military.numSentryTowers = 2; if (this.personality.defensive > this.personalityCut.strong) ++this.Military.numSentryTowers; else if (this.personality.defensive < this.personalityCut.weak) --this.Military.numSentryTowers; if (this.personality.aggressive > this.personalityCut.strong) { this.Military.popForBarracks1 = 12; this.Economy.popPhase2 = 50; this.priorities.healer = 10; } } let maxPop = gameState.getPopulationMax(); if (this.difficulty < 2) this.Economy.targetNumWorkers = Math.max(1, Math.min(40, maxPop)); else if (this.difficulty < 3) this.Economy.targetNumWorkers = Math.max(1, Math.min(60, Math.floor(maxPop/2))); else this.Economy.targetNumWorkers = Math.max(1, Math.min(120, Math.floor(maxPop/3))); this.Economy.targetNumTraders = 2 + this.difficulty; if (gameState.getVictoryConditions().has("wonder")) { this.Economy.workPhase3 = Math.floor(0.9 * this.Economy.workPhase3); this.Economy.workPhase4 = Math.floor(0.9 * this.Economy.workPhase4); } if (maxPop < 300) { this.popScaling = Math.sqrt(maxPop / 300); this.Military.popForBarracks1 = Math.min(Math.max(Math.floor(this.Military.popForBarracks1 * this.popScaling), 12), Math.floor(maxPop/5)); this.Military.popForBarracks2 = Math.min(Math.max(Math.floor(this.Military.popForBarracks2 * this.popScaling), 45), Math.floor(maxPop*2/3)); this.Military.popForForge = Math.min(Math.max(Math.floor(this.Military.popForForge * this.popScaling), 30), Math.floor(maxPop/2)); this.Economy.popPhase2 = Math.min(Math.max(Math.floor(this.Economy.popPhase2 * this.popScaling), 20), Math.floor(maxPop/2)); this.Economy.workPhase3 = Math.min(Math.max(Math.floor(this.Economy.workPhase3 * this.popScaling), 40), Math.floor(maxPop*2/3)); this.Economy.workPhase4 = Math.min(Math.max(Math.floor(this.Economy.workPhase4 * this.popScaling), 45), Math.floor(maxPop*2/3)); this.Economy.targetNumTraders = Math.round(this.Economy.targetNumTraders * this.popScaling); } this.Economy.targetNumWorkers = Math.max(this.Economy.targetNumWorkers, this.Economy.popPhase2); this.Economy.workPhase3 = Math.min(this.Economy.workPhase3, this.Economy.targetNumWorkers); this.Economy.workPhase4 = Math.min(this.Economy.workPhase4, this.Economy.targetNumWorkers); if (this.difficulty < 2) this.Economy.workPhase3 = Infinity; // prevent the phasing to city phase if (this.debug < 2) return; API3.warn(" >>> Petra bot: personality = " + uneval(this.personality)); }; PETRA.Config.prototype.Serialize = function() { var data = {}; for (let key in this) if (this.hasOwnProperty(key) && key != "debug") data[key] = this[key]; return data; }; PETRA.Config.prototype.Deserialize = function(data) { for (let key in data) this[key] = data[key]; }; Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/library.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/library.json (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/data/auras/structures/library.json (revision 24687) @@ -1,14 +1,13 @@ { "type": "global", "affects": ["Structure"], "modifications": [ - { "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.9 }, - { "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.9 }, - { "value": "ProductionQueue/TechCostMultiplier/stone", "multiply": 0.9 }, - { "value": "ProductionQueue/TechCostMultiplier/metal", "multiply": 0.9 }, - { "value": "ProductionQueue/TechCostMultiplier/time", "multiply": 0.9 } + { "value": "ProductionQueue/TechCostMultiplier/food", "multiply": 0.85 }, + { "value": "ProductionQueue/TechCostMultiplier/wood", "multiply": 0.85 }, + { "value": "ProductionQueue/TechCostMultiplier/stone", "multiply": 0.85 }, + { "value": "ProductionQueue/TechCostMultiplier/metal", "multiply": 0.85 }, + { "value": "ProductionQueue/TechCostMultiplier/time", "multiply": 0.85 } ], - "auraDescription": "Structures −10% technology resource costs and research time.", - "auraName": "Power of Knowledge", - "stackable": true + "auraDescription": "Structures −15% technology resource costs and research time.", + "auraName": "Centre of Scholarship" } Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenistic_metropolis.json =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenistic_metropolis.json (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/hellenistic_metropolis.json (revision 24687) @@ -1,31 +1,31 @@ { "genericName": "Hellenistic Metropolis", "description": "Beginning with Alexander, the Hellenistic monarchs founded many cities throughout their empires, where Greek culture and art blended with local customs to create the motley Hellenistic civilization.", "cost": { "stone": 500, "metal": 500 }, "requirements": { "all": [ { "tech": "phase_city" }, { "any": [ { "civ": "mace" }, { "civ": "ptol" }, { "civ": "sele" } ] } ] }, "requirementsTooltip": "Unlocked in City Phase.", "icon": "statue_face_stone.png", "researchTime": 60, "tooltip": "Civic Centers +100% health and capture points, double default arrows.", "modifications": [ { "value": "BuildingAI/DefaultArrowCount", "multiply": 2 }, { "value": "Capturable/CapturePoints", "multiply": 2 }, { "value": "Health/Max", "multiply": 2 } ], - "affects": ["CivCentre"], + "affects": ["CivCentre !Colony !Naval"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/crannog.xml (revision 24687) @@ -1,49 +1,50 @@ own ally neutral shore 8.0 brit Island Settlement Cranogion Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Train Citizens, construct Ships, and research technologies. Garrison Soldiers for additional arrows. CivSpecific Naval structures/crannog.png phase_town true 0.0 units/{civ}/infantry_spearman_b units/{civ}/infantry_slinger_b units/{civ}/cavalry_javelineer_b units/{civ}/ship_fishing units/{civ}/ship_merchant units/{civ}/ship_bireme units/{civ}/ship_trireme -phase_town_{civ} + -hellenistic_metropolis ship structures/britons/crannog.xml structures/fndn_8x8.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/cart/super_dock.xml (revision 24687) @@ -1,95 +1,94 @@ structures/cart_super_dock_repair own ally neutral shore Dock 2000 10 500 300 200 8.0 5 0.1 Unit Support Infantry Cavalry Ship 0 2 5000 cart Naval Shipyard Cothon Build upon a shoreline in own, neutral, or allied territory. Acquire large tracts of territory. Territory root. Construct Warships and research technologies. ConquestCritical CivSpecific - Naval -City Town Shipyard + Naval Shipyard structures/uber_dock.png - phase_town 60 40 true 0.0 0.7 units/{civ}/ship_bireme units/{civ}/ship_trireme units/{civ}/ship_quinquereme ship 35 interface/complete/building/complete_dock.xml true 200 25000 100 structures/carthaginians/super_dock.xml structures/fndn_dock_super.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/library.xml (revision 24687) @@ -1,11 +1,10 @@ mace Bibliothēkē - CivSpecific structures/macedonians/library.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/lighthouse.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/lighthouse.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/lighthouse.xml (revision 24687) @@ -1,60 +1,58 @@ own ally neutral shore Lighthouse 200 200 200 8.0 2000 decay|rubble/rubble_stone_4x6 ptol Lighthouse Pharos - Build upon a shoreline in own, neutral, or allied territory. Reveal the shorelines over the entire map. Very large vision range. + Build upon a shoreline in own, neutral, or allied territory. Very large vision range. CivSpecific - -City Town Lighthouse + Lighthouse structures/lighthouse.png - phase_town 40 40 true 0.0 interface/complete/building/complete_temple.xml - 180 - true + 200 structures/ptolemies/lighthouse.xml structures/fndn_4x4_dock.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/theater.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/theater.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/theater.xml (revision 24687) @@ -0,0 +1,12 @@ + + + + ptol + Theatron + CivSpecific + + + structures/macedonians/theater.xml + structures/fndn_theater.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/theater.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/library.xml (revision 24687) @@ -1,19 +1,18 @@ 8.0 sele Bibliothēkē - CivSpecific structures/seleucids/library.xml structures/fndn_7x7.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/theater.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/theater.xml (nonexistent) +++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/theater.xml (revision 24687) @@ -0,0 +1,12 @@ + + + + sele + Theatron + CivSpecific + + + structures/macedonians/theater.xml + structures/fndn_theater.xml + + Property changes on: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/theater.xml ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml (revision 24687) @@ -1,152 +1,153 @@ FemaleCitizen 140 190 100 Bow 0 12 0 60 0 1200 2000 0 100.0 1.5 9.81 false Human outline_border.png outline_border_mask.png 0.175 3 1 Soldier own neutral CivilCentre CivilCentre 160 2500 5.0 500 500 500 500 8.0 20 0.1 Unit Support Infantry Cavalry 1 1 3000 decay|rubble/rubble_stone_6x6 Civic Center template_structure_civic_civil_centre Build in own or neutral territory. Acquire large tracts of territory. Territory root. Train Citizens and research technologies. Garrison Soldiers for additional arrows. CivCentre Defensive CivilCentre structures/civic_centre.png 100 100 100 20 0.8 units/{civ}/support_female_citizen phase_town_{civ} phase_city_{civ} unlock_shared_los unlock_shared_dropsites unlock_spies spy_counter archery_tradition + hellenistic_metropolis 5 5 5 15 3 food wood stone metal true interface/complete/building/complete_civ_center.xml interface/alarm/alarm_alert_0.xml interface/alarm/alarm_alert_1.xml attack/weapon/bow_attack.xml attack/impact/arrow_impact.xml true 140 10000 90 structures/fndn_8x8.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml (revision 24687) @@ -1,54 +1,55 @@ 1 own neutral Colony CivilCentre 80 300 200 200 200 2000 decay|rubble/rubble_stone_5x5 Military Colony template_structure_civic_civil_centre_military_colony Colony structures/military_settlement.png phase_town 40 40 40 -phase_town_{civ} -phase_city_{civ} + -hellenistic_metropolis upgrade_rank_advanced_mercenary interface/complete/building/complete_gymnasium.xml 80 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml (revision 24687) @@ -1,59 +1,55 @@ structures/library Library 200 200 200 9.0 2000 decay|rubble/rubble_stone_4x6 Library template_structure_special_library Library structures/library_scroll.png 40 40 - - - hellenistic_metropolis - - + interface/complete/building/complete_library.xml false 50 40000 40 structures/fndn_7x9.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_special_theater.xml (revision 24687) @@ -1,51 +1,53 @@ structures/theater Theater 500 - 500 - 500 + 200 + 600 + 200 10.0 - 2000 + 3000 Theater template_structure_special_theater Theater structures/theater.png - 100 - 100 + 40 + 120 + 40 interface/complete/building/complete_greek_theater.xml false 100 40000 40 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml (revision 24687) @@ -1,130 +1,131 @@ Capture 2.5 4 1000 Field Palisade Wall Slaughter 1000 2 1.0 structures/{civ}/civil_centre structures/{civ}/crannog structures/{civ}/military_colony structures/{civ}/house structures/{civ}/storehouse structures/{civ}/farmstead structures/{civ}/field structures/{civ}/corral structures/{civ}/dock structures/{civ}/barracks structures/{civ}/stable structures/{civ}/elephant_stables structures/{civ}/arsenal structures/{civ}/forge structures/{civ}/temple structures/{civ}/market structures/{civ}/outpost structures/{civ}/sentry_tower structures/{civ}/defense_tower structures/{civ}/fortress structures/wallset_palisade structures/{civ}/wallset_siege structures/{civ}/wallset_stone + structures/{civ}/theater structures/{civ}/wonder 12 50 0 0 0 80 Human CitizenSoldier Citizen Worker Soldier Infantry Infantry Basic 100 5 0 0 0 upright 100 2 4 15 2.0 1.0 0.5 0.25 1 0.75 5 0.5 2 0.5 attack/weapon/knife_attack.xml voice/{lang}/civ/civ_{phenotype}_attack.xml voice/{lang}/civ/civ_{phenotype}_build.xml voice/{lang}/civ/civ_{phenotype}_garrison.xml voice/{lang}/civ/civ_{phenotype}_gather.xml voice/{lang}/civ/civ_{phenotype}_repair.xml voice/{lang}/civ/civ_{phenotype}_walk.xml actor/human/movement/walk.xml actor/human/movement/run.xml actor/human/death/{phenotype}_death.xml resource/construction/con_wood.xml resource/foraging/forage_leaves.xml resource/farming/farm.xml resource/gathering/gather_meat.xml resource/lumbering/lumbering.xml resource/mining/pickaxe.xml resource/mining/mining.xml resource/mining/mining.xml interface/alarm/alarm_create_infantry.xml interface/alarm/alarm_invalid_building_placement.xml 80 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml (revision 24687) @@ -1,112 +1,113 @@ Dagger 2.0 0 0.0 3 500 1000 Slaughter 1000 2 1.0 structures/{civ}/civil_centre structures/{civ}/crannog structures/{civ}/military_colony structures/{civ}/house structures/{civ}/storehouse structures/{civ}/farmstead structures/{civ}/field structures/{civ}/corral structures/{civ}/dock structures/{civ}/barracks structures/{civ}/stable structures/{civ}/elephant_stables structures/{civ}/arsenal structures/{civ}/forge structures/{civ}/temple structures/{civ}/market structures/{civ}/outpost structures/{civ}/sentry_tower structures/{civ}/defense_tower structures/{civ}/fortress structures/wallset_palisade structures/{civ}/wallset_siege structures/{civ}/wallset_stone + structures/{civ}/theater structures/{civ}/wonder 9 50 25 FemaleCitizen Citizen Worker Female Citizen template_unit_support_female_citizen female 3 5 2.0 1.0 1 0.5 1 0.7 5 0.35 2 0.35 attack/weapon/sword.xml attack/weapon/knife_attack.xml resource/construction/con_wood.xml resource/foraging/forage_leaves.xml resource/farming/farm.xml resource/gathering/gather_meat.xml resource/lumbering/lumbering.xml resource/mining/pickaxe.xml resource/mining/mining.xml resource/mining/mining.xml interface/alarm/alarm_invalid_building_placement.xml voice/{lang}/civ/civ_{phenotype}_attack.xml voice/{lang}/civ/civ_{phenotype}_build.xml voice/{lang}/civ/civ_{phenotype}_repair.xml interface/alarm/alarm_create_female.xml false 32 Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml (revision 24687) @@ -1,82 +1,83 @@ 0.5 structures/{civ}/civil_centre structures/{civ}/crannog structures/{civ}/military_colony structures/{civ}/house structures/{civ}/storehouse structures/{civ}/farmstead structures/{civ}/field structures/{civ}/corral structures/{civ}/dock structures/{civ}/barracks structures/{civ}/stable structures/{civ}/elephant_stables structures/{civ}/arsenal structures/{civ}/forge structures/{civ}/temple structures/{civ}/market structures/{civ}/outpost structures/{civ}/sentry_tower structures/{civ}/defense_tower structures/{civ}/fortress structures/wallset_palisade structures/{civ}/wallset_siege structures/{civ}/wallset_stone + structures/{civ}/theater structures/{civ}/wonder 0 15 50 -0.25 true Slave Worker Slave template_unit_support_slave Gatherer with a finite life span. Bonused at mining and lumbering. 10 5 1.0 0.5 0.5 0.35 1 1.0 5 1.0 5 1.0 resource/construction/con_wood.xml resource/foraging/forage_leaves.xml resource/farming/farm.xml resource/lumbering/lumbering.xml resource/mining/pickaxe.xml resource/mining/mining.xml interface/alarm/alarm_invalid_building_placement.xml voice/{lang}/civ/civ_{phenotype}_build.xml voice/{lang}/civ/civ_{phenotype}_repair.xml actor/singlesteps/steps_gravel_trained.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml (revision 24687) @@ -1,26 +1,25 @@ structures/athen/gymnasium - structures/athen/theater structures/athen/prytaneion athen greek units/athen/infantry_javelineer_b Thracian Peltast Peltastḗs Thrâx Mercenary units/athen_infantry_javelinist.png phase_town units/athen/infantry_javelineer_a units/athenians/infantry_javelinist_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml (revision 24687) @@ -1,26 +1,25 @@ structures/athen/gymnasium - structures/athen/theater structures/athen/prytaneion athen greek units/athen/infantry_marine_archer_b Cretan Mercenary Archer Toxótēs Krētikós Mercenary units/mace_infantry_archer.png iphicratean_reforms units/athen/infantry_marine_archer_a units/athenians/infantry_archer_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_slinger_b.xml (revision 24687) @@ -1,24 +1,23 @@ structures/athen/gymnasium - structures/athen/theater structures/athen/prytaneion athen greek units/athen/infantry_slinger_b Athenian Slinger Militia Psilòs Athēnaîos units/athen_infantry_slinger.png units/athen/infantry_slinger_a units/athenians/infantry_slinger_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/infantry_spearman_b.xml (revision 24687) @@ -1,24 +1,23 @@ structures/athen/gymnasium - structures/athen/theater structures/athen/prytaneion athen greek units/athen/infantry_spearman_b Athenian Hoplite Hoplítēs Athēnaîos units/athen_infantry_spearman.png units/athen/infantry_spearman_a units/athenians/infantry_spearman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen/support_female_citizen.xml (revision 24687) @@ -1,19 +1,18 @@ structures/athen/gymnasium - structures/athen/theater structures/athen/prytaneion athen Gýnē Athēnaía Athenian Woman units/hele_support_female_citizen.png units/athenians/female_citizen.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml (revision 24687) @@ -1,25 +1,19 @@ - - - structures/mace/theater - structures/mace/library - - mace greek units/mace/infantry_archer_b Cretan Mercenary Archer Toxótēs Krētikós Mercenary units/mace_infantry_archer.png phase_town units/mace/infantry_archer_a units/macedonians/infantry_archer_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_javelineer_b.xml (revision 24687) @@ -1,23 +1,17 @@ - - - structures/mace/theater - structures/mace/library - - mace greek units/mace/infantry_javelineer_b Agrianian Peltast Peltastḗs Agrías units/mace_infantry_javelinist.png units/mace/infantry_javelineer_a units/macedonians/infantry_javelinist_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/infantry_pikeman_b.xml (revision 24687) @@ -1,23 +1,17 @@ - - - structures/mace/theater - structures/mace/library - - mace greek units/mace/infantry_pikeman_b Foot Companion Pezétairos units/mace_infantry_pikeman.png units/mace/infantry_pikeman_a units/macedonians/infantry_pikeman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/support_female_citizen.xml (revision 24687) @@ -1,18 +1,12 @@ - - - structures/mace/theater - structures/mace/library - - mace Gýnē Makedonikḗ Macedonian Woman units/hele_support_female_citizen.png units/macedonians/female_citizen.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_javelineer_b.xml (revision 24687) @@ -1,23 +1,18 @@ - - - structures/sele/library - - sele greek units/sele/infantry_javelineer_b Arab Javelineer Pezakontistès Aravikós units/pers_infantry_javelinist.png phase_village units/sele/infantry_javelineer_a units/seleucids/infantry_javelinist_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/infantry_spearman_b.xml (revision 24687) @@ -1,22 +1,17 @@ - - - structures/sele/library - - sele greek units/sele/infantry_spearman_b Militia Thureos Spearman Thureophóros Politès units/sele_infantry_spearman_2.png units/sele/infantry_spearman_a units/seleucids/infantry_spearman_b.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml (revision 24687) @@ -1,29 +1,28 @@ structures/spart/syssiton - structures/spart/theater -structures/{civ}/wallset_stone -10 20 spart greek Skiritai Commando Ékdromos Skirítēs Elite units/spart_champion_infantry_sword.png phase_town units/spartans/infantry_swordsman_c.xml Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml (revision 24686) +++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/support_female_citizen.xml (revision 24687) @@ -1,36 +1,35 @@ 1.5 structures/spart/syssiton - structures/spart/theater -structures/{civ}/wallset_stone 1.4 1 spart greek Spartan Woman Spartiâtis units/spart_support_female_citizen.png true units/spartans/female_citizen.xml