Commit Graph

3803 Commits

Author SHA1 Message Date
4d3195ec5a Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
bb5392db4a Ai now cares about city distances (#4680)
* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai now cares about distance from it's cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra pay extra for bordering cities or surrounding cities

* Ai will pay extra for cities that are closer to their territory

* The code is cleaner

* The code is cleaner

* The code is cleaner

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance

* Ai now values distance
2021-08-03 19:53:46 +03:00
3b4b9a27bf Split up unit types to its own JSON file (#4717)
* Split off unitTypes to its own json, only containing the domain it can travel in for now

* Updated translationFileWriter to handle this file correctly

* Updated promotions file

* Implemented requested changes

* Units without a sprite use the sprite of a first unit with the same type

* Implemented proposed changes
2021-08-03 19:06:59 +03:00
c33e7ae6d2 Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
731aec0e65 Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
e8876e90bf All stats available as text characters (#4734) 2021-08-02 23:35:58 +03:00
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
f773a547b3 Solved another teleportation concurrent modification exception 2021-08-02 23:17:28 +03:00
9ef02cb1b2 Civ no longer attempts to intercept his own nukes - #4629 2021-08-02 21:11:29 +03:00
775f42aa0d Resolved #4629 - atomic bomb interception works as intended 2021-08-02 21:07:08 +03:00
a248a1178c Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
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
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
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
e7bf1fad7c Tweak UncivSlider and make the one on NewGameScreen permanently show the value tip (#4728) 2021-08-02 19:01:08 +03:00
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
78dddac962 Added modoptions unique for disabling city-state spawning with only a settler (#4691) 2021-08-01 19:21:04 +03:00
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
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
a427e645b9 Fix Civilopedia Unique auto-linking when Ruleset changes (#4700) 2021-08-01 11:29:02 +03:00
bb25f1fdb2 Better crude maps - zero uncovered tiles impossible (#4685) 2021-07-31 23:50:20 +03:00
5324eb96b5 Fixed bug where production from cutting down forests could apply to perpetual constructions (#4694) 2021-07-31 23:46:18 +03:00
3afe7af431 Solved crash where city states would try to gift great people without cities 2021-07-31 23:17:57 +03:00
692cbaa84a 3.15.17 2021-07-30 16:28:17 +03:00
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
4bcf821879 Resolved #4647 - influence-by-game-progress works as intended 2021-07-30 15:41:54 +03:00
3388c540d5 Resolved #4676 - one-city-challengers no longer get multiple settlers for later eras 2021-07-30 15:15:16 +03:00
864fd2ce64 Maori Warrior debuff only applies to enemy units 2021-07-30 15:07:21 +03:00
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