fixed #3066, crash in chooseMilitaryUnit and some great people actions (#3099)

* fixed KotlinNullPointerException crash in chooseMilitaryUnit
random() is not to be used in predicate
* GodmodeCheckbox is not lockable and unchecked by default
* no great people actions if no movement points left
* unique "Can start an []-turn golden age" now has parameter and 8-turn golden ages will last 8 turns instead of 10
golden age can be started if unit is on own territory (even embarked)
* "Golden Age length increased by [50]%" - now has parameter
* tweaked changed fort and terrain defence bonuses
fort can be built on forest and jungle (vegetation will not be removed)
any open flat land gives 10%  penalty
marsh gives 15% penalty
only top terrain counts, improvement bonus will be added to that
flatland + fort = 40%
hill + fort = 75%
hill = 25%
forest/jungle on flatland = 25%
forest/jungle on hill = 25%
forest on flat + fort = 75%
forest on hill + fort = 75%
forest on hill + citadel = 125%
fixed 20% penalty for attacking over river - will be displayed if unit is standing on the other side of river
"Amphibious" unique removes this penalty
This commit is contained in:
HadeanLake
2020-09-05 20:32:27 +03:00
committed by GitHub
parent ca36084e8b
commit 8ac3a88cec
13 changed files with 103 additions and 90 deletions

View File

@ -396,7 +396,7 @@
"happiness": 4,
"greatPersonPoints": {"production": 1},
"isWonder": true,
"uniques": ["Golden Age length increases +50%"],
"uniques": ["Golden Age length increased by [50]%"],
"requiredTech": "Civil Service",
"quote": "'The katun is established at Chichen Itza. The settlement of the Itza shall take place there. The quetzal shall come, the green bird shall come. Ah Kantenal shall come. It is the word of God. The Itza shall come.' - The Books of Chilam Balam"
},

View File

@ -441,7 +441,7 @@
"outerColor": [153,5,3],
"innerColor": [244,232,54],
"uniqueName": "Achaemenid Legacy",
"uniques": ["Golden Age length increases +50%", "+1 Movement for all units during Golden Age", "+10% Strength for all units during Golden Age"],
"uniques": ["Golden Age length increased by [50]%", "+1 Movement for all units during Golden Age", "+10% Strength for all units during Golden Age"],
"cities": ["Persepolis","Parsagadae","Susa","Ecbatana","Tarsus","Gordium","Bactra","Sardis","Ergili","Dariushkabir",
"Ghulaman","Zohak","Istakhr","Jinjan","Borazjan","Herat","Dakyanus","Bampur","Turengtepe","Rey","Shiraz",
"Thuspa","Hasanlu","Gabae","Merv","Behistun","Kandahar","Altintepe","Bunyan","Charsadda","Uratyube",

View File

@ -439,7 +439,7 @@
{
"name": "Freedom Complete",
"effect": "Tile yield from great improvement +100%, golden ages increase by 50%",
"uniques": ["Tile yield from Great Improvements +100%", "Golden Age length increases +50%"]
"uniques": ["Tile yield from Great Improvements +100%", "Golden Age length increased by [50]%"]
}
]
},

View File

@ -20,6 +20,7 @@
"type": "Land",
"food": 2,
"movementCost": 1,
"defenceBonus": -0.1,
"RGB": [109,139,53]
},
{
@ -28,6 +29,7 @@
"food": 1,
"production": 1,
"movementCost": 1,
"defenceBonus": -0.1,
"RGB": [200,208,161]
},
{
@ -107,7 +109,7 @@
"food": -1,
"movementCost": 3,
"unbuildable": true,
"defenceBonus": -0.1,
"defenceBonus": -0.15,
"occursOn": ["Grassland"]
},
{

View File

@ -76,7 +76,7 @@
// Military improvement
{
"name": "Fort",
"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Hill","Tundra","Snow"],
"terrainsCanBeBuiltOn": ["Plains","Grassland","Desert","Hill","Tundra","Snow","Forest","Jungle"],
"turnsToBuild": 6,
"techRequired": "Engineering",
"uniques": ["Gives a defensive bonus of [50]%", "Can be built outside your borders"]

View File

@ -1293,7 +1293,7 @@
{
"name": "Great Artist",
"unitType": "Civilian",
"uniques": ["Can start an 8-turn golden age", "Can construct [Landmark]", "Great Person - [Culture]", "Unbuildable"],
"uniques": ["Can start an [8]-turn golden age", "Can construct [Landmark]", "Great Person - [Culture]", "Unbuildable"],
"movement": 2
},
{
@ -1318,7 +1318,7 @@
{
"name": "Great General",
"unitType": "Civilian",
"uniques": ["Can start an 8-turn golden age", "Bonus for units in 2 tile radius 15%", "Can construct [Citadel]",
"uniques": ["Can start an [8]-turn golden age", "Bonus for units in 2 tile radius 15%", "Can construct [Citadel]",
"Great Person - [War]", "Unbuildable"],
"movement": 2
},
@ -1327,7 +1327,7 @@
"unitType": "Civilian",
"uniqueTo": "Mongolia",
"replaces": "Great General",
"uniques": ["Can start an 8-turn golden age","Bonus for units in 2 tile radius 15%",
"uniques": ["Can start an [8]-turn golden age","Bonus for units in 2 tile radius 15%",
"Heal adjacent units for an additional 15 HP per turn", "Can construct [Citadel]", "Great Person - [War]", "Unbuildable"],
"movement": 5
}