mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,095 Tags
6d5fe2ff7a7311a97b26ef24e59b3214d02e27b4
Commit Graph

3615 Commits

Author SHA1 Message Date
Xander Lenstra
6d5fe2ff7a Fixed bug where units could still be purchased if they used a depleted resource (#4798) 2021-08-07 23:44:53 +03:00
Xander Lenstra
0c1a21f6ae Fixed crash when borrowing names (#4800) 
* Fixed crash when borrowing names

* Fix potential mod error allowed by the previous fix
 2021-08-07 23:44:16 +03:00
Xander Lenstra
386095a9d0 One with nature yield for spain is now doubled (#4794) 2021-08-07 23:43:04 +03:00
SomeTroglodyte
ad82f63794 Mod description translation (#4801) 2021-08-07 23:42:12 +03:00
Interdice
2a3395882f City state resources (#4755) 
* 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

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* 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

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* 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

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* You can now gift improvements to the ai

* Update template.properties
 2021-08-06 16:07:38 +03:00
Xander Lenstra
547f5a57e5 Added missionairy units, which can spread religion and bought with faith (#4568) 
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-06 14:40:48 +03:00
SomeTroglodyte
ee32392ecd Bring allUnitActionsHaveTranslation test up to date (#4688) 
* Bring `allUnitActionsHaveTranslation` test up to date

* Bring allUnitActionsHaveTranslation test up to date - revert enum prop
 2021-08-06 14:38:10 +03:00
ravignir
776be5a48a Minor fix to Great Prophets cost not increasing (#4772) 2021-08-06 00:40:45 +03:00
SomeTroglodyte
9499471986 Change defeat conditions (#4761) 
* Change defeat conditions

* Change defeat conditions - unit tests setup

* Change defeat conditions - patch1
 2021-08-05 18:12:30 +03:00
SomeTroglodyte
bed38f75e7 Allow civ-unique buildings to be created by startingEra (#4756) 2021-08-04 18:10:34 +03:00
Xander Lenstra
2c428f8269 Bugfixes from unitTypes so promotions work again (#4744) 2021-08-04 13:55:12 +03:00
SomeTroglodyte
c1382477e0 Mod manager concurrency (#4750) 
* Mod manager concurrency

* Mod manager concurrency - tr
 2021-08-04 13:53:42 +03:00
Xander Lenstra
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
Interdice
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
Xander Lenstra
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
SomeTroglodyte
c33e7ae6d2 Civilopedia phase 9 - Technologies (#4737) 2021-08-03 09:36:58 +03:00
SomeTroglodyte
731aec0e65 Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
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