Commit Graph

3478 Commits

Author SHA1 Message Date
SomeTroglodyte
373b42bfcf
Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00
SomeTroglodyte
1d080ac54d
ExpanderTab revisited - move and apply to city screen (#4401) 2021-07-07 18:21:51 +03:00
Xander Lenstra
9e37cc8f16
Fixed crash when a city had negative population due to faster razing (#4389) 2021-07-06 19:41:23 +03:00
SomeTroglodyte
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
Yair Morgenstern
a6041d670d Obvious mistake 2021-07-05 21:11:47 +03:00
Yair Morgenstern
c1ff2e4ba7 Fixed Denmark's unique including also embarking instead of just disembarking 2021-07-05 21:06:54 +03:00
SomeTroglodyte
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
Xander Lenstra
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
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
Xander Lenstra
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
Yair Morgenstern
6215a5990d More concurrency problem fixes in nuke effects 2021-07-05 11:12:36 +03:00
SomeTroglodyte
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
Xander Lenstra
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
SomeTroglodyte
8fb55e77a3
ExpanderTab revisited (#4357)
* ExpanderTab revisited

* ExpanderTab revisited - patch1
2021-07-04 21:25:58 +03:00
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
Yair Morgenstern
82fd24f12c Fixed concurrent modification problem in Nuke attack 2021-07-03 22:38:48 +03:00
Xander Lenstra
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
SomeTroglodyte
d8340b9c1c
Fix mod custom maps unavailable when no local ones exist (#4358) 2021-07-03 22:24:23 +03:00
SomeTroglodyte
8fdb4f413e
Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial (#4334) 2021-07-02 19:22:38 +03:00
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
SomeTroglodyte
4e36773cf3
Fix unit promotions shortcut in UnitTable (#4335) 2021-07-02 10:07:20 +03:00
Yair Morgenstern
43ff2ea5f9 Deprecation of old uniques and fields 2021-07-02 00:05:28 +03:00
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
dd283248c2
Fixed bug where all units could move after attacking (#4325) 2021-07-01 22:18:49 +03:00
Xander Lenstra
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
Yair Morgenstern
e80c7d2101 Resolved 'getting stuck when there are no more pickable Pantheon beliefs' 2021-07-01 21:58:52 +03:00
SomeTroglodyte
ae84d3f5c8
Relgion -> Religion (#4321) 2021-07-01 09:02:41 +03:00
Yair Morgenstern
74fd80416c Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-30 21:02:57 +03:00
Yair Morgenstern
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
SomeTroglodyte
44674365fe
Translate nested placeholders for english too (#4319) 2021-06-30 20:40:41 +03:00
SomeTroglodyte
3b75f2209e
Fix mod sounds from local, Android SoundPool issues, more commenting (#4310) 2021-06-30 17:55:11 +03:00
Xander Lenstra
c1e92225c9
Research Tech Button shows progress; Small bug fix (#4303)
* "Research" button now shows progress in the selected tech

* Current tech is automtically selected as free tech when applicable

* Implemented requested changes
2021-06-30 17:35:54 +03:00
Xander Lenstra
a0cf30831c
Updated promotions - make more generalizable, update to G&K (#4292)
* Generalized the "Heal Instantly" promotion

* Extended "Indirect Fire" to WaterRanged units, conform the main game

* Generalized Extend Range, Operational Range

* Generalized "logistics"

* Typo

* Generalized the healing from "Medic"

* Implemented requested changes

* Generalized "[amount] Movement"; "[amount] Visibility Range"

* Added survavalism promotions

* Updated Boarding Party strength bonus values to G&K

* Implemented requested changes
2021-06-30 17:09:02 +03:00
Yair Morgenstern
d3f639e29c Solved crashing 'head towards sieged city' bug 2021-06-29 22:35:22 +03:00
SomeTroglodyte
4d16b3fcf8
Respect visualMods for Sound - CheckBox, formats, modchange detect (#4295)
* Respect visualMods for Sound - CheckBox, formats, modchange detect

* Respect visualMods for Sound - german patch
2021-06-29 21:31:57 +03:00
Xander Lenstra
168f984a65
Added Shrine, option for enabling religion (#4291)
* Added option in-game to enable faith (highly discouraged)

* Added shrine for generating Faith

* Made Shrine hidden in games without religion
2021-06-28 14:25:34 +03:00
Xander Lenstra
4add686bcd
Fixed bug where on quick game speed, educated elite would yield a great person every turn (#4289) 2021-06-27 22:17:05 +03:00
Yair Morgenstern
20db11e73f Added a test to ensure that translations don't crash 2021-06-27 22:16:15 +03:00
SomeTroglodyte
ca58cf1694
Translation template fixes (#4287)
* Translation template fixes

* Translation template fixes - patch

* Translation template fixes - another
2021-06-27 21:22:47 +03:00
SomeTroglodyte
f7a1d0cdee
Suppress policy branch unlock notification when incompatible (#4288) 2021-06-27 21:20:29 +03:00
Arthur van der Staaij
0f0abad5ea
Added Stealth tech and Stealth Bombers (#4271)
* Changed some interception-related uniques

- "Can not be intercepted" -> "Cannot be intercepted"
  This really irked me, and the new version is also how it is written
  in the wiki.
- "Reduces damage taken from interception by 50%" ->
  "Damage taken from interception reduced by [50]%"

* Added "Cannot be carried by [unitFilter] units" unique

* Added an icon for Stealth

* Added Stealth technology and the Stealth Bomber

* Possibly fixed incorrect rounding for interception damage bonus

* Various code style changes

* Made Stealth Bomber interceptable, but with 100% damage reduction
2021-06-27 08:57:11 +03:00
SomeTroglodyte
401c10c132
Nicer distribution of policy picker branches (#4285)
* Nicer distribution of policy picker branches

* Nicer distribution of policy picker branches - patch1
2021-06-27 06:37:14 +03:00
Arthur van der Staaij
784092c56c
Added Drama and Poetry tech and replaced Temples with Amphitheaters (#4254)
* Added Drama and Poetry tech

* Moved not-in-ruleset check to building replacement function

* Updated a version number
2021-06-26 23:36:39 +03:00