Commit Graph

5595 Commits

Author SHA1 Message Date
Yair Morgenstern
eb7cf85482 Solved rare teleport bug 2021-07-27 22:50:55 +03:00
Yair Morgenstern
7abaa11fd4
Translations update (#4654)
* Update Czech.properties (#4652)

* Update Czech.properties

- sweden, finished city states dipomacy and translated most of new strings

* Update Czech.properties

- fixed messy typo

* Update Indonesian.properties (#4651)

* Update Korean.properties (#4650)

* Update Simplified_Chinese.properties (#4643)

* Update Spanish.properties (#4642)

* Update Spanish.properties

* Update Spanish.properties

* Update Italian.properties (#4640)

* Update Swedish.properties (#4638)

Translated the newly added lines.

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@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: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
2021-07-27 22:29:22 +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
ravignir
8c9e7fa7da
Petra as in G&K fix (#4645)
* Petra as in G&K fix

* Update Buildings.json

* Update Buildings.json
2021-07-27 10:38:37 +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
Yair Morgenstern
e94033fc36 Deprecated "can only attack water" unique 2021-07-27 05:39:36 +03:00
Yair Morgenstern
52867ec265 Deprecated PolicyManager.autocracyCompletedTurns 2021-07-27 05:24:19 +03:00
Yair Morgenstern
9c1248b741 Deprecated PolicyManager.legalismState 2021-07-27 05:23:23 +03:00
Yair Morgenstern
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
Yair Morgenstern
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
Yair Morgenstern
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00
ravignir
eae17b67b4
Update Policies.json (#4646) 2021-07-26 14:31:25 +03:00
Yair Morgenstern
c5ffec9ade Replaced "Building.providesFreeBuilding" field with generic unique 2021-07-26 14:29:43 +03:00
Yair Morgenstern
8a1c728438 Step 1 in the Glorious UnitType Moddability Revolution - isRanged(), isMelee(), isMilitary(), isCivilian() are no longer unittype-dependent
Unified all isAir || isMissile to BaseUnit.MovesLikeAirUnit()
2021-07-26 00:15:18 +03:00
Yair Morgenstern
bc1455de2a 3.15.15 2021-07-25 19:49:39 +03:00
Yair Morgenstern
197bfc40bd
Translations update (#4637)
* 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>
2021-07-25 19:16:37 +03:00
SomeTroglodyte
d0155a6ddd
Minimap Slider UI (#4634) 2021-07-25 19:08:50 +03:00
SomeTroglodyte
3e482182b3
Unit name translation (#4635) 2021-07-25 19:05:56 +03:00
SomeTroglodyte
966f70d0d4
Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
SimonCeder
dbc6bc9f30
optimizing the spawn placement algorithm (#4620)
* optimize spawn placement

* consistent nomenclature
2021-07-24 22:19:46 +03:00
SomeTroglodyte
aa3be63492
Fix canImprovementBeBuiltHere regression (#4623) 2021-07-24 21:45:51 +03:00
SomeTroglodyte
f9bef4a917
Newgame screen overhaul for portrait mode (#4522)
* Newgame screen scrolls nicer, mods sorted, base/ext mod clearer, unified separators

* Newgame-Mods-UI - sort Nations
2021-07-24 21:43:12 +03:00
Yair Morgenstern
7a42ab3e99 Resolved #4394 - corrected misspelled city names 2021-07-23 16:34:04 +03:00
Yair Morgenstern
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
Yair Morgenstern
0ed47f10a8 Converted building GPP from stats to counter 2021-07-23 15:25:11 +03:00
Yair Morgenstern
2c050283b0 Source-to-GPP mapping - replaces StatMap 2021-07-23 14:29:31 +03:00
Yair Morgenstern
e6bac1c5b5 Moved the stat-to-counter conversion forward to the CityInfo level 2021-07-23 14:00:22 +03:00
Yair Morgenstern
cbfd658480 Part 1 of "generic Great Person points" - changed data type serialized in save to be stat-agnostic 2021-07-23 13:55:08 +03:00
SomeTroglodyte
6791dd3340
Deprecate "Can only be built on coastal tiles" unique (#4581)
* 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'
2021-07-23 13:19:35 +03:00
SomeTroglodyte
2b3afb5acf
Civilopedia for Religion - atlas (#4616) 2021-07-23 09:30:05 +03:00
SimonCeder
f41d30e0cc
City states adjustments (#4597)
* city-state AI

* City-state spawns

* City-state border expansion

* City-state border expansion adjustment

* Food and production multipliers for city states

* 6 CS as default
2021-07-23 00:20:20 +03:00
SomeTroglodyte
e41ba0da91
A Civilopedia category for Religion (#4609)
* A Civilopedia category for Religion

* Civilopedia for Religion - rename cat, template and EOF linting

* Civilopedia for Religion - oversight
2021-07-23 00:10:47 +03:00
SomeTroglodyte
e514df5b82
Removed Char-only restriction in keyboard support for unit actions, remap a few keys, key tooltips for non-ascii keys (#4606) 2021-07-23 00:02:20 +03:00
Yair Morgenstern
f2697ee8a1 3.15.14 2021-07-22 20:39:24 +03:00
Yair Morgenstern
5a9e4cfb85
Translations update (#4596)
* Update Russian.properties (#4594)

* Update Swedish.properties (#4592)

* Refactor German translation of Multiplayer (#4591)

* Update German translation (#4590)

* Update Spanish.properties (#4586)

* Update Indonesian.properties (#4577)

* Update Italian.properties (#4571)

* Update Korean.properties (#4569)

* Update Korean.properties

* Update Korean.properties

Co-authored-by: sockybob <44141246+sockybob@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: 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: Samsaek the Calico <saud2410@naver.com>
2021-07-22 19:44:51 +03:00
Xander Lenstra
57f647c2d1
Fixed bug where "[All] units" would not apply to city combatants (#4601) 2021-07-22 19:42:38 +03:00
SomeTroglodyte
61204db01c
Resolve #4589 (#4605) 2021-07-22 19:42:19 +03:00
Xander Lenstra
41f9fbfed2
Fixed comodification errors under certain circumstances (#4599) 2021-07-22 19:42:08 +03:00
Xander Lenstra
54df4ba0c0
Fixed a crash in badly defined mods (#4598) 2021-07-22 00:37:54 +03:00
SimonCeder
2971e6bba3
Map generation and start locations (#4588)
* 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
2021-07-21 14:41:48 +03:00
SomeTroglodyte
08954c1bd1
Spruced up Civilopedia - phase 6 - uniques (#4587) 2021-07-21 14:40:17 +03:00
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* 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
2021-07-21 10:43:55 +03:00
Xander Lenstra
605581c78b
Fixed bug where 'remove road' would also remove other improvements under specific circumstances (#4583) 2021-07-21 10:42:32 +03:00
SomeTroglodyte
70a18de7cc
City construction Civilopedia-linked (#4573)
* City construction Civilopedia-linked

* City construction Civilopedia-linked - EOF
2021-07-21 10:34:00 +03:00
Xander Lenstra
92c4e4e083
Fixed units not being removed from open borders area after declaring war (#4584) 2021-07-21 10:31:13 +03:00
Xander Lenstra
167d9705f7
Fixed bug where all great people suddenly were scientists (#4582) 2021-07-21 10:28:48 +03:00
Xander Lenstra
3d13680602
Update translationFileWriter to include missing strings (#4578)
* 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)
2021-07-20 17:07:15 +03:00