Commit Graph

3949 Commits

Author SHA1 Message Date
Pavel Bystritsky
8cd89deb71
Added information about technology required for improving resource to tile info. (#5509)
* Added information about technology required for improving resource to tile info.

* Tile improvement required tech info updated.
2021-10-19 19:47:35 +03:00
Xander Lenstra
086867731d
Enumified all terrain uniques in terrains.json (#5513)
* Enumified all terrain uniques in the json

* it

* Fixed unit tests
2021-10-19 08:27:46 +03:00
Xander Lenstra
524dfa5364
Band-aided a bug with building unique application (#5512)
Building uniques applying to all cities, such as Temple of Artemis and Sistene Chapel would apply their bonus twice to the city they were build in.
This was a result of it both being found as a non-local unique due to it having an effect outside the city and thus being classified as wonder,
and as a building, as it was built in the city and had an effect on it.
This patch is _untested_ and only a band-aid.
The real solution would be to start using the sources of uniques saved in the uniques themselves to classify were uniques are received from.
Implementing this is somewhere on my todo-list, but due to uni won't happen anytime soon.
2021-10-18 16:37:18 +03:00
SimonCeder
1b1a910eef
Can now raze cities Austria has married (#5506) 2021-10-18 00:05:17 +03:00
yairm210
4efc8b3195 Unbuildable works for units as well, as Deciv was quick to remind me 2021-10-17 23:55:47 +03:00
yairm210
ca706db753 More typings for building specific uniques 2021-10-17 23:50:42 +03:00
yairm210
d4205cb405 Typed "Unbuildable" 2021-10-17 23:42:09 +03:00
yairm210
8b2bb8e59b Typed deprecated uniques so modders have warnings 2021-10-17 22:15:46 +03:00
yairm210
1a1194236b Added overload to MapUnit.getMatchingUniques to get uniques from civ as well - see #5494 2021-10-17 21:16:14 +03:00
Xander Lenstra
5c80e8ee9b
Fixed bug where denmark's pillaging unique doesn't work (#5500) 2021-10-17 08:39:44 +03:00
SimonCeder
ac422d25cb
City State Barbarian Invasion and War with Major pseudo-quests (#5454)
* barbarian invasion event

* war with major pseudo-quest

* include latecomers

* diplomacy screen

* more notifications

* fixes

* reviews
2021-10-16 20:34:47 +03:00
Xander Lenstra
551e6e1d54
Implemented holy warriors follower belief (#5411)
* Implemented holy warriors follower belief

* Minor fixes

* Likely fixed the tests

* Made someTroglodyte happy :)

* Removed stray println's

* Implemented requested changes
2021-10-16 20:25:38 +03:00
SomeTroglodyte
de0c1161f6
Music pause on "leave game" question, not world screen menu (#5491)
* Music pause on leave game question, not worldscreen menu

* Music pause on leave game question, not worldscreen menu - log back off
2021-10-16 20:06:25 +03:00
Xander Lenstra
3c71fe41dc
Fixes bug where culture gain from killing units no longer works (#5489) 2021-10-16 20:05:30 +03:00
Xander Lenstra
24545a92dd
Choose a better visible color for the religious symbol on the city button (#5485) 2021-10-14 23:38:35 +03:00
yairm210
f1f2c1e932 3.17.8 2021-10-13 23:27:39 +03:00
Xander Lenstra
67650fec00
Fixed a bug where "[+amount] population [in this city]" did not work (#5476) 2021-10-13 23:16:38 +03:00
SimonCeder
ff67e66348
Free buildings part 2 - works for Carthage too (#5471)
* free buildings works for Carthage too
unify "provides a free [] []" and "gain a free [] []"

* re-check at start of turn

* reviews
2021-10-13 19:21:27 +03:00
Xander Lenstra
734fba8f30
Fixed bugs with diplomatic victory (#5474) 2021-10-13 12:03:34 +03:00
yairm210
56222a0ea7 Resolved #5453 - strength bonuses apply from civ bonuses as well 2021-10-12 19:49:12 +03:00
yairm210
038c501ac8 Construction automation constructs attacking units even if they provide unneeded slots 2021-10-12 19:45:21 +03:00
Xander Lenstra
9abc3ddb6e
Fixes a problem with free buildings provided in other cities not being free (#5470) 2021-10-12 17:21:04 +03:00
SimonCeder
36711f70ad
Variable resource quantities (#5456)
* implement varying resource amounts

* works on old maps

* reviews
2021-10-12 07:38:07 +03:00
SimonCeder
1a92f9c084
Free buildings are free (#5466)
* free buildings are free

* ai shouldn't sell free buildings either
2021-10-12 07:34:23 +03:00
SimonCeder
e375fb9896
Disable religious quest with religion disabled; enumify "Hidden when religion is disabled" (#5465)
* enumify hidden with religion disabled

* prevent religious quests in no-religion games
2021-10-12 07:31:22 +03:00
Xander Lenstra
d44bfce665
Fixed crashes from era (#5467) 2021-10-12 07:30:20 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders (#5446)
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
2021-10-11 09:23:28 +03:00
Xander Lenstra
a73b7b008f
Likely fixed a bug where AI nukes could hit nations they had a peace treaty with (#5449)
* Likely fixed a bug where AI nukes could hit players they had a peace treaty with

* Typefied blast radius unique
2021-10-10 22:26:54 +03:00
Xander Lenstra
9fab1f6ee7
Researching all of the techs in the previous era now also puts you in the next era (#5451) 2021-10-10 17:14:30 +03:00
Xander Lenstra
2bd8132b8d
Made it impossible to cut short peace treaties (#5450) 2021-10-10 17:11:14 +03:00
Xander Lenstra
24d7a57c1f
Fixed a bug where religious units would be expelled when an open borders agreement ended (#5448) 2021-10-10 17:10:36 +03:00
Xander Lenstra
0ddeb6eb64
Fixed bug with byzantine unique (#5445) 2021-10-10 06:24:44 +03:00
logic
3b49cc18a2
Civ icon redirects to civilopedia (#5414)
* update for no reason

* bruuhhhhhhhhh

* update for no reason

* bruuhhhhhhhhh

* remove comments

* delete atlas

* Create game.atlas
2021-10-09 22:32:47 +03:00
Yair Morgenstern
1132042949
When choosing military units, 'carrying' units are only chosen if they provide needed 'slots' for carrying units. (#5436) 2021-10-09 20:59:58 +03:00
Xander Lenstra
1df454368a
Solves bugs with unit movement through fog of war (#5382) 2021-10-09 20:46:35 +03:00
SomeTroglodyte
7bbcb8db1a
Mayas (#5408)
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
2021-10-09 20:45:59 +03:00
SimonCeder
69e1792fa9
Return Civilians captured by Barbarians to original owner; Capture stacked civilians (#5437)
* return captured civilians

* stacked civilian capture bug

* works on old saves

* diplomacy bonus expires on war declared

* vector bug
2021-10-09 20:44:03 +03:00
yairm210
fd3bfbade4 Resolved #5435 - all civ + unit uniques are accounted for in both ways 2021-10-09 20:22:29 +03:00
SimonCeder
185050bd9f
cs units wander (#5441) 2021-10-09 20:11:52 +03:00
yairm210
0b3f8d11d3 Tile height set by lazy.
This is good enough to give a 10% performance boost for regular players when there are a lot of units.
If mods add elevation somehow WITHIN a turn, this will be lost, but will recalc next turn correctly.
2021-10-08 15:54:24 +03:00
yairm210
c70d315fae Resolved #5435 - optimized units seeing invisible tiles.
@SomeTroglodyte @xlenstra - the problem was with MapUnit.matchesFilter calling hasUnique, which called civInfo.getUniques, which is patently ridiculous.
I checked ALL usages of getUniques, and only found ONE unique which conceivably could be applied both globally and individually, and separated the check there.

Current analysis shows that updating viewable tiles still takes much longer than I'd like it to, but not, like, 70% of "next turn" runtime.

Next target - tileInfo.getHeight, which clocks in at around 10% (!!!) of next turn!
Apparently the annual "we added too many new features and need to optimize" time has come again...
2021-10-08 15:40:19 +03:00
yairm210
36250dfc70 Resolved #5425 - unit maintenance discount corrected 2021-10-08 14:22:26 +03:00
yairm210
39114ff8f4 Added unique types for air unit transportation 2021-10-08 13:19:41 +03:00
Xander Lenstra
10a00eed3a
Fixed crash when AI is picking religions (#5421) 2021-10-07 21:24:17 +03:00
SomeTroglodyte
d25adacec7
Minimum city distance across continents (#5404) 2021-10-06 22:51:52 +03:00
SimonCeder
22ebe2b9af
Fix Educated Elite (#5416)
* fix educated elite

* unique-ify prophet uniques
2021-10-06 22:49:02 +03:00
yairm210
44fd987160 Fixed conditionals display when locating mod errors, which ws broken due to translation reordering all conditional-like text 2021-10-06 20:47:06 +03:00
yairm210
5e8e23fb43 Fixed broken translations 2021-10-06 19:06:53 +03:00
yairm210
6ec61128c4 More unique typing 2021-10-06 17:44:20 +03:00
SimonCeder
b41d234db6
Barbarians capture civilians and take gold from cities (#5410)
* ransom cities

* capture civilians

* fix bug
2021-10-06 17:12:13 +03:00