Commit Graph

3748 Commits

Author SHA1 Message Date
SomeTroglodyte
e8876e90bf
All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
Yair Morgenstern
6370f0ac02 Solved super rare edge-case where units try to attack over hidden tiles that they can't actually move through 2021-08-02 23:26:14 +03:00
Yair Morgenstern
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
Yair Morgenstern
9ef02cb1b2 Civ no longer attempts to intercept his own nukes - #4629 2021-08-02 21:11:29 +03:00
Yair Morgenstern
775f42aa0d Resolved #4629 - atomic bomb interception works as intended 2021-08-02 21:07:08 +03:00
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
lishaoxia1985
e993f507aa
Map size will modify policy cost, techUniques is initialized by UniqueMap(), Replace "effect" with "uniques" in UnitPromotions.json (#4507)
* Map size will modify policy cost, techUniques is initialized by UniqueMap()

* Replace "effect" with "uniques" in UnitPromotions.json
2021-08-02 19:17:26 +03:00
SomeTroglodyte
c9fa68f8ea
Privateer capture, plunder, and raze Notifications (#4698)
* Privateer capture, plunder, and raze Notifications

* Privateer capture, plunder, and raze Notifications - patch1

* Privateer capture, plunder, and raze Notifications - patch2
2021-08-02 19:14:31 +03:00
SomeTroglodyte
7d52cfbcab
Harden map editor map loader against most bad maps (#4711)
* Harden map editor map loader against most bad maps

* Harden map editor map loader against most bad maps - patch1
2021-08-02 19:03:16 +03:00
SomeTroglodyte
e7bf1fad7c
Tweak UncivSlider and make the one on NewGameScreen permanently show the value tip (#4728) 2021-08-02 19:01:08 +03:00
SomeTroglodyte
6c32d10924
TranslationFileWriter support for CivilopediaText (#4631)
* TranslationFileWriter support for CivilopediaText

* Merge branch 'master' into TranslationWriter-Civtext - patch
2021-08-01 20:23:13 +03:00
Xander Lenstra
78dddac962
Added modoptions unique for disabling city-state spawning with only a settler (#4691) 2021-08-01 19:21:04 +03:00
SomeTroglodyte
3cf9191d6a
Actually load and display the road texture found in FantasyHex (#4699)
* Actually load and display the road texture found in FantasyHex

* Actually load and display the road texture found in FantasyHex - patch1
2021-08-01 15:36:45 +03:00
Arthur van der Staaij
0c7dd9ada9
Fixed captured units not tp-ing out of illegal tiles (#4701)
In particular, this fixes the bug where embarked units captured by a
civilization without optics would stay embarked. This therefore fixes
case 4 of #4237.

In principle, it should not even be possible that captured units can no
longer stand on the tile they were on, since the capturing unit has to
be able to move to it. However, in Unciv, it is possible to capture
units without moving to their tile. This is a different problem that
needs to be addressed some time in the future.
2021-08-01 11:31:53 +03:00
SomeTroglodyte
a427e645b9
Fix Civilopedia Unique auto-linking when Ruleset changes (#4700) 2021-08-01 11:29:02 +03:00
SomeTroglodyte
bb25f1fdb2
Better crude maps - zero uncovered tiles impossible (#4685) 2021-07-31 23:50:20 +03:00
Xander Lenstra
5324eb96b5
Fixed bug where production from cutting down forests could apply to perpetual constructions (#4694) 2021-07-31 23:46:18 +03:00
Yair Morgenstern
3afe7af431 Solved crash where city states would try to gift great people without cities 2021-07-31 23:17:57 +03:00
Yair Morgenstern
692cbaa84a 3.15.17 2021-07-30 16:28:17 +03:00
SomeTroglodyte
130c318ae0
Civilopedia phase 8 - Nations and Promotions (#4657)
* Civilopedia phase 8 - Nations and Promotions

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

* Civilopedia phase 8 - Nations and Promotions - revert OR
2021-07-30 15:55:17 +03:00
Yair Morgenstern
4bcf821879 Resolved #4647 - influence-by-game-progress works as intended 2021-07-30 15:41:54 +03:00
Yair Morgenstern
3388c540d5 Resolved #4676 - one-city-challengers no longer get multiple settlers for later eras 2021-07-30 15:15:16 +03:00
Yair Morgenstern
864fd2ce64 Maori Warrior debuff only applies to enemy units 2021-07-30 15:07:21 +03:00
Yair Morgenstern
8ae4ae1cb1 AI accepts research agreement offers 2021-07-29 19:00:55 +03:00
Yair Morgenstern
5184743cbb Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-29 18:20:38 +03:00
SomeTroglodyte
4e249a0a1c
UnitActionType now knows keys, sounds and most icons (#4607)
* Removed Char-only restriction in keyboard support for unit actions, remap a few keys, key tooltips for non-ascii keys

* UnitActionType now knows keys, sounds and most icons

* UnitActionType empower - fix Prophets spreading Pantheons
2021-07-29 18:16:49 +03:00
Yair Morgenstern
98eba6a995 Resolved #4671 - Buildings from era are applied before buildings from policies 2021-07-29 17:44:18 +03:00
Yair Morgenstern
221f45b966 3.15.16 2021-07-27 23:27:41 +03:00
Yair Morgenstern
eb7cf85482 Solved rare teleport bug 2021-07-27 22:50:55 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
SomeTroglodyte
34717008b8
Civilopedia phase7 (#4628)
* Civilopedia phase 7 - Terrain

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

* Civilopedia phase 7 - Terrain - patch2 for #4641
2021-07-27 10:41:25 +03:00
Yair Morgenstern
a6f2b0e720 Whoops 2021-07-27 06:44:58 +03:00
Yair Morgenstern
a74e7c0a6a Resolved #4648 - city states no longer great Great Prophets when religion is not enabled 2021-07-27 06:43:11 +03:00
Yair Morgenstern
e94033fc36 Deprecated "can only attack water" unique 2021-07-27 05:39:36 +03:00
Yair Morgenstern
52867ec265 Deprecated PolicyManager.autocracyCompletedTurns 2021-07-27 05:24:19 +03:00
Yair Morgenstern
9c1248b741 Deprecated PolicyManager.legalismState 2021-07-27 05:23:23 +03:00
Yair Morgenstern
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
Yair Morgenstern
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
Yair Morgenstern
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00
Yair Morgenstern
c5ffec9ade Replaced "Building.providesFreeBuilding" field with generic unique 2021-07-26 14:29:43 +03:00
Yair Morgenstern
8a1c728438 Step 1 in the Glorious UnitType Moddability Revolution - isRanged(), isMelee(), isMilitary(), isCivilian() are no longer unittype-dependent
Unified all isAir || isMissile to BaseUnit.MovesLikeAirUnit()
2021-07-26 00:15:18 +03:00
SomeTroglodyte
d0155a6ddd
Minimap Slider UI (#4634) 2021-07-25 19:08:50 +03:00
SomeTroglodyte
3e482182b3
Unit name translation (#4635) 2021-07-25 19:05:56 +03:00
SomeTroglodyte
966f70d0d4
Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
SimonCeder
dbc6bc9f30
optimizing the spawn placement algorithm (#4620)
* optimize spawn placement

* consistent nomenclature
2021-07-24 22:19:46 +03:00
SomeTroglodyte
aa3be63492
Fix canImprovementBeBuiltHere regression (#4623) 2021-07-24 21:45:51 +03:00
SomeTroglodyte
f9bef4a917
Newgame screen overhaul for portrait mode (#4522)
* Newgame screen scrolls nicer, mods sorted, base/ext mod clearer, unified separators

* Newgame-Mods-UI - sort Nations
2021-07-24 21:43:12 +03:00
Yair Morgenstern
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
Yair Morgenstern
0ed47f10a8 Converted building GPP from stats to counter 2021-07-23 15:25:11 +03:00
Yair Morgenstern
2c050283b0 Source-to-GPP mapping - replaces StatMap 2021-07-23 14:29:31 +03:00
Yair Morgenstern
e6bac1c5b5 Moved the stat-to-counter conversion forward to the CityInfo level 2021-07-23 14:00:22 +03:00
Yair Morgenstern
cbfd658480 Part 1 of "generic Great Person points" - changed data type serialized in save to be stat-agnostic 2021-07-23 13:55:08 +03:00
SomeTroglodyte
6791dd3340
Deprecate "Can only be built on coastal tiles" unique (#4581)
* Deprecate "Can only be built on Coastal tiles"

* Deprecate "Cannot be built on bonus resource"

* Deprecate "Can only be built on Coastal tiles" - bump 'as of'
2021-07-23 13:19:35 +03:00
SimonCeder
f41d30e0cc
City states adjustments (#4597)
* city-state AI

* City-state spawns

* City-state border expansion

* City-state border expansion adjustment

* Food and production multipliers for city states

* 6 CS as default
2021-07-23 00:20:20 +03:00
SomeTroglodyte
e41ba0da91
A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

* Civilopedia for Religion - rename cat, template and EOF linting

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
SomeTroglodyte
e514df5b82
Removed Char-only restriction in keyboard support for unit actions, remap a few keys, key tooltips for non-ascii keys (#4606) 2021-07-23 00:02:20 +03:00
Xander Lenstra
57f647c2d1
Fixed bug where "[All] units" would not apply to city combatants (#4601) 2021-07-22 19:42:38 +03:00
Xander Lenstra
41f9fbfed2
Fixed comodification errors under certain circumstances (#4599) 2021-07-22 19:42:08 +03:00
Xander Lenstra
54df4ba0c0
Fixed a crash in badly defined mods (#4598) 2021-07-22 00:37:54 +03:00
SimonCeder
2971e6bba3
Map generation and start locations (#4588)
* cellular automata for mountains and hills

* cellular automata for mountains and hills

* tweaks

* spawn location algorithm

* consolation prizes

* improve city state spawns

* AI settle in place if possible

* make heightmap generation mod agnostic
2021-07-21 14:41:48 +03:00
SomeTroglodyte
08954c1bd1
Spruced up Civilopedia - phase 6 - uniques (#4587) 2021-07-21 14:40:17 +03:00
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* You can now use 'h' to fortify/sleep until healed

* Hide lesser used unit actions by default

* Refactored worker actions into automate & build improvements

* Added missing translation lines

* Fixed translations
2021-07-21 10:43:55 +03:00
Xander Lenstra
605581c78b
Fixed bug where 'remove road' would also remove other improvements under specific circumstances (#4583) 2021-07-21 10:42:32 +03:00
SomeTroglodyte
70a18de7cc
City construction Civilopedia-linked (#4573)
* City construction Civilopedia-linked

* City construction Civilopedia-linked - EOF
2021-07-21 10:34:00 +03:00
Xander Lenstra
92c4e4e083
Fixed units not being removed from open borders area after declaring war (#4584) 2021-07-21 10:31:13 +03:00
Xander Lenstra
167d9705f7
Fixed bug where all great people suddenly were scientists (#4582) 2021-07-21 10:28:48 +03:00
Xander Lenstra
3d13680602
Update translationFileWriter to include missing strings (#4578)
* Update translationFileWriter to include strings from new json files

* Fix promotions with multiple uniques not getting translated

* Add missing translatable strings (thanks to DuffLagerleff for finding these)
2021-07-20 17:07:15 +03:00
SimonCeder
239a406bc4
Added Sweden Civ (#4566)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic
2021-07-20 17:06:15 +03:00
Xander Lenstra
2db2dc0db7
Fix autocracy bonus accidentally being disabled (#4572) 2021-07-20 09:26:46 +03:00
SomeTroglodyte
1b397f0583
Unify all those (isWonder || isNationalWonder) cases (#4574) 2021-07-20 09:26:06 +03:00
Yair Morgenstern
1070584180 Mass deprecation 2021-07-19 23:27:34 +03:00
Yair Morgenstern
7039b6a287 More sequencing for faster unique filtering 2021-07-19 23:13:36 +03:00
Yair Morgenstern
f85bedeb2f Faster filtering to avoid some ANRs 2021-07-19 23:00:05 +03:00
SomeTroglodyte
fce7d39d4a
Fix for missing Farms (all mod TileSetConfigs were always active) (#4553)
* Fix for missing Farms (all mod TileSetConfigs were always active)

* Fix for missing Farms v2

* Fix for missing Farms patch1
2021-07-19 22:05:48 +03:00
SomeTroglodyte
973a8fb0ac
Small fixes (#4548)
* Raze city button should be disabled for original capitals

* Halicarnassus trigger checks Great Person

* New water improvements should recalculate resource stuff

* Should't be able to create water improvements outside borders
2021-07-19 21:53:15 +03:00
SomeTroglodyte
46da6bd56e
Sort Civilopedia entries using locale (#4560) 2021-07-19 21:52:26 +03:00
Xander Lenstra
c81c1b6a1b
Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

* Buttons for chosen religions are now disabled  instead of removed, idea couresty to someTroglodyte

* Implemented requested changes
2021-07-19 21:51:34 +03:00
SomeTroglodyte
50cec97354
Spruced up Civilopedia - phase 5 - buildings (#4391)
* Spruced up Civilopedia - phase 5 - buildings

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

* Spruced up Civilopedia - phase 5 - buildings - patch5
2021-07-19 21:48:51 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
SomeTroglodyte
f5a95fad18
TileGroup linting and 0.001% optimization (#4531) 2021-07-18 23:30:28 +03:00
SomeTroglodyte
8c35e54b71
Rewritten Tooltip class (#4552) 2021-07-17 22:44:09 +03:00
SomeTroglodyte
3a7da738c4
Keyboard mapping by keyCode (#4542)
* Keyboard mapping by keyCode

* Keyboard mapping by keyCode - v2
2021-07-17 22:26:20 +03:00
Xander Lenstra
9efcc4f423
Fixed bug where great prophets could be chosen as free great persons when religion was disabled (#4518) 2021-07-15 10:38:26 +03:00
Xander Lenstra
482a1260ca
Fixed bug which leads to crashes for almost all users (#4519) 2021-07-15 10:36:59 +03:00
Yair Morgenstern
df2cf711ba More deprecation 2021-07-14 23:30:47 +03:00
Yair Morgenstern
e3e08732db Deprecations 2021-07-14 22:51:33 +03:00
Yair Morgenstern
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
Xander Lenstra
477051c616
Updated the tile choosing algorithm for city expansion (#4510)
* Updated the tile choosing algorithm for city expansion to the one used in the base game

* Implemented requested changes
2021-07-14 19:32:50 +03:00
SimonCeder
314a2a48bb
Wonder build screens redux (#4509)
* wonder splash screens

* wonder splash screens atlas

* removed pyramids file, add portrait code

* restore atlas
2021-07-13 23:42:40 +03:00
SomeTroglodyte
c9010c5fdc
Tweaked Slider, use in MapParametersTable (#4506) 2021-07-13 20:55:22 +03:00
Xander Lenstra
6c0237fcc3
Disabled city state diplomacy buttons when it is not your turn (#4503) 2021-07-13 17:41:31 +03:00
Xander Lenstra
68b40cf860
Fixed bug where great prophets could be given when religion was disabled (#4502) 2021-07-13 17:40:54 +03:00
Xander Lenstra
07e3a2228e
Fixed bug where effects of all aquaducts nationwide stacked in each city (#4487)
* Fixed bug where effects of all aquaducts nationwide stacked in each city

* Implemented requested changes

* Implemented requested changes better
2021-07-13 06:26:37 +03:00
Yair Morgenstern
2e34253a1e Resolved #4484 - civs with no cities can no longer pick policies 2021-07-12 21:25:52 +03:00
Xander Lenstra
4ee0ef4e1f
Fixed crashes on loading save games with religion (#4479) 2021-07-12 21:12:46 +03:00
Xander Lenstra
f97e64e54e
Fixed bug where submarines could not attack embarked units (#4459)
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
2021-07-12 19:37:56 +03:00
Yair Morgenstern
30082c8254 Resolved #4453 - Spectator no longer appears on Diplomacy overview 2021-07-11 21:51:35 +03:00
lishaoxia1985
ab89768894
Fix worldSizeModifier in TechManager (#4473) 2021-07-11 19:11:50 +03:00
freddyhayward
1fe8c566ee
Fix Hun city names (#4469) (#4476) 2021-07-11 19:10:03 +03:00
Xander Lenstra
63d98c4692
Fixed bug where tile construction time was increased instead of decreased (#4475) 2021-07-11 19:09:17 +03:00
lishaoxia1985
4c9e15c0ea
Make map symmetrical if it's not wrapped (#4461) 2021-07-11 10:51:57 +03:00
Yair Morgenstern
56111fa24c
Translations update (#4465)
* Update Simplified_Chinese.properties (#4456)

* Update Indonesian.properties (#4455)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4445)

* Laid some groundwork for implementing further religions (#4444)

* Laid some groundwork for implementing further religions

* Fixed duplication of Religion object

* Update Korean.properties (#4443)

* Update Korean.properties

* Update Korean.properties

* Update Spanish translations fase 1 (#4440)

* Update Spanish translations fase 1

DO NOT merge this until I have finnished it. I run out of time today.

* Update Spanish.properties

* Update Czech.properties (#4437)

* Update Czech.properties

many new (and old) strings translated

* Update Czech.properties

tweaked some newly translated strings

* huns and netherlands strings

* Update Swedish.properties (#4436)

Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?

* Update German translation (#4434)

* Adjusting the accent (#4426)

I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.

Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
2021-07-10 23:02:23 +03:00
Xander Lenstra
b650b95356
Add missing pantheons, fix minor bugs (#4419)
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
2021-07-10 22:50:50 +03:00
freddyhayward
77b4bcd26a
Fixed spurious notifications of revealed resources too far away or in foreign territory (#4464)
Co-authored-by: Frederick Hayward <frederick.hayward@student.unimelb.edu.au>
2021-07-10 21:59:46 +03:00
Xander Lenstra
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
Xander Lenstra
5925489c0b
Fixed bug (#4449) 2021-07-10 21:18:45 +03:00
Xander Lenstra
02bacac8e7
Fixed nullptrexception (#4458) 2021-07-10 21:10:04 +03:00
Xander Lenstra
74b3db5927
Fixed bug where gold from rivers wasn't doubled during golden ages (#4462) 2021-07-10 21:09:21 +03:00
Xander Lenstra
0c916e85fb
Fixed _very_ old inconsitency that broke my game :( (#4442) 2021-07-09 19:15:16 +03:00
Yair Morgenstern
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
Xander Lenstra
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
Yair Morgenstern
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
Yair Morgenstern
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
Xander Lenstra
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
Yair Morgenstern
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
Xander Lenstra
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
Xander Lenstra
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
Xander Lenstra
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
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
SomeTroglodyte
b628c4238d
Fix "National Wonder is being built elsewhere" not displayed (#4284) 2021-06-26 23:35:23 +03:00
Yair Morgenstern
91f6b3ba2d Resolved #4283 - clear old legalismState after converting to new format 2021-06-26 23:28:22 +03:00
Xander Lenstra
1c079bcef3
Added Nuclear Submarines & Missile Cruisers, capable of transporting missiles (#4260)
* Implemented Nuclear Submarine and Missile Cruiser units

* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K

* Fixed deprecated uniques still working

* Implemented requested changes
2021-06-26 22:47:27 +03:00
Xander Lenstra
30ac1dae1c
Fixed crash when selecting worker (#4273)
When making the changes in workers in #4252, I accidentally overlooked that Constants.workerUnique doesn't have params, and this should be the right way to write it.
2021-06-26 22:44:32 +03:00
Arthur van der Staaij
8549931360
Fixed main menu crash (#4270)
Fixed a critical bug where the game would crash when any option was
picked in the main menu.

The bug was introduced by 823e6ffc2a.
2021-06-26 22:43:50 +03:00
Yair Morgenstern
823e6ffc2a Faster 'false' results for isStats, as proposed by @SomeTroglodyte in #4259 2021-06-25 18:33:45 +03:00
Xander Lenstra
e6850b857a
Generalized building of improvements (#4252)
* Generalized building of improvements

* Readded support for the deprecated unique "Can build improvements on tiles"

* Small code quality changes

* Implemented requested chagnes
2021-06-25 16:35:15 +03:00
SomeTroglodyte
06b2e7da2f
Promotion picker keeps vertical scroll pos on promote or resize (#4247)
* Promotion picker keeps vertical scroll pos on promote or resize

* Promotion picker keeps vertical scroll - without parameter
2021-06-24 21:37:50 +03:00
Xander Lenstra
af0cd0c9df
Implements the Telecommunications tech (v2) (#4249)
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them

* Added the Telecommunications tech

* Added the CN tower

* Implemented Bomb Shelter

* Added icons for new buildings

* Implemented requsted changes
2021-06-24 19:07:33 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

* Implemented reocmmended changes, fixed some other stuff, the usual

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Xander Lenstra
1c42e1e730
Fixes bug where in some cases building improvements would increase the base yield of the tile (#4217)
* Fixes bug where in some cases building improvements would increase the base yield of the tile

* Removed unncessary test

* Implemented requested changes

* Implemented requested changes

* Fixed build errors
2021-06-24 15:55:41 +03:00
Xander Lenstra
b43257cea8
Fixes #4232 (#4245) 2021-06-24 15:54:25 +03:00
Yair Morgenstern
208ad1aa27 Resolves #3800 in a more generic way 2021-06-23 18:20:56 +03:00
Yair Morgenstern
fc6eda364e Resolved #4200 - Cities in resistance cannot bombard 2021-06-23 10:45:49 +03:00
Yair Morgenstern
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
Yair Morgenstern
ba505dcfdb Deprecated 'download map' - map sharing should be done via Mods 2021-06-23 10:13:11 +03:00
Arthur van der Staaij
e10c52efc1
Fixed open terrain bonus working in rough terrain (#4219)
* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
2021-06-23 09:41:55 +03:00
Arthur van der Staaij
300eb6f726
Fixed captured units not tp-ing out of liberated cities (#4239) 2021-06-23 09:40:55 +03:00
Arthur van der Staaij
cf9e00c589
Fixed naval units not tp-ing out of razed cities (#4238) 2021-06-23 09:40:32 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
SomeTroglodyte
a025660fe0
Split off all individual OverviewScreen panes (#4184)
* Spliff off all individual OverviewScreen panes

* Spliff off all individual OverviewScreen panes - remove comment

* Spliff off all individual OverviewScreen panes - consistent file endings
2021-06-21 18:54:48 +03:00
Xander Lenstra
4586e44ba6
Fixed a bug where excess food would not be converted to production for settlers (#4221) 2021-06-21 11:00:47 +03:00
Yair Morgenstern
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
Yair Morgenstern
990074e9b0 Resolved #4209 - AI city-founding no longer plays music 2021-06-20 21:51:22 +03:00
Xander Lenstra
3d1836a081
Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
Xander Lenstra
bd850683e1
Fixes bug where coastal buildings cannot be built even if the city is coastal (#4197) 2021-06-19 21:46:20 +03:00
SomeTroglodyte
05e6609b25
Change improvement picker key indicators to tooltip (#4174) 2021-06-19 21:43:04 +03:00
Xander Lenstra
8f26a77b2d
Fixed an issue where mods with either the 'patronage' or 'entrepreneurschip' policy would crash upon taking it (#4192) 2021-06-19 21:41:52 +03:00
Xander Lenstra
3686366156
Fixed Great Improvement bonus not working (#4193) 2021-06-19 21:41:25 +03:00
Xander Lenstra
9eb2d1fffb
Stop AI from pillaging their own tiles. Fixes #4203 (#4204) 2021-06-19 21:40:46 +03:00