diff -ur Ancient Arabia 2007/Assets/Python/CvEventManager.py LoAA-patch8/Assets/Python/CvEventManager.py
--- Ancient Arabia 2007/Assets/Python/CvEventManager.py 2012-07-12 09:57:47.000000000 -0500
+++ LoAA-patch8/Assets/Python/CvEventManager.py 2012-06-17 04:28:22.000000000 -0500
@@ -6,7 +6,6 @@
## The argsList can contain anything from mouse location to key info
## The EVENTLIST that are being notified can be found
-
from CvPythonExtensions import *
import CvUtil
import CvScreensInterface
@@ -511,6 +510,51 @@
city = argsList[0]
unit = argsList[1]
player = PyPlayer(city.getOwner())
+ # This is a nerf for the too powerful Arabian Merchant unit
+ # In the 2007 release of Legends of Ancient Arabia, you're
+ # allowed to build as many of these as you want. Each of
+ # these units gives you 600 gold as soon as it lands in
+ # another tribe's city, and you can send as many merchants
+ # to the same city as you want. The limitation is three
+ # units, but only three units alive at one time. Once a
+ # given merchant gives us 600 gold, we can make another one
+ # and be earning 600 gold every couple of turns.
+ # This is a game-breaking mechanic, so I'm nerfing it by
+ # only allowing three merchants to ever be built for
+ # each player.
+ if unit.getName() == "Arabian Merchant":
+ # You're allowed to store a single string per
+ # player. Normally, one uses pickle
+ # to convert this in to hierarchial data, but since
+ # this is a hack to make up for Civ4's lack of
+ # CyPlayer.getUnitClassCreatedCount() (it only
+ # has that on a global game level, not for each
+ # player), I'm keeing this simple
+ amp = city.getOwner()
+ amb = gc.getPlayer(amp).getScriptData()
+ try:
+ amb = int(amb)
+ except:
+ amb = 0
+ #print "amb is " + str(amb) ##DEBUG
+ amb += 1
+ if amb == 3:
+ CyInterface().addMessage(amp,True,5,
+ "The final Arabian merchant has been built","",0,
+ gc.getUnitInfo(unit.getUnitType()).getButton(),
+ 0, unit.getX(), unit.getY(), False, False)
+ elif(amb > 3):
+ # Hack; too slow for cannotTrain()
+ # We just have the game report a new
+ # merchant has been built but immediately
+ # remove the merchant from play
+ CyInterface().addMessage(amp,True,5,
+ "No more Arabian merchants can be built; unit disbanded",
+ "",0,
+ gc.getUnitInfo(unit.getUnitType()).getButton(),
+ 0, unit.getX(), unit.getY(), False, False)
+ unit.kill(False, unit.getOwner())
+ gc.getPlayer(amp).setScriptData(str(amb))
CvAdvisorUtils.unitBuiltFeats(city, unit)
diff -ur Ancient Arabia 2007/Assets/XML/Civilizations/CIV4CivilizationInfos.xml LoAA-patch8/Assets/XML/Civilizations/CIV4CivilizationInfos.xml
--- Ancient Arabia 2007/Assets/XML/Civilizations/CIV4CivilizationInfos.xml 2012-07-12 09:57:47.000000000 -0500
+++ LoAA-patch8/Assets/XML/Civilizations/CIV4CivilizationInfos.xml 2012-07-12 09:50:18.000000000 -0500
@@ -15,8 +15,8 @@
PLAYERCOLOR_BLUE
ART_DEF_CIVILIZATION_PERSIA
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_ECBATANA
TXT_KEY_CITY_NAME_ARBELA
@@ -350,8 +350,8 @@
PLAYERCOLOR_DARK_PURPLE
ART_DEF_CIVILIZATION_ROME
ARTSTYLE_GRECO_ROMAN
- 1
- 1
+ 0
+ 0
Nicomedia
Nicaea
@@ -644,8 +644,8 @@
PLAYERCOLOR_DARK_RED
ART_DEF_CIVILIZATION_RUSSIA
ARTSTYLE_EUROPEAN
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_MOSCOW
TXT_KEY_CITY_NAME_STPETERSBURG
@@ -729,17 +729,9 @@
- LEADER_PETER
- 1
-
-
LEADER_CATHERINE
1
-
- LEADER_STALIN
- 1
-
AS3D_RUSSIA_SELECT
AS3D_RUSSIA_ORDER
@@ -753,8 +745,8 @@
PLAYERCOLOR_PINK
ART_DEF_CIVILIZATION_SPAIN
ARTSTYLE_EUROPEAN
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_MADRID
TXT_KEY_CITY_NAME_BARCELONA
@@ -832,7 +824,7 @@
- LEADER_ISABELLA
+ LEADER_BARBARIAN
1
@@ -848,8 +840,8 @@
PLAYERCOLOR_LIGHT_PURPLE
ART_DEF_CIVILIZATION_VIKINGS
ARTSTYLE_EUROPEAN
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_NIDAROS
TXT_KEY_CITY_NAME_UPPSALA
@@ -951,8 +943,8 @@
PLAYERCOLOR_LIGHT_YELLOW
ART_DEF_CIVILIZATION_ZULU
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_ULUNDI
TXT_KEY_CITY_NAME_UMGUNGUNDLOVU
@@ -1763,8 +1755,8 @@
PLAYERCOLOR_LIGHT_GREEN
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_CHEROKEE
TXT_KEY_CITY_NAME_ANASAZI
@@ -1901,10 +1893,10 @@
CIVILIZATION_LAKHMID_KINGDOM
Lakhmid Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Lakhma
Lakhmid
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_PEACH
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -2123,7 +2115,7 @@
- LEADER_BARBARIAN
+ LEADER_BRENNUS
1
@@ -2133,10 +2125,10 @@
CIVILIZATION_GHASSANID_KINGDOM
Ghassanid Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Ghassana
Ghassanid
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_DARK_GREEN
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -2351,7 +2343,7 @@
- LEADER_BARBARIAN
+ LEADER_PETER
1
@@ -2361,10 +2353,10 @@
CIVILIZATION_BAHRAYNI_SHEIKDOM
Bahrayni Sheikdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Bahrayni
Bahrayni
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_DARK_BLUE
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -2579,7 +2571,7 @@
- LEADER_BARBARIAN
+ LEADER_NAPOLEON
1
@@ -2589,10 +2581,10 @@
CIVILIZATION_SABAEAN_KINGDOM
Sabaean Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Sabaea
Sabaean
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_GRAY
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -2806,7 +2798,7 @@
- LEADER_BARBARIAN
+ LEADER_ELIZABETH
1
@@ -2816,12 +2808,12 @@
CIVILIZATION_PALMYRAN_EMPIRE
Palmyran Empire
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Palmyra
Palmyran
TXT_KEY_CIV_ROME_PEDIA
- PLAYERCOLOR_DARK_PURPLE
+ PLAYERCOLOR_DARK_YELLOW
ART_DEF_CIVILIZATION_ROME
- ARTSTYLE_GRECO_ROMAN
+ ARTSTYLE_MIDDLE_EAST
1
1
@@ -3056,8 +3048,8 @@
PLAYERCOLOR_PEACH
ART_DEF_CIVILIZATION_MALI
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
Meroe
Axum
@@ -3290,10 +3282,10 @@
CIVILIZATION_QATABAN_KINGDOM
Qataban Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Qataba
Qataban
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_CYAN
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -3510,7 +3502,7 @@
- LEADER_BARBARIAN
+ LEADER_ISABELLA
1
@@ -3520,10 +3512,10 @@
CIVILIZATION_HIJAZI_KINGDOM
Hijazi Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
- Qataban
+ Hijaz
+ Hijazi
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_RED
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -3740,7 +3732,7 @@
- LEADER_BARBARIAN
+ LEADER_GENGHIS_KHAN
1
@@ -3756,8 +3748,8 @@
PLAYERCOLOR_CYAN
ART_DEF_CIVILIZATION_PERSIA
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
Nineveh
Nimrud
@@ -4076,10 +4068,10 @@
CIVILIZATION_OMANI
Omani Sheikdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
+ Oman
Omani
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_PURPLE
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -4295,7 +4287,7 @@
- LEADER_BARBARIAN
+ LEADER_GANDHI
1
@@ -4305,10 +4297,10 @@
CIVILIZATION_HADHRAMAWTI
Hadhramawti Kingdom
- TXT_KEY_CIV_ARABIA_SHORT_DESC
- Omani
+ Hadhramawt
+ Hadhramawti
TXT_KEY_CIV_ARABIA_PEDIA
- PLAYERCOLOR_LIGHT_GREEN
+ PLAYERCOLOR_DARK_PINK
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
1
@@ -4524,7 +4516,7 @@
- LEADER_BARBARIAN
+ LEADER_STALIN
1
@@ -4540,8 +4532,8 @@
PLAYERCOLOR_LIGHT_GREEN
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
Petra
Timna
@@ -4768,8 +4760,8 @@
PLAYERCOLOR_LIGHT_GREEN
ART_DEF_CIVILIZATION_ARABIA
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
Thamud
Salalah
@@ -4996,8 +4988,8 @@
PLAYERCOLOR_YELLOW
ART_DEF_CIVILIZATION_EGYPT
ARTSTYLE_MIDDLE_EAST
- 1
- 1
+ 0
+ 0
TXT_KEY_CITY_NAME_THEBES
TXT_KEY_CITY_NAME_MEMPHIS
diff -ur Ancient Arabia 2007/Assets/XML/Terrain/CIV4BonusInfos.xml LoAA-patch8/Assets/XML/Terrain/CIV4BonusInfos.xml
--- Ancient Arabia 2007/Assets/XML/Terrain/CIV4BonusInfos.xml 2012-07-12 09:57:47.000000000 -0500
+++ LoAA-patch8/Assets/XML/Terrain/CIV4BonusInfos.xml 2012-06-12 05:34:24.000000000 -0500
@@ -621,7 +621,12 @@
1
0
1
-
+
+
+ TERRAIN_DESERT
+ 1
+
+
FEATURE_JUNGLE
@@ -724,7 +729,12 @@
1
1
1
-
+
+
+ TERRAIN_DESERT
+ 1
+
+
1
@@ -1714,7 +1724,12 @@
1
0
1
-
+
+
+ TERRAIN_DESERT
+ 1
+
+
FEATURE_JUNGLE
diff -ur Ancient Arabia 2007/Assets/XML/Units/CIV4UnitInfos.xml LoAA-patch8/Assets/XML/Units/CIV4UnitInfos.xml
--- Ancient Arabia 2007/Assets/XML/Units/CIV4UnitInfos.xml 2012-07-12 09:57:47.000000000 -0500
+++ LoAA-patch8/Assets/XML/Units/CIV4UnitInfos.xml 2012-06-11 18:44:22.000000000 -0500
@@ -1110,6 +1110,10 @@
BUILD_REMOVE_FOREST
1
+
+ BUILD_WINDMILL
+ 1
+