Commit Graph

3492 Commits

Author SHA1 Message Date
253e62de72 City states give gold when met; updates to city state gold gifts (#4435)
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
2021-07-10 21:51:11 +03:00
5925489c0b Fixed bug (#4449) 2021-07-10 21:18:45 +03:00
02bacac8e7 Fixed nullptrexception (#4458) 2021-07-10 21:10:04 +03:00
74b3db5927 Fixed bug where gold from rivers wasn't doubled during golden ages (#4462) 2021-07-10 21:09:21 +03:00
0c916e85fb Fixed _very_ old inconsitency that broke my game :( (#4442) 2021-07-09 19:15:16 +03:00
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
c327b54b1b City Centers can no longer be removed by nukes (#4423)
* City Centers can no longer be removed by nukes

* Implemented requested changes

* Implemented more requested changes
2021-07-09 12:13:45 +03:00
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
5376e488a0 Added a simplified version of great prophets, implemented a basic city religion UI (#4356)
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
2021-07-09 10:48:33 +03:00
edad1e10a2 Fix for placeholder parameters changing names and becoming out of sync with existing translations.
Relevant to #4402
2021-07-09 10:16:39 +03:00
21eadb39ff Updated TranslationFileWriter to include the new values that filters can have (#4402)
* Updated TranslationFileWriter to include the new values that filters can have

* Implemented requested changes
2021-07-09 09:14:24 +03:00
ced85fafd1 Fixed a bug where one city challengers could capture enemy cities (#4431)
* Fixed a bug where one city challengres could capture enemy cities

* Actually, this is a cleaner implementation
2021-07-09 09:11:17 +03:00
fbd64b9520 Refactored the way cities determine what uniques should apply when (#4393)
* I'm so sorry for the size of this PR

* Uniques are better generalized

* Code now compiles

* Missed a line

* Some more cleaning up
2021-07-07 22:01:14 +03:00
373b42bfcf Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00
1d080ac54d ExpanderTab revisited - move and apply to city screen (#4401) 2021-07-07 18:21:51 +03:00
9e37cc8f16 Fixed crash when a city had negative population due to faster razing (#4389) 2021-07-06 19:41:23 +03:00
7875ec4896 Better mod download and error display (#4396)
* Better mod download and error display

* Fix Android Studio Insubordinations
2021-07-06 19:33:05 +03:00
a6041d670d Obvious mistake 2021-07-05 21:11:47 +03:00
c1ff2e4ba7 Fixed Denmark's unique including also embarking instead of just disembarking 2021-07-05 21:06:54 +03:00
c42561c545 Spruced up Civilopedia - phase 4 - Visual candy, Units (#4350)
* Spruced up Civilopedia - phase 4 - Visual candy, Units

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - atlas merge

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - do separator to-do
2021-07-05 16:35:41 +03:00
c2a43ffee0 Fixed bug where city-states would not share their science income even if the player had the right policy (#4381)
* Fixed bug where city-states would not share their science income even if the player had the right policy

* Implemented requested changes
2021-07-05 16:34:15 +03:00
d909143a34 'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
624fe33be1 Updated template.properties (#4377)
* Updated translation file

* Made tests happy

* Removed unused, athematic unit filter

* Added submarine unit translation
2021-07-05 11:20:12 +03:00
6215a5990d More concurrency problem fixes in nuke effects 2021-07-05 11:12:36 +03:00
2c51f84bec Unified separators, CheckBox helper (#4349)
* Unified separators, CheckBox helper

* Unified separators, CheckBox helper - patch1

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - patch3
2021-07-05 09:35:25 +03:00
957c8697ac Added the nation of the Netherlands (#4372)
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
2021-07-05 09:35:04 +03:00
8fb55e77a3 ExpanderTab revisited (#4357)
* ExpanderTab revisited

* ExpanderTab revisited - patch1
2021-07-04 21:25:58 +03:00
0d26c69710 More bug fixes (#4370)
* Fixed Air Targetting not having icon

* Fixed the huns not having battering ram unique unit

* Plundering with multiple levels of coastal raider no longer creates multiple notifications

* Implemented requested changes
2021-07-04 19:18:15 +03:00
2a4ca74e7b Fixed more bugs I introduced myself (#4368)
* Fix bug where mobility doesn't work

* Fixed supply _still_ not working
2021-07-04 17:34:27 +03:00
b3498e6959 Fixed two more of my own bugs (#4361)
* Fixed bug were required science for tech did not match label

* Fixed a bug
2021-07-04 06:23:02 +03:00
aa132c8bf8 Fixed more bugs (#4360)
* Fixed city states spawning with multiple settlers

* Renamed icon for the huns
2021-07-04 00:25:20 +03:00
82fd24f12c Fixed concurrent modification problem in Nuke attack 2021-07-03 22:38:48 +03:00
6c221cd56b Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355)
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
2021-07-03 22:26:03 +03:00
d8340b9c1c Fix mod custom maps unavailable when no local ones exist (#4358) 2021-07-03 22:24:23 +03:00
8fdb4f413e Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial (#4334) 2021-07-02 19:22:38 +03:00
433204bd6f Added missing notification when a privateer is attacked by a unit and plunders goods as a result (#4341)
* Added missing notification when a privateer is attacked by a unit and plunders goods as a result

* Added an extra function to do it instead
2021-07-02 16:56:41 +03:00
b8d79dc23d Split off properties of era's to another JSON file (#4336)
* Added Era.json and imported the data to the ruleset

* Units at start are now also determined by eras.json

* Research agreement costs now determined by json file

* Gold and Culture provided at the start are now awarded

* Can no longer build wonders that are more than two eras older than the starting era

* Default population and buildings for settlers can now be added

* Added checks for validity of eras.json file in mods

* Colors for the icons of technologies are no also saved in eras.json

* Removed constants for all era's as they have been generalized away by this PR

* Removed spurios println's

* Added compatibility for mods

* Updated the military unit you get from ruines to be the military unit you received at the start of the game
2021-07-02 15:45:18 +03:00
d94a1d1432 Updated and generalized more promotions (#4331)
* Generalized "[1] extra interceptions may be made per turn"

* Generalized and rephrased Cover promotion (requires #4311 to work)

* Generalized Logistics

* According to the civilopedia the defence value of cover has also risen, apparently

* Updated Ambush strength values

* Split up Targeting and Air Targeting (different strength bonus)

* Generalized Haka War Dance

* Added Supply promotion

* Renamed a unique so it matches other uniques

* Implemented May heal outside of friendly territory better

* Implemented requested changes
2021-07-02 14:02:20 +03:00
70882b4e8b Added Privateer unit; updated Coastal Raider promotion (#4301)
* Added privateer unit

* Privateers can now capture other naval units

* Updated Coastal Raider promotion to include the gold gained from damaging cities

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
2021-07-02 10:38:45 +03:00
4e36773cf3 Fix unit promotions shortcut in UnitTable (#4335) 2021-07-02 10:07:20 +03:00
43ff2ea5f9 Deprecation of old uniques and fields 2021-07-02 00:05:28 +03:00
afdc2ffbd5 Adds the nation of The Huns (#4311)
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

* Fixed some typo's, split up a very long function for redability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-01 22:53:00 +03:00
c6fac03067 Added a few pantheons; religion uniques affect cities instead of civs; updated pantheon picker screen (#4296)
* Added a few simple beliefs for testing

* Moved CityReligion to its own file

* Created a picker screen for choosing pantheons

* Pantheon uniques are now calculated only for cities with the specific pantheon

* Added all the pantheon beliefs that can easily be added and commments for the ones still missing

* Games only have religion if either the user specifically asked for it, or uses a mod with religion

* Implemented requested changes
2021-07-01 22:48:18 +03:00
dd283248c2 Fixed bug where all units could move after attacking (#4325) 2021-07-01 22:18:49 +03:00
c350a3c923 Fix a few bugs related to nukes (#4324)
* Fixed bugs where nukes don't work due to capitilzation issues

* Renamed existing translations

* Fixed crash happening when nuking tiles without an owner

* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
2021-07-01 22:18:37 +03:00
e80c7d2101 Resolved 'getting stuck when there are no more pickable Pantheon beliefs' 2021-07-01 21:58:52 +03:00
ae84d3f5c8 Relgion -> Religion (#4321) 2021-07-01 09:02:41 +03:00
74fd80416c Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-30 21:02:57 +03:00
aeceead616 Removed final vestiges of old Bonus/Penalty effects.
Friendship ended with Regex, now Unique is my best friend.
2021-06-30 21:02:53 +03:00