Commit Graph

1079 Commits

Author SHA1 Message Date
827d24c778 Resolved #694, and another crashing bug 2019-05-02 23:06:34 +03:00
e8f27c4ef4 Diplomacy is ready to be unleashed upon the unsuspecting public! 2019-05-02 00:11:32 +03:00
b4fc129a9b Added "relationship" dependant on the modifiers - this will be the main way we apply user actions to AI consequences 2019-05-01 00:13:41 +03:00
5952056518 Resolved #506 - Added real diplomatic relations!
Doesn't affect much now, but the platform is there to add what we want!
2019-04-30 23:56:47 +03:00
2ab8caeaea City states option locked away, so it doesn't affect users yet 2019-04-30 21:21:45 +03:00
0eb6b91957 Ibrushed up on the rules and there are ways to have influence decrease in quantities less than 1, so you were right, it is a float 2019-04-30 20:45:09 +03:00
de9ae3da54 City state type is now an enum
Attitude is now Influence and is an Int, not a float
Can no longer trade with city states
(All as per original Civ)
2019-04-30 19:52:27 +03:00
f2333b5839 Added City states (#681)
* Add Milan as 1st city state. Choose box for number of city states.

* City states don't get settlers.

* Added diplomancy relationship. Now increase by gift and decreases every turn.

* Friendly culture city states provides culture bonus.

* 0 city states by default.

* Disable many trade items for city states.

* Fix part 1.

* Fix diplomacy screen and pop-ups.

* City state doesn't build world wonders.

* City states destroy city when conquering.

* Fixed : Trying to move into border of uncountered civs caused crash.

* City states don't exchange tech or declare war on others.

* Fix a very strange problem : you could trade introduction of AI to itself.

* City states automatically get all invented techs.

* Pops defeat msg before AI founds any city.

* Fix conquest victory with city states.

* Fixed : AI city under seige change production every turn.
2019-04-30 19:33:32 +03:00
307aea1cc0 Fixed : AI city under seige change production every turn. 2019-04-29 06:54:08 +03:00
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
2b8946f5e7 DiplomacyManager.flagsCountdown is now a Hashmap<String, Int> because of deserialization bullshit
Solved a silly bug in the Diplomacy overview
2019-04-29 00:25:02 +03:00
c8ea9f1a27 change chinese font to "WenQuanYiMicroHei" (#691)
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* change chinese font with WenQuanYiMicroHei

* Update Translations.json
2019-04-28 08:14:35 +03:00
28cc905bb5 Pops defeat msg before AI founds any city. 2019-04-28 08:11:14 +03:00
292297e02d Resolved #685 - loading game would clear resistance counters 2019-04-27 23:36:35 +03:00
7eb8c03d24 Basic Help in Chinese and Some Updates (#683)
* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Update Tutorials_Simplified_Chinese.json

* Add files via upload

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update BasicHelp_Simplified_Chinese.json

* Update Translations.json

* Update Translations.json

* Update Tutorials_Simplified_Chinese.json

* Chinese traslation, i have test it,but app may get corruption.

* constructing buildings and wonders in the city the language shows normally according to language setting

* Update Translations.json

* Update Translations.json

* Update Translations.json
2019-04-27 21:09:53 +03:00
884c7b7bb8 Fixed : Trying to move into border of uncountered civs caused crash. 2019-04-27 20:54:58 +03:00
68c2763ea7 Code cleanup 2019-04-25 10:37:46 +03:00
931f485a8e Kotlin'D Counter class, apparently it's been Java this whole time and I didn't even notice 2019-04-25 10:28:46 +03:00
aea2e3efcf AIs no longer exchange techs below Prince difficulty 2019-04-24 22:13:37 +03:00
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
143d4422e8 When purchasing a building, the buildings list (on the left) is immediately updated to reflect that 2019-04-24 21:03:33 +03:00
c3a00a0f5e All trades are now cancelled when a civ is defeated 2019-04-24 20:48:32 +03:00
bda375f441 Declaring war now cancels all prior trade agreements 2019-04-24 12:15:30 +03:00
8a600ea07d Moved hasOpenBorders to a transient bool for "next turn" performance reasons 2019-04-24 11:58:03 +03:00
07a8b97ed2 Open Borders is now only available with Civil Service, as per Civ V 2019-04-24 11:31:50 +03:00
c81c81fe8f Resolved #525 - Added Open Borders agreement 2019-04-24 10:19:47 +03:00
21398c96a1 Building type check normalized. 2019-04-24 07:37:00 +03:00
cb951da53e Fix negative turnsToNewPopulation while razing
missing bracket, sorry I will never compile any programmes in my life, I will never learn Kotlin and will have a happy life. I wrote it by hand in the textarea on github.com 😎
2019-04-23 23:13:48 +03:00
42624f5bac Fix negative turnsToNewPopulation while razing
Now when razing, city's food storage is carried over from the stage when city's population was +1 larger and FoodToNextPopulation was respectively larger. If a player would like to stop razing, such city would spring up immediately growing next turn or further on. Another side effect is negative turnsToNewPopulation in the city screen.

The same surplus cut off could be done to production if a Great Engineer speeds wonder production the same way and if negative turnsToComplete is possible (but have not spotted this line yet).
2019-04-23 23:13:48 +03:00
0e8decfd07 AI won't propose peace for 10 turns after war has been declared 2019-04-23 18:34:20 +03:00
11db5524dd AI now waits a certain number of turns between offering the same trade again - 20 turns for luxury exchange, 5 turns for peace 2019-04-23 18:02:07 +03:00
5bb598fb6f AI now offers peace to the player - need to normalize its requests, since now it only offers gold so the offer is kind of flat if it doesn't have any. 2019-04-23 17:47:32 +03:00
5d8d7ca89b AI can now offer you trades - this is a big step towards proper diplomacy relations!
As of now they only offer luxury-to-luxury trades
2019-04-23 17:07:01 +03:00
720b3546eb Fix national wonders 'building elsewhere' tip. 2019-04-23 14:37:52 +03:00
bd3a0da2e6 Fixed : Pillaging destroyed improvement even on land. 2019-04-22 11:48:12 +08:00
c3da6a5112 Treaties are now correctly added and removed from both sides of the table together 2019-04-21 21:08:36 +03:00
cefd50ea57 Trade table logic greatly simplified, now all trade displays are dependent only on the current trade in the TradeLogic - this paves the way for "inserting" trades into the trade table, which is required for AI-offered trades! 2019-04-20 22:44:18 +03:00
3afcd68a6b Enable Piety when building Broadcast Tower
someone wrote [it should work for Broadcast Towers](https://forums.civfanatics.com/resources/social-policy-piety-vanilla.25659/#1) as well.
2019-04-20 18:50:53 +02:00
c83a2ed73c Continents shape improved. 2019-04-19 19:03:40 +08:00
babd29919a MapGen added type Continents. 2019-04-19 18:46:43 +08:00
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
9dabbb7946 Merge pull request #658 from ninjatao/AI_parameter
Adjust AI parameters.
2019-04-17 15:02:28 +03:00
54fc81fda7 Merge pull request #655 from Am-per-Sand/piety
Activate Piety bonus
2019-04-17 13:30:25 +03:00
c6c3ba1e67 Adjust AI parameters. 2019-04-17 18:21:09 +08:00
e3907e0fe1 forgot Broadcast Tower 2019-04-16 19:50:36 +02:00
35a0dee32f Activate Piety bonus
N.B.
The same condition may be found in `Building.kt`, so 
- may be add a function `isCultural`
or
- add a property `cultural:true` or even `type:[military, cultural, productive, financial, scientific, wonder]` to `Buildings.json` and get rid of `isWonder` there
2019-04-16 19:45:19 +02:00
cbf0c52d2c Barbarians no longer spawn on mountains and lakes (a bit silly) 2019-04-15 22:08:44 +03:00
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
5d77ac8b84 Merge pull request #651 from ninjatao/fix_battletable
Fix submarines battle table.
2019-04-15 10:56:53 +03:00