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

1501 commits

Author SHA1 Message Date
Yair Morgenstern
27b8cd5f1b AI now puppets cities by default - much better for long-term strategy, since puppeted cities are technically also controlled by AI controllers so... 2019-09-24 16:57:49 +03:00
Duan Tao
38a28888ef Duantao/ai bonus (#1117) 
* Ai bonus.

* AI modifiers apply correctly.

* AI initial units.

* Use gameInfo.getDifficulty() instead of civInfo.getDifficulty().

* Minor fix.
 2019-09-24 16:19:17 +03:00
Yair Morgenstern
cb06253584 Minor code reorg 2019-09-23 17:48:59 +03:00
Yair Morgenstern
548078fb37 Changes to Puppet - Annex - Liberate: 
- From Conquer you can move either to Liberate, or to Puppet -> Annex -> Raze
- All unit actions at battle are completely independant of your decision what you do with the city, so they're not deffered until you decide
 2019-09-23 17:29:05 +03:00
Yair Morgenstern
6d9543e07b Added resistance icon in city screen 2019-09-23 16:19:53 +03:00
Yair Morgenstern
a1f5690e41 Added Puppet icon - some reorgnizing still needs to be done in regards to puppet vs annex 2019-09-23 10:46:51 +03:00
Duan Tao
65b8fe531e Duantao/liberate city (#1097) 
* Allow to liberate city to its founder.

* Workaround : Avoid exception on conquering city with infantry unit.

* Liberate button actually works.

* Fix trade resources check.

* Postpone the 2nd part of postBattleActions until choice is made.

* Add puppet option.

* Puppet city cannot be controlled directly.

* Add annex and puppet happiness/culture/science bonus.

* Add courthouse. Icon is missing.

* Icon for courthouse.

* Update png.
 2019-09-23 08:37:53 +03:00
Yair Morgenstern
a3889a549e Iroquis can now use Forest and Jungles to connect cities 
Persian +1 movement only activaes when in golden age
 2019-09-20 10:26:15 +03:00
Duan Tao
c4e4f3d2a3 Fix trade resources check. 2019-09-19 11:10:50 +03:00
Yair Morgenstern
2def82c4a6 When picking random city states for a map, first priority now goes to city states with starting locations defined in the map 2019-09-18 22:42:44 +03:00
Yair Morgenstern
753efe5f47 Added error popup when failed to download map 2019-09-18 22:28:16 +03:00
Duan Tao
0adeb68ea6 Invisible submarines are excluded from notification. 2019-09-18 08:42:47 +03:00
Yair Morgenstern
b86d11b5fa Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-17 22:40:09 +03:00
Yair Morgenstern
190d9f72fd Resolved #1091 (spelling mistakes) 2019-09-17 22:39:21 +03:00
Yair Morgenstern
04127164bc Added all remaining wonder quotes and more promotion icons 2019-09-17 22:39:08 +03:00
Duan Tao
0f1f5bf746 Spaceship should not be bought. 2019-09-17 08:14:10 +03:00
lishaoxia1985
390254b584 instead some font-sizes with the one is often used in game and doesn't need to be created again, adjust the construction table in city screen (#1080) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update

* update

* update

* update

* update

* viewport
 2019-09-16 19:48:41 +03:00
Yair Morgenstern
48ad8f3f88 Got rid of most of the original civ's Promotion icons and replaced with Unciv icons =) 2019-09-15 23:26:20 +03:00
Yair Morgenstern
479b751cb3 Gold and Science breakdowns are now much more detailed 2019-09-15 18:52:40 +03:00
Yair Morgenstern
b038e926a4 Idle units are much more visible on the map 
Technically, nstead of fading out the entire unit with its background, we just fade out its central icon, that way it remains much more visible on the map
 2019-09-15 18:15:57 +03:00
Yair Morgenstern
3084a5bc33 Added Persian civilization 2019-09-15 15:17:56 +03:00
Yair Morgenstern
9665c59782 Changed some border icons to filled icons, which look way better in-game 2019-09-15 14:53:18 +03:00
Yair Morgenstern
d645ae4478 Added Iroquois civilization 2019-09-15 12:13:14 +03:00
Yair Morgenstern
bad10370de innerColor and outerColor function name changes 2019-09-14 23:17:52 +03:00
Yair Morgenstern
f6323edbc8 Victory screen no longer shows every turn on "one more turn" mode 
Moved Nation jsons
 2019-09-14 23:06:34 +03:00
lishaoxia1985
5f43c93846 MrUldiggg delete some words which are necessary. please update immediately (#1069) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程

* update

* update

* update
 2019-09-12 19:42:29 +03:00
lishaoxia1985
6e34f4743a update translation (#1067) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
 2019-09-12 13:05:58 +03:00
Yair Morgenstern
05a77a9a68 Fixed "units deselect after next turn" problem 
Popup alerts now come before trade request popups
 2019-09-11 21:18:01 +03:00
Yair Morgenstern
b8c3bd402f Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-11 19:37:09 +03:00
Yair Morgenstern
5cc169a828 Added half the wonder quotes 2019-09-11 19:35:42 +03:00
Duan Tao
548b1a96d0 Fix statue of liberity affect. 2019-09-11 10:33:28 +03:00
Duan Tao
d2ee684293 Adjust food and culture weight for AI cities developpment. (#1060) 2019-09-11 10:33:06 +03:00
lishaoxia1985
99959c9937 delete one english selectlanguage because menu have two choice, enlarge overview's image icon because it's too small to align. (#1058) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt

* delete english selectlanguage becauce menu have two choice, enlarge overview's image icon because it's too small to align.

* update

* language polish is wrong to be writing "polski"

* 显示教程
 2019-09-10 17:41:45 +03:00
Yair Morgenstern
1cf049f82f Added popups after construction of wonder is complete 2019-09-10 00:11:25 +03:00
Yair Morgenstern
bdb049a29a
Tech cost increases with more city. (#1054) 2019-09-09 23:07:43 +03:00
Yair Morgenstern
7454b57e4d Tech coloration issues 2019-09-09 23:06:17 +03:00
lishaoxia1985
a8663dda91 fix that researched tech can be picked when we pick a free tech (#1049) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt
 2019-09-09 22:43:00 +03:00
Duan Tao
6c3c4bf7af Auto build Aqueducts and Medical Labs. 2019-09-09 15:52:07 +03:00
Duan Tao
bfe73c1f4e Tech cost increases with more city. 2019-09-09 17:56:32 +08:00
Yair Morgenstern
9e0ba99c0a Invalid trade requests (e.g. giving a city that isn't yours anymore or resources you no longer own) are discarded at the beginning of the civ's turn 2019-09-08 23:33:39 +03:00
Yair Morgenstern
7603d3c839 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-08 19:27:58 +03:00
Yair Morgenstern
462fc6fab7 English translations 2019-09-08 19:27:00 +03:00
lishaoxia1985
c06028b082 update translation (#1041) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-08 19:25:49 +03:00
Yair Morgenstern
3974842265 Added error message when attempting to load a map from bad copied data 2019-09-07 21:31:56 +03:00
Yair Morgenstern
c9f6ba958f Can no longer adopt policies after being defeated 2019-09-07 21:24:28 +03:00
lishaoxia1985
53aaceb06b update Chinese translation，Russian translation Lost a word ("), please update it immediately！ (#1028) 
* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-07 21:08:36 +03:00
Duan Tao
3d324f516d AIs are not affected by auto-production setting. 2019-09-07 21:00:48 +03:00
Yair Morgenstern
df2be37785 Added show/hide button for tile panel in map editor 
Fixed unit unique translations in Civilopedia
 2019-09-06 16:20:45 +03:00
Yair Morgenstern
587c76b1f8 Added Show Minimap setting option 2019-09-05 23:20:16 +03:00
Yair Morgenstern
17b3069668 Added confirmation popup when deleting maps 2019-09-05 21:50:33 +03:00
Yair Morgenstern
d3a6417996 Can no longer pick policies in multiplayer when it's someone elses turn 2019-09-05 21:45:04 +03:00
lishaoxia1985
faa90dd269 update chinese traslation (#1026) 
* systemProp

* update

* update

* update
 2019-09-05 15:27:22 +03:00
Yair Morgenstern
e9bb39d9e5 Added name and description for map editor objects 2019-09-04 20:27:23 +03:00
Yair Morgenstern
59cb9f972c You now see your own Diplomacy screen when in multiplayer, and not that of the current player 2019-09-04 20:12:13 +03:00
Yair Morgenstern
91ac744692 Added "user id from clipboard" button in New Game screen 
Fixed other user id problems
 2019-09-03 23:22:27 +03:00
Yair Morgenstern
eeb1c26ef5 Added Korean civ 2019-09-02 23:44:29 +03:00
Yair Morgenstern
675d05d1e4 Minor fixes to multiplayer UI components 2019-09-01 17:18:08 +03:00
Yair Morgenstern
efaa0c9a6c Performance improvements for NativeFont - separated chinese and other charsForFonts, 
since the chinese have hundreds of chars and it makes the font loading time really long
 2019-09-01 17:12:47 +03:00
Yair Morgenstern
ab26f66e1a Implemented Alexander's unique - #563 2019-09-01 15:26:27 +03:00
Yair Morgenstern
20493b12b6 Resolved #1014 - Great Engineers can hurry National Wonders 2019-09-01 15:13:06 +03:00
lishaoxia1985
62a85cd14a can use native font and "WenQuanYimicroHei" in andriod and desktop (#1013) 
* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* Can Change Language with No "ttf" Font (#772)

* Update Other.json

* Update Notifications.json

* Update Other.json

* Can Change Language With No "ttf" Font

* update

* Update AndroidLauncher.java

* repair app running slowly in using no "tff" class

* update nativefont for Desktop and IOS

* Delete NativeFontIOS.java

* can choose nativefont or font downloading from internet

* update

* update

* Update Fonts.kt

* Update Fonts.kt

* update

* update

* update

* update

* Update build.gradle

* update

* update

* update

* can choose native font or "WenquanYiMicroHei"

* update

* update

* update

* update
 2019-09-01 13:01:37 +03:00
Yair Morgenstern
8d3a2d6da3 Organized Multiplayer popup 2019-08-31 22:24:18 +03:00
Yair Morgenstern
015b8343c7 Hoh boy so many changes to ensure the regular game works with multiplayer... 2019-08-30 14:46:52 +03:00
Yair Morgenstern
bc1592bafe Added game ID copy and join, so one person can create a game, send it to someone else, and the other person can join it 2019-08-29 13:18:09 +03:00
Yair Morgenstern
fd4d96ed8e Policy screen button moved to world screen instead of being in the menu 2019-08-29 12:04:43 +03:00
Yair Morgenstern
acdeea06b8 More steps towards upload/downloading multiplayer games 2019-08-29 11:09:57 +03:00
Yair Morgenstern
eb06ed2cf6 Unified PopupTable.addCloseButton() 
Added basic online game upload/download functionality
 2019-08-29 10:27:08 +03:00
Yair Morgenstern
ef75593794 More PopupTable.close() uses 2019-08-28 13:30:49 +03:00
Yair Morgenstern
e82b6c5090 Added close() function to popup 2019-08-27 17:00:28 +03:00
Yair Morgenstern
834290001b Improved "rank city center" by also considering resources that the civ has in its borders but has not yet improved 2019-08-27 15:09:54 +03:00
Yair Morgenstern
8ef09a816a Fixed annoying "can't click next turn" bug! 2019-08-27 14:57:40 +03:00
Yair Morgenstern
5ae8f0d6ff AI tries to build cities next to luxury resources it doesn't yet have 2019-08-27 14:56:21 +03:00
Yair Morgenstern
22a8a85426 AI now more focused on improving small cities to big ones 2019-08-27 14:39:54 +03:00
Yair Morgenstern
6769c30ebe Added isOnlineMultiplayer toggle in newGameScreen and an input for the player ID 2019-08-26 15:49:59 +03:00
Yair Morgenstern
3a04fe75eb New "Load map" screen, with load from clipboard and delete map options 2019-08-25 23:26:50 +03:00
Yair Morgenstern
17f41a549e "Upload map" now deals with failures properly 
Maps for downloading now scrollable
 2019-08-25 17:16:36 +03:00
Yair Morgenstern
60257c6d64 Save and load game screens now hide autosaves by default 2019-08-25 17:01:28 +03:00
Yair Morgenstern
0a777e5b59 Action strings are now constants 2019-08-21 23:55:12 +03:00
Yair Morgenstern
c685e0f528 Resolved #1007 - trades and alerts now work again, which means they'll also work in multiplayer =) 2019-08-21 23:44:28 +03:00
Yair Morgenstern
b9baa654ab Added End Game Messages for varioud victory types 2019-08-20 10:55:27 +03:00
Yair Morgenstern
56b3f1c77a City founding tutorial no longer activates if the AI founded a city before you 2019-08-18 23:25:01 +03:00
Yair Morgenstern
23f575d150 Resolved #963 - Units wouldn't leave enemy tiles after war was declared, unlike original Civ 2019-08-18 22:57:20 +03:00
Yair Morgenstern
814ecde1e3 Resolved #1003 - Logistics promotion didn't work on air units 2019-08-18 22:45:03 +03:00
Yair Morgenstern
1817b3e541 Resolved #995 - Can now open/close categories in city screen 2019-08-15 22:20:34 +03:00
Yair Morgenstern
9a4722b6b9 Readded city state select box 2019-08-15 20:41:28 +03:00
Yair Morgenstern
365cb6f1b9 Nation changed to transient in CivInfo 2019-08-15 10:43:15 +03:00
Yair Morgenstern
d84863d2dd Ottoman unique no longer also applies to ranged units 2019-08-15 10:16:20 +03:00
Yair Morgenstern
202c1828a7 Fixed concurrency problems when working on "next turn" by working on a clone of the game state 2019-08-15 10:15:27 +03:00
Yair Morgenstern
05d3aa9193 Each individual player is now specified when starting a new game 2019-08-12 00:30:29 +03:00
Yair Morgenstern
9de30bfbce More changes towards player-based game starts 2019-08-09 15:57:34 +03:00
Yair Morgenstern
93634dae31 Added base for player picking per-player - necessary for multiplayer and solves other probems along the way 2019-08-09 09:03:51 +03:00
Yair Morgenstern
327eea7b13 Added display of Human / AI for othe civs 2019-08-08 19:44:05 +03:00
Yair Morgenstern
05e4e33a3d Added username and ID - this will be how we recognize players in multiplayer 2019-08-08 18:50:18 +03:00
Yair Morgenstern
c138fbc385 Fixed "can't download map on Android" bug 2019-08-07 22:14:23 +03:00
Yair Morgenstern
cbf1b8bb11 Players can now continue to view (but not change) game data when other players are playing their turns 2019-08-06 23:04:56 +03:00
Yair Morgenstern
2f6eec5ff8 All city screen state-changing functions are now dependant on whether the viewing civ is the current player civ 2019-08-06 22:39:31 +03:00
Yair Morgenstern
786c157ba9 Disabled all (hopefully) state-changing actions when it's not the player's turn 2019-08-05 06:28:39 +03:00
Yair Morgenstern
5c02281023 When multiple policies can be picked, don't exit the policy picker screen 2019-08-04 23:15:46 +03:00
Yair Morgenstern
9a48133e1b Added visible scrollbars in tech picker screen 2019-08-04 22:59:33 +03:00
Yair Morgenstern
7b37e426a9 WorldScreen now accepts player as parameter - important for multiplayer so people could see their own map even when it's someone else's turn 2019-08-04 22:47:49 +03:00