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

2589 commits

Author SHA1 Message Date
Yair Morgenstern
e1aaa88e3d Resolved #2789 - losing a resource no longer cancells all trades with that resource, only as many as is necessary to reach equilibrium 2020-07-02 19:43:01 +03:00
Yair Morgenstern
665404db4d Removed tech exchange, as per Civ V - some of the logic is still there, to allow a gradual phase-out for games that have existing tech trades 2020-06-29 22:22:28 +03:00
Yair Morgenstern
df18d5f8a9 Resolved #2749 - show current improvement and remaining time to build in improvement picker screen 2020-06-29 21:59:45 +03:00
Yair Morgenstern
29e25747a8 Resolved #2112 - Show current resource amounts on incoming trade requests 2020-06-29 21:45:00 +03:00
Alexander Korolyov
5356e63249
Refactor UncivGame initialization - add UncivGameParameters. (#2779) 2020-06-29 20:05:58 +03:00
Yair Morgenstern
79ff8c2ecf Fixed broken tests due to 'impassible' changes 2020-06-28 20:48:51 +03:00
Yair Morgenstern
1bb26c579d All UI changes in MultiplayerScreen now use postRunnable to run on the main thread 2020-06-27 23:51:05 +03:00
Yair Morgenstern
cba9995f99 Fixed natural wonders not being considered 'impassible' for certain things (e.g. ancient ruins spawn) 2020-06-27 23:40:40 +03:00
Alexander Korolyov
4c7970f5d7
Slightly change mechanics of simulateUntilWin (#2772) 
* Slightly change mechanics of simulateUntilWin

* Forgot to turn off some debugging switch
 2020-06-25 22:32:00 +03:00
Alexander Korolyov
aa677042dd
New icon for "Load Scenario" (#2768) 
* New icon for "Load Scenario"

* Javadoc comments
 2020-06-25 22:30:39 +03:00
Daniel Bälz
5753115c30
Fix not translated notifications (#2715) 
* Translate notification strings before they are shown. Fixes #2703

* Respect translations from active mods for placeholder translations

* Revert translation call to avoid issues in multiplayer. Still works without it.
 2020-06-24 23:58:16 +03:00
Alexander Korolyov
de03a727f6
Scenarios editor first part of changes (#2764) 
* Unnecessary line.

* First part of changes

* All features required for basic functionality were implemented.

Additional features:
- Sync between player adding/deleting and it's unit on map editor
- Sync between player's nation change and all it's units

Final prototype ready for beta-test.

* Second part of commits

* Small fix of TileMap.stripAllUnits

* Small post fixes.
Bring back deleting rivers, accidentally removed during merging.

* Fixes by your comments

* reverse if statement for "Random" chosenCiv

* tileEditorOptions take updated this.gameParameters from constructors

* updated unit placement.
Check validity by unit.canMoveTo()
Correct airunit placement in carriers.

* tileMap.stripAllUnits() refactor
 2020-06-24 23:47:34 +03:00
Yair Morgenstern
a23d9ff291 Resolved #2761 - Tutorial titles are auto-added to the translation files 2020-06-24 23:44:17 +03:00
soggerr
213f71def3
Improve performance of multiplayer load poll (#2758) 
* Switch to schedule instead of schedulefixedrate to prevent floodgate of requests after long delays
* Move everything possible off of main thread so user can have smoother interaction with game during poll
 2020-06-24 23:13:04 +03:00
lyrjie
e18bfa0053
Replaced the List with MutableList to avoid creating new ones on adding/removing values (#2746) 2020-06-20 23:10:02 +03:00
lyrjie
835c0832e2
Fixed strategic resources generation (#2745) 
* Fixed strategic resources generation

* Removed the already PR'd part
 2020-06-20 23:09:15 +03:00
alkorolyov
f6b738a04a Now clearCurrentMapButton and TerrainsAndResources clears rivers. 2020-06-20 23:07:22 +03:00
Yair Morgenstern
b49fba6955 Fixed coast tiles around nat wonders spawning land-type tings, hopefully 2020-06-20 23:04:53 +03:00
Duan Tao
b2d0a10f0e Fix oil generation in sea. 2020-06-20 23:04:06 +03:00
Duan Tao
3150c1783c Fix forest display in Default tileset. 2020-06-20 22:57:10 +03:00
Yair Morgenstern
1b73aab856 Opening the New Game screen from within a game saves the previous game parameters, map generation parameters work again 
@alkorolyov
 2020-06-17 19:56:20 +03:00
Yair Morgenstern
604a41ca6c Merge branch 'master' of https://github.com/yairm210/Unciv 2020-06-16 20:35:47 +03:00
Yair Morgenstern
4e0d819d01 Resolved #2662 - left side of the screen no longer becomes unresponsive to player input after changing from a selected unit to a selected city 2020-06-16 20:35:29 +03:00
Alexander Korolyov
62b7138580
Fix error during saving scenario when empty name. (#2732) 
* Fix error during saving scenario when empty name.
Safe saving and check for empty name.

* New Screen instead of popup for Game Parameters, during editing/creating scenario.

* Now game parameters information is correctly loaded with scenario.
 2020-06-16 20:26:03 +03:00
Yair Morgenstern
6900e28671 Resolved #2735 - Diplomatic "Friends with friend/enemy" modifiers are recalculated every turn 2020-06-16 20:24:11 +03:00
Alexander Korolyov
9547b82054
Continue work on Scenario functionality (#2726) 
* Hide all scenarios functionality behind switch in Unciv class.

* Refactoring:
1) abstract class changed to interface
2) rulset added to GameSetupInfo class

Fixed screen bug during map editing

* Added Load/Edit/Delete buttons for scenario functionality.

* Hide recently added scenario buttons behind debugSwitch.
 2020-06-15 20:12:29 +03:00
Yair Morgenstern
46dd66d343 3.9.3 2020-06-14 23:53:11 +03:00
Yair Morgenstern
9b37f0a907 Resolved #2723 - resource-specific improvement bonuses are *in addition to* the regular improvement bonuses, and not instead. 2020-06-14 20:52:00 +03:00
Alexander Korolyov
c3da044c43
Adding units on map editor. (#2667) 
* Adding units to map editor.

* loadScenario checkbox Prototype added to MapOptions table.

* adds switch for Scenario and Unit editor debug

* New Scenario class

* Background step1:
1. Create a new class Scenario, containing TileMap, GameParameters and string name (doesn't really matter where, we can move it around later)
2. Create SaveScenario and LoadScenario functions in MapSaver (save to/ load from scenario name)

* Prototype of Save/Load scenario implementation.

* Add update method to NewGameOptionsTable

* First working Save/Load scenario prototype

* First working prototype of Load/Save scenario

* Added test conditions for the new debug modes

* Resolve merge conflict

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-06-13 22:53:04 +03:00
Yair Morgenstern
1961aa7245 Code for era-based city images is go, the current era city images hide the rivers behind them so it's temporarily disabled 2020-06-10 22:00:32 +03:00
Yair Morgenstern
21f9df63dd Clicking the menu button when it is open closes the menu - #2706 2020-06-07 22:19:22 +03:00
Yair Morgenstern
bc458c72ff Move units out of cities when liberating 2020-06-07 21:27:27 +03:00
Väinö Mäkelä
05ae6fc81f
Don't draw text on worker threads (#2701) 
Drawing text requires OpenGL context if new characters need to be
rendered.
 2020-06-07 19:14:27 +03:00
Yair Morgenstern
713ee08bf9 Buildings requiring a nearby resource can be constructed even when the tile belongs to another city 2020-06-03 19:26:39 +03:00
Yair Morgenstern
d511899ed8 Resolved #2613 - added a close button to the Civ-picking popup in the New Game screen 2020-06-03 19:09:48 +03:00
Yair Morgenstern
3e31be1801 Natural wonders spawned before rivers, so we don't retroactively get rivers on coast tiles 
Other small improvements for catching and avoiding crashes
 2020-06-03 18:44:03 +03:00
Yair Morgenstern
b90690a24b Solved air interception defensive bonuses crashes 2020-06-01 21:57:20 +03:00
Yair Morgenstern
e4661db4e3 Upgraded Gradle plugin 2020-06-01 20:23:11 +03:00
Yair Morgenstern
d77415de8d Barbarian automation's run away uses the same function as the worker's run away - solves a crash caused by bad logic in the barbarian automation 
3.9.0-patch1
 2020-06-01 01:54:26 +03:00
Yair Morgenstern
4b649825cd Battle calculation takes into account the tile that the unit will attack from 2020-06-01 01:51:11 +03:00
Yair Morgenstern
9496c4523e Fixed crashing bug where map generation would try to have rivers going off-map 2020-06-01 01:31:38 +03:00
Yair Morgenstern
22fd10498e 3.9.0 2020-05-31 23:02:07 +03:00
Yair Morgenstern
43f8fa89c0 Game now saves save files in external storage on Android when possible. 
May the lord have mercy on our souls.
 2020-05-31 19:48:36 +03:00
Yair Morgenstern
434ded6070 Simplified multiplayer vs local save storage 2020-05-31 19:20:16 +03:00
Yair Morgenstern
ba9329963f River generation is go! =D 2020-05-31 19:14:16 +03:00
Yair Morgenstern
60aeebd3bb Separated Landmass and Natural Wonder generation from the MapGenerator class - now it's much easier to understand what's going on where. 2020-05-31 17:21:15 +03:00
Yair Morgenstern
844cdcb821 Added a river coordinate system - it's just far enough from the tile oordinate system to be incredibly annoying 2020-05-31 17:05:35 +03:00
Yair Morgenstern
e81e048169 Added combat penalty when attacking across a river 2020-05-31 16:47:52 +03:00
Yair Morgenstern
4a69544c7d Resolved #2672 - Difficulties are sorted by ascending difficulty in Civilopedia 2020-05-30 23:40:27 +03:00
Yair Morgenstern
84e4e58f23 Added movement cost for crossing rivers 2020-05-30 23:32:53 +03:00
Yair Morgenstern
58059fc59b Great person uniques can be added to any modded unit 2020-05-30 23:11:49 +03:00
Yair Morgenstern
40325a38b4 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-05-26 16:35:56 +03:00
Yair Morgenstern
8e9cd174dc 3.8.12-patch1 
Added case where worker that needs to ru away has nowhere to move to
 2020-05-26 16:35:01 +03:00
k.h.lai
a9d9b5a64f
Reformat "object:" to "object :" according to the official kotlin style guide (#2666) 2020-05-26 16:12:29 +03:00
k.h.lai
ef0c0b9407
Improve keyboard shortcut (#2663) 
* Use keyDown instead of keyTyped to handle arrow keys

* Rename getIconAnKeyForUnitAction to getIconAndKeyForUnitAction
Remove unnecessary dependencies in UnitActionsTable.kt

* Use backButtonAndESCHandler to deselect unit and city
 2020-05-25 21:17:02 +03:00
Yair Morgenstern
41aade6eb9 Advanced sliders work on New Map Screen 2020-05-24 21:49:36 +03:00
Daniel Bälz
fcffbbb9bd
Minor UI improvements construction menu (#2657) 
* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable

* Fix padding for headers in construction menu

* Sync width of queue and available construction tables

* Left align "Add to queue" button to prevent jumping

* Remove duplicate separator and padding

* Improve design of CityInfoTable
 2020-05-24 21:30:34 +03:00
Daniel Bälz
ee5ef800c7
Evaluate translations for mods only when the mod is active in a game. Fixes #2622 (#2650) 2020-05-24 21:29:16 +03:00
Daniel Bälz
24c88313e8
Add remove button for construction queue items (#2654) 2020-05-23 23:10:46 +03:00
Yair Morgenstern
2f43213616 Resolved #2647 - Automated workers run away from enemy military units 2020-05-22 11:08:39 +03:00
Alexander
8745f58dc2
Uniformed the size of buttons on LanguagePickerScreen and MultiplayerScreen (#2628) 2020-05-21 22:31:03 +03:00
Yair Morgenstern
90051ebe5c Rivers no longer disappear on 'next turn' 2020-05-21 22:18:28 +03:00
Yair Morgenstern
9b9e172897 Gold deficit only affects science when the civ has negative gold 2020-05-21 22:16:12 +03:00
Jack Rainy
98a4c8bf00
Don't reveal submarine position by city markers (#2643) 2020-05-21 12:20:44 +03:00
Yair Morgenstern
4b405ecc61 Resolved #2642 - added difficulty settings to Civilopedia 
No translations yet
 2020-05-20 22:20:26 +03:00
Yair Morgenstern
d81507ef2d Resolved #2549 - fixed New Game Screen options alignment and placing 2020-05-20 20:52:13 +03:00
Yair Morgenstern
9b93e4fb51 Unified capitalization in New Game screen - #2549 2020-05-20 20:46:59 +03:00
Yair Morgenstern
0262ee816b Resources no longer spawn under unbuildable, unremovable terrain features 2020-05-19 21:44:10 +03:00
AcridBrimistic
39e5d0df0f
relationshipLevel() clean-up (#2627) 
* Diplomacy Clean-up

* Better formatting

* Quickfix

* Fix

counterpoint
 2020-05-19 21:28:32 +03:00
Yair Morgenstern
eb6a11cccb Resolved #2638 - Auto-assign of population no longer "double books" tiles 2020-05-19 19:21:26 +03:00
lishaoxia1985
0678e77487
delete skin file about "*.fnt" and use nativefont instead. (#2109) 2020-05-19 19:06:03 +03:00
Daniel Bälz
47d7e8ef09
Gradle Kotlin DSL (#2634) 
* Ease migration to Gradle Kotlin DSL by changing quotes, function calls and plugin definitions

* Migrate build scripts to Gradle Kotlin DSL
 2020-05-19 00:14:01 +03:00
Yair Morgenstern
45f85d9c38 Fixed Manhattan Project being inversely affected by nuclear weapons disabling 2020-05-18 23:42:40 +03:00
Väinö Mäkelä
4b6bab523f
Rewrite the font system to render the characters incrementally (#2635) 2020-05-18 23:09:38 +03:00
Yair Morgenstern
7330daff48 All UI changes in threads are now run in a postRunnable - should hopefully get rid of IndexOutOfBoundsExceptions 2020-05-18 23:08:19 +03:00
Yair Morgenstern
3032ba9c73 River adjacency functions and gold bonus for tiles adjacent to rivers 2020-05-17 21:29:12 +03:00
Alexander Korolyov
8a43d5c5d6
Change default value for new simulateUntilWinOrLose parameter. (#2632) 
By default it should be 0 - simulation turned off.
 2020-05-17 18:48:58 +03:00
Alexander Korolyov
55fdb3a9e7
Exits simulation mode when player wins or losses. (#2624) 
* Exits simulation mode (simulateUntilTurnForDebug) when player wins or losses.

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/UncivGame.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* Update core/src/com/unciv/logic/GameInfo.kt

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>

* New parameter for simulation until any of player wins or loses or maximum turns reached.
Added battle logging flag.

Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
 2020-05-17 12:33:49 +03:00
Yair Morgenstern
2444b2e1d2 New river edges and flattened tiles by The Bucketeer! 
Opened River changes in Tile Editor - only visual for now, but should help people see how their tiles would look with rivers surrounding them
 2020-05-16 23:54:16 +03:00
Yair Morgenstern
7668a21ae8 Tiny fix to Years To Turn 2020-05-16 22:15:54 +03:00
AcridBrimistic
67f7e67f55
Years per turn improvement (#2607) 
* Year issue fix

* Clean up and try

* real good update

* udf
 2020-05-16 22:01:10 +03:00
Jack Rainy
8877c18f31
Civilian should not move when bought (#2621) 
* Civilian cannot move when bought same as military unit

* Minor code restyling
 2020-05-16 21:57:36 +03:00
Jack Rainy
4026c9b91d
Fix of the translation template for the start new game menu (#2623) 
* Adding missing translations + corrections to existing

* Translation of the "Avoid" starting biases
 2020-05-16 21:56:55 +03:00
Yair Morgenstern
14b99aa010 City-states no longer accumulate points towards Great Generals 2020-05-16 21:40:43 +03:00
Yair Morgenstern
8639fc6e1c Can no longer see other human players' assigned tiles in Multiplayer 2020-05-15 14:07:58 +03:00
Yair Morgenstern
cc8f4c3ceb Separated the city overview from the overview screen - it was getting too crowdded 2020-05-15 12:28:17 +03:00
Yair Morgenstern
2f3d3d96b7 Resolved #2618 - better inter-city navigatin int eh city screen 2020-05-15 10:39:51 +03:00
Yair Morgenstern
54dd7e5d62 Resolved #2611 - City button shrinks on zoom in, showing the 'hidden' unit icons behind it 2020-05-15 00:36:06 +03:00
Yair Morgenstern
de337a0ca2 Fixed crash in rare situation where a citadel takes over land of an unknown civ 2020-05-14 08:22:30 +03:00
Yair Morgenstern
b566aacef4 3.8.8 2020-05-12 21:47:33 +03:00
Yair Morgenstern
b393498c1a Organized checkboxes in game parameters table 2020-05-12 21:46:31 +03:00
Yair Morgenstern
c84550fc2c More NewGameScreen reorg 2020-05-12 21:38:54 +03:00
Yair Morgenstern
0190854b88 Redid layout for the New Game screen - see #2549 2020-05-12 20:38:44 +03:00
Yair Morgenstern
105a7d63b0 Separated MapOptions to its own class - this can help us with map generation in the map editor, AND help us make UI changes for the New Game screen faster 2020-05-12 19:20:48 +03:00
Yair Morgenstern
1ace4bcf3a Normalized "Buy" and "Fortify" sounds, so they're not overly loud 2020-05-11 23:11:18 +03:00
Yair Morgenstern
1adb19787a Removed the crutches for unit attack bugs - we want to figure them out! 2020-05-11 20:33:53 +03:00
Yair Morgenstern
3a2b8453d5 Solved ANR when loading game to display its metadata 2020-05-11 20:20:24 +03:00
Yair Morgenstern
c756014fec Added helper class GameSetupInfo - this will help us when setting up multiplayer games for transferring data from/to the server 2020-05-10 22:28:35 +03:00
Yair Morgenstern
b64391d767 Population assigned to tiles of other cities do not auto-unassign 2020-05-10 20:32:34 +03:00
Yair Morgenstern
f605a0c00f Settler automation takes into account which tiles already belong to other civs 2020-05-10 10:55:38 +03:00
Yair Morgenstern
b012fd0df8 Fixed "isWorked" not registering for tiles worked not by the owning city 2020-05-09 22:01:15 +03:00
Yair Morgenstern
efb823c67d Optimized imports 2020-05-08 11:43:44 +03:00
uncivbot[bot]
a9f9685dc2
Translations update (#2600) 
* Update Romanian.properties (#2589)

* Translation/romanian (#2590)

* romanian translations

* romabian translation

* romanian translatiobs

* wrong diacritics

* fixed wrong diacritics

* Romanian translations

* romanian translations

* Romanian translations

* Romanian translations

* Finalized Nations translations for Romanian

* romanian translations

Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>

* Update Brazilian_Portuguese.properties (#2591)

* Update Brazilian_Portuguese.properties

> Some fixes

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

* German translations 2020-05-06 (#2593)

* German translations 2020-05-06

* Fix two missing tr() calls for User-ID-from-clipboard responses

* add translation to China , USA and Japan city (#2594)

* Update Italian.properties (#2597)

* UPDATE SPANISH (#2599)

I hope this could be useful. Regards.

Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: Beniamin Szabo <beniamin.szabo@reea.net>
Co-authored-by: quantumilogic <64731997+quantumilogic@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: HI_OuO <45450852+zvn2060@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Rakyat02 <63031405+Rakyat02@users.noreply.github.com>
 2020-05-08 11:39:05 +03:00
Väinö Mäkelä
bba289627c
Remove gdx-box2d from build files because it isn't used (#2595) 
* Remove box2d from build files because it isn't used

* Remove some unused includes to make the build work
 2020-05-08 08:05:26 +03:00
Yair Morgenstern
b309cac67b Fadeout for potentially workable tiles currently being worked by another city 
Mint icon looks much nicer
 2020-05-07 13:04:25 +03:00
Yair Morgenstern
0eb79fff82 Resolved #2588 - instead of tile ownershp being transferrable between cities, cities can now work tiles belonging to other cities. 2020-05-06 23:37:02 +03:00
Väinö Mäkelä
91c1e0ae6d
Fix the missing overlays caused by commit 0ffb038129 (#2586) 2020-05-05 20:15:13 +03:00
Jack Rainy
647a0c9ff7
Wait for autosave thread while closing (#2580) 2020-05-05 08:51:41 +03:00
SomeTroglodyte
a940eda4a9
Better Resource order in empire overview screen (#2577) 2020-05-04 22:10:24 +03:00
Yair Morgenstern
2b3a9c14bf Resolved #2576 - Clicking on "Encountering" notifications now move the map to the encounter location 2020-05-04 20:22:23 +03:00
Väinö Mäkelä
0ffb038129
Don't call canReach on the main thread when selecting a tile to move to (#2575) 2020-05-04 17:01:53 +03:00
Yair Morgenstern
d828fdaeca Maps no longer spawn ancient ruins in immediate vicinity of civ spawns 2020-05-03 21:45:23 +03:00
Yair Morgenstern
ad7d7fba60 Added missing Romanian characters 2020-05-03 20:39:08 +03:00
Yair Morgenstern
9397f3608c Fixed thread crashes due to concurrent actor changes in multiplayer update popups 2020-05-03 19:11:07 +03:00
uncivbot[bot]
b42c8672e1
Translations update (#2562) 
* Update Simplified_Chinese.properties (#2545)

* Update Romanian.properties (#2546)

* Update Russian.properties (#2547)

* Update Russian.properties

Tutorial error correction

* Update Russian.properties

Небольшие правки в Tutorial и Tutorial tasks.

* Update Russian.properties

Nations, City-states, minor translations

* Update Russian.properties

Cities

* German translations 2020-04-30 (#2548)

* Update French.properties (#2560)

* Translation/romanian (#2557)

* romanian translations

* romabian translation

* romanian translatiobs

* Update Portuguese.properties (#2558)

* Corrections to the translations (#2559)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: LynxRo <62301821+LynxRo@users.noreply.github.com>
Co-authored-by: BadaTheBada <64350251+BadaTheBada@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: snipe2004 <snipe2004@hotmail.com>
Co-authored-by: Beniamin Szabo <szabo.farkas.beny@gmail.com>
Co-authored-by: guilherme-peev <guilherme.peev@gmail.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
 2020-05-02 21:42:53 +03:00
Yair Morgenstern
f5968e678d Players has to be an ArrayList, or else it's not guaranteed to be initializable when starting mods... 2020-05-01 00:03:07 +03:00
Yair Morgenstern
af8e217e18 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-30 15:58:02 +03:00
Yair Morgenstern
cc206494df 3.8.4-patch1 
Fixed regexes broken for Android by #2538
 2020-04-30 15:57:08 +03:00
SomeTroglodyte
3808c006ae
Translation code cleanup - purely decorative changes (#2544) 2020-04-30 14:08:08 +03:00
Yair Morgenstern
ba2e6d26e5 3.8.4 2020-04-29 19:39:38 +03:00
SomeTroglodyte
4ff1e96892
Make tr() a little faster (#2538) 
* Make tr() a little faster

* Make tr() a little faster - more consistent whitespace

* Make tr() a little faster - fix translation file generator

* Make tr() a little faster - adapted unit tests
 2020-04-29 19:02:48 +03:00
Yair Morgenstern
cee834b062 AI war motivation taked relationship level into account 2020-04-29 19:02:18 +03:00
SomeTroglodyte
44239e9e7a
TranslationFileWriter: patch to duplicate less stuff into mods (#2541) 2020-04-29 19:01:36 +03:00
Yair Morgenstern
6e3de37950 Minimap now looks good for both rectangular and hexagonal maps 2020-04-29 11:14:52 +03:00
Yair Morgenstern
8bcca39f07 WILL YOU SHUT UP ABOUT THE STUPID MINIMAP NOW 2020-04-29 10:56:31 +03:00
Yair Morgenstern
3865972737 Better declare war and city battle decisions (hopefully) for AI 2020-04-29 10:42:35 +03:00
Yair Morgenstern
38333c2600 Resolved #2536 - cities correctly expand to the last available tile 2020-04-28 12:52:18 +03:00
Yair Morgenstern
206686a4d4 Game always resume previous screen on resume(), and autosaves on pause (in case the user / Android decides later that it's closing the app completely) 2020-04-28 00:05:58 +03:00
Yair Morgenstern
e11feaea2f Fixed 'auto assign production' not working when changing from manual to auto assign 2020-04-27 23:21:14 +03:00
Väinö Mäkelä
c4f1e0f15d
Use ArrayDeque for BFS implementation (#2529) 2020-04-27 22:57:32 +03:00
Yair Morgenstern
6e03910097 Fixed crashing error when loading mods 
Load game now shows user ShowableUncivExceptions
 2020-04-27 19:23:59 +03:00
Yair Morgenstern
6fed455d76 Happiness is now a saved transient - saves about 10% of all runtime! Can't believe I hadn't thought of that before! 0_0 2020-04-27 00:01:40 +03:00
Yair Morgenstern
ba2d6fe405 Performance improvements for .nextTurn() 2020-04-26 23:09:06 +03:00
Yair Morgenstern
f0adc40e81 Fixed modification exception when destroying transported units 2020-04-26 20:50:09 +03:00
SomeTroglodyte
5e5a175f06
Terrace Farms: Bonus resource restriction (#2522) 2020-04-26 19:39:48 +03:00
SomeTroglodyte
818adbd1a3
Map editor: Placed improvement check updated: Potentially resolves #2489 (#2518) 
* Map editor: Placed improvement check updated: Potentially resolves #2489

* Map editor: Placed improvement check updated: Code readability
 2020-04-26 19:39:29 +03:00
Yair Morgenstern
f9d5cf60f8 Performance - Great general automation was taking 40% (!) of nextTurn time - decreased to 6%, which is still A LOT but much, much less 2020-04-26 11:23:09 +03:00
Yair Morgenstern
04cd1978fa Resource bonus from Fascism effective immediately 2020-04-26 09:58:24 +03:00
Yair Morgenstern
e50e2ad5d2 3.8.2 
Translations writer updated to handle new older structure
 2020-04-26 00:26:14 +03:00
SomeTroglodyte
20f37d25f1
Character set reorganized, added portuguese vowels (#2513) 2020-04-25 23:14:03 +03:00
Jack Rainy
99f4b612ec
Dynamical width of the buttons (#2496) 
* Dynamical width of the buttons

* Better alignment of icons

* Using the same style as in the game

* Compilation fix after merging
 2020-04-24 15:17:43 +03:00
Yair Morgenstern
4d75f30fd2 Can now add units in map editor! 
Support for loading maps with units added, support for starting gams with maps with preadded units added
Not supported: Starting games with maps of civ A when that civ isn't in the game
This needs a lot of work before it can be released publicly
 2020-04-24 15:04:19 +03:00
Yair Morgenstern
c2fdcb7849 Prepping for multiple rulesets - current ruleset is now is Vanilla folder 2020-04-24 14:03:41 +03:00
Yair Morgenstern
5ec9cc5f67 AI great people will no longer try to raise great improvements on tiles with existing great improvements 2020-04-24 13:47:10 +03:00
Yair Morgenstern
e3ed241b9d Iroquois movement unique only applies to friendly territory 2020-04-24 11:29:24 +03:00
Yair Morgenstern
f318df68ce Resolved #2491 - Terrace farms are not precluded by resources 2020-04-24 11:15:56 +03:00
Yair Morgenstern
5a8b6fdb19 Resolved #2503 - Resizing the game no longer returns you to the main menu 2020-04-24 11:04:11 +03:00
Yair Morgenstern
9ec721f93b New game screen adjusts to base rulesets with small amounts of civs, including barbarians 
Unknown eras no longer cause the screen to go black
 2020-04-23 23:21:25 +03:00
Yair Morgenstern
33ee29bbb2 Saving a map from the map editor screen no longer changes the screen 2020-04-23 23:03:29 +03:00
Jack Rainy
813ba5b83c
Hotfix: Do not reset the screen to the capital in the multiplayer game (#2502) 2020-04-23 22:46:07 +03:00
Yair Morgenstern
c0b1788d96 Changed main menu buttons to the default color scheme, renamed MenuScreen to MainMenuScreen 2020-04-23 20:16:14 +03:00
uncivbot[bot]
c890895f39
Translations update (#2500) 
* French translation fixes (#2484)

* Replace tile improvement term in FR to match Civ terminology

* FR fixes for tutorial

* FR fixes for buildings and diplomacy

* FR fixes for Trade, Nation and City-State

* FR fixes for Menus and notifications

* FR - Removed particles in front of civ names

* FR - fix non translated string (419 -> 335)

Most of the fixes here are city or place names.
These were extracted from Wikipedia French articles matching the
corresponding english article.

Thanks goes to https://wikipedia.org

* FR - fix space before "!", typo, translate falsely translated tutorial lines

* Translations (#2490)

* Translations are added and corrected

* Translations for the main screen

* Update Indonesian.properties (#2487)

* Update Indonesian.properties

Finished all required translations
Some tweaks and corrections
Enjoy, Indonesians

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Luke Marlin <luke.marlin@viacesi.fr>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-04-23 20:09:31 +03:00
Yair Morgenstern
f2c8c04106 More concurrency problems solved 2020-04-23 20:00:08 +03:00
Yair Morgenstern
07b4dcd8ba Fixed #2492 - trading cities with units in them no longer crashes the game 2020-04-23 19:53:06 +03:00
Yair Morgenstern
4e53bb77d1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-23 19:39:42 +03:00
Yair Morgenstern
c73df02d76 Unified City States and City-States -> City-States #2497 2020-04-23 19:39:16 +03:00
Jack Rainy
73ffe4f44f
Decrease CPU load for multiplayer game (#2495) 
* Decrease CPU load for multiplayer game

* Misprint is corrected
 2020-04-23 19:33:14 +03:00
Yair Morgenstern
286ef707c2 Can start a new game from within a game, to copy over the game's parameters 2020-04-22 17:16:24 +03:00
Yair Morgenstern
b59cc8ab4f Fixed resource display bug in tile table in multiplayer 2020-04-22 16:25:42 +03:00
Yair Morgenstern
688b780b14 Added a repeating baclground to the menu screen 2020-04-21 23:53:33 +03:00
Yair Morgenstern
0321aed309 Solved a concurrent modification bug, a second before publish 2020-04-21 20:34:02 +03:00
Yair Morgenstern
700b1afb34 3.8.0 2020-04-21 20:28:41 +03:00
SomeTroglodyte
f774b715ab
Allow scandinavian lowercase vowels (capitalized are very rare) (#2479) 
Co-authored-by: proteus-anguinus <16001896+rh-github-2015@users.noreply.github.com>
 2020-04-21 20:01:18 +03:00
Yair Morgenstern
6bfe7ea9c7 Map editor now works with functions on the selected tiles - much cleaner! 2020-04-21 15:18:28 +03:00
Yair Morgenstern
081f8cb4a6 Getting to map editor from the main screen is much nicer 2020-04-21 14:53:34 +03:00
Yair Morgenstern
5aae57d848 Added icons to the main menu, looks much better! 2020-04-21 14:18:38 +03:00
Yair Morgenstern
4c3b9e0c14 Map editor leaves to main menu 2020-04-21 12:40:38 +03:00
Yair Morgenstern
0ed283f5e3 Can enter map editor directly, without loading a game 2020-04-21 00:35:10 +03:00
Yair Morgenstern
661ac08e5c Moved the map editor into the main menu as well 2020-04-21 00:07:05 +03:00
Yair Morgenstern
bb3a84fbe7 Removed may references to UncivGame.Current 2020-04-20 23:35:38 +03:00
Yair Morgenstern
eaf7c0a150 New players are correctly send to the language screen 2020-04-20 23:21:52 +03:00
Yair Morgenstern
a3a9bd142e Added a main menu - and it only took 3 years before I felt it was needed 
This should allow players whose game generation is crashing to be able to send us games, and a lot more besides!
 2020-04-20 23:16:58 +03:00
Yair Morgenstern
458caa8bbb Map height normalized to feasable amounts of mountains 2020-04-20 19:47:26 +03:00
Yair Morgenstern
b6fc37aad8 Resolved #1936 - can sign Declarations of Friendship in Multiplayer 2020-04-20 18:29:16 +03:00
Yair Morgenstern
09bdaeb7a8 Resolved #2360 - can now change the current user ID for multiplayer when changing devices 2020-04-20 17:35:05 +03:00
Yair Morgenstern
1a0d808b65 More toTextButton() changes 2020-04-20 17:33:46 +03:00
Yair Morgenstern
fea202dbd6 Much more turn-efficient exploration! 2020-04-20 15:46:49 +03:00
Yair Morgenstern
b6f75f0583 Better exploration - units explore to tiles adjacent to those they don't know, which solved the "I can't see the coastline" effect 
This may have a performance impact, so reduced the radius of the search significantly - beyond that, people can send them manually to explore and then automate whe they're close enough
 2020-04-20 14:31:42 +03:00
Yair Morgenstern
cbeb9a96a6 replaceAll appears to be a Java 8 feature, so rewrote the queue updating when obsoleting units 
Also added sequence changes as per @SomeTroglodyte
 2020-04-20 13:31:21 +03:00
Yair Morgenstern
bc7ee18141 More sequencing, it can only help 2020-04-20 09:24:38 +03:00
Yair Morgenstern
81097fdde9 City tiles are always contiguous, otherwise loads of wierd bugs happen 
Also, better calculation of the number of claimed tiles
In retrospect this has been plaguing us for a long time
 2020-04-20 01:46:21 +03:00
Yair Morgenstern
1564502fc2 Fixed unassigning extra specialists, and activate that at the end of each turn 2020-04-20 01:44:25 +03:00
Yair Morgenstern
3f97daf1da 3.7.6 2020-04-19 23:55:11 +03:00
Yair Morgenstern
e3b9e73c50 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-19 22:57:04 +03:00
Yair Morgenstern
122b815fc0 small minimap fix 2020-04-19 22:55:48 +03:00
SomeTroglodyte
f99b3f574a
Minimap size may be a matter of taste (or screen size) (#2468) 2020-04-19 22:52:55 +03:00
Jack Rainy
c449e68ba7
Highlight unique offer suggestions (#2469) 2020-04-19 20:52:51 +03:00
Yair Morgenstern
e06c0f47a7 We can now support mods with no techs whatsoever! 2020-04-19 20:26:55 +03:00
Jack Rainy
c5abfc5066
Minor UI fix: city-state dropdown list has sufficient width (#2467) 2020-04-19 19:18:10 +03:00
Yair Morgenstern
5d95356e0f Can build mods without workers 2020-04-19 18:11:19 +03:00
Yair Morgenstern
95fd51acc5 Removed city center icon from Civ VI - it's not legally ours! 2020-04-19 17:17:57 +03:00
SomeTroglodyte
e599a2007e
Fix minimap mouse dragging behaviour (#2466) 
Sorry *that* ScrollPane was never meant to go *there*
 2020-04-19 16:58:13 +03:00
Jack Rainy
cd9737df9f
Display trades sorted by expiration (#2465) 2020-04-19 16:36:13 +03:00
Yair Morgenstern
14d526605f Minimap reverted to previous "see constant size" - "see everything" is of no use at al on large maps 
Feature graphic updated
 2020-04-19 14:11:09 +03:00
Yair Morgenstern
77b72cccf7 Civ picker adjusts to Scenarios with few civs 
Map generator can handle maps with no water tiles
 2020-04-19 10:10:55 +03:00
Yair Morgenstern
9b1ca770cb We don't need a special parameter for 'no barbarians'... since we can jut not include barbarians in the Nations to begin with... 
Obviously
 2020-04-19 09:16:19 +03:00
Yair Morgenstern
004bede4bb modOptions propogation now works - mods can get by without having a Barbarians civilization! 2020-04-19 00:24:50 +03:00
Yair Morgenstern
745d48c2ae Can now permanently disable barbarians in mods 2020-04-18 23:59:26 +03:00
Yair Morgenstern
4fd869dbee Tile variants! 2020-04-18 22:46:25 +03:00
Yair Morgenstern
cb2e3a1bce More .toTextButton() changes 2020-04-18 22:35:25 +03:00
Jack Rainy
77a63ce365
Citadel improvements + improved AI for the forts (#2453) 
* Allow building the citadels either next to or within friendly tiles only

* Citadel acquire the tiles around it

* AI uses the citadels to get the tiles back + improved AI for the forts
 2020-04-18 21:25:48 +03:00
Jack Rainy
d4ef5cb637
Map Editor UI improvements (#2462) 
* Better icons for "clear" tools

* Map editor layout is reworked
 2020-04-18 21:20:50 +03:00
SomeTroglodyte
4f00639969
Fix: Modded strategic resource without tech prerequisite crashes game (#2460) 2020-04-18 21:19:52 +03:00
Yair Morgenstern
885f280747 Merge tag '3.7.5-patch1' 2020-04-18 21:15:51 +03:00
Yair Morgenstern
1b4cd9c3b3 Fixed replacing obsolete units for new queue 2020-04-18 21:10:39 +03:00
Jack Rainy
6635ed5be9 Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 21:04:18 +03:00
SomeTroglodyte
0397cd7126
Fix city construction side effects (#2448) 2020-04-18 21:01:26 +03:00
Jack Rainy
0de947d1b9
Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 20:59:29 +03:00
Yair Morgenstern
75b11a0a9a Civs never start out on snow (might as well start over...) 2020-04-17 18:03:50 +03:00
Yair Morgenstern
a3843450bf Starting techs no longer hardcoded - this means that mods can have their own tech trees starting wherever 2020-04-17 17:52:45 +03:00
Yair Morgenstern
c764324e81 Unique units do not need to replace existing units 2020-04-17 17:15:21 +03:00
Yair Morgenstern
30fc110d67 More era-related fixes 2020-04-17 15:26:24 +03:00
Yair Morgenstern
eba7dc8c8c All era names changed to "... era" to fit in with what is actually translated and displayed 
Removed Era enum - too restrictive to tech tree variations (atomic era, anyone?)
As a side bonus, mods can now add their own eras, that'll be interesting?
 2020-04-17 15:11:45 +03:00
Yair Morgenstern
4c48cfe4f3 Can now specify a mod as a 'base ruleset', and the regular base ruleset will not be added 
This means that you can 'start from scratch' and build whatever you want - example "Scenario" in unciv-mod-example repo
Obviously we'll have to change around a lot of things or this to work well, but it's a start
 2020-04-17 14:42:15 +03:00
Yair Morgenstern
ffe8691df9 Disabled city-state notifications when the city state is defeated 2020-04-17 14:13:18 +03:00
Yair Morgenstern
f9e7411569 3.7.5 2020-04-17 11:58:42 +03:00
Yair Morgenstern
de1c6872fe Resolved #2444 - buying buildings no longer crashes 2020-04-17 11:33:57 +03:00
SomeTroglodyte
cb87ae94a8
Effect of rationalism was not visible in city UI: Translations patch (#2442) 
* Effect of rationalism was not visible in city UI

* Effect of rationalism was not visible in city UI - translations patch
 2020-04-17 10:21:11 +03:00
SomeTroglodyte
14991c3261
Keyboard-operated unit actions didn't play their sounds (#2438) 2020-04-17 10:18:35 +03:00
SomeTroglodyte
64ec6bd26e
Bring Legion Unit closer to wiki? (#2439) 2020-04-17 10:15:41 +03:00
SomeTroglodyte
fce4b41aaa
Keyboard: Left/Right arrows work in city screen (#2445) 2020-04-17 10:14:13 +03:00
SomeTroglodyte
bc6e2c97ef
Clarify/optimize the role of the inProgressConstructions validator (#2433) 2020-04-16 20:41:05 +03:00
SomeTroglodyte
3f7d5a5cb4
Perpetual constructions display "0 turn" in the queue (#2435) 
This gag or omitting the line entirely both look better
 2020-04-16 20:40:27 +03:00
SomeTroglodyte
ac8648216e
Tiny optimization for isCoastalTile (#2434) 
Yes benefit may be low as neighbors are already cached, but cost is negligible
 2020-04-16 20:39:45 +03:00
Jack Rainy
31134d0fe5
Disable auto building of forts while a human can do that (#2436) 
* Automate building forts for AI players only

* Using constants
 2020-04-16 20:39:05 +03:00
Yair Morgenstern
248d7b5aa6 More policy names to effects 2020-04-16 17:06:47 +03:00
Jack Rainy
038e1cadbf
Application crash after the defeat (#2427) 2020-04-16 16:15:47 +03:00
Yair Morgenstern
25b1259ab6 Resolved #2348 - construction queue is 'cleaned' after every construction 
It's much easier to validate the construction queue now as well
 2020-04-16 16:12:17 +03:00
Yair Morgenstern
1d2ec21210 There is only one true source of removing constructions from the queue, to which all other functions lead 2020-04-16 15:58:46 +03:00
GGGuenni
4fc5c5de64
New screen for "Add Game" [MultiplayerScreen] (#2431) 
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
 2020-04-16 14:44:52 +03:00
Yair Morgenstern
7d3a10b6ab All constructions are now in the queue - no more separate "current construction" and "construction queue" - #2428 
That went pretty simply, compared to the magnitude of the change
 2020-04-16 13:01:45 +03:00
Yair Morgenstern
3ba20dca52 Resolved #2413 - Yes, having the hotkey always be on display does look much nicer, and I think it's more user-firendly too (no more 'wait let me hover over it to see what the hotkey is') 2020-04-16 11:59:11 +03:00
Yair Morgenstern
381f61a441 More isAdopted to hasEffect conversions 2020-04-16 11:30:22 +03:00
Yair Morgenstern
d031b2855b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-16 11:06:58 +03:00
Yair Morgenstern
c1f0084fb0 Added a check to see if a policy effect was active - this is an important step towards "different effects for the same policy name", as happens between Vanilla and G&K/BNW 2020-04-16 11:05:49 +03:00
SomeTroglodyte
048ce0d3c3
Remove "Camp" hardcoding and allow mods to do similar things (#2417) 2020-04-16 10:41:29 +03:00
Jack Rainy
2594777b52
The original capital can not be razed (#2412) 
* Civ is not defeated while at least 1 settler is alive

* The original capital cannot be razed

* Revert "Civ is not defeated while at least 1 settler is alive"

Defeat condition is: no cities remained
 2020-04-16 10:33:58 +03:00
Jack Rainy
1203dc7f7d
Using the correct icons for the great improvements (#2425) 2020-04-15 23:36:50 +03:00
SomeTroglodyte
5033cca9c2
Next turn button had a dead color assignment statement (#2403) 
Color goes to Label instead of container
  String comparison special casing eliminated
  Clearer code structure
  Chose different colors - from standard palette but close to associated stat

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-04-15 23:34:01 +03:00
SomeTroglodyte
966de236f4
Options: Turning on city production autoassign affects world immediately (#2401) 
* Options: Turning on city production autoassign affects world immediately

* Options: Turning on city production autoassign affects world immediately - patch
 2020-04-15 23:33:12 +03:00
Jack Rainy
ba81c3e97c
The world view top panel can open the corresponding screens (#2415) 
* Empire overview can open the requested pages

* Open the empire overview screen on the given page

* Open the tech and policies screens

* Turns counter opens the victory status screen
 2020-04-15 23:19:09 +03:00
SomeTroglodyte
fcc14ab093
EmpireOverview: A little color on the Stats page (#2419) 
* EmpireOverview: A little color on the Stats page

* EmpireOverview: Align numbers on the Stats page
 2020-04-15 23:17:03 +03:00
Jack Rainy
ed9fcc3ec1
Fix application crash when city area is too small (#2421) 2020-04-15 23:14:58 +03:00
SomeTroglodyte
9fb6ad29e5
Cultural expansion pauses when no more tiles available (#2414) 
* Cultural expansion pauses when no more tiles available

* Cultural expansion stops when city owns whole 5-tile radius
 2020-04-15 23:14:15 +03:00
Yair Morgenstern
096eb7935a Welp forgot I was on debug mode 
I should probably add in a pre-commit check
 2020-04-14 15:17:40 +03:00
Yair Morgenstern
9d24fc0ff5 Resolved #2146 - can no longer accept multiple offers in a row which invalidate each other 2020-04-14 10:52:16 +03:00
Yair Morgenstern
3174767634 Added description for continuous rendering - #2213 2020-04-14 10:46:23 +03:00
Yair Morgenstern
f5a8211574 Resolved #2322 - added city expansion tutorial 2020-04-13 23:51:27 +03:00
Yair Morgenstern
50f79f5a3a Resolved #2407 - reveal all civs when won or lost 2020-04-13 23:21:19 +03:00
Yair Morgenstern
b441d537a5 Resolved #2278 - various exploration-related improvements 2020-04-13 23:08:45 +03:00