Skip to content

Commit 14b1a14

Browse files
authored
Merge pull request #1614 from SimoCvijic0/patch
Patch
2 parents 3c0ed73 + c87364d commit 14b1a14

9 files changed

+55
-22
lines changed

Assets/XML/Art/CIV4ArtDefines_Building.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44945,7 +44945,7 @@
4494544945
<Button>Art/Interface/TeamColor/norsebutton.dds</Button>
4494644946
</BuildingArtInfo>
4494744947
<BuildingArtInfo>
44948-
<Type>ART_DEF_BUILDING_TRADING_POST</Type>
44948+
<Type>ART_DEF_BUILDING_FISHING_HUT</Type>
4494944949
<LSystem>LSYSTEM_COAST</LSystem>
4495044950
<bAnimated>0</bAnimated>
4495144951
<fScale>2.38</fScale>

Assets/XML/Buildings/GreatWonders_CIV4BuildingInfos.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5394,7 +5394,6 @@
53945394
<iMaxGlobalInstances>1</iMaxGlobalInstances>
53955395
<Description>TXT_KEY_BUILDING_CYRUS_CYLINDER</Description>
53965396
<Civilopedia>TXT_KEY_BUILDING_CYRUS_CYLINDER_PEDIA</Civilopedia>
5397-
<Help>TXT_KEY_BUILDING_CYRUS_CYLINDER_HELP</Help>
53985397
<Advisor>ADVISOR_MILITARY</Advisor>
53995398
<ArtDefineTag>ART_DEF_BUILDING_CYRUS_CYLINDER</ArtDefineTag>
54005399
<MovieDefineTag>ART_DEF_MOVIE_CYRUS_CYLINDER</MovieDefineTag>

Assets/XML/Buildings/Regular_CIV4BuildingInfos.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46169,7 +46169,7 @@
4616946169
<Description>TXT_KEY_BUILDING_FISHERMANS_HUT</Description>
4617046170
<Civilopedia>TXT_KEY_BUILDING_FISHERMANS_HUT_PEDIA</Civilopedia>
4617146171
<Advisor>ADVISOR_GROWTH</Advisor>
46172-
<ArtDefineTag>ART_DEF_BUILDING_TRADING_POST</ArtDefineTag>
46172+
<ArtDefineTag>ART_DEF_BUILDING_FISHING_HUT</ArtDefineTag>
4617346173
<ConstructSound>AS2D_BUILD_FISHING_HUT</ConstructSound>
4617446174
<fVisibilityPriority>1</fVisibilityPriority>
4617546175
<MapCategoryTypes>
@@ -90766,10 +90766,7 @@
9076690766
<BuildingType>BUILDING_FARMSCRAPER_III</BuildingType>
9076790767
</ReplacementBuildings>
9076890768
<ObsoletesToBuilding>BUILDING_FARMSCRAPER_III</ObsoletesToBuilding>
90769-
<VicinityBonus>BONUS_MANGO</VicinityBonus>
90770-
<PrereqVicinityBonuses>
90771-
<VicinityBonus>BONUS_CORN</VicinityBonus>
90772-
</PrereqVicinityBonuses>
90769+
<VicinityBonus>BONUS_PAPAYA</VicinityBonus>
9077390770
<iCost>139</iCost>
9077490771
<iCostSizeModifier>2</iCostSizeModifier>
9077590772
<iCostCountModifier>1</iCostCountModifier>

Assets/XML/Events/CIV4EventInfos.xml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10395,6 +10395,18 @@
1039510395
<UnitType>UNIT_HUNTER</UnitType>
1039610396
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
1039710397
</PromoteUnit>
10398+
<PromoteUnit>
10399+
<UnitType>UNIT_MASTER_CHASER</UnitType>
10400+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10401+
</PromoteUnit>
10402+
<PromoteUnit>
10403+
<UnitType>UNIT_MASTER_TRACKER</UnitType>
10404+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10405+
</PromoteUnit>
10406+
<PromoteUnit>
10407+
<UnitType>UNIT_MASTER_HUNTER</UnitType>
10408+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10409+
</PromoteUnit>
1039810410
</PromoteUnits>
1039910411
<PythonCanDo>canDoBestHunters1</PythonCanDo>
1040010412
<Button>,Art/Interface/Buttons/Process/Blank.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,8,5</Button>
@@ -10420,6 +10432,18 @@
1042010432
<UnitType>UNIT_HUNTER</UnitType>
1042110433
<Promotion>PROMOTION_HUNTING_SIGHT1</Promotion>
1042210434
</PromoteUnit>
10435+
<PromoteUnit>
10436+
<UnitType>UNIT_MASTER_CHASER</UnitType>
10437+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10438+
</PromoteUnit>
10439+
<PromoteUnit>
10440+
<UnitType>UNIT_MASTER_TRACKER</UnitType>
10441+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10442+
</PromoteUnit>
10443+
<PromoteUnit>
10444+
<UnitType>UNIT_MASTER_HUNTER</UnitType>
10445+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10446+
</PromoteUnit>
1042310447
</PromoteUnits>
1042410448
<PythonCanDo>canDoBestHunters2</PythonCanDo>
1042510449
<Button>,Art/Interface/Buttons/Process/Blank.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,8,5</Button>
@@ -10446,6 +10470,18 @@
1044610470
<UnitType>UNIT_HUNTER</UnitType>
1044710471
<Promotion>PROMOTION_GREAT_HUNTER</Promotion>
1044810472
</PromoteUnit>
10473+
<PromoteUnit>
10474+
<UnitType>UNIT_MASTER_CHASER</UnitType>
10475+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10476+
</PromoteUnit>
10477+
<PromoteUnit>
10478+
<UnitType>UNIT_MASTER_TRACKER</UnitType>
10479+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10480+
</PromoteUnit>
10481+
<PromoteUnit>
10482+
<UnitType>UNIT_MASTER_HUNTER</UnitType>
10483+
<Promotion>PROMOTION_HUNTING_STRIKE1</Promotion>
10484+
</PromoteUnit>
1044910485
</PromoteUnits>
1045010486
<Button>,Art/Interface/Buttons/Process/Blank.dds,Art/Interface/Buttons/Beyond_the_Sword_Atlas.dds,8,5</Button>
1045110487
<iAIValue>6</iAIValue>

Assets/XML/GameText/Buildings_CIV4GameText.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16239,15 +16239,6 @@
1623916239
<Polish>Cylinder Cyrusa</Polish>
1624016240
<Russian>Öèëèíäð Êèðà</Russian>
1624116241
</TEXT>
16242-
<TEXT>
16243-
<Tag>TXT_KEY_BUILDING_CYRUS_CYLINDER_HELP</Tag>
16244-
<English>[ICON_BULLET]Generates Great General points, based on game score.[NEWLINE][ICON_BULLET]Vassals increase the rate.</English>
16245-
<French>[ICON_BULLET]Génère des points de General Illustre, basé sur le score actuel.[NEWLINE][ICON_BULLET]Les Vassaux font augmenter le taux.</French>
16246-
<German>[ICON_BULLET]generiert Punkte für Große Generäle, basierend auf der aktuellen Punktzahl.[NEWLINE][ICON_BULLET]Vasallen erhöhen die Rate.</German>
16247-
<Italian>Genera punti gran generale, in base al punteggio della partita.[NEWLINE][ICON_BULLET]I vassalli aumentano il punteggio.</Italian>
16248-
<Polish>[ICON_BULLET]Generuje punkty Wielkiego Generala na podstawie punktacji.[NEWLINE][ICON_BULLET]Wasale zwiekszaja przyrosty tych punkt&#243;w.</Polish>
16249-
<Russian>[ICON_BULLET]Приносит очки великого полководца в зависимости от вашего счета.[NEWLINE][ICON_BULLET]Вассалы делают зависимость более выгодной.</Russian>
16250-
</TEXT>
1625116242
<TEXT>
1625216243
<Tag>TXT_KEY_BUILDING_CYRUS_CYLINDER_PEDIA</Tag>
1625316244
<English>The Cyrus cylinder, also known as the Cyrus the Great cylinder, is a document issued by the Persian ruler Cyrus the Great in the form of a clay cylinder inscribed in Akkadian cuneiform script. The cylinder was created following the Persian conquest of Babylon in 539 BC, when Cyrus overthrew the Babylonian king Nabonidus and replaced him as ruler, ending the Neo-Babylonian Empire. The text of the cylinder denounces Nabonidus as impious and portrays the victorious Cyrus as pleasing to the chief Babylonian god Marduk. It goes on to describe how Cyrus had improved the lives of the citizens of Babylonia, repatriated displaced peoples and restored temples and cult sanctuaries.</English>

Assets/XML/Terrain/CIV4ImprovementInfos.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6556,6 +6556,16 @@
65566556
<iYieldChange>2</iYieldChange>
65576557
</YieldChanges>
65586558
</BonusTypeStruct>
6559+
<BonusTypeStruct>
6560+
<BonusType>BONUS_TIN_ORE</BonusType>
6561+
<bBonusMakesValid>1</bBonusMakesValid>
6562+
<bBonusTrade>1</bBonusTrade>
6563+
<YieldChanges>
6564+
<iYieldChange>0</iYieldChange>
6565+
<iYieldChange>0</iYieldChange>
6566+
<iYieldChange>1</iYieldChange>
6567+
</YieldChanges>
6568+
</BonusTypeStruct>
65596569
<BonusTypeStruct>
65606570
<BonusType>BONUS_SILVER_ORE</BonusType>
65616571
<bBonusMakesValid>1</bBonusMakesValid>

Assets/XML/Units/CIV4PromotionInfos.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1868,7 +1868,7 @@
18681868
<Description>TXT_KEY_PROMOTION_HUNTER2</Description>
18691869
<Sound>AS2D_IF_LEVELUP</Sound>
18701870
<PromotionPrereq>PROMOTION_HUNTER1</PromotionPrereq>
1871-
<TechPrereq>TECH_TRACKING</TechPrereq>
1871+
<TechPrereq>TECH_TRAPPING</TechPrereq>
18721872
<PromotionLine>PROMOTIONLINE_HUNTER</PromotionLine>
18731873
<iLinePriority>2</iLinePriority>
18741874
<NotOnDomainTypes>
@@ -16190,7 +16190,7 @@
1619016190
<Type>PROMOTION_ENTRAPMENT1</Type>
1619116191
<Description>TXT_KEY_PROMOTION_ENTRAPMENT1</Description>
1619216192
<Sound>AS2D_IF_LEVELUP</Sound>
16193-
<TechPrereq>TECH_HUNTING</TechPrereq>
16193+
<TechPrereq>TECH_TRAPPING</TechPrereq>
1619416194
<PromotionLine>PROMOTIONLINE_ENTRAPMENT</PromotionLine>
1619516195
<iLinePriority>1</iLinePriority>
1619616196
<iCaptureProbabilityModifierChange>10</iCaptureProbabilityModifierChange>

Assets/XML/Units/U_Neanderthals_CIV4UnitInfos.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,7 +1335,7 @@
13351335
<UnitType>UNIT_WARDOG</UnitType>
13361336
</UnitUpgrades>
13371337
<ObsoleteTech>TECH_SEDENTARY_LIFESTYLE</ObsoleteTech>
1338-
<iCost>92</iCost>
1338+
<iCost>70</iCost>
13391339
<iBaseUpkeep>1</iBaseUpkeep>
13401340
<iMoves>2</iMoves>
13411341
<SeeInvisible>INVISIBLE_CAMOUFLAGE</SeeInvisible>
@@ -1345,7 +1345,7 @@
13451345
<iIntensity>1</iIntensity>
13461346
</VisibilityIntensityType>
13471347
</VisibilityIntensityTypes>
1348-
<iCombat>5</iCombat>
1348+
<iCombat>4</iCombat>
13491349
<iXPValueAttack>3</iXPValueAttack>
13501350
<iXPValueDefense>1</iXPValueDefense>
13511351
<iAnimalCombat>15</iAnimalCombat>

Assets/XML/Units/U_Sea_CIV4UnitInfos.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6755,7 +6755,7 @@
67556755
<FormationType>FORMATION_TYPE_MACHINE</FormationType>
67566756
</UnitInfo>
67576757
<UnitInfo>
6758-
<Type>UNIT_KAYAK</Type>
6758+
<Type>UNIT_MASTER_SAILOR_KAYAK</Type>
67596759
<Combat>UNITCOMBAT_WOODEN_SHIPS</Combat>
67606760
<SubCombatTypes>
67616761
<SubCombatType>UNITCOMBAT_RECON</SubCombatType>
@@ -7929,7 +7929,7 @@
79297929
<FormationType>FORMATION_TYPE_MACHINE</FormationType>
79307930
</UnitInfo>
79317931
<UnitInfo>
7932-
<Type>UNIT_FF_DESTROYER_I</Type>
7932+
<Type>UNIT_MASTER_SAILOR_FF_DESTROYER_I</Type>
79337933
<Combat>UNITCOMBAT_NUCLEAR_SHIPS</Combat>
79347934
<SubCombatTypes>
79357935
<SubCombatType>UNITCOMBAT_DESTROYER</SubCombatType>

0 commit comments

Comments
 (0)