Commit Graph

3625 Commits

Author SHA1 Message Date
8ae4ae1cb1 AI accepts research agreement offers 2021-07-29 19:00:55 +03:00
5184743cbb Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-29 18:20:38 +03:00
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
98eba6a995 Resolved #4671 - Buildings from era are applied before buildings from policies 2021-07-29 17:44:18 +03:00
221f45b966 3.15.16 2021-07-27 23:27:41 +03:00
eb7cf85482 Solved rare teleport bug 2021-07-27 22:50:55 +03:00
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
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
a6f2b0e720 Whoops 2021-07-27 06:44:58 +03:00
a74e7c0a6a Resolved #4648 - city states no longer great Great Prophets when religion is not enabled 2021-07-27 06:43:11 +03:00
e94033fc36 Deprecated "can only attack water" unique 2021-07-27 05:39:36 +03:00
52867ec265 Deprecated PolicyManager.autocracyCompletedTurns 2021-07-27 05:24:19 +03:00
9c1248b741 Deprecated PolicyManager.legalismState 2021-07-27 05:23:23 +03:00
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00
c5ffec9ade Replaced "Building.providesFreeBuilding" field with generic unique 2021-07-26 14:29:43 +03:00
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
d0155a6ddd Minimap Slider UI (#4634) 2021-07-25 19:08:50 +03:00
3e482182b3 Unit name translation (#4635) 2021-07-25 19:05:56 +03:00
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
dbc6bc9f30 optimizing the spawn placement algorithm (#4620)
* optimize spawn placement

* consistent nomenclature
2021-07-24 22:19:46 +03:00
aa3be63492 Fix canImprovementBeBuiltHere regression (#4623) 2021-07-24 21:45:51 +03:00
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
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
0ed47f10a8 Converted building GPP from stats to counter 2021-07-23 15:25:11 +03:00
2c050283b0 Source-to-GPP mapping - replaces StatMap 2021-07-23 14:29:31 +03:00
e6bac1c5b5 Moved the stat-to-counter conversion forward to the CityInfo level 2021-07-23 14:00:22 +03:00
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
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
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
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
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
57f647c2d1 Fixed bug where "[All] units" would not apply to city combatants (#4601) 2021-07-22 19:42:38 +03:00
41f9fbfed2 Fixed comodification errors under certain circumstances (#4599) 2021-07-22 19:42:08 +03:00
54df4ba0c0 Fixed a crash in badly defined mods (#4598) 2021-07-22 00:37:54 +03:00
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
08954c1bd1 Spruced up Civilopedia - phase 6 - uniques (#4587) 2021-07-21 14:40:17 +03:00
e48ae69927 Implemented temples (#4585) 2021-07-21 12:21:24 +03:00
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
605581c78b Fixed bug where 'remove road' would also remove other improvements under specific circumstances (#4583) 2021-07-21 10:42:32 +03:00
70a18de7cc City construction Civilopedia-linked (#4573)
* City construction Civilopedia-linked

* City construction Civilopedia-linked - EOF
2021-07-21 10:34:00 +03:00
92c4e4e083 Fixed units not being removed from open borders area after declaring war (#4584) 2021-07-21 10:31:13 +03:00
167d9705f7 Fixed bug where all great people suddenly were scientists (#4582) 2021-07-21 10:28:48 +03:00
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
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
2db2dc0db7 Fix autocracy bonus accidentally being disabled (#4572) 2021-07-20 09:26:46 +03:00
1b397f0583 Unify all those (isWonder || isNationalWonder) cases (#4574) 2021-07-20 09:26:06 +03:00
1070584180 Mass deprecation 2021-07-19 23:27:34 +03:00
7039b6a287 More sequencing for faster unique filtering 2021-07-19 23:13:36 +03:00