Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
@@ -1,7 +1,7 @@
{
"type": "range",
"radius": 60,
- "affects": ["Soldier", "Elephant"],
+ "affects": ["Champion"],
"modifications": [
{ "value": "Attack/Melee/Hack", "multiply": 1.2 },
{ "value": "Attack/Melee/Pierce", "multiply": 1.2 },
@@ -12,6 +12,6 @@
{ "value": "Attack/Capture/Value", "add": 2 }
],
"auraName": "Warrior Queen",
- "auraDescription": "+20% attack and +2 capture for soldiers and elephants.",
+ "auraDescription": "+20% attack and +2 capture for champion units.",
"overlayIcon": "art/textures/ui/session/auras/attack_bonus.png"
}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen.json
@@ -1,19 +0,0 @@
-{
- "type": "range",
- "radius": 60,
- "affects": ["Soldier", "Elephant"],
- "modifications": [
- { "value": "Looter/Resource/food", "multiply": 1.5 },
- { "value": "Looter/Resource/wood", "multiply": 1.5 },
- { "value": "Looter/Resource/stone", "multiply": 1.5 },
- { "value": "Looter/Resource/metal", "multiply": 1.5 },
- { "value": "Attack/Melee/Hack", "multiply": 1.1 },
- { "value": "Attack/Melee/Pierce", "multiply": 1.1 },
- { "value": "Attack/Melee/Crush", "multiply": 1.1 },
- { "value": "Attack/Ranged/Hack", "multiply": 1.1 },
- { "value": "Attack/Ranged/Pierce", "multiply": 1.1 },
- { "value": "Attack/Ranged/Crush", "multiply": 1.1 }
- ],
- "auraName": "Saviour of Kush",
- "auraDescription": "Own units +10% attack.\nNastasen acquired lots of bounty from the defeated invaders. Gain +50% loot from killing enemy units."
-}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_1.json
@@ -0,0 +1,19 @@
+{
+ "type": "range",
+ "radius": 60,
+ "affects": ["Soldier", "Elephant"],
+ "modifications": [
+ { "value": "Looter/Resource/food", "multiply": 1.5 },
+ { "value": "Looter/Resource/wood", "multiply": 1.5 },
+ { "value": "Looter/Resource/stone", "multiply": 1.5 },
+ { "value": "Looter/Resource/metal", "multiply": 1.5 },
+ { "value": "Attack/Melee/Hack", "multiply": 1.1 },
+ { "value": "Attack/Melee/Pierce", "multiply": 1.1 },
+ { "value": "Attack/Melee/Crush", "multiply": 1.1 },
+ { "value": "Attack/Ranged/Hack", "multiply": 1.1 },
+ { "value": "Attack/Ranged/Pierce", "multiply": 1.1 },
+ { "value": "Attack/Ranged/Crush", "multiply": 1.1 }
+ ],
+ "auraName": "Savior of Kush",
+ "auraDescription": "Own units +10% attack.\nNastasen acquired lots of bounty from the defeated invaders. Gain +50% loot from killing enemy units."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_nastasen_2.json
@@ -0,0 +1,10 @@
+{
+ "type": "global",
+ "affects": ["KushTrireme"],
+ "modifications": [
+ { "value": "Cost/Resources/wood", "add": -50 },
+ { "value": "Cost/Resources/metal", "add": -50 }
+ ],
+ "auraName": "Gift of Warships",
+ "auraDescription": "Train Ptolemaic Mercenary Triremes at -25% resource cost.\nCrushing the Ptolemaic invasion of Kush, Nastasen seized numerous enemy warships."
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/kushites/upgrade_rank_elite_healer.json
@@ -1,5 +1,5 @@
{
- "genericName": "High Priest of Amun",
+ "genericName": "Divine Instruction",
"description": "Have your priests instructed by the High Priest himself - may Amun bless him.",
"cost": { "food": 500, "wood": 0, "stone": 0, "metal": 500 },
"requirements": {
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player.xml
@@ -34,6 +34,9 @@
2
2
5
+ 4
+ 2
+ 1
Index: ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/special/player/player_kush.xml
@@ -1,10 +1,4 @@
teambonuses/kush_player_team_bonus
-
-
- 4
- 2
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_barracks.xml
@@ -1,5 +1,11 @@
+
+
+ 150
+ 150
+
+
12.0
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+ kush
+ Temple of Apedemak
+ Pr-‘Iprmk
+ Train priests to heal your troops. Train Meroitic Temple Guards. Garrison units to heal them at a quick rate.
+ TempleOfApedemak
+
+
+
+
+
+
+ units/{civ}_champion_infantry_apedemak
+
+
+
+ structures/kushites/temple.xml
+
+
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_amun.xml
@@ -3,6 +3,9 @@
structures/kush_temple_amun
+
+ TempleOfAmun
+
10
300
@@ -17,13 +20,18 @@
30
- rubble/rubble_stone_6x6
+ 3000
+ decay|rubble/rubble_stone_6x6
kush
- Temple of Amun
+ Grand Temple of Amun
Pr-‘Imn
+ Train priests to heal your troops. Train Napatan Temple Guards and research unique technologies. Garrison units to heal them at a quick rate.
+ structures/temple_epic.png
TempleOfAmun
+ City -Town
+ phase_city
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush_temple_apedemak.xml
@@ -1,28 +0,0 @@
-
-
-
-
-
-
- rubble/rubble_stone_4x6
-
-
- kush
- Temple of Apedemak
- Pr-‘Iprmk
- TempleOfApedemak
-
-
-
-
-
-
- units/{civ}_champion_infantry_apedemak
-
-
-
-
- structures/kushites/temple.xml
- structures/fndn_4x6.xml
-
-
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_cavalry_javelinist_merc_b.xml
@@ -8,13 +8,12 @@
kush
- Camel
units/kush_cavalry_javelinist_merc_b
Blemmye Desert Raider
nhw Bulahau gml
units/kush_merc_camelry.png
phase_town
- Mercenary
+ Camel Mercenary
units/kush_cavalry_javelinist_a
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_apedemak.xml
@@ -1,9 +1,28 @@
+
+ -1
+ -1
+
+
+
+
+
+ Champion
+ 1.3
+
+
+ Hero
+ 1.3
+
+
+
+
kush
Meroitic Temple Guard
rs ‘Iprmk
+ Armor-piercing Axes: Counters 1.3x vs. Champions and Heroes.
Axe
ApedemakGuard
units/kush_champion_apedemak.png
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_arakamani.xml
@@ -9,7 +9,7 @@
kush
Arakamani
‘Irk.‘Imn
- units/mace_hero_philip.png
+ units/hele_hero_alexander.png
units/kushites/hero_elephantry_arakamani_m.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_harsiotef.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_harsiotef.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_harsiotef.xml
@@ -1,15 +1,14 @@
- units/heroes/kush_hero_nastasen
+ units/heroes/kush_hero_nastasen_1
+ units/heroes/kush_hero_nastasen_2
kush
Nastasen
Nastasen Ankhkhare
- Nastasen
- units/hele_hero_alexander.png
- Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.
+ units/mace_hero_philip.png
units/kushites/hero_cavalry_spearman_harsiotef_m.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_hero_nastasen.xml
@@ -1,15 +1,14 @@
- units/heroes/kush_hero_nastasen
+ units/heroes/kush_hero_nastasen_1
+ units/heroes/kush_hero_nastasen_2
kush
Nastasen
Nastasen Ankhkhare
- Nastasen
- units/hele_hero_alexander.png
- Hero Special: "Gift of Warships" - Allows the training of Ptolemaic trireme-class ships.
+ units/mace_hero_philip.png
units/kushites/hero_cavalry_spearman_nastasen_m.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_archer_b.xml
@@ -5,10 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_clubman_b.xml
@@ -6,7 +6,7 @@
3.0
- 5.0
+ 2.5
@@ -14,10 +14,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_javelinist_merc_b.xml
@@ -5,10 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_pikeman_b.xml
@@ -5,10 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_spearman_b.xml
@@ -1,17 +1,12 @@
-
- -1
-
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
@@ -20,18 +15,11 @@
Nubian Spearman
iry-rdwy Nhsyw
phase_village
- Faster than usual spearmen but has less hack armor.
units/kush_infantry_spearman.png
units/kush_infantry_spearman_a
-
- 1.2
-
- 1.2
-
-
units/kushites/infantry_spearman_b.xml
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_swordsman_b.xml
@@ -5,10 +5,8 @@
structures/kush_pyramid_small
structures/kush_pyramid_large
structures/kush_temple_amun
- structures/kush_temple_apedemak
structures/kush_blemmye_camp
structures/kush_nuba_village
- -structures/{civ}_temple
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_ship_trireme.xml
@@ -2,14 +2,15 @@
- 30
- 30
+ 50
+ 50
kush
- Great Warship
+ Ptolemaic Mercenary Trireme
shry ‘3
+ KushTrireme
units/ptol_ship_trireme.png
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_support_female_citizen.xml
@@ -1,10 +1,5 @@
-
-
- -structures/{civ}_temple
-
-
kush
Shmt