Commit graph

2378 commits

Author SHA1 Message Date
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