AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 05:46:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,704 Commits 6 Branches 1,117 Tags
Commit Graph

5704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yairm210
2ee4598e70 Ruleset checks allow for unit types to be defined in default ruleset, since it's copied to all complex rulesets if no unit types are there 2021-08-12 20:45:15 +03:00
yairm210
8fec3b8345 Merge remote-tracking branch 'origin/master' 2021-08-12 20:43:15 +03:00
yairm210
3b1fa58806 Resolved #4842 - solved Android/libs folder not being created on bundle, only on local assembly 2021-08-12 20:42:49 +03:00
Yair Morgenstern
0e8a61e07a
Translations update (#4844) 
* Update Swedish (#4834)

* Update Swedish.properties

* Update Swedish.properties

* Update android/assets/jsons/translations/Swedish.properties

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>

* Update Simplified_Chinese.properties (#4831)

* Update Spanish.properties (#4824)

* Update Malay.properties (#4820)

* added and modified malay language

* update Malay.properties

* corrected wrong tags

* update Malay.properties

* update Malay.properties

* fix missing tag (thanks @xlenstra)

Co-authored-by: kyliow <kliow@kyle.astro>

* Update German translation (#4817)

* Update German translation

* Update German translation

* Update Indonesian.properties (#4816)

* Update Italian.properties (#4814)

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Jerry1962325 <60921621+Jerry1962325@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Kong You Liow <53225674+kyliow@users.noreply.github.com>
Co-authored-by: kyliow <kliow@kyle.astro>
Co-authored-by: MartinP <77325495+Mape6@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>
 2021-08-12 19:23:32 +03:00
Tyler
d18080c2e1
Fix typo (#4841) 2021-08-12 12:24:12 +03:00
yairm210
fb266b07b2 Fixed compile error from branch merging 2021-08-11 21:15:04 +03:00
SomeTroglodyte
0d041ab1ef
Civilopedia - Difficulty (#4789) 
* Civilopedia - Difficulty

* Civilopedia - Difficulty - patch2

* Civilopedia - Difficulty - patch3
 2021-08-11 21:03:43 +03:00
yairm210
6146cc834a Merge branch 'temp' 
# Conflicts:
#	core/src/com/unciv/logic/civilization/CivilizationInfo.kt
 2021-08-11 20:55:21 +03:00
yairm210
b276250dfc 3.16.2-patch1 3.16.2-patch1 2021-08-11 20:50:52 +03:00
yairm210
a08a0e1489 Added ruleset check for units whose type is not defined in the unitTypes 2021-08-11 20:40:44 +03:00
yairm210
85ecddad2f Fixed crash with diplomacy screen and city-states with no cities 
(cherry picked from commit 7c1c58580171a4abacb4e5a4231f47e0d224a452)
 2021-08-11 20:30:00 +03:00
Xander Lenstra
421cce0a43 Fixed crash when selecting certain buildings in the civilopedia (#4819) 
(cherry picked from commit 6d04bf424bbfcf2ee940a248e1ee8f01dc997858)
 2021-08-11 20:29:25 +03:00
yairm210
bec7922eff Merge remote-tracking branch 'origin/master' 2021-08-11 19:53:42 +03:00
yairm210
7c1c585801 Fixed crash with diplomacy screen and city-states with no cities 2021-08-11 19:53:21 +03:00
ravignir
5d2732c656
G&K resources, resource improvement yield changes to match civ5. (#4835) 
* Update Credits.md

* Add files via upload

* Add files via upload

* Update TileResources.json

* Update FantasyHex.json

* Update TileResources.json
 2021-08-11 18:48:10 +03:00
AdityaMH
ca54fac555
Add Holy Site for FantasyHex (#4828) 
* Add Holy Site & Holy Place

* Delete Holy Place.png
 2021-08-11 14:45:48 +03:00
Xander Lenstra
4aed0f0f80
Added founder beliefs, updates to pantheon spreading (#4827) 
* Added founder beliefs, minor changes to pantheons

* Fixed the tests

* Implemented recommended chances

* Implemented requested changes
 2021-08-11 09:56:36 +03:00
SomeTroglodyte
3c4bb1a558
City screen stats double separators (#4821) 2021-08-09 15:32:30 +03:00
SomeTroglodyte
e59db3ada3
Unit rename UI (#4804) 
* Rework Yes/No and OK/Close

* Apply Yes/No and OK/Close constants

* Clean up and decorate RenameUnitPopup
 2021-08-09 13:59:30 +03:00
Xander Lenstra
6d04bf424b
Fixed crash when selecting certain buildings in the civilopedia (#4819) 2021-08-09 13:57:13 +03:00
ravignir
bf40779605
Fix (#4813) 2021-08-09 06:34:21 +03:00
Xander Lenstra
92728e9007
Added an overview screen for religions (#4808) 
* Added an overview screen for religions

* Missed a thing

* Implemented requested changes
 2021-08-08 23:46:39 +03:00
Yair Morgenstern
7cd368d024 3.16.2 3.16.2 2021-08-08 23:20:44 +03:00
Yair Morgenstern
1aa9eecf85 Fixed crashing Diplomatic victory bug 2021-08-08 23:08:07 +03:00
Yair Morgenstern
806cd7df38
Translations update (#4812) 
* Update Spanish.properties (#4787)

* Update German translation (#4783)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

Co-authored-by: Martin <77325495+Mape6@users.noreply.github.co>

* Update Indonesian.properties (#4779)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#4778)

* Turkish translations (#4775)

* Turkish translations

* Update Turkish.properties

* fix typo

* change [unit] into [param] to fix

* add the missing ] to the [amount and finally make the pr mergeable

Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Martin <77325495+Mape6@users.noreply.github.co>
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: Miraç <56484801+logicminimal@users.noreply.github.com>
 2021-08-08 23:02:44 +03:00
Xander Lenstra
55d32e1bcb
Added follower beliefs for buying religious buildings (#4793) 
* Added follower beliefs for buying religious buildings

* Implemented recommended changes
 2021-08-08 22:23:22 +03:00
SomeTroglodyte
eab42c0a93
MapGenerator optimization (#4805) 
* MapGenerator cleanup

* MapGenerator cleanup - lint

* MapGenerator cleanup - tuning

* MapGenerator cleanup - patch1
 2021-08-08 22:20:53 +03:00
Xander Lenstra
b649427415
Hides 'automate' unit action and unhides 'stop exploring' unit action (#4810) 2021-08-08 22:06:57 +03:00
SomeTroglodyte
b6ee4c0b1c
Common interface for Unique-collections in ruleset objects (#4788) 2021-08-08 18:21:04 +03:00
Xander Lenstra
92d3fa65e3
Ruins now have their own file (#4771) 
* Ruins now have their own file

* Added religious rewards

* Added an option for only enabling rewards after a certain amount of turns

* You can now weigh rewards making some more likely than others

* Cleaned up some code

* Make new changes compatible with old mods

* Implemented proposed changes

* Implemented requested changes

* Implemented requested changes
 2021-08-08 17:31:08 +03:00
Xander Lenstra
4d0b2405e1
Missionaries are now disabled when religion is disabled (#4791) 2021-08-08 15:22:09 +03:00
SomeTroglodyte
58a3dfdda3
Diplomacy: City State resource UI, improvement gift effect (#4782) 
* CS Resources shown in Diplomacy linked

* CS Improvement gift updates resources immediately

* CS Improvement gift updates resources immediately - patch1
 2021-08-08 15:21:44 +03:00
SomeTroglodyte
b8fe46d057
Regression in template.properties (#4785) 
"Advanced Settings" has been a while ago. I'm not fixing all comment/empty lines having added spaces here, later.
 2021-08-07 23:47:58 +03:00
ravignir
56541a6489
Pikeman upgrades only to Lancer (#4780) 
Checked this in civ5.
 2021-08-07 23:47:35 +03:00
Xander Lenstra
a35f55db6f
Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
Xander Lenstra
c56f0b3d4e
Architecture is now a prerequiste of Archaeology (#4797) 2021-08-07 23:45:05 +03:00
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
9a24f04d56
Fixes bug where Russia's unique no longer works (#4803) 2021-08-07 23:43:47 +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
Miraç
124d614a9f
Fix banking's required techs (#4796) 
will this break a hypothetical save where someone is now researching a tech and has all required techs for now but not the new to be added requirement?
 2021-08-07 22:47:19 +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
Yair Morgenstern
8394930d6d 3.16.1 3.16.1 2021-08-06 15:21:57 +03:00
Yair Morgenstern
5eec9e8e0e
Translations update (#4776) 
* Update German translation (#4773)

* Update Swedish.properties (#4768)

Translated the newly added lines.

* Update Italian.properties (#4763)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-06 15:12:54 +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
Xander Lenstra
9634f7045a
Replaced the last promotion effects with uniques (#4764) 2021-08-05 07:41:48 +03:00