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?
* 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
* 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>
- Deserts are a little bit more common (but now have higher chance of being stripes)
- Slightly reduced range of Tundra.
- Slightly reduced amount of Snow.
- Grasslands can now appear next to desert tiles and huge plains areas are much less likely.
* 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
* 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
* Fix Hagia Sophia and CN Tower not giving civ 5 bonuses
i got the information about Hagia Sophia from @ravignir and CN Tower from civ wiki. i will also add faith to buildings that give faith in G&K but will do it as a commit, that so that it would be easily revertable if faith doesnt just get ignored when religion is disabled
* Create Buildings.json
* Delete Fix Hagia Sophia and CN Tower not giving the bonuses it gave in civ 5
* And new unit pixel and some improvement.
* Improve Road & Railroad more realistic
* Unit pixel improvement
* Delete Airship.png
* Delete Stealth Bomber.png
* Re-art Missionary
* Add Rome color for ballista
* Delete Future Soldier.png
This should make the map look more like a civ5 map:
here is a spreadsheet i've created and used to make these changes: https://drive.google.com/file/d/18uacHvZlh4FoM8xEVH4J9jaAmtHomutr/view?usp=sharing
What it does:
- makes center of a map mostly Grassland with some bits of Plains
- next biome is Desert and Plains with a rare patches of Grasslands.
- next biome is again Grasslands and Plains (in about equal proportions)
- final biome is Tundra that turns into Snow towards poles.
- makes the whole map look less stripy.
It looks kind of messy, but i tried to make it as compact as i could.
* Add files via upload (#4632)
* Update Finnish.properties (#4627)
* Update Finnish.properties
* Update Finnish.properties
* Update Finnish.properties
* Update Hungarian.properties (#4625)
* Update Swedish.properties (#4621)
* Update Korean.properties (#4614)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
스웨덴 문명 추가됨. 아래 주목. (#4566)
> I took the liberty of redoing the city name list. The new list includes only cities in modern Sweden (so no Finland), and no Viking Age settlements that are not currently inhabited.
도시 목록을 모던 스웨덴 기준으로 했다는데, 말이 좋아 그렇지 걍 좃대로 한걸로밖엔 생각되지 않음. Unciv가 문5 따라가는 겜인데, 문5 도시목록에 중대한 오류가 있지 않은 이상 그대로 가주는게 맞는거지. 근데 내가 역사덕후도 아니고 이사람은 스웨덴어 번역(swedish.properties)도 한거보면 현지인인거 같아서 일단 번역은 해놈. 내가 하는 한국어번역부터가 문5를 그렇게 완벽히 리스펙하진 않으니 또이또이기도 하고 걍 내가 귀찮은거 뿐이니까.
도시 목록 번역에는 국립국어원 외래어 표기법을 참고함.
국립국어원 https://www.korean.go.kr/front/main.do
국립국어원 어문규범 https://kornorms.korean.go.kr//main/main.do
국립국어원의 존재의의가 어문규범인데 홈페이지 분리하는 클라스... 그렇지.. 정부기관 홈페이지는 이렇게 지저분해야 제맛이지
스웨덴어 표기법은 알아서 찾아드가시고
실제로 본 페이지는 여기임. 구글링해서 나온거고 내용물은 같은데 레이아웃이 달라버림 ㅋㅋ
스웨덴어 표기 일람표 https://www.korean.go.kr/front/page/pageView.do?page_id=P000115&mn_id=97
스웨덴어 표기 세칙 https://www.korean.go.kr/front/page/pageView.do?page_id=P000136&mn_id=97
도시 목록을 한글로 옮긴 결과물은 다음과 같음
ㅇ : 예시에 있어서 복붙한거
v : 규정에 맞춰서 짜맞추는데 성공한거
?? : 도시이름이 현지표기랑 다르거나(예테보리는 원래 Göteborg), 규정대로 적었는데 구글링 결과가 시원찮은거(그렌나는 영문검색결과도 Granna Granaa 가 더 많음)
Stockholm = 스톡홀름 ㅇ
Uppsala = 웁살라 ㅇ
Gothenburg = 예테보리 ??
Malmö = 말뫼 ㅇ
Linköping = 린셰핑 ㅇ
Kalmar = 칼마르 v
Skara = 스카라 v
Västerås = 베스테로스 ㅇ
Jönköping = 옌셰핑 ㅇ
Visby = 비스뷔 ㅇ
Falun = 팔룬 ㅇ
Norrköping = 노르셰핑 ㅇ
Gävle = 예블레 v
Halmstad = 할름스타드 ㅇ
Karlskrona = 칼스크로나 v
Hudiksvall = 후딕스발 v
Örebro = 외레브로 ㅇ
Umeå = 우메오 ㅇ
Karlstad = 칼스타드 v
Helsingborg = 헬싱보리 v
Härnösand = 헤르뇌산드 v
Vadstena = 바드스테나 v
Lund = 룬드 ㅇ
Västervik = 베스테르비크 v
Enköping = 엔셰핑 ㅇ
Skövde = 셰브데 ㅇ
Eskilstuna = 에실스투나 v
Luleå = 룰레오 ㅇ
Lidköping = 리드셰핑 v
Södertälje = 쇠데르텔리에 ㅇ
Mariestad = 마리에스타드 v
Östersund = 외스테르순드 ㅇ
Borås = 보로스 v
Sundsvall = 순스발 ㅇ
Vimmerby = 빔머뷔 v
Köping = 셰핑 v
Mora = 모라 v
Arboga = 아르보가 v
Växjö = 벡셰 v
Gränna = 그렌나 ??
Kiruna = 키루나 ㅇ
Borgholm = 보르그홀름 v
Strängnäs = 스트렝네스 v
Sveg = 스베그 v
맨날 꺼무위키 보고 작업하다가 해보니까 번역다운 번역 한거같아서 나름 재미있었고, 한국어 정발명이 외래어 표기법에 맞지 않는 경우도 있다는걸 알게됨
( i.e. Jönköping = 옌셰핑 은 문5에도 있는 도시명인데 꺼무에는 이엔최핑이라 되있음 🤦♂️ )
그래도 돌발적인 행동은 안해줬으면 좋겠다... 머리터지는줄
* Update Indonesian.properties (#4613)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#4610)
* Update Russian.properties (#4608)
* Update Russian.properties
* Update Russian.properties
* Translating more (#4604)
* Translating keys and more
* Translating more
* Update Portuguese.properties
* Translating
* Update Portuguese.properties
* Update Portuguese.properties
* Translating civilizations: China, France and Rome
Translating phrases and cities from China, France and Rome.
* Translating the United States and Japan
* Translating Indian and German civilizations
Translating what is missing from the Indian and German civilizations
* Update Portuguese.properties
* Update Portuguese.properties
* Update Portuguese.properties
* Update Portuguese.properties
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: AcridBrimistic <acridbrimistic@protonmail.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
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: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
* 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'
* 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
* 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
* 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)
* 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
* Update Ukrainian.properties (#4550)
* Update Korean.properties (#4544)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Simplified_Chinese.properties (#4543)
* Update Czech.properties (#4540)
* Update Czech.properties
new strings, some old tweaked for better gramar
* Update Czech.properties
tweaked word form to beter fit to usage
* Updated Swedish Translation (#4539)
* Updated Swedish Translation
Translated the last lines that needed to be translated for the Swedish translation to be complete.
* Updated 2 lines with advice from SimonCeder
* Refactor New game screen (#4538)
* Update Russian.properties (#4537)
* Update Russian.properties
* Update Russian.properties
* Update German translation (#4536)
* Refactor Diplomacy,Trade,Nations (#4535)
* Refactor Nation Picker (#4534)
* Update Indonesian.properties (#4562)
* Unit gifting (#4557)
* wonder splash screens
* wonder splash screens atlas
* reset to master
* add basic gifting to city states and major civs
* actual gifting of the unit
* add gift icon to atlas
* adjust relationship decay
* add strings to jsons
* AI and player return same object
* Update Indonesian.properties
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
* Minor things
* Added a few follower beliefs
* Implemented follower beliefs when founding a religion
* Added missing follower beliefs as much as possible
* Religion screen now scrolls correctly
* Buttons for chosen religions are now disabled instead of removed, idea couresty to someTroglodyte
* Implemented requested changes
* wonder splash screens
* wonder splash screens atlas
* reset to master
* add basic gifting to city states and major civs
* actual gifting of the unit
* add gift icon to atlas
* adjust relationship decay
* add strings to jsons
* AI and player return same object
* Fixed crashes on loading save games with religion
* Added missing credit
* Religious cities now show religion icons in the city button
* Add icons for religions
* You can now found beliefs, with snazzy icons!
* Fixed bug which made prophets impossible to generate
* Added missing translatable strings
* Fixed translation tests properly
* Implemented requested changes
* Implemented part of the requested changes
* Removed SplitPane in favor of Table
* Removed unused code
* Capped the amount of foundable religions to the amount of religions
* Update Simplified_Chinese.properties (#4486)
* Update Czech.properties (#4482)
* Translating new Civilopedia entries
* More Civilopedia
* Civilopedia again
* Almost done...
* Finally done :)
* Update German translation (#4481)
* Update German translation
* Update German translation
* Update German translation
* Consistency of Great Person
* Update Swedish.properties (#4477)
* Translating more (#4474)
* Adjusting the accent
I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.
* Translating more stuff
* Translating more
Translating Babylonian and Greek names.
* Translating 2 more civilizations
Translating Egypt and England
* Update Russian.properties (#4472)
* Update Russian.properties
* Update Russian.properties
* Update Russian.properties
* Update Indonesian.properties (#4468)
* Update Italian.properties (#4466)
* Update Italian.properties
* Update Italian.properties
* Update Korean.properties (#4489)
* Resolved#4484 - civs with no cities can no longer pick policies
* Update Korean.properties
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
* Update Simplified_Chinese.properties (#4456)
* Update Indonesian.properties (#4455)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#4445)
* Laid some groundwork for implementing further religions (#4444)
* Laid some groundwork for implementing further religions
* Fixed duplication of Religion object
* Update Korean.properties (#4443)
* Update Korean.properties
* Update Korean.properties
* Update Spanish translations fase 1 (#4440)
* Update Spanish translations fase 1
DO NOT merge this until I have finnished it. I run out of time today.
* Update Spanish.properties
* Update Czech.properties (#4437)
* Update Czech.properties
many new (and old) strings translated
* Update Czech.properties
tweaked some newly translated strings
* huns and netherlands strings
* Update Swedish.properties (#4436)
Back up to 100%
Also some tweaks:
Ändrade ett par enheter för att få realegenus (en/den) på så många som möjligt
t ex Pansarskepp -> Pansarbåt (historiskt korrekt benämning, även Monitor är tänkbart)
Man kan överväga även t ex Infanteri -> Infanterist, finns åsikter?
* Update German translation (#4434)
* Adjusting the accent (#4426)
I changed a lot of phrases and words to European Portuguese as these phrases were in Brazilian Portuguese which has its own translation in another document.
Co-authored-by: lishaoxia1985 <49801619+lishaoxia1985@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>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
* Added all remaining pantheons
* AI now choose pantheons, AI no longer tries to get mutually exclusive policies
* I don't know why this was changed
* Implemented requested changes
* City States now give gold when met
* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game
* Implemented requested changes
* Fixed tests
* Add a very simple display for the religion in a city
* Added missing credits for shrine
* Added Great Prophet unit
* Great prophets can now be generated using faith
* Great Prophets can now construct holy sites
* Great Prophets can now spread their religion to friendly cities
* Holy site can only be constructed if the great prophet hasn't spread religion yet
* Added missing translation string
* Fixed more translation problems
* Implemented requested changes
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
* Added the nation of the Netherlands
* Added Sea Beggar, Dutch unique unit
* Added polder improvement, Dutch unique improvement
* Added national ability
* Fixed Air Targetting not having icon
* Fixed the huns not having battering ram unique unit
* Plundering with multiple levels of coastal raider no longer creates multiple notifications
* Implemented requested changes
* Fixed carriers in mods no longer working
* Fixed scouting prerequisites
* Fixed surivialism not having icon or prerequisites
* Fix logistics in mods not working
* Added image for supply promotion
* Added Era.json and imported the data to the ruleset
* Units at start are now also determined by eras.json
* Research agreement costs now determined by json file
* Gold and Culture provided at the start are now awarded
* Can no longer build wonders that are more than two eras older than the starting era
* Default population and buildings for settlers can now be added
* Added checks for validity of eras.json file in mods
* Colors for the icons of technologies are no also saved in eras.json
* Removed constants for all era's as they have been generalized away by this PR
* Removed spurios println's
* Added compatibility for mods
* Updated the military unit you get from ruines to be the military unit you received at the start of the game
* Generalized "[1] extra interceptions may be made per turn"
* Generalized and rephrased Cover promotion (requires #4311 to work)
* Generalized Logistics
* According to the civilopedia the defence value of cover has also risen, apparently
* Updated Ambush strength values
* Split up Targeting and Air Targeting (different strength bonus)
* Generalized Haka War Dance
* Added Supply promotion
* Renamed a unique so it matches other uniques
* Implemented May heal outside of friendly territory better
* Implemented requested changes
* Added privateer unit
* Privateers can now capture other naval units
* Updated Coastal Raider promotion to include the gold gained from damaging cities
* Added missing translatable notification
* Implemented requested changes
* Implemented requested changes _but better_
* Forgot to update a variable name
* Added the nation of The Huns
* Added unique units of The Huns
* Removed MountedRanged unitType
* Implemented requested changes
* Fixed some typo's, split up a very long function for redability
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
* Added a few simple beliefs for testing
* Moved CityReligion to its own file
* Created a picker screen for choosing pantheons
* Pantheon uniques are now calculated only for cities with the specific pantheon
* Added all the pantheon beliefs that can easily be added and commments for the ones still missing
* Games only have religion if either the user specifically asked for it, or uses a mod with religion
* Implemented requested changes
* Fixed bugs where nukes don't work due to capitilzation issues
* Renamed existing translations
* Fixed crash happening when nuking tiles without an owner
* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
* Changed some interception-related uniques
- "Can not be intercepted" -> "Cannot be intercepted"
This really irked me, and the new version is also how it is written
in the wiki.
- "Reduces damage taken from interception by 50%" ->
"Damage taken from interception reduced by [50]%"
* Added "Cannot be carried by [unitFilter] units" unique
* Added an icon for Stealth
* Added Stealth technology and the Stealth Bomber
* Possibly fixed incorrect rounding for interception damage bonus
* Various code style changes
* Made Stealth Bomber interceptable, but with 100% damage reduction
* Implemented Nuclear Submarine and Missile Cruiser units
* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K
* Fixed deprecated uniques still working
* Implemented requested changes
* Fix some problems (wouldnt merge lol) (#4256)
* many new strings translated (#4255)
* Update Italian.properties (#4251)
typo
* Update Korean.properties (#4250)
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Korean.properties
* Update Spanish.properties (#4248)
* Russian Translation (#4244)
Translated new lines and fixed typo
* Update Italian.properties (#4240)
* Update German.properties (#4263)
* Update German.properties
* Update German.properties
* add edits (#4261)
This was just some additions. There are random apostrophes that end up quoting large chunks of text until a new apostrophe is found. I don't know if this can be a problem for the technical part but for now, is just a minor pain when translating because of lack of auto-complete.
* Revert "add edits (#4261)" (#4264)
This reverts commit 980ca313fa.
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: end <72604018+laok233@users.noreply.github.com>
Co-authored-by: TG <saud2410@naver.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Rafael 'Fig' Diamantino de Figueiredo <45023203+rafaeldfigueiredo@users.noreply.github.com>
* Generalized building of improvements
* Readded support for the deprecated unique "Can build improvements on tiles"
* Small code quality changes
* Implemented requested chagnes
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them
* Added the Telecommunications tech
* Added the CN tower
* Implemented Bomb Shelter
* Added icons for new buildings
* Implemented requsted changes
* Improved nukes
* Fixed build error (probably)
* Implemented reocmmended changes, fixed some other stuff, the usual
* Implemented requested changes
* Fixed Tech connections
* Fixed nuclear missiles and guided missiles being interceptable
* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
* Reordered units
Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column
* Added Nuclear Fusion technology and GDR
* Fixed open terrain bonus working in rough terrain
Fixed#4139 - The open terrain combat bonus no longer works in rough
terrain.
Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.
* Minor simplification
* Replaced "rough" with "Rough terrain" unique
* Empty commit to re-run the build checks
* Created Patronage policy branch -- draft
* Patronage branch is now functional
* Added images for the policies
* Temporarily bandaged backwards compatability, added incompatabilities
* Implemented recommended changes
* Fixed acquirement of 'patronage complete' not being saved
* Reverted change I was unhappy with
* Implemented requested changes
* Fixed build errors
* Implemented recommended changes
* City States can now give any great person, including unique ones, conform Ravignirs tests
* Corrected building construction costs
Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)
Lighthouse 100 -> 75 (!)
Great Lighthouse 250 -> 185 (!)
Temple 120 -> 100
Burial Tomb 120 -> 100
Mud Pyramid Mosque 120 -> 100
Market 120 -> 100
Bazaar 120 -> 100
Mint 120 -> 100
Aqueduct 120 -> 100
The Oracle 300 -> 250
Petra 300 -> 250
Great Wall 300 -> 250
Monastery 160 -> 120
Workshop 160 -> 120
Forge 160 -> 120
Hagia Sophia 400 -> 300
Chichen Itza 400 -> 300
Machu Picchu 400 -> 300
Harbor 200 -> 120 (!)
University 200 -> 160
Wat 200 -> 160
Castle 200 -> 160
Mughal Fort 200 -> 150 (!)
Armory 200 -> 160
Angkor Wat 500 -> 400
Alhambra 500 -> 400
Notre Dame 500 -> 400
Observatory 250 -> 200
Opera House 250 -> 200
Bank 250 -> 200
Satrap's Court 250 -> 200
Hanse 250 -> 200
Theatre 250 -> 200
Sistine Chapel 625 -> 500
Forbidden Palace 625 -> 500
L. Tower of Pisa 625 -> 500
Himeji Castle 625 -> 500
Seaport 300 -> 250
Windmill 300 -> 250
Taj Mahal 750 -> 625
Porcelain Tower 750 -> 625
Museum 360 -> 300
Public School 360 -> 300
Arsenal 360 -> 300
Military Academy 360 -> 300
Louvre 920 -> 750
Big Ben 920 -> 750
Brandenburg Gate 920 -> 750
Hospital 500 -> 360
Stock Exchange 500 -> 360
Eiffel Tower 1250 -> 1060
Statue of Liberty 1250 -> 1060
Kremlin 1250 -> 625 (!)
Neuschwanstein 1250 -> 1060
Nuclear Plant 750 -> 500
Solar Plant 750 -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project 2000 -> 750 (!)
Apollo Program 1500 -> 750 (!)
* Corrected Hanging Gardens
10 food -> 6 food.
Now provides a free Garden.
* Corrected Statue of Liberty
Now provides a free social policy.
* Corrected Angkor Wat
Now unlocked with Education instead of Chivalry.
* Corrected Cristo Redentor
Now unlocked with Plastics instead of Flight.
* Corrected Kremlin
No longer gives 12 city strength (this was removed in G&K).
* Corrected Manhattan Project
Now unlocked with Atomic Theory instead of Nuclear Fission".
This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.
* Corrected Leaning Tower of Pisa
Now provides +25% great person generation in all cities.
* Corrected Kremlin some more
Now unlocked with Metallurgy instead of Railroad.
* Fixed Arsenal production cost correction
It is now actually 300, as was stated in the previous changelog.
* Reordered many buildings
Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.
* Corrected production cost for Colossus
Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.
tl;dr 250 -> 185
* Corrected Hermitage
Now unlocked with Architecture instead of Archaeology.
* Corrected National Treasury
Now unlocked with Guilds instead of Currency.
* Reverted incorrect corrections
Kremlin:
Provides 12 city strength again.
Statue of Liberty:
No longer provides a free social policy.
* did some Turkish translations (#4175)
i mostly did some polidhing in translations and added translations to much of simpler stuff that needed translations, but the civilopedia and civilizations are mostly not done, also i couldnt figure out how to fix typos and other stuff in mining
* French translation: fix typos and translate some (#4167)
* French translation: fix typos and translate some
* French translation: Fix typo and correct mistake
* Update Russian.properties (#4166)
* Update Russian.properties
* Update Russian.properties
* Update Italian.properties (#4164)
* Update Italian.properties
* Update Italian.properties
* Update Czech.properties (#4183)
* Update Russian.properties (#4182)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
Co-authored-by: Miraç <56484801+logicminimal@users.noreply.github.com>
Co-authored-by: Mayeul Cantan <mayeul.cantan@gmail.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
A previous commit changed the atlas textures to use nearest filtering,
making the game look significantly jaggier. This commit makes them use
mipmap filtering again.
Using mipmaps with atlas textures can cause the edges of the images to
bleed into each other, an effect that was indeed present before the
filtering was changed to nearest. This commit adds some additional
padding and sets the padding to duplicate the edges of images to
mitigate this effect. Note that altough this makes some of the atlas
images look very strange, the in-game result is improved.
* Added the Utopia Project for the culture victory; AI will now build it
* Forgot to credit the icon
* Fixed a few minor issues
* Improved code quality; added translatable notifications
* Fixed mistakes; improved quality
* Changed a label
* Revert a small change which is no longer necessary
* Reverted the revert of a small change which is no longer necessary
* Made requsted changes
* Updated Tradition branch to G&K
* Small performance boost for calcualting maintenance; fix crash on next turn
* Fixed a bug where maintenance-free buildings would still cost maintenance
* Simplified some code
* I am unable to read
* Fixed a few broken uniques, including #4109
* Implemented requested changes
* Updated Liberty branch to G&K, improved modularity of uniques
* Updated meritocracy to only affect non-occupied cities
* Implemented requsted changes
* Updated some unit obsoletions
* Added a missing unit upgrade
* Added some missing commas in units.json
* Replaced Military Base icon with a simpler one
The original had a bit too much detail for the size at which it is
shown.
* Enabled Arsenal and added a new Armory icon
The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.
* Enabled Military Base and added an icon for it
* Enabled Petra and added an icon for it
* Enabled Composite Bowman and added an icon for it
* Enabled Mobile SAM and added an icon for it
* Enabled Jet Fighter
* Made Machine Gun upgrade to Mechanized Infantry
* Removed "Will be added in G&K" comments
Since we are now targeting G&K, these comments are no longer required.
* Fixed Aluminum/Aluminium inconsistencies
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.
* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps
* Translation strings
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap
* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps
* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.
* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
* Refund wasted production as gold
Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).
We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.
When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.
* Implement wonder refund and obsolete unit upgrade
If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.
If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.
* Shorten notification messages
* Update alerts: been obsolete -> become obsolete
* Added an icon for unit swapping
* Implemented unit swapping
In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.
This change implements unit swapping for Unciv.
To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.
Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.
In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.
The swapping code is robust, it can even handle swaps that involve a
paradrop!
An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.
* Added some comments to existing movement functions
* Fixed a silly mistake
Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.
* Removed some unneeded code
* Fixed movement buttons not showing with world wrap
Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.
* Made the swap action only display if usable
Made the unit swapping button only display if there is at least one
possible swap movement.
* Added the paratrooper unit
* Reverted accidental reordering of action table
* Fixed Github build errors
* Hopefully actually fixed the build errors
* Added a Dutch translation, finally fixing the error
* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto
* Removed double update action
* Add global alerts for certain constructions
In the original game, certain constructions alert all players upon
their completion. This commit introduces a new unique for this behavior
and adds this unique to the relevant constructions.
The code that implements the new unique is placed in
Building.postBuildEvent, so it can only be activated by buildings. If
other kinds of constructions require a global alert as well, the code
could be moved to CityConstructions.constructionComplete.
* Removed redundant line in template.properties
* Moved global alert logic to CityConstructions
Moved the implementation of "Triggers a global alert upon completion"
from Building.postBuildEvent to CityConstructions.constructionComplete,
close to the similar Wonder notification logic.
* Technology and construction bars no longer extend past their maximum
* Fixed compile errors
* actually fixed the issue
* Added the marine unit
* Moved amphibious promotion effect to unique
* Added icons for Amphibious promotion and Marine unit
* aaah
* Update Turkish.properties (#3964)
* Update Spanish.properties (#3963)
* Update Indonesian.properties (#3960)
* Update Indonesian.properties
* Update Indonesian.properties
* Update Italian.properties (#3956)
* Update Spanish.properties (#3970)
* Fix spaceship part production boosts (#3953)
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.
The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.
The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
* Update Spanish.properties
I had to reopen a new pull request due to conflicts the other had.
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
Co-authored-by: Nazım Gediz Aydındoğmuş <nga@hotmail.com.tr>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Arthur van der Staaij <32672293+avdstaaij@users.noreply.github.com>
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.
The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.
The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
* Removed Duplicates and HillForest
since the Image HillForest got renamed to Forest to reduce ruleVariants
* reorganized legacy variants
* Added "Offshore Platform" for oil well on water
