Index: binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json =================================================================== --- binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json +++ binaries/data/mods/public/simulation/data/auras/structures/kush_pyramids_military.json @@ -1,8 +1,11 @@ { "type": "range", - "radius": 60, + "radius": 70, "affects": ["Soldier"], "modifications": [ + { "value": "Armour/Hack", "add": 1 }, + { "value": "Armour/Pierce", "add": 1 }, + { "value": "Armour/Crush", "add": 1 }, { "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 }, { "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 }, { "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 }, @@ -11,6 +14,6 @@ { "value": "Attack/Ranged/Damage/Crush", "multiply": 1.1 } ], "auraName": "Exhortative Presence", - "auraDescription": "Soldiers +10% melee and ranged attack damage.", + "auraDescription": "Soldiers +1 armor level and +10% melee and ranged attack damage.", "overlayIcon": "art/textures/ui/session/auras/attack_bonus.png" } Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json +++ binaries/data/mods/public/simulation/data/technologies/civbonuses/celt_structures.json @@ -10,5 +10,5 @@ { "value": "Capturable/CapturePoints", "multiply": 0.8 }, { "value": "Cost/BuildTime", "multiply": 0.8 } ], - "affects": ["Structure"] + "affects": ["Structure !Wonder"] } Index: binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json +++ binaries/data/mods/public/simulation/data/technologies/civbonuses/greek_structures.json @@ -10,5 +10,5 @@ { "value": "Capturable/CapturePoints", "multiply": 1.1 }, { "value": "Cost/BuildTime", "multiply": 1.1 } ], - "affects": ["Structure"] + "affects": ["Structure !Wonder"] } Index: binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json +++ binaries/data/mods/public/simulation/data/technologies/kushites/monumental_architecture.json @@ -1,15 +1,21 @@ { "genericName": "Monumental Architecture", - "cost": { "food": 0, "wood": 500, "stone": 250, "metal": 250 }, - "requirements": { "all": [{ "tech": "phase_city" }, { "civ": "kush" }] }, - "requirementsTooltip": "Unlocked in City Phase.", + "cost": { "food": 0, "wood": 0, "stone": 600, "metal": 0 }, + "requirements": { + "all": [ + { "tech": "phase_town" }, + { "civ": "kush" } + ] + }, + "requirementsTooltip": "Unlocked in Town Phase.", "icon": "pers_hundred_columns.png", "researchTime": 60, - "tooltip": "+25% HP and -50% build time for Civic Centers, Temples, Pyramids and Wonders.", + "tooltip": "Civic Structures +20% build time, +20% health, and +20% capture points.", "modifications": [ - { "value": "Health/Max", "multiply": 1.25 }, - { "value": "Cost/BuildTime", "multiply": 0.5 } + { "value": "Capturable/CapturePoints", "multiply": 1.2 }, + { "value": "Cost/BuildTime", "multiply": 1.2 }, + { "value": "Health/Max", "multiply": 1.2 } ], - "affects": ["CivilCentre", "Wonder", "Pyramid", "Temple"], + "affects": ["Civic"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json =================================================================== --- binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json +++ binaries/data/mods/public/simulation/data/technologies/persians/persian_architecture.json @@ -11,6 +11,6 @@ { "value": "Capturable/CapturePoints", "multiply": 1.25 }, { "value": "Health/Max", "multiply": 1.25 } ], - "affects": ["Structure"], + "affects": ["Structure !Wonder"], "soundComplete": "interface/alarm/alarm_upgradearmory.xml" } Index: binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_civil_centre.xml @@ -17,6 +17,9 @@ units/{civ}_infantry_archer_b units/{civ}_cavalry_javelinist_b + + kushites/monumental_architecture + structures/kushites/civic_centre_kush.xml Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_large.xml @@ -1,8 +1,6 @@ - + - structures/kush_pyramids_territory - structures/kush_pyramids_economic structures/kush_pyramids_military @@ -11,8 +9,8 @@ 300 - 400 - 400 + 450 + 150 @@ -26,24 +24,20 @@ kush Large Pyramid mr ʿȝ - Pyramid - Pyramid PyramidLarge + -ConquestCritical + City Pyramid phase_city structures/kush_pyramid_big.png - 80 - 80 + 90 + 30 + decay|rubble/rubble_stone_6x6 - - 0.8 - - kushites/monumental_architecture - - + @@ -51,10 +45,13 @@ - 6.0 - 0.6 15.0 + + false + 40 + 40000 + 40 Index: binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml =================================================================== --- binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml +++ binaries/data/mods/public/simulation/templates/structures/kush_pyramid_small.xml @@ -1,5 +1,5 @@ - + structures/kush_pyramids_economic @@ -9,8 +9,8 @@ 200 - 300 300 + 100 @@ -19,19 +19,20 @@ 2000 + decay|rubble/rubble_stone_4x4 kush Small Pyramid mr - -City Town Pyramid - Pyramid PyramidSmall + -ConquestCritical + Town Pyramid phase_town structures/kush_pyramid_small.png - 60 60 + 20 @@ -43,11 +44,11 @@ interface/complete/building/complete_iber_monument.xml - - 6.0 - 0.6 - 12.0 - + + false + 30 + 30000 + 30 Index: binaries/data/mods/public/simulation/templates/template_structure_wonder.xml =================================================================== --- binaries/data/mods/public/simulation/templates/template_structure_wonder.xml +++ binaries/data/mods/public/simulation/templates/template_structure_wonder.xml @@ -11,7 +11,6 @@ - structures/epic_temple_heal structures/wonder_pop_1 structures/wonder_pop_2 @@ -25,9 +24,8 @@ 1000 - 1000 1000 - 1000 + 1500 1000 @@ -58,9 +56,8 @@ 300 - 200 200 - 200 + 300 200