wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4265 commits 7 branches 304 tags 288 MiB
Commit graph

2170 commits

Author SHA1 Message Date
Yair Morgenstern
6ff712b625 A mishmash of different fixes: Unit uniques and promotions, happiness calculation, etc. 2020-08-24 10:58:14 +03:00
Yair Morgenstern
21c8336563 unit.getMatchingUniques() 2020-08-24 09:48:33 +03:00
Yair Morgenstern
8203549aea Removed UniqueAbility from Nations 2020-08-23 22:33:31 +03:00
Yair Morgenstern
40f93461fa With new translation lines 2020-08-23 21:27:31 +03:00
Yair Morgenstern
9ef7d8770d Added a new test that ensures no two placeholders are the same 
Fixed double 'param' parameter in existing translations
 2020-08-23 21:20:17 +03:00
uncivbot[bot]
6185312fd9
Translations update (#3022) 
* Update Italian.properties (#3013)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Simplified_Chinese.properties and Traditional_Chinese.properties (#3019)

* Update Simplified_Chinese.properties

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update Indonesian.properties (#3014)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update German.properties (#3015)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Russian.properties and Ukrainian.properties (#3018)

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties

* update Ukrainian.properties

* Update Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* update Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties

* Update Russian.properties and Ukrainian.properties after review

* Update Russian.properties and Ukrainian.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: HadeanLake <69697985+HadeanLake@users.noreply.github.com>
 2020-08-23 20:29:37 +03:00
Yair Morgenstern
002d0cc7f6 Settler 'by name' recognition changed to 'by unique' recognition, allowing for modded settler-like units 2020-08-23 00:28:55 +03:00
Yair Morgenstern
db7f064498 Resolved #3016 - Policy branch uniques are translated properly 2020-08-21 14:06:29 +03:00
Yair Morgenstern
02c2da9347 generified []# of food is carried over 2020-08-20 23:45:44 +03:00
Yair Morgenstern
408077cd5f Roads and railoads can be removed outside your borders 2020-08-20 23:21:12 +03:00
Yair Morgenstern
270c50afd6 Generified more building uniques and merged functionality of global and city uniques when alculating tile stats 2020-08-20 23:11:53 +03:00
Yair Morgenstern
e7c0710042 3.10.2 2020-08-20 12:30:46 +03:00
uncivbot[bot]
2492c17216
Translations update (#3012) 
* Update Italian.properties (#3002)

* Update Czech.properties (#3003)

lot of new strings translated

* Update German.properties (#3005)

* Update Indonesian.properties (#3004)

* Update Simplified_Chinese.properties (#3010)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties (#3011)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
 2020-08-20 12:09:06 +03:00
HadeanLake
a12c1ada26
Fixed AI being stuck doing science or gold per turn (#3006) 
* AI will no longer get stuck doing science or gold per turn

* added missing commas in jsons
 2020-08-18 20:53:16 +03:00
HadeanLake
764a1c3913
scenario editing mode improvements and new unique (#2999) 
* scenario editing mode improvements and new uniques

* Fixed Russian nation unique - it is civ-wide bonus

* genericized "+[]% Production when building [] in this city"

* genericized "All newly-trained [] units in this city receive the [] promotion"

* changed some uniques to be able to have list of filters separated by comma as unique param

* scenario editing mode improvements:

Resource requirements when buying buildings and units are ignored

Limit for selling buildings is ignored

Workers improve tiles instantly

Units will not be disbanded if civilization has negative gold

* fix crash in scenario editing mode due to PerpetualConstruction not having a GoldCost

* undo comma separation

* implement All newly-trained [relevant] units in this city receive the [] promotion
relevant as in 'units that can receive'

* upadte template.properties

* unnecessary parentheses

* Not being annoyed by this vs less chance of forgetting to set gold before releasing scenario

* update template.properties

* add missing spaces
 2020-08-18 19:20:59 +03:00
ravignir
18834d94ae
Update Polish.properties (#2998) 
Fixed (hopefully) all typos
 2020-08-17 23:40:54 +03:00
Yair Morgenstern
2c8074bfe4 Converted the "special power" of the Future Tech to a unique than can be applied to any tech 2020-08-17 23:07:58 +03:00
Yair Morgenstern
41615909df Translation tests are fixed - translators beware 2020-08-16 22:01:55 +03:00
Yair Morgenstern
7cdad3c882 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-08-16 20:43:41 +03:00
Yair Morgenstern
574e588711 City-wide bonuses are clearly marked as such to differentiate them from civ-wide bonuses 2020-08-16 20:43:19 +03:00
uncivbot[bot]
da4852d954
Translations update (#2996) 
* Finnish translation update (#2993)

* Add Finnish.properties

* Move Finnish.properties to right folder

* Delete Finnish.properties

* Add translations to Finnish

* Add translations to Finnish

* Translate more stuff in Finnish

* More translation to Finnish

* Update Brazilian_Portuguese.properties (#2994)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#2992)

* Create PolishNew (#2995)

New polish translation, should be 100% complete.

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ravignir <RAVIGNIRFORATT@GMAIL.COM>
 2020-08-16 20:41:51 +03:00
Yair Morgenstern
f2f14b6570 Revert "Changed all "[] from [] tiles" to "[] from every []"" 
This reverts commit c89041e2d4.
 2020-08-16 20:16:01 +03:00
Yair Morgenstern
4cd4d5d89f All kinds of crazy translation fixes 2020-08-15 23:20:18 +03:00
Yair Morgenstern
c89041e2d4 Changed all "[] from [] tiles" to "[] from every []" 2020-08-15 21:58:26 +03:00
leanhquanea1234
324f4d7a15
Update Vietnamese.properties (#2991) 
* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-08-15 21:22:28 +03:00
Yair Morgenstern
4046837a3e AI chooses to fortify in non-bombardable tiles if possible 
Can choose replacement building for Palace to indicate the capital city
 2020-08-14 13:43:28 +03:00
Yair Morgenstern
59fa4ff052 #2988 Finnish translation file expanded 2020-08-14 10:24:50 +03:00
Perttu Männistö
99f19b1f71
Move Finnish.properties to right folder (#2988) 
* Add Finnish.properties

* Move Finnish.properties to right folder
 2020-08-14 10:22:06 +03:00
Yair Morgenstern
5c0eaa18dd Resolved #2986 - Knight now obsoletes properly 2020-08-14 10:16:50 +03:00
Yair Morgenstern
24d5e08783 Translation updates for Finnish 2020-08-14 00:38:17 +03:00
uncivbot[bot]
9b13f44b2b
Translations update (#2983) 
* Add Finnish.properties (#2982)

* Update Indonesian.properties (#2978)

* Update Simplified_Chinese.properties (#2977)

* Update Italian.properties (#2975)

* Update German.properties (#2984)

Co-authored-by: Perttu Männistö <64960796+maitovelkkis@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
 2020-08-14 00:32:12 +03:00
Yair Morgenstern
451234c3bb 3.9.20 2020-08-12 19:39:45 +03:00
uncivbot[bot]
adfd44c959
Translations update (#2974) 
* Update Italian.properties (#2958)

* Update Indonesian.properties (#2961)

* Update Indonesian.properties

* Update Indonesian.properties

* German translation update (#2965)

* Update German.properties

* Update German.properties

* Update German.properties

"Hinterhalt" seems more logic to me in this case

* Update Ukrainian.properties (#2963)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Japanese.properties (#2968)

* Update Korean.properties (#2969)

* Update Simplified_Chinese.properties (#2970)

* Create Vietnamese (#2971)

* Create Vietnamese

* Update and rename Vietnamese to Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

* Update Vietnamese.properties

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ZGMZY <69511837+ZGMZY@users.noreply.github.com>
Co-authored-by: leanhquanea1234 <69520258+leanhquanea1234@users.noreply.github.com>
 2020-08-12 19:15:30 +03:00
Yair Morgenstern
889d6a1587 Denounce now has a confirmation popup 2020-08-10 23:24:02 +03:00
Yair Morgenstern
3b2e813523 Ancient Ruins can now provide Culture 2020-08-10 23:12:02 +03:00
Yair Morgenstern
be51735fdf Fixed broken tests 2020-08-09 21:37:09 +03:00
Yair Morgenstern
38490ca1cc Forts can also be built outside your borders 2020-08-08 23:16:28 +03:00
Yair Morgenstern
b8ce489ea3 3.9.19 2020-08-08 21:39:34 +03:00
uncivbot[bot]
b035571d79
Translations update (#2957) 
* Update Italian.properties (#2942)

* Update Thai.properties (#2949)

Hmm can we change the current Thai font to the other. Maybe that would help fixing the current Thai text display problem

* Update Indonesian.properties (#2948)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: NoNZeeZ <58921355+NoNZeeZ@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-08-08 21:26:57 +03:00
Yair Morgenstern
ae60aab7e5 Resolved #2818 - Can no longer build improvements outside your borders 2020-08-07 17:22:48 +03:00
Yair Morgenstern
faaab3173b Resolved #2944 - Air units intercept range fixed 2020-08-07 14:56:42 +03:00
Yair Morgenstern
376079100d Tile Improvements get parametrized Uniques! 2020-08-07 14:48:14 +03:00
Yair Morgenstern
0a30e99359 All nations uniqueified! 2020-08-06 23:29:49 +03:00
Yair Morgenstern
de97e1c32f All nations up till Mongols - almost done! 2020-08-06 20:53:40 +03:00
Yair Morgenstern
5cc610aa5d Persia nation uniques - also contained a translation-wide change 2020-08-06 20:24:18 +03:00
Yair Morgenstern
ce0985d077 All nation uniques up to Iroquois 2020-08-06 20:15:59 +03:00
Yair Morgenstern
9f5b8d157a Converted civ uniques up to India 2020-08-06 19:53:29 +03:00
Yair Morgenstern
1fb566ec30 RIP PolicyManager.PolicyEffects 2020-08-06 18:40:35 +03:00
Yair Morgenstern
5e222a44b6 3.9.18 2020-08-05 22:03:53 +03:00
uncivbot[bot]
318a8fb22f
Translations update (#2941) 
* Update Italian.properties (#2919)

* Update Indonesian.properties (#2927)

* Update Ukrainian.properties (#2931)

* Update Korean.properties (#2934)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
 2020-08-05 22:00:45 +03:00
Yair Morgenstern
a97c9bafcc Civ uniques up to Arabia converted 2020-08-02 22:03:30 +03:00
Yair Morgenstern
5aaab7e137 Civ uniques done up till Egypt 2020-08-02 17:04:11 +03:00
Yair Morgenstern
04d4c9c9bf Resolved #2929 - Can no longer destroy original capitals by nuke 2020-08-02 16:17:20 +03:00
Yair Morgenstern
ebb8432dcb Changed how great unit recognition works 2020-08-02 13:53:27 +03:00
Yair Morgenstern
b4708b05b3 Unified regular unit and great person unit additions 
First playaround with nation uniques!
 2020-08-01 23:04:33 +03:00
Yair Morgenstern
9ade890ad4 3.9.17 2020-08-01 22:07:28 +03:00
Yair Morgenstern
f88e2f2bb7 Merge remote-tracking branch 'origin/master' 2020-08-01 21:46:27 +03:00
uncivbot[bot]
c8ff18503b
Translations update (#2918) 
* Update Japanese.properties (#2904)

* Update Italian.properties (#2906)

* Update Korean.properties (#2915)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
 2020-08-01 21:44:50 +03:00
lishaoxia1985
acdc6cee69
AS update to 4.0.1, Edit Diplomacy UI in Overview (#2885) 2020-08-01 21:44:32 +03:00
Yair Morgenstern
fbf4312973 All policies converted! 2020-07-31 19:09:56 +03:00
Alexander Korolyov
86f500b266
Fog of war implementation (#2887) 
* Initial implementation fog of war for spectators

* Corrected fog of war for main map

* Fix borders seen in unexplored tiles during spectating

* Small refactor

* Fixes after code review

* Fixes after code review

* wierd bug fix, android studio "eats" spaces
 2020-07-31 11:32:44 +03:00
Yair Morgenstern
0f727e1929 Moar policies! Policy stat changes can now happen from wonders as well! 2020-07-31 00:25:48 +03:00
Yair Morgenstern
8fec837e64 Modernized translations yay 2020-07-30 22:40:50 +03:00
Yair Morgenstern
c0a9690d2a Finished Rationalism tree! 2020-07-30 22:39:52 +03:00
Yair Morgenstern
0eaad31ce1 Getting used to multi-param placeholders ;) 2020-07-30 22:26:15 +03:00
Yair Morgenstern
362ca7c1e3 More policy conversions, only 3 trees left! 2020-07-30 22:07:05 +03:00
Yair Morgenstern
0444a28657 Policy transformation 2020-07-30 19:56:43 +03:00
Yair Morgenstern
654a355666 Resolved #2907 - University unique registers properly 2020-07-30 19:15:11 +03:00
Yair Morgenstern
8dfc147bb1 Added civ-wide per-building stat bonus 2020-07-30 19:05:07 +03:00
Yair Morgenstern
ca58bb22ac 3.9.16 2020-07-30 13:37:28 +03:00
uncivbot[bot]
dfce74f020
Translations update (#2903) 
* Update Italian.properties (#2888)

* Update Persian_(Pinglish-DIN).properties (#2889)

Made some translations more accurate, Fixed a few mistakes and, Added some new translations.

* Update Persian_(Pinglish-UN).properties (#2890)

The same thing that I did with  the PinglishDIN translations.

* Update Persian instructions.txt (#2891)

Updated the criteria

* Update Indonesian.properties (#2892)

* Update German.properties (#2899)

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: scaphander <67830047+scaphander@users.noreply.github.com>
 2020-07-30 13:09:09 +03:00
Yair Morgenstern
406959c771 Resolved #3901 - nuclear weapon setting remains between games 2020-07-29 23:33:30 +03:00
Yair Morgenstern
97def95817 Can now handle multiple civ-wide uniques of the same type! 2020-07-28 19:56:57 +03:00
Yair Morgenstern
5fbfa637f2 All improvement placing units are automated in the same way - this allows for the AI to control modded units that place other improvements! 2020-07-28 19:26:02 +03:00
Yair Morgenstern
b816d1036d Resolved #2894 - Map editor button only opens popup once 2020-07-27 19:53:50 +03:00
Yair Morgenstern
f18f6d4a29 3.9.15 2020-07-26 22:07:50 +03:00
Kensvin
d57c814190
Update Indonesian.properties (#2882) 2020-07-26 21:38:38 +03:00
Giuseppe D'Addio
46cc0ed5d1
Update Italian.properties (#2883) 2020-07-26 21:38:20 +03:00
Yair Morgenstern
4758beffa6 More policy conversions 2020-07-25 23:03:21 +03:00
Yair Morgenstern
627283b10b Converted policies up to Collective Rule 2020-07-25 22:36:15 +03:00
Yair Morgenstern
8463d0a884 Welp, missed a spot 2020-07-24 18:21:03 +03:00
Yair Morgenstern
e7639c93c4 Step 2 - started POC breakdown of policy effects to constituent uniques 
This will allow mix&matching of policy effects, AND allow them to be used as building uniques as well!
 2020-07-24 18:18:17 +03:00
Yair Morgenstern
bf874fe749 [stat] from [terrain] tiles applied to all existing buildings 2020-07-24 17:56:59 +03:00
Yair Morgenstern
066dd615b4 Created stat parameter parsing and translation! 
Genericified "[stats] from [terrain] tile" building unique
 2020-07-24 17:47:55 +03:00
Yair Morgenstern
d9e1b58bd2 Added Pinglish translations 2020-07-24 09:55:29 +03:00
uncivbot[bot]
881aff1166
Translations update (#2880) 
* Update Korean.properties (#2874)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Create Persian_PingilishDIN.properties (#2866)

This is the Persian translation for UnCiv, please note that since the Persian has its own alphabet (which is from right to left) I just used an alphabet derived from the DIN 31635 standard made by "Deutsches Institut für Normung"

* Create Persain_PinglishUN.properties (#2867)

This is a Persian translation for UnCiv, please note that since Persian has its own alphabet (which is written from right to left) I just used an alphabet derived from the ALA_LC standard made by "American Library Association - Library of Congress".

* Update Brazilian_Portuguese.properties (#2868)

Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: TheRNB <44290454+TheRNB@users.noreply.github.com>
Co-authored-by: Dalmolax <63485458+Dalmolax@users.noreply.github.com>
 2020-07-24 09:32:18 +03:00
Yair Morgenstern
d7bac9ed3e Genericified 'free [unit] appears] 2020-07-24 00:34:39 +03:00
Yair Morgenstern
548e107504 Generic "must be next to []" unique for buildings 2020-07-24 00:23:42 +03:00
TG
bcfcadf5bc
Update template.properties (#2875) 2020-07-23 14:40:52 +03:00
Yair Morgenstern
1a558a70d2 Buildings that are missing resources are still displayed in city constructions 2020-07-23 12:54:26 +03:00
Yair Morgenstern
aa2f9726ac Unit 'unbuildable' parameter converted to unique 2020-07-20 23:36:54 +03:00
Yair Morgenstern
d8b84db3a6 Removed extraneous (for now) G&K files 2020-07-20 23:03:00 +03:00
uncivbot[bot]
d578393f65
Translations update (#2865) 
* Update Simplified_Chinese.properties (#2847)

音译了一些城市名称。
Transliterated some city names.

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Japanese.properties (#2855)

* Update Korean.properties (#2858)

* Update Korean.properties

* Update Korean.properties

* Update Russian translations (#2859)

* Add missing Russian translations

Added missing Russian translations. One translation is still missing: "Removing Terrain Features"

* add missing

* Update Italian.properties (#2861)

* Update Indonesian.properties (#2862)

Co-authored-by: Doubi_TS <48427744+tianshidoubi@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: Sergei Bolotov <sbolotov@microsoft.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
 2020-07-20 06:22:44 +03:00
Yair Morgenstern
c402d63a68 3.9.12 2020-07-16 23:15:23 +03:00
uncivbot[bot]
9b2ef20f25
Update Russian.properties (#2846) (#2854) 
Co-authored-by: Kruger-Sheppard <65571371+Kruger-Sheppard@users.noreply.github.com>
 2020-07-16 22:27:22 +03:00
lishaoxia1985
59f6e10511
some bug fix (#2817) 
* Scout won't be built when research "Scientific Theory". Fix the word "Can only build water units in coastal cities".

* Fix the bugs when you delete all maps close button disappears and you can't go to main menu.

* Basictests don't check that Scout can't upgrade.

* If the unit is obsolete it will remove from construction queue.
 2020-07-16 22:22:47 +03:00
Yair Morgenstern
6309bc2fba Main menu buttons no longer require scrolling 2020-07-15 21:52:42 +03:00
Giuseppe D'Addio
4f919b32de
Update template.properties (#2843) 
Added new translation lines that were absent in the game
 2020-07-14 14:32:55 +03:00
Yair Morgenstern
e179f1a472 Added Water Mill building 2020-07-13 22:42:30 +03:00
Giuseppe D'Addio
0c7d4b296a
Update Nations.json (#2815) 
Typo fix
 2020-07-13 22:37:01 +03:00