Commit graph

2172 commits

Author SHA1 Message Date
Yair Morgenstern
1acf337d55 Resolved #2055 - cities bombard melee units once again
Basically undid the change from #1993 and prettified a bit
@Kentalot
2020-03-03 20:18:38 +02:00
Yair Morgenstern
a493661aad Merge branch 'master' of https://github.com/yairm210/Unciv 2020-03-03 20:09:52 +02:00
Yair Morgenstern
27b9c93d6f Resolved #2035 - Strategic resources are affected by map generation parameters 2020-03-03 20:09:40 +02:00
lishaoxia1985
95354964ba
some UI update. (#2069) 2020-03-03 19:54:20 +02:00
Yair Morgenstern
8a9bbf4154 City state diplomacy screen cleanup 2020-03-03 17:43:07 +02:00
Yair Morgenstern
9721fb66c0 Resolved #2033 - happiness from tiles is always considered correctly in regards to food consumption 2020-03-03 17:25:30 +02:00
Vladimir Tanakov
78dab67257
[2065] Fix issue when unit can sleep while fortification (#2067) 2020-03-03 14:23:01 +02:00
lishaoxia1985
fc9de6f7fb
Fix that when great person creates great improvement great person doesn't disappear. (#2062) 2020-03-02 18:12:17 +02:00
wrov
1df0c408aa
Fixed Multiplayer Turn Notifier periodically failing with error notification. (#2054) 2020-03-02 06:44:53 +02:00
JackRainy
8cae2fb125
Include Nations in the calculation of a translation`s percentage (#2044)
* Include Nations in the calculation of a translation`s percentage

* Refactoring: Parameter renaming

* Check for empty originals
2020-03-01 23:10:43 +02:00
lishaoxia1985
47065e0384
modify Eiffel Tower effect. translation update. (#1955) 2020-03-01 22:25:59 +02:00
JackRainy
24e4d77453
Civilization rankings (Richest, Strongest, Most Fertile, Largest, etc.) (#2036)
* Initial preparations

* Moving to the separate package

* Calculation and visualization

* Translations

* Using a local function instead of additional class

* Using a local function instead of additional class (part 2)

* Rankings French.properties

* Fixup of the leftover

Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
2020-02-29 20:48:55 +02:00
JackRainy
9fbd569e1f
Allow to buy buildings from the queue (#2032)
* Allow to buy buildings from the queue

* Minor refactoring
2020-02-29 20:10:24 +02:00
Yair Morgenstern
fa61bdfd04
Translations (#2020)
* Update Polish.properties (#1997)

* Update Polish.properties

* Update Polish.properties

This should solve the problem (and correct a small translation error)

* Update Polish.properties

Next corrections, thanks @rprzystasz

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* New french translation (#2014)

* Update Italian.properties (#2016)

* Update German.properties (#2017)

* Update German.properties

* Create Nations_German.json

Start new file for nations translation in german

* Update Nations_German.json

* Extensive correction of French translation (#2022)

* Resolved #1986 - research agreement cost consistency

* Tile stats are shown on a row, rather than on a column (#1946)

* Feature/refactor actions (#2008)

* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.

* Update based on comments

* Redo to be more easily compared

* use elvis operator for assignment

* resolve merge conflicts

* Fix typo

* Fix one more typo

* Get rid of one more search for great person actions

* Get rid of one more search for pillage action

* Try to realign methods names for better diff

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Resolved #2012 - manually place starting locations are no longer visible in-game

* Extensive correction of French translation

Many, many several little corrections to the French translation. A few mistakes marred gameplay a little bit, but most of them were simple grammar mistakes. But the details are always important.

* Modifications to resolve conflict

* Modifications to resolve conflict (bus)

* Modifications to resolve conflict MK3

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>

* Updates

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: armandberger <hoel@free.fr>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CarpeLuxNoctem <61473456+CarpeLuxNoctem@users.noreply.github.com>
Co-authored-by: RobertGine <61517798+RobertGine@users.noreply.github.com>
Co-authored-by: Federico Luongo <fluo392@gmail.com>
Co-authored-by: Kentalot <Kentalot@users.noreply.github.com>
2020-02-27 19:57:55 +02:00
Yair Morgenstern
3ccd457759 Victory screen shows the viewing player, not the current player, in multiplayer games 2020-02-27 19:30:22 +02:00
JackRainy
f621ed5192
Fix for the wrong placement of purchased and upgraded units (#2006)
* Place the unit at the current position firstly

* More simple solution

* Try to place unit with traceability taken into account

* Return money and notify about the problem

* Popup dialog instead of notification

* Refactoring: Split UI and logic
2020-02-27 09:22:24 +02:00
Yair Morgenstern
85ea92cf72 Resolved #2012 - manually place starting locations are no longer visible in-game 2020-02-26 22:00:25 +02:00
Kentalot
0565405fc0
Feature/refactor actions (#2008)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Refactor the UnitActions to use more sequences and also to grab the actions needed by Automation directly.

* Update based on comments

* Redo to be more easily compared

* use elvis operator for assignment

* resolve merge conflicts

* Fix typo

* Fix one more typo

* Get rid of one more search for great person actions

* Get rid of one more search for pillage action

* Try to realign methods names for better diff

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-26 21:50:36 +02:00
Federico Luongo
c4375ed4e8
Tile stats are shown on a row, rather than on a column (#1946) 2020-02-26 21:48:24 +02:00
Yair Morgenstern
faa204d86f Resolved #1986 - research agreement cost consistency 2020-02-26 21:43:12 +02:00
Robert
e062947e7e
Trade routes (Railroad) fixes (#2013)
* Changes:
- worker automation to build Railroad overseas (currently they do not improve roads/build new)
- recognize harbor connection and add Railroad production bonus
- extracted and refactored connections to capital lookup

* CR fixes
2020-02-25 15:09:53 +02:00
Yair Morgenstern
252f8b23cc Minor cleanups 2020-02-24 19:33:37 +02:00
Kentalot
7b13a48d74
Try to fix bug I introduced (#2009)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Try to fix bug I introduced
2020-02-24 19:24:14 +02:00
JackRainy
55a8211be0
Do not allow to buy what can not be built (#2007) 2020-02-24 08:14:21 +02:00
Yair Morgenstern
3b4bce780a Arial -> Aerial name refactoring 2020-02-23 22:33:32 +02:00
JackRainy
6009c1b5d3
Continuous rendering is not experimental anymore (#1996)
* Continuous rendering is not experimental anymore

* Better select boxes alignment
2020-02-23 20:22:31 +02:00
Kentalot
3c2cb01169
Earlier version with changes mostly to use Sequences (#1993)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips

* Major refactor to use Sequences instead of List to try to improve logic whenever getting a list of tiles at a distance.

* Get rid of extraneous parameter

* get rid of extra exception. slight refactor placeUnitNearTile for readability

* Fix bug of doing intersection instead of union

* Add an extra method to get tiles in distance range

* Update based on comments
2020-02-23 14:22:50 +02:00
JackRainy
9f0e74be1f
Display the current amount of gold in the prompt dialog (#1995) 2020-02-23 11:25:11 +02:00
JackRainy
eb0fd17d9b
Fix of the click on unknown civilization (#1989)
* Fix of the click on unknown civilization

* Minor optimization

* Better naming of variable
2020-02-22 23:10:52 +02:00
Yair Morgenstern
13d50f250c Resolved #1982 - Can now pic civ-equivalent Great People in great person picker screen 2020-02-22 23:10:04 +02:00
JackRainy
ebe9826b22
Better handling of disband and destroy of carrier with planes (#1992) 2020-02-22 22:32:54 +02:00
JackRainy
cff7435841
Better alignment for "Pick now!" in the pickerscreens (#1984) 2020-02-22 22:30:27 +02:00
JackRainy
aeee5e22eb
Sort the cities by food, production, etc. (#1979) 2020-02-21 11:49:55 +02:00
Yair Morgenstern
43918a2580 Resolved #1962 - set a max zoom level so that "infinite zoom" from capacative scrolling is no longer irrecoverable 2020-02-19 22:34:53 +02:00
GGGuenni
8733f02f85
Bug Fix for Multiplayer Screen (#1970)
* Possible Bug Fix 

Testing if clipboard content == null
This should have been a problem before

* Moved null check into addMultiplayerGame

making it more readable
2020-02-19 14:31:46 +02:00
wrov
cf84f5a0b5
Small bug fixes (#1968)
* Fixed access to unitialized variable
Fixed possible concurrency issue (long has visibility issues)
https://github.com/yairm210/Unciv/issues/1680

* Added comments
https://github.com/yairm210/Unciv/issues/1680
2020-02-19 13:18:40 +02:00
JackRainy
094f72dd26
The Future Tech can't be picked as a free technology until requirements are met (#1967) 2020-02-19 08:25:35 +02:00
Kentalot
8f757e9ab4
Fixes Issue #1697 by adding information to the special production con… (#1965)
* Fixes Issue #1697 by adding information to the special production constructions.

* Get rid of extra $ sign in the SpecialConstruction tooltips
2020-02-18 22:38:14 +02:00
Yair Morgenstern
65e1c90e28 Resolved #1963 - can now unautomate embarked workers 2020-02-18 17:25:59 +02:00
wrov
0b7a64db16
Switched persistent turn notification to false for pre-Oreo Android phones, as they may display an annoying icon in status bar. (#1957)
Fixed potential hanging notifier service due to not resetting error counter.
https://github.com/yairm210/Unciv/issues/1680
2020-02-17 20:57:04 +02:00
Yair Morgenstern
4004c6ff76
Translation (#1951)
* Update Polish.properties (#1931)

* Update Russian.properties (#1932)

* Update Italian.properties (#1933)

Also added Research Agreement

* Update Japanese.properties (#1942)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Translations update (#1943)

* Translations update

* Render some missing characters in the Ukrainian translations

* More translations

* Fixed typo: Otto von Bismark -> Otto von Bismarck (#1954)

* Translation updates, added test to assure that translations in template file end with a space

* Disabled Maven - hopefully Travis check will not take 10 minutes and will pass

Co-authored-by: Freshy <60152907+GreenFreshy@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: schnippl0r <58435847+schnippl0r@users.noreply.github.com>
2020-02-17 19:38:14 +02:00
GGGuenni
80997d157b
Reworked Multiplayer Screen (#1952)
* Added MultiplayerScreen

Added MultiplayerScreen Class to replace openMultiplayerPopup()
Added Sessionbrowser UI elements

* Added Session Browser functionality

* Added ResponsePopup

is used for "copy UserID" among others to be more responsive

* Added "Edit Session" and Help Button

Changed saving Multiplayer Session to seperate Folder
-TODO? Help Button chould be in every pickerscreen

* removed function for Turn Check

heard tobo is working on a Turn checker so no need for the function

* Added delete to editScreen + Cleanup and Comments

delete should be a "give up" instead

* creating new game as multiplayer now saves to multiplayer folder

 + gameId gets copied to clipboard

* Delete unintended save file

delete a save file which got falsely commited

* Added helpPopup Text and refresh Button

* Cleanup + Translation

* More Cleanup

Refresh List doesn't flicker anymore
Response PopUp time for new Game reduced

* Fixed Game crashing on reload

* Added Add Current Game

Games you don't know the gameID of can now be saved when running

* Added Translations entry

* adding requested changes

+ added addCurrentGameButton() for readability and to reduce indentation
- removed unnecessary returns
+ sequentialised try catch for better readability
+ added comments to responsePopup for better unstanding

* Adding requested indent changes

- removed all unnecessary indents
2020-02-17 18:37:15 +02:00
wrov
bc15d97de7
Added Multiplayer Turn Notification Service (#1947)
* Added Multiplayer Turn Notification Service
https://github.com/yairm210/Unciv/issues/1680

* Minor update on Credits.md (#1949)

# Nations
- Fix typo on word "crescent"
- Fix link that flew off on word "sword"

* 3.5.14-patch1

* Edit startgame screen. (#1950)

Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>

* Small improvements suggested in pull request review
https://github.com/yairm210/Unciv/pull/1947

* Removed potential concurrency hazzards caused by access to non-final variables. Added option to turn off persistent notification (may be necessary on pre-Oreo phones.)
Added suggested comments. https://github.com/yairm210/Unciv/pull/1947

* Fixed miscommited debug code. https://github.com/yairm210/Unciv/pull/1947

Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
2020-02-17 18:34:46 +02:00
lishaoxia1985
9d1e45de08
Edit startgame screen. (#1950)
Co-authored-by: u-ndefine <41176671+u-ndefine@users.noreply.github.com>
2020-02-16 22:03:39 +02:00
JackRainy
a6765c0b72
Enable Polinesia worker to build regular improvements (#1945)
* Enable Polinesia worker to build regular improvements

* More short notation, similar to next line

* Revert "More short notation, similar to next line"

This reverts commit f97cc59fac449dcddab7045761cfc1ceb8a900ce.
2020-02-15 21:54:09 +02:00
JackRainy
eb0f00dc72
The civilization whose area is nuked must declear a war (#1941) 2020-02-15 19:06:47 +02:00
JackRainy
cd3004fedb
Barbarians can be never defeated (#1940) 2020-02-15 19:05:57 +02:00
Yair Morgenstern
19cac1f7bf Resolved #1930 - national wonders no longer require built buildings in puppeted cities 2020-02-14 14:32:13 +02:00
Yair Morgenstern
fa31704217 Resolved #1918 - added missing translations 2020-02-14 13:38:05 +02:00
Yair Morgenstern
99111df5c6 Resolved #1818 - Marble bonus now displayed in Civilopedia 2020-02-14 13:23:10 +02:00
Yair Morgenstern
efe200442a Resolved #1927- changing new game parameters and exiting the new game screen doesn't change the current game's parameters 2020-02-14 13:15:30 +02:00
Yair Morgenstern
5117a9faa4 Resolved #1926 - fixed unique improvements 2020-02-14 13:01:10 +02:00
JackRainy
0143f6702d
Preview tile improvements (#1711) (#1919)
* Refactoring: extracted "getImprovementStats" method

* Display the icons for added/removed resources
2020-02-13 09:21:36 +02:00
lishaoxia1985
b6e2b72b5c
The size of minimap will change with resolution changing. (#1922) 2020-02-13 09:20:04 +02:00
Yair Morgenstern
3bfb2a29b7
Merge pull request #1903 from JackRainy/ForgeAndSpacePart
Forge increases production of the space parts (#1902)
2020-02-12 23:17:39 +02:00
JackRainy
4ab084feeb
Forge increases production of spaceparts 2020-02-12 23:11:28 +02:00
JackRainy
5b845abc04
This reverts previous commit cb0a87681e. 2020-02-12 21:25:21 +02:00
r3versi
aec539f77f
Fix tile yields in city screen 2020-02-12 19:39:32 +01:00
Yair Morgenstern
3402065e3c Captured Khans now automate properly 2020-02-12 20:34:32 +02:00
Yair Morgenstern
d9d6f4eeb8
Minimap can show the whole worldscreen (#1872)
Saw the images you sent by email =)
2020-02-12 20:22:19 +02:00
YueR
ac1e5bb417 Minimap can show the whole worldscreen 2020-02-13 00:33:11 +08:00
Federico Luongo
b9e3ca5fd4
Legalism grants enqueued buildings (#1906) 2020-02-11 10:36:58 +02:00
JackRainy
cb0a87681e
Forge increases production of the space parts 2020-02-10 22:06:41 +02:00
Yair Morgenstern
942092e33e Resolved #1902 - buildings requiring worked resources can be built in cities that are built on that resource 2020-02-10 20:35:14 +02:00
Yair Morgenstern
a514e462cc Cleaned up Unit Actions 2020-02-10 18:43:18 +02:00
lyrjie
14f89b6799 Fix: Moai being buildable on forests, etc. (#1896)
* Moved terrain.unbuildable check above moai coastal tile check

* Refactor
2020-02-10 11:32:59 +02:00
Federico Luongo
6d2cf860a7 Reset advanced settings to default (#1894)
* Reset to default

* Translations
2020-02-10 10:25:48 +02:00
Yair Morgenstern
86cd158d83 3.5.12 2020-02-09 20:44:52 +02:00
Yair Morgenstern
26affe7943
Translation (#1878)
* Update Nations_Italian.json (#1864)

* Update Japanese.properties (#1867)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Thai.properties (#1871)

I'm back!!

* Update German.properties (#1873)

Revised promotions

* Update German.properties (#1874)

added missing unit translations

* Update Italian.properties (#1875)

Typo fix

* Update Nations_Russian.json (#1877)

* rfe

* Update Nations_Russian.json

* Update Nations_Russian.json

* Update Russian.properties (#1876)

* Translation roundup + added Mongolian civ translations

* Update Russian.properties (#1879)

Mongolia update

* Additional translation strings related to the custom map settings (#1881)

* Diplomacy screen: Secondary relationships line is added (#1880)

* Additional translation strings

* Update Japanese.properties (#1883)

* Update Japanese.properties

* Update Japanese.properties

* Update to Ukrainian translations + fix of the translation call (#1888)

* Final touches before version

Co-authored-by: Smashfanful <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: IraqLobster34 <56483230+IraqLobster34@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
2020-02-09 20:29:34 +02:00
JackRainy
66ac364045
Center the research screen (#1887)
* Correct list of the researchable techs

* Center on the researchable technology
2020-02-09 20:16:34 +02:00
JackRainy
3f27bdb19e Diplomacy screen: Secondary relationships line is added (#1880) 2020-02-08 21:58:03 +02:00
Yair Morgenstern
e2c435d36f Fixed bug where air units in transports couldn't upgrade 2020-02-08 21:13:03 +02:00
lyrjie
096e1c2beb
Tied the unit upkeep scaling to game speed (#1870)
* Tied the unit upkeep scaling to game speed

* Refactor: Modifier and TurnLimit are now fields

* Turn limit will be derived from the GameSpeed.modifier and base game duration
2020-02-08 20:51:45 +02:00
Federico Luongo
edf0294dfd
Mongolia (#1855)
* Mongolia

* Translation & Atlas

* Remove debug option

* Remove erroneous import

* Promotions.addXP

* Khan heals 15 HP

* XP bonus fix

* Added 'Mongol Terror' which is the term used for the mongolian combat bonus

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-02-08 20:51:21 +02:00
JackRainy
33de01961d
Improvements to the Diplomacy screen (#1851)
* Diplomacy overview window: Using full screen

* Different shades of friendship

* Show/hide the relations for the picked civilization

* Minor refactoring

* Optimized handling of lines visibility
2020-02-08 20:46:42 +02:00
Yair Morgenstern
f8f44320ae Resolved #1859 - skip defeated players' turns in multiplayer 2020-02-06 22:51:26 +02:00
Yair Morgenstern
3d18a2aa0a Automated workers now build unique improvements 2020-02-06 22:21:58 +02:00
Yair Morgenstern
20a7ff7c76 Organized 'explore' actions 2020-02-05 23:30:37 +02:00
Federico Luongo
6fc3b2fd0e
Bugfix: Request rendering on New Game creation and Game Save (#1857)
* Request rendering on New Game creation and Game Save

* setWorldScreen issues a rendering request
2020-02-05 23:04:52 +02:00
Yair Morgenstern
193ebe0ccd Resolved #1852 - buildings requiring an improved resource now accept resources with great improvements 2020-02-05 22:21:57 +02:00
Yair Morgenstern
cb6ca058f3 Solved the 'infinite warmongering penalty' bug 2020-02-05 20:40:05 +02:00
Yair Morgenstern
c4a2a3055e Resolved #1844 - improved worker automation 2020-02-05 00:01:53 +02:00
Yair Morgenstern
1a2e69f4ae Resolved #1847 - Civs defeated by a nuke are now properly destroyed 2020-02-04 23:47:02 +02:00
Federico Luongo
d43afe38e6
Rectangular maps, maps generator, bugfixes (part 1) (#1843)
* TileMap Rectangular constructor

* HexMath utilities

* Perlin gradients changed & utility function to combine octaves

* NewGame & MapParameters UI

* MapParameters & MapGenerator refactor

* Advanced Map Parameters UI

* Fix Hide advanced settings
2020-02-04 23:30:35 +02:00
Yair Morgenstern
eb1ce0f6cb Resolved #1457 - no AI trades are 'automatically accepted', they all require an active decision of the proposed side and will only happen on their turn 2020-02-04 16:13:37 +02:00
Yair Morgenstern
f6b8afc952 When disbanding carriers, transported air units move to nearby tiles if they can. If thy can't then they're disbanded. 2020-02-04 09:23:36 +02:00
Yair Morgenstern
7ac515ad6e If you're at war with someone, then 'please don't settle cities near us' is irrelevant 2020-02-04 09:20:45 +02:00
Yair Morgenstern
748168398e Resolved #1839 - Civs no longer declare war and offer things in the same turn 2020-02-04 09:10:17 +02:00
Yair Morgenstern
df68ff75f8 Resolved #1827 - can no longer see other (current) player's city production in multiplayer 2020-02-04 09:06:41 +02:00
Yair Morgenstern
0ace2e1c7a forgot this little thing 2020-02-03 16:48:32 +02:00
Yair Morgenstern
848637c78c Better top-down trickling of information instead of relying on UncivGame.Current info 2020-02-03 16:41:42 +02:00
Yair Morgenstern
0f26671bcf Resolved #1835 - game no longer crashes when losing alliance with a city-state due to it being captured 2020-02-03 16:24:10 +02:00
Yair Morgenstern
24c3bdc564 Fixed crashes caused by 'healing on friendly tile' checks to unmet civs for barbarians 2020-02-03 16:13:32 +02:00
Yair Morgenstern
ef19775545 More translation related stuff that I forgot =/ 2020-02-02 18:00:08 +02:00
JackRainy
6df11f0a7f
Fix: Capturing the cities must not improve relations (#1828) 2020-02-02 16:07:15 +02:00
JackRainy
db5cc82ec7
"Sleep until healed" functionality (#1821)
* "Sleep until healed" functionality

* Unit test for actions translations is added

* "Fortify until healed" functionality

* Refactoring
2020-02-02 09:55:10 +02:00
ltrcao
0914750489
Show name when icon is tapped in resource overview in a label above the icon. (#1817) 2020-02-01 20:31:12 +02:00
Yair Morgenstern
261c3d6ced Resolved #1820 - Fixed a crashing bug with the AI trying to ally with defeated city states, as well as many other minor bugs
All caused by the fact that getKnownCivs didn't filter out defeated civs
Also some minor code cleanup
2020-02-01 20:26:27 +02:00
Yair Morgenstern
d7310aa90a typo fix withing -> within 2020-01-31 14:17:38 +02:00
lyrjie
58fa5d6dd5
Debug option: simulate game until certain turn (#1812) 2020-01-31 14:10:32 +02:00
JackRainy
7577655264
Nuclear missile is able to target any tile within the range (#1801)
* Minor refactoring

* Refactoring: special function Battle.nuke() for missiles

* Special BattleTable.simulateNuke() function for missiles

* Refactoring: BugReport popup moved into a separate function

* Refactoring: call defaults().pad once in the init()

* Refactoring: not using "syntax sugar"
2020-01-31 14:09:55 +02:00
lyrjie
0888e0a24d
Rewritten the MapUnit.rankTileForHealing() (#1811) 2020-01-31 14:04:44 +02:00
lyrjie
3362c2128c
Fix: notification when city-states advance to a new era (#1813)
* Fix: notification when city-states advance to a new era

* Replaced forEach with for, according with code standards
2020-01-31 14:03:21 +02:00
JackRainy
a728da6a2a
Fix: do not trim the text in the statistics screen (#1810) 2020-01-31 07:50:51 +02:00
Yair Morgenstern
3214bfbbfa
Translations update (#1809)
* Update Turkish.properties (#1799)

* Update German.properties (#1807)

* Improved translations for Ukrainian and russian languages (#1802)

* Chinese translation update. delete some old code about "Scientific Revolution" because its effort has changed. (#1805)

Co-authored-by: lyrjie <lyrjie@gmail.com>

Co-authored-by: rayray61 <54810477+rayray61@users.noreply.github.com>
Co-authored-by: ozolotl <ozolotl@users.noreply.github.com>
Co-authored-by: JackRainy <JackRainy@users.noreply.github.com>
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: lyrjie <lyrjie@gmail.com>
2020-01-30 20:33:19 +02:00
Yair Morgenstern
1119968f59 Resolved #1808 - Disabled declaration of friendship 2020-01-30 20:16:05 +02:00
Yair Morgenstern
c2eac14b3a Solved ANR when waiting for the list of maps 2020-01-30 19:40:01 +02:00
Yair Morgenstern
375c39c61e Fixed crash in city-state influence notification 2020-01-30 19:17:12 +02:00
Yair Morgenstern
b29813b389 Improved queue functionality readability 2020-01-29 22:25:21 +02:00
lyrjie
5e264a7e62 City state influence lower limit (#1798) 2020-01-28 13:01:11 +02:00
Federico Luongo
ea29f91519 Fix buy current construction (#1794) 2020-01-27 23:59:40 +02:00
Teague Lander
ac8a1f144b Add specialist slot tooltip for buildings that provide them (#1776)
* Add specialist slot tooltip for buildings that provide them
 - #1762

* Remove duplicate translations
2020-01-27 08:33:10 +02:00
Timo T
d3d8933bbf Fix popups (#1784)
* Fix community popup not opening

Fixes a regression in b95844d2f4. This commit refactored popups and it was thought that the "screen has popup -> don't show popup" was correct for all popups. That assumption was incorrect, the community popup was not opening anymore as well as the game menu popups (editor and normal game) could not be opened over other popups anymore.

This commit fixes that by introducing a queue for popups. When you try to open a popup and one is already open, the popup you tried to open only gets shown when the popup that was already open is closed. This can be manually overridden with a calling the `open` method with a `(force = true)` argument.

Also, all popups are now and should be opened and closed only with their `open()` and `close()` methods to ensure this behavior works.

* Refactor: Remove all open() methods from popup constructors

While it may be a little less to type, it should be up to the caller to decide to open a popup over other popups (via the `force = true` parameter) or not. This is not possible if a popup is opened automatically within its constructor, which is why that is the wrong place to open the popup-
2020-01-27 08:32:16 +02:00
Yair Morgenstern
de1be0f6ee Forgot to test run =/ welp 2020-01-27 00:19:52 +02:00
Yair Morgenstern
cc764426e5 Added Marathon speed per user request 2020-01-27 00:11:28 +02:00
Yair Morgenstern
f1fb8aea18 Added Marathon speed per user request 2020-01-27 00:11:01 +02:00
Yair Morgenstern
daa3c8fcec Resolved #1782 - air units are no longer sent to join non-transporting units exiting the city
Transportation logic cleanup
2020-01-27 00:04:45 +02:00
ltrcao
563e1f2527 Added quick access to diplomacy screen with other civilizations by tapping on their city buttons. (#1774)
Implemented with @Azzurite's suggestions to match the button's behavior with the player's own city buttons:
* First tap slides the city button down so that the underlying tile is visible.
* Second tap on the button presents the diplomacy screen focused on the city's owner civ.
2020-01-26 21:40:38 +02:00
Yair Morgenstern
7339c43c0d CivilizationInfo.getUnits is now a sequence, for better performance throughout 2020-01-26 21:22:58 +02:00
Federico Luongo
66b5263509 Fix Latitude (#1781)
* Fix Latitude

* Code de-duplication
2020-01-26 21:00:39 +02:00
Yair Morgenstern
67bc2231b9 Fixed anti air units intercept range 2020-01-26 20:59:16 +02:00
Teague Lander
30a50a8c6b Add missing Forge and Seaport production bonus uniques (#1773)
* Add missing Forge and Seaport production bonus uniques
 Parital fix for #1762
 - Forge gets "+15% production of land units"
 - Seaport gets "+15% production of naval units"

* Adds missing translation "+15% production of land units"
2020-01-26 20:17:26 +02:00
Yair Morgenstern
5a6b5e5db3 Simplified research agreement logic 2020-01-25 21:21:06 +02:00
Federico Luongo
925f3267ad Discrete rendering (#1768)
* Re-introduced Discrete Rendering as an opt-in feature

* Persistent settings change
2020-01-25 20:56:48 +02:00
Federico Luongo
59e815c30e Fix turns to construction (#1767)
Fix #1759: the stored production is used only for the first construction of its kind in the construction queue
2020-01-25 19:50:43 +02:00
Marerjh
8469956f91 Update Ukrainian.properties (#1761)
* Update Ukrainian.properties

* Update template.properties

* Update Ukrainian.properties

* Update ConstructionsTable.kt

* Update CityInfoTable.kt

* Update Ukrainian.properties

* Update Ukrainian.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-25 19:47:38 +02:00
JackRainy
e0a00eb9a5 Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions (#1754)
* Implemented aircraft carrier "Flight Deck" and "Armor Plating" promotions

* Template for the translation strings

* New icons are added

Co-authored-by: ltrcao <ltrcao@users.noreply.github.com>
2020-01-25 19:43:53 +02:00
lyrjie
b21fdc6c37 Fix: being able to acquire another player's tiles in multiplayer (#1766) 2020-01-25 19:40:47 +02:00
Yair Morgenstern
e9a6fd86f9 Added 'mountain within 2 tiles' restriction to Machu Picchu as per #1762 2020-01-23 23:44:25 +02:00
rayray61
5889cfd182 sorry for not informing you enough (#1764)
I didn't think you would add them from discord they were just example (I forgot letter Ğ ğ )
2020-01-23 22:15:32 +02:00
Yair Morgenstern
c29ccadc60 Exploring units no longer auto-enter city states 2020-01-23 20:50:53 +02:00
Yair Morgenstern
e419443eb6 Added missing Turkish letters 2020-01-23 20:36:56 +02:00
lishaoxia1985
42e16ec80a Now we and AI can sign research agreement. (#1671) 2020-01-23 20:12:24 +02:00
Yair Morgenstern
ce50828cdb 3.5.5-patch1 2020-01-22 19:09:16 +02:00
Federico Luongo
32e3cb2112 Hotfix Legalism on foundation (#1747) 2020-01-22 19:06:45 +02:00
lyrjie
9e0ed36bba Map editor menu (#1739)
* Refactor: map size is enum

* Feature: map editor menu

* Cleanup

* Added "Empty" map generation type for the map editor
2020-01-22 13:10:39 +02:00
JackRainy
617eea92cf Refactoring of isTransported flag for air units (#1742)
* Refactoring of `isTransported` flag for air units

* Minor refactoring: canAirUnitMoveTo as a separate function

* Redundant check is removed
2020-01-22 13:09:36 +02:00
Yair Morgenstern
4accfb594f Better specialist allocation table placement 2020-01-21 23:27:56 +02:00
Yair Morgenstern
1633394164 Resolved #1696
Specialist allocation
- Is now in a separate class
- Is immediately viewable on the City screen
2020-01-21 23:16:44 +02:00
Yair Morgenstern
7ea6fc2551 Added 4-way tile images (base,feature,improvement,resource) by The Bucketeer
Fixed some issues with existing tile images
2020-01-21 21:02:11 +02:00
lyrjie
73fc55eb0c Fix: Oligarchy (#1740)
* Fix: Oligarchy applying to civilian, water and air units

* Fix: moving unit into/out of city doesn't trigger income refresh
2020-01-21 19:48:52 +02:00
JackRainy
1441dd49f5 Aircraft carrier is added (#1731)
* Implemented aircraft carrier by @ltrcao in PR #1723

* New icon for the Carrier unit
2020-01-20 22:53:59 +02:00
Timo T
b95844d2f4 Refactor: Streamline popups (#1735)
First, `PopupTable` and all extending classes had the `Table` at the end removed. Second, the popup base classes `Popup(Table)` and `YesNoPopup(Table)` were moved from the worldscreen to the util package.

Third: The popups were inconsistent. In CameraStageBaseScreen, there was a check with 3 parts, one if any tutorial was showing, second if any child is a TradePopup, and third if the boolean field "hasPopupOpen" is true.

However, all of these checks were, in the end, `Popup(Table)`s on the screen. So, this check has simply been changed to check if any child is a `Popup(Table)`. All the other checks and their relating code could simply be removed.
2020-01-20 19:13:21 +02:00
Federico Luongo
0a5aefcdd9 Fix Legalism Policy (#1724)
Closes #1712
2020-01-19 18:43:52 +02:00
Federico Luongo
fd765fc442 Hotfix empty entry in construction queue (#1725) 2020-01-19 18:41:25 +02:00
lyrjie
762af74b61 Barbarians don't move/attack on the turn of their spawning (#1719)
* Barbarians don't move/attack on the turn of their spawning

* Revert "Barbarians don't move/attack on the turn of their spawning"

This reverts commit b088fb8c

* Better implementation

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-19 18:40:44 +02:00
lyrjie
7805f90dab Fix: ships being teleported into landlocked cities (#1718)
* Fix: ships being teleported into landlocked cities

* Proposal: extend the city teleport to all owned tiles

* Utilizing the existing method

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-18 22:14:29 +02:00
Yair Morgenstern
014220c480 Merge tag '3.5.3-patch1' 2020-01-18 21:58:09 +02:00
lyrjie
8efe21ea57 Fix: barbarians pillaging ancient ruins (#1720)
Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-18 21:56:22 +02:00
Yair Morgenstern
66637637f4 findFurthestTile no longer crashes when the unit has no tiles it can move to 2020-01-18 21:20:28 +02:00
Yair Morgenstern
02def2ffa9 Resource+Improvement is go!
Added resource-specific plantations by The Bucketeer
2020-01-17 15:07:47 +02:00
lyrjie
d3e88906d6 Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments (#1691)
* Fix: starting units being able to spawn on Ancient Ruins/Barbarian encampments

* Added doc and commentary
2020-01-16 12:06:43 +02:00
Yair Morgenstern
c1c6f93f6d Ancient ruins are no longer save-scummable 2020-01-15 22:21:00 +02:00
Yair Morgenstern
b73e7100c0 Resolved #1700 - As per original civ, you no longer start with a scout. 2020-01-15 22:11:05 +02:00
lyrjie
ad1a57dd02 Map reveal after singleplayer defeat (#1681)
* Added map reveal when the player is defeated in singleplayer

* Added victory (actually defeat) screen when the player is defeated

* Moved the victory screen navigation to an appropriate place

* Moved the map reveal logic to WorldMapHolder

* Tutorials and Diplomacy button are hidden after the defeat
2020-01-15 19:56:01 +02:00
lyrjie
0a12062c70 Fix: "Pick construction" tutorial never completes (#1693) 2020-01-14 15:28:18 +02:00
lyrjie
81258297d5 Fix: ability to buy the same building multiple times (#1692) 2020-01-14 15:21:12 +02:00
lyrjie
2d0aec5a26 Fix: idle units not being properly selected after settling a city (#1685)
Closes #1682
2020-01-13 13:29:38 +02:00
Duan Tao
72df6869a3 Make sure all building be built before producting science. (#1678) 2020-01-13 12:06:19 +02:00
Yair Morgenstern
9a426318ba Proper destruction notification for city states
Added Fur resource image
2020-01-13 00:09:09 +02:00
Federico Luongo
5e003cfd64 Fix Map Editor Lag (#1670)
In painting mode, only the last drawn tiles are updated.
2020-01-12 23:29:26 +02:00
JackRainy
de7a369131 Fix of the Regex expression to heal after the battle (#1676) 2020-01-12 23:24:00 +02:00
Yair Morgenstern
08218b954e healUnit and tryPillageImprovement in BarbarianAutomation use their counterparts from UnitAutomation, because they're basically exactly the same 2020-01-12 23:21:34 +02:00
JackRainy
8a327fa7be Fix for the "Back button can't end Unciv (#1513)" (#1661)
* Callback to exit the game by 'Back' button

* Prompt dialog for the game exit

* Additional strings for translations are generated

* Do not show exit prompt dialog twice
2020-01-12 23:05:49 +02:00
Yair Morgenstern
ca59dc4e1f Removed redundant "else"s for less indentation and 'happy pathing' 2020-01-12 20:52:23 +02:00
Vladimir Tanakov
725edc2a31 Better barbarian automation (#1560) 2020-01-12 20:48:34 +02:00
JackRainy
109b60db2c Disable France culture boost after Steam Power research (#1663) 2020-01-11 22:59:45 +02:00
r3versi
51ecb0e99d Legalism grants Culture Buildings asap (#1658)
* Legalism grants Culture Buildings asap

* Buildings granted by Legalism cost no maintenance
2020-01-11 22:52:58 +02:00
r3versi
a1b03849ec Fix city screen (#1657)
* Last CityScreen fix

* Atlas & Translations
2020-01-11 22:46:17 +02:00
lyrjie
c37ea14df5 Defeat improvements (#1654)
* Fix: civilization not being destroyed when disbanding the initial settler

* Fix: destroyed unit providing visibility until the end of the turn
2020-01-11 22:33:27 +02:00
Vladimir Tanakov
fd5d38fb01 Fix issue when city can not bombard enemy (#1644) 2020-01-11 22:11:20 +02:00
r3versi
2daf27278d WIP Construction Queue (#1648)
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile
* Max queue size, cannot change queue in puppet city or in other player turn
* Queue and current construction reset on puppeting city

* Cleanup again

* CityStatsTable is a separate class so we can play around with where it's located with minimal code changes

* Rejection reason wrap & removing nothing on enqueue a construction

* Crude UI proposal

* Tutorial updates for queues

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-10 11:41:43 +02:00
r3versi
12a98aa4bb City construction queue (#1479)
* Construction Queue

* Added constructionQueue in addition to currentConstruction: if currentConstruction is done, next construction from Queue is started; if Queue is empty invoke ConstructionAutomation
* Queue utility methods: add, remove, higher prio, lower prio
* Icons to move constructions in queue
* Top left city stats moved to top right panel
* Added current construction and queue construction to top left
* Extended selected construction (containing description) moved to bottom right, it is now displayed alternatively to selected tile

Rework

* Max queue size, cannot change queue in puppet city or in other player turn

* Queue and current construction reset on puppeting city

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-09 20:58:15 +02:00
Yair Morgenstern
977fcfb97e Code cleanup - when{} instead of if-else chains, toLabel() instead of Label(...) 2020-01-09 20:54:33 +02:00
lyrjie
ba324c9fad Added the "crudely-drawn map" to ancient ruins outcomes (#1645)
* Added the "crudely-drawn map" to ancient ruins outcomes

Closes #1640

* Extracted the constants for readability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-09 20:40:59 +02:00
drwhut
b1b82c6a67 Fixed a bug where the growth bar's height exceeded the group. (#1646)
This happened on the turn that a city was taken.
2020-01-09 20:18:37 +02:00
lyrjie
fe837d78ee Fix: player being able to buy tiles outside the 3-tile radius (#1643) 2020-01-09 20:18:03 +02:00
philippeitis
bc83be1441 Fix Altas type (should be Atlas). Fix srawable -> drawable (#1639) 2020-01-09 20:17:33 +02:00
Vladimir Tanakov
9776029376 introduce UnitActionsType (#1633) 2020-01-09 20:17:13 +02:00
r3versi
036d4058f1 Cities referenced by UUID (#1638)
* Cities referenced by UUID

* UUID defaulted in CityInfo

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-01-09 19:41:55 +02:00
r3versi
065e944896 Songhai (#1636)
* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty
2020-01-09 19:23:00 +02:00
Yair Morgenstern
f554d8c2c4 Multiple mods work OK! 2020-01-07 19:50:36 +02:00
drwhut
a13570f109 Added a growth progress bar to CityButton. (#1626)
* Added temporary growth number to CityButton.

* Added a growth bar to CityButton.

* Made relevant changes based on comments in pull request #1626

* Added the unicode infinity symbol to reflect no growth.

* New growth functions now return null instead of -1.

* Adjusted the population group width to account for large numbers.

* Changed the colour of the growth number.
2020-01-07 18:55:38 +02:00
Yair Morgenstern
365dced442 Non-continuous rendering isn't quite ready yet 2020-01-06 09:47:18 +02:00
Yair Morgenstern
285c92150c Incan mod is successful! We can haz mods! =D 2020-01-05 22:55:48 +02:00
Yair Morgenstern
7462aae94c Big changes to mods and rulesets - almost production ready!
Rulesets are heavy to load so we now have a RulesetCache, which can construct "custom" rulesets with a list of mods!
We now pack mod images on Desktop run, and load the atlases for the loaded mods on load game!
2020-01-05 22:11:10 +02:00
Yair Morgenstern
6a9de727ad misc. so they don't get in the way of the main work 2020-01-05 21:45:09 +02:00
Yair Morgenstern
47e998269a Allocation and runtime optimization with sequences 2020-01-04 23:02:57 +02:00
Yair Morgenstern
8f231cd6e1 Can now only start game in NewGamScreen with 2 or more players 2020-01-04 22:09:49 +02:00
Yair Morgenstern
7eb4b0db2d 3.4.8 2020-01-04 21:26:33 +02:00
Yair Morgenstern
c6b96f4f5b Resolved #1608 - added û character 2020-01-04 21:17:15 +02:00
r3versi
e61c4f5f1c Discrete rendering (#1612)
* Named threads for debugging/profiling

* Proposal: Discrete rendering, remove black spinning circle
2020-01-04 21:13:41 +02:00
r3versi
23cfab6001 Stop Exploration sets unit.action to null (#1613)
* Stop Exploration sets unit.action to null

* UnitActions callback Fix #1614
2020-01-04 21:08:23 +02:00
lyrjie
2af847b3a6 Fix: "Sell the building" button being randomly disabled (#1611)
* Fix: "Sell the building" button being randomly disabled based on the sell price

* Fix: `sellBuildingButton` being enabled in puppet cities

Co-authored-by: dumichno <57294813+dumichno@users.noreply.github.com>
2020-01-04 21:01:06 +02:00
r3versi
40c6934ae4 Clear current map removes natural wonders (#1607) 2020-01-04 21:00:18 +02:00
Yair Morgenstern
19c21b64f7 All GetTilesInDistance and GetTilesAtDistance are now without new vector allocation, so much faster and with much less memory! 2020-01-04 20:47:09 +02:00
Yair Morgenstern
9907e4429c Removed game settings from crash report, not very helpful 2020-01-03 15:20:38 +02:00
r3versi
f7b5a506fd HexMath is a singleton (#1603) 2020-01-03 10:33:01 +02:00
r3versi
a1b0c1dcd4 TileMapHolder refactor & Map Editor update (#1584)
* TileMapHolder renamed to MapHolder
* EditorMapHolder and WorldMapHolder inherits from ZoomableScrollPane
* MapEditor Brush Size (from 1 to 5)
* MapEditor painting mode (dragging the pointer on screen paints continuously)
2020-01-02 20:02:38 +02:00
Yair Morgenstern
73816dd470 Resolved #1598 - we now save map options for new games started 2020-01-02 19:37:40 +02:00
Yair Morgenstern
52165e692f Specific automation for Missile units means they won't try to move to tiles that they can't move to 2020-01-02 19:36:19 +02:00
Vladimir Tanakov
03aee45fe3 Refactor sounds and unitactions data class (#1596) 2020-01-02 19:01:51 +02:00
Yair Morgenstern
4c51e70283 Managed to load first mini mod, needs some work before this can work for users
(what happens if we started a game with mod A and then we want to start a game with only mod B?)
2019-12-31 17:49:07 +02:00
Yair Morgenstern
61050feca1 3.4.6 2019-12-30 18:36:05 +02:00
lyrjie
cedb6ff5e3 Added the notification for the third-party civilizations (#1558)
* Added the notification for the third-party civilizations

If a civilizations knows about some two civilizations, it will be notified when:
* They declare the war
* They make a peace
* They sign the declaration of peace
* One denounce the other

Additionally, when civ enters a new era, all civs that know about it get a notification

* Fixed the translation `.properties`

* Cleanup

* Fix: 2 notifications for each peace treaty

Russia and America...
America and Russia...

* Typo

* Code style changes

* Resolved conflicts

* Simple getCommonKnownCivs() tests
2019-12-30 18:12:14 +02:00
Yair Morgenstern
2132c49d55 jsonParser no longer serialized in CivilizationInfo 2019-12-30 18:07:00 +02:00
Vladimir Tanakov
1cc8227025 Fix civilopedia parsing, fix dialog does not call update to enable next turn button (#1553) 2019-12-30 18:04:12 +02:00
Yair Morgenstern
d3311b3f24 Map editor works again 2019-12-30 18:00:11 +02:00
Yair Morgenstern
d750e369a0 Resolved #1569 - "Patreon" button actually opens Patreon now 2019-12-29 18:03:59 +02:00
Yair Morgenstern
006b2d7690 External merge resolve of #1566
Merge branch 'spain' of https://github.com/r3versi/Unciv into r3versi-spain
2019-12-29 17:56:05 +02:00
Yair Morgenstern
4dd3a69a72 Can now display pixel resources on the map! 2019-12-29 17:51:39 +02:00
Yair Morgenstern
1143356747 Letting players see other players' policies was not a good idea, having it be unknown is part of the challenge methinks 2019-12-29 15:08:31 +02:00
r3versi
aa034d73c2 Fix natural wonders (#1550)
* Natural Wonders Uniques

* Fix Natural Wonders in Map Editor

* Translation files

* Terrain uniques test

* GBR spawn update Fix #1552
2019-12-28 23:11:37 +02:00
Yair Morgenstern
a55e01f004 AI no longer attempts to get rid of barbarian encampments with nuclear strikes. 2019-12-28 23:10:49 +02:00
Yair Morgenstern
e02038d4bf Fixed crashing bug from trying to move the the enemy unit instead of to the place to attack from 2019-12-28 21:15:57 +02:00
r3versi
461f285059 Moving a city to a cityless Civ flags it as capital (#1556) 2019-12-28 19:10:26 +02:00
Yair Morgenstern
9d9700b119 Welp added some lines I shouldn't have 2019-12-27 00:20:02 +02:00
Yair Morgenstern
80be3c276e Small steps towards mods 2019-12-27 00:15:42 +02:00
Yair Morgenstern
87830bf8b2 Code cleanup - ruleset maps are now lowercased 2019-12-26 22:00:49 +02:00
Yair Morgenstern
6c10d1d4f8 Code cleaning - no more direct access to the cached center tile in CityInfo 2019-12-26 18:08:11 +02:00
Yair Morgenstern
8a229c502c Can no longer purchase constructions from cities in resistance 2019-12-26 18:04:02 +02:00
lyrjie
539758b905 Translation placeholder testing (#1542)
* Added translation string placeholders test

* Fixed the placeholder typos in all translations

* [30] to 30 migration
2019-12-26 14:39:15 +02:00
Yair Morgenstern
94f1b074c9 Indonesian is in and has a flag 2019-12-26 12:15:26 +02:00
Yair Morgenstern
fd8528af7a All tests are properly Koltinized! 2019-12-26 12:01:23 +02:00
Vladimir Tanakov
7f06ae0cce Refactor Tutorials and fix some issues, write tests (#1524) 2019-12-26 11:40:48 +02:00
lyrjie
935f598282 Fix: automated units would advance towards enemies they can't attack without dying (#1529)
* Fix: units would advance towards enemies they can't attack without dying

* Code quality
2019-12-26 11:29:40 +02:00
Yair Morgenstern
a95c9ee4cd Ancient Ruins are now spread out instead of randomized 2019-12-25 23:52:09 +02:00
Yair Morgenstern
94414203ef Resolved #1533 - Defeated city states no longer "declare war" if you attack their ally 2019-12-25 23:42:32 +02:00
r3versi
00f26b1510 Fix #1531 + Indonesian.properties added (#1532)
* Fix #1531

* Requested on Discord

* Update Indonesian.properties

Co-authored-by: hyunamae <59202601+hyunamae@users.noreply.github.com>
2019-12-25 23:37:49 +02:00
lyrjie
be09051295 Fix: cities can be connected to capital via coast even if they don't have Harbor building (#1528)
Reported by discord@tap wature
2019-12-25 10:59:53 +02:00
lyrjie
2c07bae6f2 Fix: barbarians won't enter tiles owned by other civs (#1523)
* Fix: barbarians won't enter tiles owned by other civs

* Barbarians ability to enter player tiles is now affected by difficulty setting
2019-12-24 23:43:26 +02:00
Yair Morgenstern
97f3260047 Grand Mesa artwork by The Bucketeer means it's now in the game! 2019-12-24 15:28:59 +02:00
lyrjie
982c326ccd Polynesia ocean fix (#1522)
yarim210/Unciv#1514
2019-12-24 12:49:25 +02:00
r3versi
b6dbc3a833 Fix nat wonder #2 (#1519)
* Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn

* Bugfix Barbarians spawning on Natural Wonder + Notification on Barbarian Spawn

* Added notification text to ranslations
2019-12-23 23:55:19 +02:00
r3versi
303e0493d8 Fix Natural Wonders tile worked happiness not computed & double bonus from discovering extended (like GBR) Natural Wonder in same turn (#1518) 2019-12-23 22:14:02 +02:00
Vladimir Tanakov
25a3467cb3 Add crash reporting controller and email sending on android (#1509) 2019-12-23 22:12:35 +02:00
Yair Morgenstern
dedb46c55c 3.4.3 2019-12-23 19:15:57 +02:00
r3versi
a1aec212bd City states influence, Bugfix Greece (#1512)
* Fix Greece Unique wasn't effective + Added CityState relation notifications

* Greece influence to CityState benefits from unique
* Added notifications when you are about to lose (or lost) friendship and alliance with a city state. Closes #1168
* Introduced restingPoint in DiplomacyManager to support constant shifts in influence

* Autogeneration translation files
2019-12-22 23:08:46 +02:00
Yair Morgenstern
dff886939d Many many people have said that winning cultural victory is too easy, so it's now upped from 4 to 5 policy branches 2019-12-22 22:14:04 +02:00
Yair Morgenstern
707b59cc6a Hopefully solved ANRs when first entering a large multiplayer game 2019-12-22 22:13:05 +02:00
Yair Morgenstern
3ef34f99ff Added missing translations 2019-12-22 20:00:28 +02:00
Yair Morgenstern
9838e0f3a9 Solved rare bug when razing the capital city 2019-12-22 19:58:38 +02:00
Yair Morgenstern
82d8670b16 Fixed super wierd bug where the conquering player hadn't met the civ he was conquering the city from (whaaaaat) 2019-12-22 19:00:58 +02:00
Yair Morgenstern
ca86d9d360 Hopefully fixed crash on specific devices when activating "Conduct trade mission" 2019-12-22 18:54:07 +02:00
Yair Morgenstern
fb244943fb Fixed crash when liberating cities when you haven't met their original owners 2019-12-22 18:50:40 +02:00
Yair Morgenstern
314b620405 Fixed relatively rare crash where the settings were being read but ended up null, not sure how that happened to start with... 2019-12-22 18:35:41 +02:00
r3versi
c2dc0217b6 Rejuvenation icon + Unique promotions are listed in PromotionPickerScreen (#1506) 2019-12-22 15:29:40 +02:00
Yair Morgenstern
ffd5368df4 Added Promotion information to Civilopedia 2019-12-21 21:05:54 +02:00
Yair Morgenstern
1d2bf490b5 People said in the comments they couldn't find the "Create improvement" button, so here. 2019-12-21 20:35:04 +02:00
Yair Morgenstern
884eb672e7 Merge branch 'master' of https://github.com/yairm210/Unciv 2019-12-21 20:07:43 +02:00