wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1872 commits 7 branches 304 tags 288 MiB
Commit graph

1284 commits

Author SHA1 Message Date
martin
1c3b44af16 idle unit buttons: set due=false and select the right unit in case of 2 units per tile 2019-05-14 17:07:01 +03:00
martin
462dc26460 made on-map windows touchable, so you can't "touch through" them on the map 2019-05-14 17:07:01 +03:00
Yair Morgenstern
48af218795 Strategic resources cost more in trade from a civ who's at war and can use them for units 2019-05-13 22:23:30 +03:00
martin
12f1b41784 fixed next turn button by updating it on main thread 2019-05-13 17:17:27 +03:00
martin
eaa0a9dbad when a unit is selected, use the ? button to read about it in the Civilopedia 2019-05-13 17:17:27 +03:00
martin
0ce55feb39 added a ? to the unit panel in the lower left and fixed jumping ui elements there 2019-05-13 17:17:27 +03:00
martin
dcb7daaabd minor ui fixes 2019-05-13 17:17:27 +03:00
etourdot
995ebb5cf8 #742: fix options screen bug when language changed 2019-05-13 17:09:11 +03:00
Yair Morgenstern
c9bd56da95 Resolved #732 - don't change peace negotiation deals depending on how much you dislike the enemy 2019-05-12 22:29:22 +03:00
Yair Morgenstern
a9a1962cec Continuation of #738 - readability, and solves case where 2 civs have unique buildings to the same base building (say Royal Library and Paper Maker) 
#729 - AddCultureBuilding now adds civ-specific building (e.g. Burial Tomb), not just checks to see if it's built
 2019-05-12 22:24:11 +03:00
Yair Morgenstern
42a0e2e771 Continuation of d2541e6, to better fit coding standards (everything worked fine) 
I reallly like the way you did this, so I'm making it enabled by default =D
 2019-05-12 19:29:02 +03:00
sulai
d2541e6c4a improved "next turn" - button (#741) 
* as long as there are units due to be checked by the player, replace "next turn" button by "next unit" button

* fixed the next-turn button to update within WorldScreen.update()

* moved due methods to CivilizationInfo.kt

* "next turn" button will also show "pick a tech" and "pick a policy" when needed

* added "check for idle units" to the game settings

* "check for idle units" - default to false
 2019-05-12 19:20:06 +03:00
Yair Morgenstern
cf9194f767 Other civ you're at war with is always at least Enemy, if not Unforgivable 2019-05-11 23:39:00 +03:00
Yair Morgenstern
24a71b16f2 Trade button changed to "Negotiate Peace" when at war, and peace treaties are a must when "trading" in this situation 2019-05-11 23:32:12 +03:00
lishaoxia1985
20d05aa8e0 all chinese font will show well (#739) 
* update some diplomacy words in chinese

* all chinese font can be show well

* Update Fonts.kt

* update chinese language
 2019-05-11 22:20:41 +03:00
Duan Tao
0e68a23d29 Fix crash. 2019-05-11 22:13:41 +03:00
Duan Tao
4ab118273b Transfer unique bulidings properly. 2019-05-11 22:13:41 +03:00
lishaoxia1985
656246cd10 all chinese font can be show well 2019-05-10 18:20:27 +03:00
Duan Tao
3b30daf852 Code cleanup. 2019-05-10 18:20:07 +03:00
Duan Tao
91baeddde2 Fix crash from diplomacy screen. 2019-05-10 18:20:07 +03:00
lishaoxia1985
c37983667c move some words into other translation files,the city name can be changed with setting 
although the city name can be changed with setting,it's only correct when you build a new city or start a new game.if you change the game language in game progress it will miss some font.
 2019-05-09 23:16:47 +03:00
Duan Tao
2ac654e26b Fix first contact popup. 2019-05-09 18:54:43 +03:00
Duan Tao
c221d50e01 Add 2 more type of city-states. 2019-05-09 18:54:43 +03:00
Duan Tao
0b6422f9e7 Better check for culture buildings. 2019-05-09 18:04:05 +03:00
Duan Tao
029ab965d1 Legalism checks replaced culture building correctly. 2019-05-09 18:04:05 +03:00
Yair Morgenstern
b3a4ed4c4f Declaration of Friendship is go! 
I'm sure there's stuff I've forgotten but there is just so much that happens in diplomacy that is dependant on these declarations
 2019-05-08 18:48:36 +03:00
Yair Morgenstern
f8a4f15f33 Separated City-state and Major civ diplomacy tables, because they're more different than similar at this point 
Centralized nation leader name
 2019-05-08 17:58:49 +03:00
Yair Morgenstern
75bdced3c6 Added Declaration of Friendship logic 
@ninjatao - I changed your BorderConflict into a DiplomacyFlag, and so all the logic of "removing every turn and deleting if 0" is built-in =)
 2019-05-08 17:24:56 +03:00
Yair Morgenstern
8ce1613559 Resolved #698 - Added Heal Instantly 'promotion' 2019-05-08 16:03:01 +03:00
Duan Tao
ff508f22b0 Add border conflict counter for periodly popup. 2019-05-08 13:32:23 +03:00
Duan Tao
06f25b5b5b Fix peace popup with city-state. 2019-05-08 13:32:23 +03:00
Duan Tao
1434ca3f30 Update city-state related icons and popups. 2019-05-08 13:32:23 +03:00
Yair Morgenstern
9ab02c8d22 Organized json files, split translation file into several smaller files for organizational purposes 2019-05-07 21:59:34 +03:00
Duan Tao
cb867f0066 Code improvement for city state border conflict. 2019-05-07 15:23:08 +03:00
Duan Tao
ad54fb3c56 Invading city-state border will damage relationship. 2019-05-07 13:55:11 +03:00
Duan Tao
30531316d2 Player can enter city-state borders. 2019-05-07 13:55:11 +03:00
Duan Tao
ef7b73ad5f Unlock city states. 2019-05-07 13:55:11 +03:00
lishaoxia1985
79daad778f update some chinese language (#712) 
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* chinese language update

* Update Translations.json

* Update Translations.json

* Update Translations.json

* Update BaseUnit.kt

* delete some word with "Nations.json"
 2019-05-07 08:40:36 +03:00
Yair Morgenstern
89902bef95 Added Medic, Medic II promotions - #698 2019-05-06 23:01:28 +03:00
Yair Morgenstern
cf2580b8ed Solved #670 - civ starting locations are given as much space as possible 2019-05-06 20:46:48 +03:00
Yair Morgenstern
9e03893e60 Added Woodsman promotion - #698 2019-05-05 23:22:59 +03:00
lishaoxia1985
3318f26a33 CivilopediaScreen language can be changed with setting (#706) 
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting

* CivilopediaScreen language can be changed with setting
 2019-05-05 22:51:26 +03:00
Duan Tao
4d3e04baa0 Special diplomacy window for city states. 2019-05-05 16:20:23 +03:00
Duan Tao
1865f53c42 City states no longer build national wonders. 2019-05-05 16:20:23 +03:00
Duan Tao
fc4f62f555 City state icon. 2019-05-05 16:20:23 +03:00
Duan Tao
3292e41977 Fix city state diplomacy popup title. 2019-05-05 16:20:23 +03:00
Yair Morgenstern
2263f0c098 Map editing tools organized 2019-05-04 23:09:08 +03:00
Yair Morgenstern
5ea62f24d0 Tile icons in the map editor now look like the real tiles would 2019-05-04 22:40:19 +03:00
Yair Morgenstern
32ea37d4ec Added "Clear Map" button to Map Editor 2019-05-04 22:09:07 +03:00
Yair Morgenstern
d8fd48b4ce Workers can now remove Roads and Railroads 2019-05-04 21:55:31 +03:00
lishaoxia1985
fabb4e922a nations in Chinese (#696) 
* 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

* nation.json in chinese(no completed)

* Update Nations_Simplified_Chinese.json

* Update Nations.json

* Update Translations.json

* Update Translations.json

* Update Nations_Simplified_Chinese.json

* Update WorldScreenTopBar.kt

* update

* Update Translations.json

* update

* Update Nations_Italian.json

* updated(nation.json in Chinese also cannot runs well)

* updated(nation.json in Chinese also cannot runs well)

* Update TileImprovement.kt

* Update TileResource.kt

* Update Terrain.kt

* Update Terrain.kt

* updated(nation.json in Chinese also cannot runs well)

* Update Terrain.kt
 2019-05-04 21:17:18 +03:00
Brian Gainor
7ab0267376 Don't show already-built national wonders in build menu 
Should check whether wonder is already built *first*, before we check
whether prereqs are satisfied.
 2019-05-04 20:46:17 +03:00
Duan Tao
cecce008b1 Lock city states. 2019-05-03 17:04:18 +03:00
Yair Morgenstern
cdfdbb40b8 More massive performance boosts 2019-05-03 16:59:46 +03:00
Yair Morgenstern
7400f6e874 Performance boost - moved TileInfo.isLand and .isWater to transient bools instead of functions, since the base terrain doesn't change 
isBarbarianCivilization performance boost - called A LOT!
 2019-05-02 23:15:22 +03:00
Yair Morgenstern
827d24c778 Resolved #694, and another crashing bug 2019-05-02 23:06:34 +03:00
Yair Morgenstern
e8f27c4ef4 Diplomacy is ready to be unleashed upon the unsuspecting public! 2019-05-02 00:11:32 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Yair Morgenstern
2ab8caeaea City states option locked away, so it doesn't affect users yet 2019-04-30 21:21:45 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Duan Tao
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
Duan Tao
307aea1cc0 Fixed : AI city under seige change production every turn. 2019-04-29 06:54:08 +03:00
Yair Morgenstern
d5b247e2c1 Human players can no longer see each other's construction info 2019-04-29 00:36:08 +03:00
Yair Morgenstern
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
lishaoxia1985
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
Duan Tao
28cc905bb5 Pops defeat msg before AI founds any city. 2019-04-28 08:11:14 +03:00
Yair Morgenstern
292297e02d Resolved #685 - loading game would clear resistance counters 2019-04-27 23:36:35 +03:00
lishaoxia1985
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
Duan Tao
884c7b7bb8 Fixed : Trying to move into border of uncountered civs caused crash. 2019-04-27 20:54:58 +03:00
Yair Morgenstern
68c2763ea7 Code cleanup 2019-04-25 10:37:46 +03:00
Yair Morgenstern
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
Yair Morgenstern
aea2e3efcf AIs no longer exchange techs below Prince difficulty 2019-04-24 22:13:37 +03:00
Yair Morgenstern
d8c238bf97 Added a popup for people who try to create a game and fail 2019-04-24 21:14:53 +03:00
Yair Morgenstern
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
Yair Morgenstern
c3a00a0f5e All trades are now cancelled when a civ is defeated 2019-04-24 20:48:32 +03:00
Yair Morgenstern
bda375f441 Declaring war now cancels all prior trade agreements 2019-04-24 12:15:30 +03:00
Yair Morgenstern
8a600ea07d Moved hasOpenBorders to a transient bool for "next turn" performance reasons 2019-04-24 11:58:03 +03:00
Yair Morgenstern
07a8b97ed2 Open Borders is now only available with Civil Service, as per Civ V 2019-04-24 11:31:50 +03:00
Yair Morgenstern
c81c81fe8f Resolved #525 - Added Open Borders agreement 2019-04-24 10:19:47 +03:00
Duan Tao
21398c96a1 Building type check normalized. 2019-04-24 07:37:00 +03:00
Am-per-Sand
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
Am-per-Sand
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
Yair Morgenstern
0e8decfd07 AI won't propose peace for 10 turns after war has been declared 2019-04-23 18:34:20 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Yair Morgenstern
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
Duan Tao
720b3546eb Fix national wonders 'building elsewhere' tip. 2019-04-23 14:37:52 +03:00
Duan Tao
bd3a0da2e6 Fixed : Pillaging destroyed improvement even on land. 2019-04-22 11:48:12 +08:00
Yair Morgenstern
c3da6a5112 Treaties are now correctly added and removed from both sides of the table together 2019-04-21 21:08:36 +03:00
Yair Morgenstern
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
Am-per-Sand
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
Duan Tao
c83a2ed73c Continents shape improved. 2019-04-19 19:03:40 +08:00
Duan Tao
babd29919a MapGen added type Continents. 2019-04-19 18:46:43 +08:00
Yair Morgenstern
4576056b9f Number of strategic resources now directly dependant on the number of settlable land tiles 2019-04-17 20:34:03 +03:00
Yair Morgenstern
9dabbb7946
Merge pull request #658 from ninjatao/AI_parameter 
Adjust AI parameters.
 2019-04-17 15:02:28 +03:00
Yair Morgenstern
54fc81fda7
Merge pull request #655 from Am-per-Sand/piety 
Activate Piety bonus
 2019-04-17 13:30:25 +03:00
Duan Tao
c6c3ba1e67 Adjust AI parameters. 2019-04-17 18:21:09 +08:00
Am-per-Sand
e3907e0fe1
forgot Broadcast Tower 2019-04-16 19:50:36 +02:00
Am-per-Sand
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
Yair Morgenstern
cbf0c52d2c Barbarians no longer spawn on mountains and lakes (a bit silly) 2019-04-15 22:08:44 +03:00
Duan Tao
1a6fe1a397 Merge branch 'dev/main' into BigBen 2019-04-15 19:59:03 +08:00
Duan Tao
70241ac25b Add Big Ben. 2019-04-15 19:46:15 +08:00
Yair Morgenstern
5d77ac8b84
Merge pull request #651 from ninjatao/fix_battletable 
Fix submarines battle table.
 2019-04-15 10:56:53 +03:00
Duan Tao
e63f9297b3 Fix submarines battle table. 2019-04-15 14:05:22 +08:00
Yair Morgenstern
bafd7b2a21
Merge pull request #650 from ninjatao/fix_conquer 
Fix unassigned population when capturing city.
 2019-04-15 08:21:00 +03:00
Duan Tao
67a763ef21 Fix unassigned population when capturing city. 2019-04-15 09:27:05 +08:00
Yair Morgenstern
089f8ac49f "Map Editor" button now takes the current map to edit 2019-04-14 22:33:19 +03:00
Yair Morgenstern
8d91cb90dc Solved another rare concurrency error 2019-04-14 22:18:40 +03:00
Yair Morgenstern
8bf09420e0 Resolved #647 - Starting locations should not be on tiny Islands 2019-04-14 22:13:55 +03:00
Yair Morgenstern
cd6806d07e Removed our getRandom() extension, because it now comes built-in in Kotlin, yay! 2019-04-14 22:12:54 +03:00
Yair Morgenstern
0539890a4d Added "No barbarians" starting option - part of #559 2019-04-13 22:49:17 +03:00
Yair Morgenstern
d86672b0c0 Organized new game screen functions 2019-04-12 16:59:56 +03:00
Yair Morgenstern
9bb4d988a3 Added Arabian unique - #563 2019-04-12 15:11:39 +03:00
Yair Morgenstern
c3bfed1bd1 Added Legion unique unit - #563 2019-04-12 14:30:53 +03:00
Yair Morgenstern
dc2f88765b Added Foreign Legion unique unit - #563 2019-04-12 13:33:59 +03:00
Yair Morgenstern
646f430636 Added War Chariot unique unit - #563 2019-04-11 23:16:14 +03:00
Yair Morgenstern
2c638d46e6
Merge pull request #634 from ninjatao/population_assign 
Fix pop assignment when founding city.
 2019-04-10 09:21:10 +03:00
Duan Tao
c1fad81e18 Fix pop assignment when founding city. 2019-04-10 13:50:39 +08:00
Yair Morgenstern
6af749b77b Added Walls of Babylon unique building 
Added Chu-Ko-Nu unique unit
 2019-04-09 23:31:16 +03:00
Yair Morgenstern
9b9b21fe28 Resolved #579 - When picking a construction and buying it, chosen construction reverts to previously chosen construction 2019-04-09 22:38:47 +03:00
Yair Morgenstern
06b44140b8 Resolved #603 - Move unit icons back above city label 2019-04-09 16:49:24 +03:00
Yair Morgenstern
7fa24a8f17 Added Neuschwanstein wonder - part of #245 2019-04-09 16:27:12 +03:00
Yair Morgenstern
350963d182 Resolved #606 - Added "Annex or raze city" popup 2019-04-08 22:25:47 +03:00
Yair Morgenstern
6cd925cf78 Replaced "Diplomatic Incident" with more generic "Popup Alert" 2019-04-08 20:49:34 +03:00
Yair Morgenstern
e7f99975eb Resolved #610 - map generation assigns a set amount of each Strategic resource, which are spread across the map 2019-04-07 23:16:57 +03:00
Yair Morgenstern
3c3c81fd88 Added Himji Castle wonder - #245 2019-04-07 20:23:57 +03:00
Yair Morgenstern
9a0baf028e Added Colossus wonder - #245 2019-04-04 16:07:16 +03:00
Yair Morgenstern
24d71c3450 A minor usage of Java 8 replaced with non-Java-8 for older phones 2019-04-04 15:53:42 +03:00
Yair Morgenstern
55860fb480
Merge pull request #627 from ninjatao/invisible_submarine 
Battle table no longer pops up when clicking on invisible submarines.
 2019-04-03 16:05:54 +03:00
Duan Tao
b368b32cd1 Battle table no longer pops up when clicking on invisible submarines. 2019-04-03 19:18:21 +08:00
Yair Morgenstern
e93ed68a2b Icons for units replaced by civ unique units are no longer shown in tech button 2019-04-02 21:53:36 +03:00
Yair Morgenstern
5444fd705b Greatly increased distance between civ starting locations 2019-04-01 23:00:05 +03:00
Yair Morgenstern
89a720f7b2 Cities now only take ownership of _unowned_ tiles around them 2019-04-01 22:38:36 +03:00
Yann
1a8708576d
Update BattleDamage.kt 
To solve Issue #621
 2019-04-01 11:37:36 +02:00
Yair Morgenstern
e433eefc05
Merge pull request #618 from ninjatao/future_tech 
Avoid future tech blocking ending turn.
 2019-04-01 07:23:11 +03:00
Duan Tao
0bbcc39eca Avoid future tech blocking ending turn. 2019-04-01 09:54:59 +08:00
Yair Morgenstern
6796c1868b Added a much better initial tutorial, so people new to the 4X genre can find their arms and legs around the game 2019-04-01 00:05:11 +03:00
Yair Morgenstern
9eb9176b2a Units & buildings requiring resources or other needs are now displayed, but not selectable, from the city screen as constructions 2019-03-29 18:03:18 +03:00
Yair Morgenstern
a5e1978a71 Added popup for "move and attack" bug that I can't figure out 2019-03-29 15:38:22 +03:00
Yair Morgenstern
f38da59fe9 Resolved #614 - bug withpillaged water tiles 2019-03-29 15:26:31 +03:00
Yair Morgenstern
b0830ba487 Resolved #613 - policy choice & city conquer collision 2019-03-29 15:20:30 +03:00
Yair Morgenstern
12719c1e0e Added Great Wall wonder 2019-03-29 15:17:58 +03:00
Yair Morgenstern
064488ca37 Solved a crash situation when clicking on "Future Tech" when it has already been researched 2019-03-28 23:51:39 +02:00
Yair Morgenstern
0b47289c3d Resolved #601 - gold luxury not accepted in trades 
Organized trade buy/sell logic - should be much easier to understand now!
Split into Evaluation and the current trade deal, evaluation split into buying and selling
 2019-03-28 23:05:50 +02:00
Yair Morgenstern
3295753d2d Resolved #581 - Turns to production values are now always accurate and don't depend on bonuses to the current production 2019-03-25 19:52:29 +02:00
Yair Morgenstern
e43c22a74b Apparently .replaceAll is incompatible with Android 5.1, but hey who needs them. 2019-03-24 20:27:00 +02:00
Yair Morgenstern
bba6f43943 Changed "Combat Unit" to Military Unit" for naming consistency 2019-03-23 22:04:50 +02:00
Yair Morgenstern
a751ed6e31 Resolved #593 - Show/Hide resources and improvements button wasn't working 2019-03-22 10:57:18 +02:00
Duan Tao
22253af842 Work boat should have lower priority than other buildings, not higher. 2019-03-22 12:07:11 +08:00
Duan Tao
e2f650a512 wonder building priority. 2019-03-22 11:50:03 +08:00
Yair Morgenstern
4001526aea Construction choices are now more standardized and easier to understand 
Construction choice depends on how much work is left towards construction and not initial cost
 2019-03-22 00:49:08 +02:00
Yair Morgenstern
34a3b614b0 Map no longer zooms whe being created 2019-03-22 00:10:27 +02:00
Yair Morgenstern
dcd64bf58f Can see all production icons in debug mode 2019-03-22 00:09:56 +02:00
Yair Morgenstern
69d3703543 Resolved #595 - Added release version to options table 2019-03-21 22:46:49 +02:00
Yair Morgenstern
1dc6a2cf2d
Merge pull request #585 from ninjatao/build_order2 
Redo build order AI.
 2019-03-21 13:42:20 +02:00
Yair Morgenstern
e4c7a2698f Clearer population toggle in cities 2019-03-21 13:17:10 +02:00
Yair Morgenstern
775055902f Continuation of #590 - "Machu Picchu" instead of "Machu Pichu" 
Changed info in saved games to fit the change
 2019-03-21 12:53:41 +02:00
Duan Tao
90f8421777 Avoid building many wonders at the same time. 2019-03-21 08:00:11 +08:00
Yair Morgenstern
973cfd50a2 Added different city tiles for different locations 2019-03-20 15:15:55 +02:00
Yair Morgenstern
2503da2ed0 Added City tile! 2019-03-20 13:11:47 +02:00
Yair Morgenstern
1d88e76452 Split map into layers for base image, features, overlays, and fog 
Added Marsh and Lakes images
IT LOOKS SO GOOD NOW DAMN
 2019-03-20 12:09:54 +02:00
Yair Morgenstern
fe9fc110d8 Added tile feature tiles to tilesets! 2019-03-20 11:06:08 +02:00
Duan Tao
af48f80e1a Priority tuning part 2. 2019-03-20 10:25:33 +08:00
Yair Morgenstern
d6f3ab3f40 Fantasy hex tileset is go! 2019-03-19 18:35:58 +02:00
Yair Morgenstern
21377f63e7 Added Tilesets, for alternative tile images - this could be big! 
Options table is now a table, not a list - more room for future options
 2019-03-19 17:09:51 +02:00
Duan Tao
11bb63495b Fixed : unit upgrades to itself with 10 gold. 2019-03-18 18:40:11 +08:00
Duan Tao
cb9f032e35 Priority tuning part 1. 2019-03-18 15:41:37 +08:00
Yair Morgenstern
3086520bd2 Hopefully solved a YouCantGetThereFromHereException in tryAttackNearbyEnemy 2019-03-18 06:47:17 +02:00
Yair Morgenstern
c33b0a67fe Resolved #586 - units now upgrade to the most recent upgrade, not to the next possible one 2019-03-17 23:10:11 +02:00
Duan Tao
c916b96d1e Redo build order AI. 2019-03-18 00:15:36 +08:00
Duan Tao
f8a8d7bbfb Embarked civilian units should have no defense. 2019-03-17 15:50:52 +08:00
Yair Morgenstern
29bc82e1bd Diplomacy screen redesigned, to allow for more diplomacy options in the future 2019-03-15 12:14:19 +02:00
Yair Morgenstern
ab2e044a09 Units no longer freeze on the spot when they need to heal but can't find where 2019-03-15 10:41:51 +02:00
Yair Morgenstern
36781e4b55 Unified ranking tiles for healing logic 2019-03-15 10:34:16 +02:00
Yair Morgenstern
5873ccc848 Resolved #541 - change "Replacable Parts" to "Replaceable Parts", also in saved games 
Continuation of #571
 2019-03-15 10:21:00 +02:00
Yair Morgenstern
10d098b9de 2.13.14 2019-03-14 22:29:25 +02:00
Yair Morgenstern
7d312eea39
Merge pull request #567 from ninjatao/AI_peace 
AIs negociate peace.
 2019-03-13 13:10:57 +02:00
Duan Tao
d113a88e21 AIs negociate peace. 2019-03-13 18:13:39 +08:00
Yair Morgenstern
479b3a02ad Resolved #383 - Configurable amount of turns between autosaves 2019-03-12 22:10:25 +02:00
Yair Morgenstern
eba3aa3033 no message 2019-03-12 19:25:41 +02:00
Yair Morgenstern
81b29a5b57 Resolved #551 - Update city stats on production change 2019-03-12 19:24:50 +02:00
Yair Morgenstern
f69be35647
Merge pull request #564 from ninjatao/fix_buildings_list 
Fix builds list in city screen.
 2019-03-12 18:19:31 +02:00
Duan Tao
67eb3a86e0 Fix builds list in city screen. 2019-03-12 22:18:30 +08:00
Yair Morgenstern
02f1530c44 Fixed translation file 2019-03-11 20:20:07 +02:00
Yair Morgenstern
cef4eafa0f
Merge pull request #557 from ninjatao/fix_bombarf_crash 
Fix bombard crash.
 2019-03-11 17:52:05 +02:00
Duan Tao
1a5862d6b1 Fix build error... 2019-03-11 23:19:40 +08:00
Duan Tao
dbf48ac7bf Fix bombard crash. 2019-03-11 23:07:04 +08:00
Yair Morgenstern
0fcc3a6807 Fixed bug where setting the max. amount of AI players meant that there was no human player, so people got a fully-fogged out map 2019-03-10 23:43:49 +02:00
Yair Morgenstern
42ca98efd2 Gave up on the idea of the attack button - if the enemy moves we need to remove the button, and it's actually very difficult to determine this. 2019-03-10 23:27:19 +02:00
Yair Morgenstern
aea7d750fd Added a popup when trying and faiing to load a game, so people will send me emails when this happens 2019-03-10 23:13:04 +02:00
Yair Morgenstern
881f532bf7 Memory-saving tweak 2019-03-10 23:04:04 +02:00
Yair Morgenstern
115aef50ad Better starting locations on tiny map with lots of players 2019-03-10 23:03:25 +02:00
Yair Morgenstern
09b1446fea Removed empty translations (very bad for people who play the game in that language) 
Added a way to copy game info directly from files, and also a popup when encountering a certain error, for debugging purposes
 2019-03-10 22:52:57 +02:00
Yair Morgenstern
883469a6b9
Merge pull request #547 from ninjatao/explorer_heal 
Auto-explore heals if injured.
 2019-03-10 15:52:16 +02:00
Duan Tao
5173bd98a2 Auto-explore heals if injured. 2019-03-10 20:42:13 +08:00
Yair Morgenstern
319b1c8524 Can now attack enemies from the map, just like moving units 2019-03-09 22:56:20 +02:00
Yair Morgenstern
3883261d45
Merge pull request #537 from ninjatao/jira/493 
Better defeat condition.
 2019-03-09 22:07:07 +02:00
Duan Tao
451a95a86c Better defeat condition. 2019-03-08 22:37:26 +08:00