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

1861 commits

Author SHA1 Message Date
Yair Morgenstern
5694877fbd Every civ damaged by a nuclear blast declares war on the attacker 2019-12-08 12:01:58 +02:00
Yair Morgenstern
02501793b3 Using nuclear weapons has large diplomatic reprecussions 2019-12-08 11:50:30 +02:00
Yair Morgenstern
736edb5069 Back to the way it was - we only need the shader if we're using GL 3.0 apparently 
Let's stick to 2.0 for now
 2019-12-08 11:22:46 +02:00
Yair Morgenstern
81e520e608 GL 3.0 should now work for mac - kudos @lishaoxia1985 2019-12-08 10:04:16 +02:00
Yair Morgenstern
9f3a943865 Resolved #1426 - starting a new game from a file-map game shows new correct options on the new game screen 2019-12-07 20:31:04 +02:00
Yair Morgenstern
440941cdea Battle simulation will no longer be dislayed for fogged-out tiles with units 2019-12-07 20:21:44 +02:00
Yair Morgenstern
69cdd0c187 Can no longer construct Apollo Program, and therefore spaceship parts, if Scientific Victory is disabled 2019-12-07 19:56:10 +02:00
Yair Morgenstern
38b9b13a0a Ruleset should have a lower-case s, because it's not, you know, a Set 
Also, Rulesets can now read rules from any json folder
 2019-12-06 13:59:12 +02:00
Yair Morgenstern
c32e3fce3c More normalization - can no longer add "everywhere" improvements on Water tiles. 2019-12-06 11:17:33 +02:00
Yair Morgenstern
6ab58fd8ab More map editor normalization, because people will doo whatever they can to break the system 2019-12-06 10:23:30 +02:00
Yair Morgenstern
3ea4f8bc82 Resolved #1420 - Menu in the map editor no longer opens multiple times on subsequent clicks 2019-12-06 10:12:16 +02:00
Yair Morgenstern
110e7b7052 Desktop no longer crashes/bugs on first initialization 2019-12-05 20:59:44 +02:00
Yair Morgenstern
b9487c1800 More ruleSet-shouldnt-come-from-static fixes 2019-12-05 20:39:57 +02:00
Yair Morgenstern
51a0d7727a Renamed gameInfo.gameBasics to ruleSet 2019-12-05 20:22:34 +02:00
Yair Morgenstern
9b6ec809b3 Map editor now works with new ruleset 2019-12-05 00:15:05 +02:00
Yair Morgenstern
b7ffdb7cc3 Renamed GameBasics to RuleSet, because that's basically what it is 2019-12-05 00:01:00 +02:00
Yair Morgenstern
47e214258a FINALLY managed to un-staticify GameBasics, this means the game can potentially recognize different rulesets! 2019-12-04 23:57:54 +02:00
Yair Morgenstern
b64c209218 Resolved #1361 - clicking on a unit's promotions now brings you to the promotion screen 2019-12-04 19:47:18 +02:00
Yair Morgenstern
ef272b3208 Fixed "Positive" diplomatic modifier for warmongering 2019-12-03 21:28:50 +02:00
Yair Morgenstern
87a746f79b Non-coastal cities no longer have water units missing resources in the construction list 2019-12-03 21:19:28 +02:00
Yair Morgenstern
cf4d40501e Fixed "Arial units trying to move to their own tile" crashing bug 2019-12-03 20:45:35 +02:00
Yair Morgenstern
9868749d56 Solved crashing "AI Unit upgrade" bug! 2019-12-03 19:48:16 +02:00
Yair Morgenstern
e3ac6f4e53 Resolved #1404 - AI should no longer be able to win cultural victory after being defeated 2019-12-02 22:08:57 +02:00
Yair Morgenstern
f79858e39e Tutorials will now always be read with the correct encoding 2019-12-02 22:02:21 +02:00
Yair Morgenstern
7a9fd14b13 Resolved #1405 - upgrading Spearman to Landsknecht no longer gives you gold 2019-12-02 22:01:16 +02:00
Yair Morgenstern
fa0d650362 City buttons stay the correct size upon "Next turn" 2019-12-01 21:47:40 +02:00
Yair Morgenstern
6124fd5271 Removed long click action. It was more trouble than it was worth. 2019-12-01 21:21:50 +02:00
Yair Morgenstern
dae477a870 Resolved #1374 - air units should no longer move and attack in the same turn 2019-12-01 21:20:53 +02:00
Yair Morgenstern
c992995b6f Can now pick Random civ in player picker 2019-11-30 23:11:46 +02:00
u-ndefine
6d1cfd2a9c Minor typo fix at VictoryScreen.kt (#1399) 2019-11-30 21:57:42 +02:00
Yair Morgenstern
757439f2d1 3.3.3 2019-11-30 21:56:00 +02:00
Yair Morgenstern
68ee549edb Map editor normalizes tiles, so you can't add improvements of features where they shouldn't belong 
Placing a civ starting location removes older starting locations
 2019-11-29 12:01:32 +02:00
Yair Morgenstern
5807957d32 Resolved #1369 - nuking capitals no longer crashes the game 2019-11-28 22:21:39 +02:00
Yair Morgenstern
c1d3ac2604 Added timers to see what's taking so long. It's the fonts - 11 seconds to load Chinese characters. 
Specifically, putGlyph. Which makes sense, since it's basically rendering 3000 images into the memory for Chinese.
 2019-11-28 22:10:26 +02:00
Yair Morgenstern
3816014ae4 Added Great Person city location to notification 2019-11-28 21:10:36 +02:00
Yair Morgenstern
55b2da6d75 Normalized resource reveal notification 2019-11-28 21:05:36 +02:00
Yair Morgenstern
3d3b2cd3fc When choosing a tech to work towards, the order will no longer "jump" over techs 2019-11-28 20:42:25 +02:00
Yair Morgenstern
df964a5ec6 TechPickerScreen organization 2019-11-28 20:28:04 +02:00
Yair Morgenstern
008485b38c Exploring units are not considered Idle 2019-11-28 20:26:44 +02:00
Yair Morgenstern
d0975ebc38 I don't think you should be able to see other tech's tech trees from the victory screen. 2019-11-28 19:57:55 +02:00
Yair Morgenstern
ad19dd1afa Resolved #1388 - Starting era no longer automatically displayed as "Ancient" in New Game screen 2019-11-28 19:42:08 +02:00
Yair Morgenstern
8826c4e84f Resolved #1372 - AI should now build spaceship parts and be able to win a scientific victory =) 2019-11-27 21:15:16 +02:00
Yair Morgenstern
7998ed2f0c Resolved #1365 - Disabled trading cities in One City Challenge 2019-11-26 20:55:07 +02:00
Yair Morgenstern
2da7c5be8f Tutorials are now popup tables - limits the width of tutorials so they don't go off-screen 2019-11-25 14:28:32 +02:00
Yair Morgenstern
ad4bc86d52 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-11-25 12:09:33 +02:00
Yair Morgenstern
aee9724765 Your voice has been heard - All units now have the Explore command 2019-11-25 12:08:22 +02:00
lishaoxia1985
7453ee637f 1. overflow science when finishing and starting research. 2. in the cityscreen unit should be not visible. 3. modifier the policy "Commerce Complete" according to original game. 4. the action of "Great Merchant" now is the same as original game. 5. translation update. (#1355) 
* update

* update

* update

* update

* update

* update
 2019-11-25 12:03:20 +02:00
Yair Morgenstern
488b733db6 Resolved #1368 - missiles can no longer be promoted 2019-11-25 11:58:02 +02:00
Yair Morgenstern
2a139ff732 Resolved #1364 - Policy picker screen won't appear from the world screen if there are no possible policies to pick 2019-11-24 00:02:28 +02:00
Yair Morgenstern
a8c98f60d7 Railroads are now much more visible! 2019-11-23 22:43:35 +02:00
Yair Morgenstern
c447bd2da8 Resolved #1359 - City name from overview screen now leads directly to the city scren 2019-11-23 22:30:25 +02:00
Yair Morgenstern
095deee125 UncivGame rename 2019-11-23 22:28:23 +02:00
Yair Morgenstern
18be826c1a Changed "help translating" initial message to point to Github 2019-11-23 21:52:43 +02:00
Yair Morgenstern
1230b00688 Fixed crash in tile editor as a result of adding Fallout, which has no "occursOn" terrains 2019-11-23 21:35:03 +02:00
Yair Morgenstern
62fd7d8588 Desktop Unciv now sends status to Discord! 
Basically stole the Discord RPC implementation outta Mindustry
 2019-11-21 16:24:27 +02:00
Yair Morgenstern
0ec0ee3d44 All the various clicks on the world screen can now work together as friends 2019-11-21 10:53:08 +02:00
Yair Morgenstern
cbb5db2fb8 Resolved #1231 - can now aquire tiles from eighboring cities again, kudos @klondi 2019-11-20 23:33:09 +02:00
Yair Morgenstern
e4fe43f281 Resolved #1344 - currently showing tutorials should not activate again 2019-11-19 23:19:07 +02:00
Yair Morgenstern
3ea6c63e0b Fixed annoying bug which would treat long pans and flings as long clicks 2019-11-19 23:09:36 +02:00
Yair Morgenstern
526a99fb0d Set ShowPixelImprovements to True for new players - I think the world is ready 2019-11-19 22:08:24 +02:00
Yair Morgenstern
b1868accc5 Nuclear Weapon setting moved to Options, s it can be more easily explored by players 2019-11-19 22:00:16 +02:00
lishaoxia1985
dd28711ee7 update translation (#1352) 
* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 21:58:56 +02:00
Yair Morgenstern
ff3795c96f TechButton now displays units and buildings corresponding to the description 2019-11-19 20:16:53 +02:00
Yair Morgenstern
15e59b161b Technology description no longer includes Manhatten Prokect or Nuclear Missile in description when nuclear weapons are disabled 2019-11-19 19:34:48 +02:00
lishaoxia1985
1eb5ced75c add map modifier and the benefit when we research the technology other Civs have. (#1339) 
* update

* update

* update

* update

* update

* update

* update

* update
 2019-11-19 19:11:01 +02:00
Duan Tao
111030e457 Nuke your enemy! (#1318) 
* Nuke your enemy!

* Fantasy tiles. Worker automaticly clears fallout.

* Some AI improvement for choosing wonder and military unit.

* Add nuclear weapon option.
 2019-11-19 08:43:04 +02:00
Yair Morgenstern
313f55171c Lint 2019-11-18 22:03:49 +02:00
Yair Morgenstern
83aab24bba Resolved #1341 - Annexed cities no longer have population permanently gone "outside" their borders (Mr Gorbachev, tear down this wall!) 2019-11-17 23:03:13 +02:00
Yair Morgenstern
f7bb5c4a59 Added lines between prerequisite techs in TechPickerScreen - now you can see the entire tree! 2019-11-17 22:41:08 +02:00
Yair Morgenstern
2d94cc2179 Changed translation files to always read in UTF-8 - should solve Desktop getting wierdly read characters, hopefully 2019-11-17 22:38:30 +02:00
Yair Morgenstern
80d9b3bd49 Trades in overview screen are now almost symmetrical 2019-11-17 21:37:27 +02:00
Yair Morgenstern
aa4c70f090 Fixed trades always beng denied because "our proposed trade is no longer relevant" 2019-11-17 21:16:51 +02:00
Yair Morgenstern
1ecc6bbb2a Performance improvement - tile taps and long-clicks are now done at the TileMapHolder level, meaning we can only create one instead of one per tile, massive memory saving! 
Map now zooms with mouse scroll in Desktop!
 2019-11-16 23:02:09 +02:00
Yair Morgenstern
a48c356920 Base image tiles on tiles with improvement images are now grayed out when not visible 2019-11-16 21:15:33 +02:00
Yair Morgenstern
3a4d79c14f Resolved #1336 - can no longer get Settlers from Collective Rule policy when in One City challenge 2019-11-16 18:44:56 +02:00
Yair Morgenstern
e7b6450a71 Resolved #1332 - can no longer get settlers from ruins in One City challenge 2019-11-15 14:31:19 +02:00
Yair Morgenstern
4845fb7865 JAR file is now ready for desktop consumption! 2019-11-15 09:12:06 +02:00
Yair Morgenstern
e21d7eb54a We can now have "layered" images for the base tile, such as grassland + manufactory! 2019-11-14 21:01:24 +02:00
Yair Morgenstern
c6b550e43d Resolved #1312 - More obvious division between promotion 'pick now' and description 
Civilopedia redone!
Now with simpler picking and images!
 2019-11-13 22:54:10 +02:00
Yair Morgenstern
a94a3f9d2e Resolved #1323 - invalid trades should now be removed when turn starts 2019-11-13 21:45:54 +02:00
sveckarel
7a9c99ee81 Update czech translations (#1327) 
* Czech translations improvements

* Update Czech translations
 2019-11-12 06:52:48 +02:00
Yair Morgenstern
b0e29c5d3c City-state alliance Bugfix 2019-11-11 21:07:16 +02:00
Yair Morgenstern
637b487a2c City-states allied to Civs no longer attempt to declare war when it does on Civs they haven't met yet 2019-11-09 20:25:30 +02:00
Yair Morgenstern
28b15a537a City-states no longer generate Great People 2019-11-09 19:18:27 +02:00
Yair Morgenstern
e1350cdb05 separated whiteDot for images from TableBackground for backgrounds 2019-11-08 15:42:19 +02:00
lishaoxia1985
4d5ae8fa25 now you only need to create font once. (#1269) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* 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

* update

* update

* update

* update

* update

* update
 2019-11-08 15:31:11 +02:00
Yair Morgenstern
d8ec67bb43 Resolved #1307 - you no longer get a notification when conneccting to the cities of other Civs 
New notification when cities have disconnected from your capital
 2019-11-06 21:43:48 +02:00
Yair Morgenstern
140753e9c4 Resolved #1302 - captured settlers are converted workers as per original Civ V 2019-11-05 18:16:37 +02:00
Yair Morgenstern
777802ab04 Can no longer click 'next turn' if popups are open - #1289 2019-11-05 15:21:28 +02:00
Yair Morgenstern
8226304097 Better Civ icons 2019-11-05 12:51:05 +02:00
Duan Tao
1e403442f7 City-state allies with most influencing civ. (#1291) 
* City-state allies with most influencing civ.

* More notifications for alliance. More intense status update.

* Fix a crash about lateinit tiles.

* More reasonable civInfo.setTransients.
 2019-11-05 12:23:21 +02:00
Yair Morgenstern
2e9b1e6de6 Added 750x500 resolution for tiny screens (it still looks OK, but if we go lower to 600*400 then...no) 
City states no longer get starting Scouts - #1289
 2019-11-05 10:18:43 +02:00
BenBooth1344
92ddc864fa Implemented One City Challenge (#1279) 
* Implemented One City Challenge

Implemented One City Challenge

* prevent OCC from capturing settlers

* Fixed spellling of Destroy

* fixed capture logic for barbarian
 2019-11-04 14:24:43 +02:00
Yair Morgenstern
57b0040df7 Added Siam civ - #703 2019-11-03 23:22:49 +02:00
Yair Morgenstern
9610f9f918 bugfix - Music volume slider no longer auto-sets to sound effect volume 2019-11-03 20:15:49 +02:00
BenBooth1344
b82a52ce38 added no ancient ruins option (#1280) 2019-11-03 16:17:15 +02:00
Yair Morgenstern
791439397e Added Brandenburg Gate wonder - #643 
Fixed translation bugs
 2019-11-02 23:08:55 +02:00
Yair Morgenstern
edb5ff92ed Fixed Indirect Fire promotion 2019-11-02 20:10:01 +02:00
Yair Morgenstern
78027ef249 Distinguished notifications of "trade item TO nation has ended" from "trade item FROM nation has ended" 2019-10-31 15:55:13 +02:00
Yair Morgenstern
23178836cf More performance 
- Shoved TextureRegionDrawables into a hashmap for faster searching and more unified access (not everyone has to create a Drawable for the Region now)
- getLanguages() now does the minimum amount of work without saving intermediates

Unified ImageGetter.getTableBackground()  (helper, not performance)
 2019-10-31 12:59:19 +02:00
Yair Morgenstern
de30382536 Memory performance improvements! 
- .tr() no longer tries to regex replace every entry in the dictionary - instead, we save the shortened version of each translation in its place!
 - when counting language completion percentage, we only count the numbers, not save them to a list!
 - label coloring and size now baked-in to .toLabel(). meaning we don't need to reassign styles and rebuild font caches!
 2019-10-31 12:01:23 +02:00
Yair Morgenstern
c39c1a4c15 Fixed crash when failing to download map in map editor 2019-10-31 10:25:11 +02:00
Yair Morgenstern
18ffe9b67f Removed unused Fonts functions 
Fixed bug on city creation caused by 750ca0c
 2019-10-31 09:46:33 +02:00
Yair Morgenstern
dbbfd13486 Music now downloads on another thread to not harm the user experience 
Removed unused "Username" string
 2019-10-31 09:40:50 +02:00
Yair Morgenstern
9dee9f8256 Can now download background music for the game through the Options menu =D 2019-10-30 23:31:16 +02:00
Yair Morgenstern
f4c20792ae Resolved #1256 - Puppeted cities no longer autobuild units or wonders 2019-10-30 20:36:14 +02:00
lishaoxia1985
1f8db38ea2 update translation (#1258) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* 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-10-30 15:45:03 +02:00
Yair Morgenstern
750ca0c1e9 Resolved #1252 - Tiles created inside your borders take control of the city center tile, so they don't become "Invisible cities" 2019-10-29 22:32:52 +02:00
Yair Morgenstern
2ec628a0da Map generation simplified, rewritten, and now much MUCH more readable! 2019-10-29 22:17:07 +02:00
lishaoxia1985
8af6a5ffa6 update translation (#1247) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-29 06:20:27 +02:00
Yair Morgenstern
f80b0ee777 Added link to Patreon 
Units upgrading to units with built-in promotions now get those promotions
 2019-10-28 21:24:04 +02:00
Yair Morgenstern
827af89498 Resolved #1250 - Resources requiring a specific tech to build the improvement, are no longer provided before researching that tech (by cities etc) 2019-10-28 21:09:18 +02:00
Yair Morgenstern
6a46af4f88 Can no longer create great improvements on water or unbuildable tiles (like Oasis) 2019-10-28 21:00:08 +02:00
lishaoxia1985
e865055488 update translation (#1243) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-27 17:30:56 +02:00
sveckarel
5abaff7905 Added next few czech words, fixed issue with Save game from last commit 2019-10-27 11:39:24 +02:00
sveckarel
c12ed1842c Translations improvements, fixed few czech words 2019-10-27 11:39:24 +02:00
Yair Morgenstern
ba33e2266d Resolved #1230 - sleeping units wake up if there's an enemy nearby 2019-10-26 21:18:17 +03:00
Yair Morgenstern
8151476806 NativeFont has proved itself well enough - got rid of old WenQuanYiMicroHei font and corresponding setting 2019-10-26 20:54:32 +03:00
Yair Morgenstern
232896665e Solved promotion name-change bug 2019-10-26 20:44:32 +03:00
Yair Morgenstern
4d285e972d Can now translate [year] BC / [year] AD (#1240) 2019-10-26 20:27:01 +03:00
sveckarel
39747cb6e3 Correction of Czech tranlations, adding missing keys 2019-10-26 20:17:03 +03:00
Duan Tao
c4263867ff Better work actions. Improvement time scales with game speed. 2019-10-25 16:04:08 +03:00
Yair Morgenstern
c751d5a670 Resolved #1233 - notifications show up on "next turn" without needing to click anywhere 2019-10-24 22:42:37 +03:00
Yair Morgenstern
891ea5584f Resolved #1234 - improvements that replace the current improvement now indicated in the improvement picker screen 2019-10-24 22:18:47 +03:00
Yair Morgenstern
6fb3ba0f13 Resolved #1229 - AI doesn't choose to construct workers if the Civ has idle automated workers 2019-10-24 21:57:24 +03:00
Yair Morgenstern
7d1fd6e177 Added cache for character sets, improving time for Chinese and Korean game initialization 2019-10-24 21:50:49 +03:00
Duan Tao
d630c742b9 Worker will not waste time on oasis. 2019-10-24 12:15:34 +03:00
lishaoxia1985
88da508b82 update translation (#1222) 
* update

* update

* update

* update

* update

* update

* update

* range extension

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-10-23 21:59:20 +03:00
Yair Morgenstern
318dbb2a6d Added tiles with visiable improvements, since not all improvements and combinations are ready this is behind a menu option 2019-10-23 21:56:23 +03:00
Smashfanful
2967f66fdf Update Fonts.kt 2019-10-23 09:08:39 +03:00
Yair Morgenstern
777d1391f4 Changed options for "Show worked tiles" and "Show resources and improvements" because it was less clear than the other options 2019-10-22 19:41:22 +03:00
Yair Morgenstern
f400a03358 Renamed "Immortal" to "Persian Immortal" because of the conflict in naming between the unit and the difficulty 
Also, changed existing units of Immortal or with Range promotion
 2019-10-22 19:25:58 +03:00
Yair Morgenstern
e6ecc53615 Progress bar should no longer appear after getting a tech in the middle of research for free 
Generalized unique fonts to fit Korean as well as Chinese
 2019-10-22 00:14:56 +03:00
Yair Morgenstern
965217d95c Undid "Immortal" name change 
Fixed json errors
Added Korean and Czech flags
 2019-10-21 23:23:38 +03:00
Yair Morgenstern
e2c19696c9 Grassland ad Tundra are now also constants, completing the set 2019-10-20 10:48:16 +03:00
Yair Morgenstern
384194c531 Desert now a constant 2019-10-18 17:39:13 +03:00
Yair Morgenstern
77f479e39b Added river toggles to map editor to see how it looks. Not good, btw - can't see rivers behind mountain/forest/hill tiles... 
Disabled for now, until we find a better way to display rivers.
 2019-10-18 16:39:23 +03:00
lishaoxia1985
6d1edd67e0 move the tile table to the top of the min-map, delete the bottom bar, the size of the unit table can be changed according to resolution, especially about 900*600. (#1207) 
* update

* update

* update

* update

* update
 2019-10-18 16:22:38 +03:00
Yair Morgenstern
397d9ccec3 Added river rendering, river effects not implemented yet 2019-10-18 09:16:08 +03:00
Yair Morgenstern
e71bc978b9 Fixed "Negative turns to construction" in extreme edge cases 2019-10-18 09:14:53 +03:00
Yair Morgenstern
96281db945 Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-10-17 10:25:31 +03:00
Yair Morgenstern
33805ca6f8 Organized TileGroup icons (for improvements, resources and units) into a separate class 2019-10-17 00:05:10 +03:00
Duan Tao
691a305e50 Duantao/settler food info (#1198) 
* Better info for building settler.

* Shorter message.

* Fix message.
 2019-10-16 18:16:27 +03:00
Yair Morgenstern
e95fbc3fb9 Expanded and clarified stats breakdown 2019-10-16 10:33:24 +03:00
Yair Morgenstern
ecc32365f5 Added notification when cities are connected to the capital 2019-10-16 00:40:37 +03:00
Duan Tao
e6659a80e0 Fixed : unit cannot be bombarded sometimes between 2 cites. (#1193) 2019-10-15 20:34:08 +03:00
Yair Morgenstern
36ffc5520a Added annex/puppet/liberate/raze explanations on the popup where you choose between them 2019-10-15 20:30:11 +03:00
Yair Morgenstern
14cbe9e21d Even more pixel images! 
Added Pillaging tutorial
 2019-10-15 16:00:07 +03:00
Yair Morgenstern
f7a9aa9bb6 Unit pixel images are now opt-in 2019-10-15 11:09:30 +03:00
Yair Morgenstern
e2459c06fc More unit icons 2019-10-15 10:52:21 +03:00
Yair Morgenstern
35a96dbed4 Bonus and Luxury resources are spread out evenly over the map 2019-10-14 23:00:55 +03:00
Yair Morgenstern
0f351ad964 Solved "Free tech but all techs already researched" problem 2019-10-14 21:43:34 +03:00
Yair Morgenstern
5473afbecf Added icons for the major unit types 2019-10-13 14:06:18 +03:00
Yair Morgenstern
fb768682fe Added more unit icons =) 
Organized tileset image locations
 2019-10-13 11:49:34 +03:00
Yair Morgenstern
538e53883c Added pixel sprites for land and water units! 2019-10-13 11:18:14 +03:00
Yair Morgenstern
16d565a1f2 Resolved #1185 (hopefully): Made trade requests in offer popup, scrollable 2019-10-12 22:44:28 +03:00
Yair Morgenstern
b661308a9d Improvements that provide resources now specified in the improvement picker screen 
Tutorials for resources now specify that a specific improvement is needed
 2019-10-12 22:27:45 +03:00
lishaoxia1985
7d14c0924b 1.update translation 2. delete population number back the city name of city screen because there is a detail table in the screen. 3. now when you touch "X" you can close unit table. (#1184) 2019-10-12 21:39:58 +03:00
Yair Morgenstern
27dfae18de Can now choose Era when starting a new game! 2019-10-11 16:05:27 +03:00
Yair Morgenstern
e77fdd2993 Polynesia works! 2019-10-11 14:54:08 +03:00
Duan Tao
c8e68842e9 Added setting about auto-build roads. (#1181) 
* Added setting about auto-build roads.

* AI tries to keep population growing if possible.
 2019-10-11 12:46:57 +03:00
Yair Morgenstern
a8dac82157 Added Moai as part of Polynesian civ - lots of changes to be made for that! 2019-10-11 12:09:22 +03:00
Yair Morgenstern
0d929a7942 Resolved #1182 - Iroquois unique fixed 2019-10-10 21:10:21 +03:00
Yair Morgenstern
01dd6dfc7d We now assign the input processor when assigning the current screen, hopefully this should solve the "no input" bug in Chrome OS mentioned in #1140 2019-10-10 15:35:26 +03:00
Yair Morgenstern
8d58702d80 Resolved #1177 - Great Improvements now provide Strategic resources 
APK no longer bundles maps in assets
 2019-10-10 14:48:09 +03:00
Yair Morgenstern
eb179c7a66 Nicer menu table 2019-10-10 12:39:52 +03:00
Duan Tao
362184e515 City states now get free techs from major civs. (#1175) 2019-10-10 12:10:54 +03:00
Yair Morgenstern
222e4ad4b5 Tutorial fix 2019-10-10 09:48:05 +03:00
lishaoxia1985
4baa7b6105 fix display tutorial, please update immediately (#1176) 
* update

* update
 2019-10-09 23:40:02 +03:00
Yair Morgenstern
5d6ecd1ca4 More tutorial name changes so it looks better in the Civilopedia 2019-10-08 10:44:14 +03:00
Yair Morgenstern
734e0e8068
Merge pull request #1171 from ninjatao/duantao/barbarian_bonus 
Duantao/barbarian bonus
 2019-10-08 10:27:38 +03:00
Yair Morgenstern
62310fa3d5 Fixed "Game errors when loading game" - #1171 2019-10-08 10:26:46 +03:00
Duan Tao
b1c5398804 Difficulty bonus vs barbarian. 2019-10-08 10:17:14 +08:00
Duan Tao
3ae18374b6 Liberating city state gives influence. 2019-10-07 13:58:34 +03:00
Yair Morgenstern
b3a2bc3307 Tutorials now accessible from Civilopedia! 
Mass tutorial renaming
 2019-10-06 23:18:51 +03:00
Yair Morgenstern
69dd7ec7b6 Resolved #1157 - Added popup for entering Golden Age 2019-10-06 19:46:22 +03:00
Yair Morgenstern
4cde23e7a9 Popups no longer appear in multiplayer when it's not your turn 2019-10-06 19:25:40 +03:00
Yair Morgenstern
3d992fc9ee Resolved #1162 - City button, resources and tech description in multiplayer now act according to the viewing civ, and not the current player - Thanks @lobraarbol! 2019-10-06 19:21:47 +03:00
lishaoxia1985
09420786bc modify battle damage calculation method about city attack. (#1141) 2019-10-05 21:10:10 +03:00
Yair Morgenstern
d1fb55a75e Resolved #1152 - New units no longer skip over unassignable tiles (land tiles for water units, mountains) when spawning 2019-10-05 20:58:33 +03:00
Yair Morgenstern
b9f79376ce Transportation upkeep no longer disappears after adopting Trade Unions - kudos ..,,,! 2019-10-05 20:46:10 +03:00
Yair Morgenstern
2a00ab2775 "Introduction to X" and "Declare war on X" trade items are now only X, adding the extra text on UI display - this makes them translatable 2019-10-04 16:49:31 +03:00
Yair Morgenstern
aafe23a2f5 freeTechs parameter in buildings replaced with Free Technology unique 2019-10-04 16:23:17 +03:00
Duan Tao
2305f18233 Destroy planes when city is razed. 2019-10-03 16:32:27 +03:00
Yair Morgenstern
3358baab52 Added alert popups on finished tech 2019-10-02 18:21:43 +03:00
Duan Tao
1f543843af Better worker AI. (#1136) 
* Better worker AI.

* Fix tiles to improve condition.

* tilesToImprove changed from member to function.

* Minor performance optimization.

* Use the same condition for worker AI long term and short term target.
 2019-10-02 17:49:07 +03:00
Yair Morgenstern
512a68c2ae Fixed bad nations comment end... 2019-10-01 23:30:04 +03:00
Yair Morgenstern
dd561759e4 Fixed bug where Open Borders trades didn't work when loading games 2019-10-01 22:18:25 +03:00
Yair Morgenstern
47db4dce31 Fixed Coastal Raider image 
Puppet cities no longer increase policy costs
 2019-10-01 22:05:38 +03:00
lishaoxia1985
3b2777e098 some translation update (#1135) 2019-10-01 21:55:37 +03:00
Yair Morgenstern
3abd25c130 Added Thai, although the symbols on top don't seem to render well =( 2019-09-29 12:44:02 +03:00
Duan Tao
1607d0b17c Better AI choice for annexing and razing cities. (#1132) 2019-09-29 11:54:43 +03:00
Yair Morgenstern
3ce1c7ee9d Made battle damage more readable 2019-09-29 11:53:54 +03:00
lishaoxia1985
e5370c9b00 1.split different eras in tech tree, although color is not very good. 2. in original game, Japanese UA should be not used in Air Unit, so I fix it. 3. according to original game, edit the method to calculate battle damage. 4. there is two "Mohawk Warrior" words in the file "Units.json", and its obsoleteTech should be"Gunpowder", so i delete the wrong one and edit the right one. 5. edit "Building.json" to make it describing more accurate, of course, i edit "TileInfo.kt" according to the edited"Building.json". 6. some translation update. (#1127) 
* 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

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update
 2019-09-29 10:33:18 +03:00
Yair Morgenstern
7e274cae84 Added translations in map editor 2019-09-28 22:06:52 +03:00
Yair Morgenstern
5980f18f89 Puppeted cities now always auto assign production 
Resolved #1124 - added annex and puppet tutorial
 2019-09-28 21:43:27 +03:00
Yair Morgenstern
27e2b0615a Merge branch 'master' of https://github.com/yairm210/UnCiv 2019-09-28 21:42:45 +03:00
Duan Tao
ba3103277a Fix Persia civ battle bonus. 2019-09-28 21:20:32 +03:00
Yair Morgenstern
49d3ea2c0e Resolved #1125 - cities can bombard over all tiles in a radius of 2 2019-09-27 11:25:23 +03:00
lishaoxia1985
df2faee2a8 fix that the rightsidebutton will change into another words when you touch tech button in tech tree switching from victorystatus screen. (#1122) 
* 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

* update

* update

* update

* update

* update

* update

* update
 2019-09-26 18:17:43 +03:00
Duan Tao
f32f4de3a9 Fixed : Liberated city remain in puppet status. 2019-09-26 18:16:16 +03:00
Yair Morgenstern
98f780be93 Attacking unit now enters enemy city before you decide what to do with it - #1123 2019-09-25 22:26:07 +03:00
Duan Tao
f714dd197c AI bonus starting units should not provide city-states settlers. 2019-09-25 22:00:56 +03:00
Duan Tao
fc5c7235c5 Minor code reorg. Adjust tech trade value with game speed. 2019-09-25 22:00:56 +03:00
Duan Tao
4ca32a0523 Fix a code style bug that caused exception mentioned in last commit. 2019-09-25 22:00:56 +03:00
Duan Tao
e511385d12 Fix a bug that causes exception when selecting special construction. 2019-09-25 22:00:56 +03:00
Duan Tao
56f4d2d57b Annexed city from puppet status should not be in resistance. 2019-09-25 22:00:56 +03:00
Yair Morgenstern
dcdf36b153 Added coloring to tech icons themselves (All tech icons are now white) 2019-09-24 17:55:21 +03:00
Yair Morgenstern
40c76b7752 Resolved #1114 - submarines cannot attack from coast to lake and vice versa 2019-09-24 17:26:19 +03:00
lishaoxia1985
f6009c43ca 1. In PickTechScreen all the Techs have the same size. 2.The tech in different era has different color. 3.About global status in victory status screen, you can touch the icons of Civs to check its policy tree and tech tree, but close button may lead to worldscreen (#1096) 2019-09-24 17:09:19 +03:00
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