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

2655 commits

Author SHA1 Message Date
HadeanLake
44744fd17b
Fix #3000 (#3001) 2020-08-17 14:46:38 +03:00
Yair Morgenstern
574e588711 City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses 2020-08-16 20:43:19 +03:00
Yair Morgenstern
f2f14b6570 Revert "Changed all "[] from [] tiles" to "[] from every []"" 
This reverts commit c89041e2d4.
 2020-08-16 20:16:01 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
c89041e2d4 Changed all "[] from [] tiles" to "[] from every []" 2020-08-15 21:58:26 +03:00
Yair Morgenstern
be216d8e6b Game no longer crashes on new game screen when no scenarios are available 2020-08-15 21:58:02 +03:00
HadeanLake
dc1181f3fd
Update TileInfo.kt and GameOptionsTable.kt (#2990) 
* check if Improvement in question isGreatImprovement before applying buff that only Great Improvements are supposed to have

* update() GameOptionsTable when player selects or unselects mod

some mods might change list of difficulties or eras

* run onChange() when SelectBox is added

so if user select modded difficulty and unselect mod that added it  gameParameters.difficulty will be updated

* add [+stats] from every [baseTerrain or terrainFeature] Nation unique
 2020-08-15 21:20:25 +03:00
Yair Morgenstern
7efbe6feb2 Better loading of stuff 2020-08-14 16:33:09 +03:00
Yair Morgenstern
15bca9cc1c Can now load scenarios from inside mods, so they aren't sent as 2 separate files! 2020-08-14 14:50:22 +03:00
Yair Morgenstern
1261b1de30 List of saved games is now returned as a series of file hanldes - this means there's a lot less ping-ponging between the game name and the file in all kinds of places 2020-08-14 14:28:47 +03:00
Yair Morgenstern
4046837a3e AI chooses to fortify in non-bombardable tiles if possible 
Can choose replacement building for Palace to indicate the capital city
 2020-08-14 13:43:28 +03:00
Yair Morgenstern
7a7fb57f56 Resolved #2985 - fixed Embark/Disembark costs 2020-08-14 10:19:01 +03:00
Yair Morgenstern
81f19c0d12 Merged "save scenario map" and "save map" to the same button - the buttons in the map editor screen are much more managable now 2020-08-14 10:12:24 +03:00
Yair Morgenstern
795599207f Merged "load map" and "load scenario map" to the same screen - they're basically the same thing anyway 2020-08-14 10:07:15 +03:00
Yair Morgenstern
6ebc4ebf6f Units have full movement when starting a scenario map game 
Units have full movement when bought when in Scenario Editor mode
 2020-08-14 09:43:42 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
Yair Morgenstern
25b434cb29 Can now adopt policies in Scenario Editor mode by double-clicking 2020-08-13 18:11:21 +03:00
Yair Morgenstern
88d72f0f39 Spectator and City-State civs are no logner considered as having 'discovered' a natural wonder 2020-08-13 17:45:28 +03:00
Yair Morgenstern
d090b0567c Proper separation between "Scenario Map" and "Scenario" 2020-08-13 17:40:48 +03:00
Yair Morgenstern
a27aecda09 The new age of scenarios is upon us! 
Can save a game and have it get turned instantly into a scenario!
 2020-08-13 17:06:37 +03:00
Yair Morgenstern
42c8a64943 Added "scenario editing" mode for creating prebuild scenarios 2020-08-12 21:58:23 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
Yair Morgenstern
5084bb6f9e Can now play an entire scenario with no improvements or techs defined 2020-08-11 22:53:48 +03:00
Yair Morgenstern
7382d4f8e8 The ImageGetter changes rulesets correctly when entering\exiting scenario editor 2020-08-11 22:44:41 +03:00
Yair Morgenstern
0c84b95614 Tests are sometimes ridiculous. 2020-08-10 23:44:10 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
2e0d73cf75 Game handles 'picking a scenario based on a custom ruleset' well 2020-08-10 22:59:48 +03:00
Yair Morgenstern
0c4947a03e Added Scenario victory condition - can now have Scenario deathmatches! (sort of) 2020-08-10 22:45:34 +03:00
Yair Morgenstern
fd211b1fa3 Scenario now no longer spawns starting units - they should be prebuilt into the scenario! 2020-08-10 21:18:55 +03:00
Yair Morgenstern
8dd8fa3575 Resolved #2951 - only ancient ruins improvements are removed around players' starting locations, and not other improvements 2020-08-10 21:03:28 +03:00
Yair Morgenstern
c17de11c35 Remove all unavailable resource when scenario-ing a map 2020-08-09 23:10:55 +03:00
Yair Morgenstern
be51735fdf Fixed broken tests 2020-08-09 21:37:09 +03:00
Yair Morgenstern
0dae80d379 AI now has 5 favored policy trees for each preferred victory type, making them more likely to win culturally 2020-08-08 22:02:50 +03:00
Yair Morgenstern
1a021a21fe AI no longer uses all its aluminum on units and leaves some for spaceship construction 2020-08-08 21:56:51 +03:00
Yair Morgenstern
b8ce489ea3 3.9.19 2020-08-08 21:39:34 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
376079100d Tile Improvements get parametrized Uniques! 2020-08-07 14:48:14 +03:00
Yair Morgenstern
9a2ec028af Tests fixed 2020-08-07 13:25:51 +03:00
Yair Morgenstern
f0b041b20b NationUnique is now removable whenever we want ;) 2020-08-06 23:48:25 +03:00
Yair Morgenstern
0a30e99359 All nations uniqueified! 2020-08-06 23:29:49 +03:00
Yair Morgenstern
de97e1c32f All nations up till Mongols - almost done! 2020-08-06 20:53:40 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
ce0985d077 All nation uniques up to Iroquois 2020-08-06 20:15:59 +03:00
Yair Morgenstern
9f5b8d157a Converted civ uniques up to India 2020-08-06 19:53:29 +03:00
Yair Morgenstern
1fb566ec30 RIP PolicyManager.PolicyEffects 2020-08-06 18:40:35 +03:00
Yair Morgenstern
97916e15a1 More usage of existing Uniques 2020-08-06 18:26:43 +03:00
Yair Morgenstern
93435948d6 Solved unit purchase discount being 100x what it was supposed to be 2020-08-06 18:11:58 +03:00
Yair Morgenstern
73cd231f5b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-05 21:52:48 +03:00
Yair Morgenstern
bde0b97138 Resolved #2872 - Diplomacy screen now scrollable when there's too much text 2020-08-05 21:51:44 +03:00
Väinö Mäkelä
3ecee11e11
Resolved #2893 - Use list_folder/continue to get the whole folder (#2930) 
listing when downloading a file
 2020-08-05 21:49:23 +03:00
Yair Morgenstern
fef63865f7 Moar performance improvements 2020-08-05 21:46:19 +03:00
Yair Morgenstern
a39303625a Performance improvements for parametrized uniques 2020-08-05 21:31:45 +03:00
Yair Morgenstern
69ed4e3b53 Fixed civ name translation in the top bar and great person point percentage bonuses 2020-08-04 22:42:36 +03:00
Yair Morgenstern
42a96724af Merge tag '3.9.17-patch2' 2020-08-03 23:30:35 +03:00
Yair Morgenstern
697ff92fea 3.9.17-patch2 2020-08-03 23:30:02 +03:00
Yair Morgenstern
a97c9bafcc Civ uniques up to Arabia converted 2020-08-02 22:03:30 +03:00
Yair Morgenstern
5aaab7e137 Civ uniques done up till Egypt 2020-08-02 17:04:11 +03:00
Yair Morgenstern
04d4c9c9bf Resolved #2929 - Can no longer destroy original capitals by nuke 2020-08-02 16:17:20 +03:00
Yair Morgenstern
01d6698b7a Resolved #2928 - contact with other civs is now also when encountering their cities 2020-08-02 15:10:36 +03:00
Yair Morgenstern
ebb8432dcb Changed how great unit recognition works 2020-08-02 13:53:27 +03:00
Yair Morgenstern
0626755a4e Resolved #2924 - got rid of extra +1 science for all improvements 2020-08-02 12:46:05 +03:00
Yair Morgenstern
60b03956cf Resolved #2926 - cost reduction from big ben and policies works correctly 2020-08-02 12:44:07 +03:00
Yair Morgenstern
6cc4db69b1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-02 12:42:59 +03:00
Yair Morgenstern
4cfbf1e5cb Resolved #2925 - Free policy from adopting "Free Religion" works correctly 2020-08-02 12:42:37 +03:00
Alexander Korolyov
9543f2f709
Top bar selected civ refactor, increase performance for updates. (#2913) 2020-08-02 12:38:12 +03:00
Yair Morgenstern
4985d077af Resolved #2914 - Can no longer exploit but to 'skip' promotions 2020-08-01 23:13:59 +03:00
Yair Morgenstern
b4708b05b3 Unified regular unit and great person unit additions 
First playaround with nation uniques!
 2020-08-01 23:04:33 +03:00
Yair Morgenstern
f88e2f2bb7 Merge remote-tracking branch 'origin/master' 2020-08-01 21:46:27 +03:00
lishaoxia1985
acdc6cee69
AS update to 4.0.1, Edit Diplomacy UI in Overview (#2885) 2020-08-01 21:44:32 +03:00
Yair Morgenstern
fbf4312973 All policies converted! 2020-07-31 19:09:56 +03:00
Yair Morgenstern
28f51a2050 Map editor should no longer crash in scenarios 2020-07-31 15:33:27 +03:00
Yair Morgenstern
2d3daa8c3b Scouts ignore river movement penalties 2020-07-31 11:40:02 +03:00
Alexander Korolyov
86f500b266
Fog of war implementation (#2887) 
* Initial implementation fog of war for spectators

* Corrected fog of war for main map

* Fix borders seen in unexplored tiles during spectating

* Small refactor

* Fixes after code review

* Fixes after code review

* wierd bug fix, android studio "eats" spaces
 2020-07-31 11:32:44 +03:00
Yair Morgenstern
275348c70e Pillage action now has a confirmation popup 2020-07-31 11:14:06 +03:00
Yair Morgenstern
bf4f952485 Spaceship parts not shown to user until Apollo Program is built 2020-07-31 10:42:59 +03:00
Yair Morgenstern
f686b0c6d1 Units can pass through cities of other friendly civs 2020-07-31 10:35:42 +03:00
Yair Morgenstern
0be86a6cb2 Merge branch '3.9.16-1' 2020-07-31 10:34:42 +03:00
Yair Morgenstern
9bfc0485e1 3.9.16-patch1 2020-07-31 00:28:48 +03:00
Yair Morgenstern
0f727e1929 Moar policies! Policy stat changes can now happen from wonders as well! 2020-07-31 00:25:48 +03:00
Yair Morgenstern
8fec837e64 Modernized translations yay 2020-07-30 22:40:50 +03:00
Yair Morgenstern
c0a9690d2a Finished Rationalism tree! 2020-07-30 22:39:52 +03:00
Yair Morgenstern
0eaad31ce1 Getting used to multi-param placeholders ;) 2020-07-30 22:26:15 +03:00
Yair Morgenstern
362ca7c1e3 More policy conversions, only 3 trees left! 2020-07-30 22:07:05 +03:00
Yair Morgenstern
0444a28657 Policy transformation 2020-07-30 19:56:43 +03:00
Yair Morgenstern
654a355666 Resolved #2907 - University unique registers properly 2020-07-30 19:15:11 +03:00
Yair Morgenstern
8dfc147bb1 Added civ-wide per-building stat bonus 2020-07-30 19:05:07 +03:00
Yair Morgenstern
ca58bb22ac 3.9.16 2020-07-30 13:37:28 +03:00
Yair Morgenstern
406959c771 Resolved #3901 - nuclear weapon setting remains between games 2020-07-29 23:33:30 +03:00
Yair Morgenstern
97def95817 Can now handle multiple civ-wide uniques of the same type! 2020-07-28 19:56:57 +03:00
Yair Morgenstern
f583c04d38 Game can now handle modded unique buildings that don't replace anything existing 2020-07-28 19:37:30 +03:00
Yair Morgenstern
5fbfa637f2 All improvement placing units are automated in the same way - this allows for the AI to control modded units that place other improvements! 2020-07-28 19:26:02 +03:00
Yair Morgenstern
9d2cc90ccd Railroad connection propagates correctly over harbor connections 2020-07-28 09:27:37 +03:00
Yair Morgenstern
b816d1036d Resolved #2894 - Map editor button only opens popup once 2020-07-27 19:53:50 +03:00
Yair Morgenstern
f18f6d4a29 3.9.15 2020-07-26 22:07:50 +03:00
Alexander Korolyov
94c4b27838
Fix bug when city states gets all techs from spectators (#2881) 2020-07-25 23:08:19 +03:00
Yair Morgenstern
5a97a9be3b Removed confusin extra lines in the diplomacy overview 2020-07-25 23:07:50 +03:00
Yair Morgenstern
4758beffa6 More policy conversions 2020-07-25 23:03:21 +03:00
Yair Morgenstern
627283b10b Converted policies up to Collective Rule 2020-07-25 22:36:15 +03:00
Yair Morgenstern
a5f7aee1ea Upgradable units show the final unit they're upgrading to in the Overview screen 2020-07-25 22:03:45 +03:00
Yair Morgenstern
e7639c93c4 Step 2 - started POC breakdown of policy effects to constituent uniques 
This will allow mix&matching of policy effects, AND allow them to be used as building uniques as well!
 2020-07-24 18:18:17 +03:00
Yair Morgenstern
937a832b2c Step 1 of merging unique powers - civInfo.hasUnique treats building and policy uniques equally 2020-07-24 18:03:53 +03:00
Yair Morgenstern
bf874fe749 [stat] from [terrain] tiles applied to all existing buildings 2020-07-24 17:56:59 +03:00
Yair Morgenstern
066dd615b4 Created stat parameter parsing and translation! 
Genericified "[stats] from [terrain] tile" building unique
 2020-07-24 17:47:55 +03:00
Yair Morgenstern
56052884f1 Resolved #2838 - cities in resistance can no longer be traded 2020-07-24 11:55:10 +03:00
Yair Morgenstern
d7bac9ed3e Genericified 'free [unit] appears] 2020-07-24 00:34:39 +03:00
Yair Morgenstern
548e107504 Generic "must be next to []" unique for buildings 2020-07-24 00:23:42 +03:00
Yair Morgenstern
2e024c67e0 Greatly improved performance of worker's automated city connecting 2020-07-24 00:08:05 +03:00
Yair Morgenstern
c50c490a63 Resolved #2853 - Sped up loading of all saved games 2020-07-23 14:38:36 +03:00
Alexander Korolyov
0f70726c10
Spectator can view other civ stats: Tech, Trades, Cities, Units, Gold (#2877) 
* Select units/cities in spectator mode

* Can enter EmpireOverviewScreen in spectator mode

* keep selectedCiv after nextTurn

* Add current civilization Label and Icon

* Clickable Civilization label

* Victory screen and next turn update
 2020-07-23 14:27:39 +03:00
Yair Morgenstern
b5a4591955 Resovled #2852 - can no longer make peace with a city state while at war with its ally 2020-07-23 14:24:50 +03:00
Yair Morgenstern
3f44e1c519 Resolved #2864 - Locks on tiles are removed when the tile is no longer under your control 2020-07-23 14:17:41 +03:00
Yair Morgenstern
1a558a70d2 Buildings that are missing resources are still displayed in city constructions 2020-07-23 12:54:26 +03:00
Alexander Korolyov
7d360e5fa1
Skip spectator turn in multiplayer games (#2873) 2020-07-22 10:43:03 +03:00
Alexander Korolyov
1c613ac274
Remove unnecessary try catch block. (#2869) 2020-07-22 06:29:12 +03:00
Yair Morgenstern
aa2f9726ac Unit 'unbuildable' parameter converted to unique 2020-07-20 23:36:54 +03:00
Yair Morgenstern
22e5f30b64 3.9.13 2020-07-20 23:25:12 +03:00
Yair Morgenstern
d8b84db3a6 Removed extraneous (for now) G&K files 2020-07-20 23:03:00 +03:00
Yair Morgenstern
e0dcf25e23 More placeholder regex replacements 2020-07-20 00:21:17 +03:00
Yair Morgenstern
ceb456acab Simplified translation file writing by treating all placeholders with a single number in the same way 2020-07-20 00:16:51 +03:00
Yair Morgenstern
95e1e8279d Created parameter-extracting functions for placeholder texts! 2020-07-20 00:04:21 +03:00
Alexander Korolyov
00983dd00e
Spectators can enter and view other player cities (#2856) 
* Spectators can enter and view other player cities

* Spectators not shown on diplomacy screen

* master merge fix

* Spectators can enter and view other player cities

* Spectators not shown on diplomacy screen

* Fix barbarians spawn in spectator mode

* small post fixes

* remove excessive spectator check

* Remove spectators from diplomacy screen

* Spectators cannot reallocate specialists in cities

* Refactor using canChangeState value for CityScreen and WorldScreen.

* Continue refactor using canChangeState value
 2020-07-19 13:35:38 +03:00
Alexander Korolyov
bd422fdb16
Fix map editor gameparameters layout (#2860) 2020-07-19 00:00:04 +03:00
Yair Morgenstern
77d741040d Worker unique is now moddable to other units 2020-07-17 15:47:49 +03:00
Yair Morgenstern
c402d63a68 3.9.12 2020-07-16 23:15:23 +03:00
lishaoxia1985
59f6e10511
some bug fix (#2817) 
* Scout won't be built when research "Scientific Theory". Fix the word "Can only build water units in coastal cities".

* Fix the bugs when you delete all maps close button disappears and you can't go to main menu.

* Basictests don't check that Scout can't upgrade.

* If the unit is obsolete it will remove from construction queue.
 2020-07-16 22:22:47 +03:00
Alexander Korolyov
e74f7608d1
transfer simulateUntilWin from UncivGame to GameInfo class. (#2849) 
* transfer simulateUntilWin from UncivGame to GameInfo class.

* update tests

* Update description comments
 2020-07-16 13:52:39 +03:00
Yair Morgenstern
6309bc2fba Main menu buttons no longer require scrolling 2020-07-15 21:52:42 +03:00
Alexander Korolyov
a0daa6be4c
Add mod compatibility for extended map editor (#2840) 
* Add mod compatibility for extended map editor

* fix crashes when loading scenario with mods enabled

* update imagegetter ruleset when loading scenario

* reload ruleset on new scenrio

* Fixed crash when units/improvements from the missing mods present in the map editor.

* removeMissingModReferences - better name
 2020-07-14 18:17:37 +03:00
Yair Morgenstern
e179f1a472 Added Water Mill building 2020-07-13 22:42:30 +03:00
Yair Morgenstern
f57533bc48 3.9.11 2020-07-13 21:45:52 +03:00
Alexander Korolyov
494e8eacc0
Fixed two empty mods checkbox in game options (#2837) 2020-07-12 16:10:52 +03:00
Alexander Korolyov
c51879cc5f
OptionsPopup with two experimental switches: Spectator mode, Extended Map editor. (#2834) 2020-07-12 12:59:32 +03:00
Alexander Korolyov
438a4dbaff
No improvement/unit editing for Spectator and Random players (#2836) 2020-07-12 12:56:55 +03:00
Duan Tao
e03763766b
Do not generate fallout on impasssible terran. (#2830) 2020-07-11 23:29:15 +03:00
Yair Morgenstern
6d34612035 Empty Faith indicator no longer displayed in city stats 2020-07-10 16:47:33 +03:00
Yair Morgenstern
bc6ce6e54d Better civilopedia icons for buildings and units 2020-07-10 16:40:20 +03:00
Yair Morgenstern
1020dd217e Resolved #2822 - normalized the amount of strategic resources, so they're roughly on par with the amount of luxury/bonus resources 
Also, 'spectators' can now see all resources, even ones which require advanced techs
 2020-07-10 13:15:07 +03:00
Yair Morgenstern
04f0ba945e Resolved #2819 - units no longer gain XP from attacking already defeated cities 2020-07-10 13:00:40 +03:00
Yair Morgenstern
e848d0b8b8 Resolved #2820 - ressurected civs are at peace with everyone 2020-07-10 09:55:48 +03:00
Duan Tao
13a26fa434
Fix AI nuke radius. (#2826) 2020-07-10 09:36:39 +03:00
Yair Morgenstern
04939feb3c 3.9.10 2020-07-08 19:39:16 +03:00
Yair Morgenstern
ddf12b743c Resource toggle button is consistent with population toggle - by @lishaoxia1985 
#2809
 2020-07-08 19:31:32 +03:00
Yair Morgenstern
1fe8d704a0 Unremovable terrain features e.g. Flood plains are no longer removed by great improvements 2020-07-08 19:10:31 +03:00
Yair Morgenstern
cb9687a1c9 Added Faith to stats 2020-07-07 23:26:24 +03:00
Yair Morgenstern
210011fb15 Resolved #2640 - Difficulty level shown in victory status screen 2020-07-07 23:05:27 +03:00
Yair Morgenstern
a06a4531be Great improvements are no longer hardcoded, so new great improvements can be modded in =) 2020-07-07 22:49:36 +03:00
Yair Morgenstern
ad5cf3a1ec Resolved #2811 - Offering the same resource to 2 civs when you only have 2 left no longer causes 'trade no longer valid' for the second one 2020-07-07 22:39:56 +03:00
Yair Morgenstern
19bb1cdb94 Translation writer now takes from all base ruleset, and doesn't add duplicate keys - we're ready to start actual work on G&K! 2020-07-07 00:18:02 +03:00
Yair Morgenstern
0516810571 Dispose main menu screen when exiting to save space 2020-07-06 23:25:11 +03:00