mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-03 04:45:34 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,093 Commits 6 Branches 1,047 Tags 1.1 GiB
982d739ec8
Commit Graph

6093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AdityaMH
600f1a32fc
Fix missed sound for Sea Beggar (#5300) 2021-09-23 11:23:04 +03:00
SomeTroglodyte
a5a8ea1338
Natural Wonders un-hardcoded (#5279) 
* Natural Wonders un-hardcoded

* Natural Wonders un-hardcoded - oops testing change revert

* Natural Wonders un-hardcoded - tests OK

* Natural Wonders un-hardcoded - requests

* Natural Wonders un-hardcoded - hide from pedia

* Natural Wonders un-hardcoded - readable unique
 2021-09-23 11:21:08 +03:00
MartinP
c7d5caf08c
Correct one line in template.properties (#5302) 2021-09-23 11:20:17 +03:00
SomeTroglodyte
8161da26de
Texture pack/load for mods also distributes by Images.*X* (#5296) 2021-09-22 22:11:39 +03:00
SimonCeder
318a8d99ff
regenerated game.atlas and game.png (#5295) 2021-09-22 21:41:48 +03:00
yairm210
66b0ddb25a Mod error detection improvements! 
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
 2021-09-22 21:28:19 +03:00
Yair Morgenstern
e3f9f849a8
Update template.properties 
Added space that ruined tests
 2021-09-22 20:26:54 +03:00
SimonCeder
0bb565fdc6
Can't trade resources from other trades or city-states (#5252) 
* can't trade resources from city-states

* display untradeable sources in trade screen

* Update template.properties

template string

* Update Swedish.properties

* Spelling, better buttons
 2021-09-22 20:21:41 +03:00
yairm210
98f14523ed Add all cityFilter strings from the 'source of truth', since many were missing from translation file 2021-09-22 19:47:31 +03:00
SomeTroglodyte
d1005327e7
Lint a few warnings and typos (#5293) 2021-09-22 19:32:25 +03:00
yairm210
0771cb1fad 3.17.1 2021-09-22 18:50:17 +03:00
Yair Morgenstern
8538573204
Translations update (#5291) 
* Update Spanish.properties (#5286)

* Update Russian.properties (#5283)

* Update Swedish.properties (#5282)

* Update Swedish.properties

* Update Swedish.properties

* Update Italian.properties (#5278)

* Update Italian.properties

* Update Italian.properties

* Update German translation (#5277)

* Update Germans translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5275)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Japanese.properties (#5274)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.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: SimonCeder <63475501+SimonCeder@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
 2021-09-22 18:40:02 +03:00
yairm210
5d6765a879 Resolved crash in unit civilopedia lines that depended on unitType being initialized 2021-09-22 18:32:16 +03:00
SomeTroglodyte
5e4aff90e9
Music controller with fade-over and mod capabilities. (#5273) 
* Music controller with fade-over and mod capabilities.
- Preparation for music following game situations
- Minimal in-game hooks for now
- Already allows mods providing music, will play randomly

* Music controller - template
 2021-09-22 09:35:33 +03:00
Xander Lenstra
b7467d3467
Added support for conditionals to some more uniques (#5280) 
* Added support for conditionals to some more uniques

* Implemented a new conditional

* Added the new conditional to the translations file

* Fixed tests

* Implemented requested changes
 2021-09-22 09:24:16 +03:00
Xander Lenstra
4343137b82
Save the sources of uniques with the uniques themselves (#5281) 2021-09-21 20:26:14 +03:00
Yair Morgenstern
05394f627d
Using reflection to find and report deprecated uniques (#5276) 
* Using reflection to find and report deprecated uniques

* No kotlin reflection needed thank you very much
 2021-09-21 20:26:05 +03:00
Xander Lenstra
7a59cbcbe8
Fixed bug where a unit auto-exploring ancient ruins would in some cases disappear after upgrading (#5285) 2021-09-21 20:18:02 +03:00
yairm210
eedfbe0235 Specify acceptable uses of this unique 
Later we'll be able to check this in checkRuleset to warn against incorrect usages
 2021-09-20 16:26:36 +03:00
Xander Lenstra
ce5a82c763
Fix translation tests and wrongly translated conditionals (#5272) 2021-09-20 16:04:51 +03:00
yairm210
bd7824cdb9 More UniqueType-ing, discovering an overlap this time 2021-09-19 21:33:26 +03:00
yairm210
5fc7d1ce46 Gain free building uniqueType'D 2021-09-19 21:18:56 +03:00
yairm210
bdefb7894c cityInfo.getMAtchingUniques accepts uniqueType 2021-09-19 21:15:26 +03:00
yairm210
ef7676183d 3.17.0 2021-09-19 21:04:34 +03:00
yairm210
aee087ec01 tileResource unique fully replaceable by uniques 2021-09-19 20:58:17 +03:00
Yair Morgenstern
dbac2bfccb
Translations update (#5271) 
* Translation update (#5261)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Indonesian.properties (#5260)

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#5258)

* Update German translation

* Update German translation

* Update Italian.properties (#5214)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: cjddig <67223322+cjddig@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-09-19 20:53:20 +03:00
Xander Lenstra
f47f427b05
Adds conditionals to most of the uniques currently in the enum (#5270) 
* Moved uniques to their own folder

* Added support for conditionals to most of the uniques in the current enum

* Deprecation > removal, of course

* Fixed tests & added `.removeConditionals` before checking for placeholders
 2021-09-19 18:43:32 +03:00
Xander Lenstra
62e3dbe014
Moved uniques to their own folder (#5269) 2021-09-19 18:03:41 +03:00
Xander Lenstra
6416f397ea
Fixed a few incorrect upgrades (#5268) 2021-09-19 17:56:53 +03:00
Xander Lenstra
cb4feb29ed
Fixed a few bugs relating to earning great prophets (#5267) 
* Fixed bug where great prophets gifted by city-states wouldn't have a religion

* Fixed bug where earning/buying great prophets whithout having founded a religion would result in great prophets of your pantheon, regardless of the religious state of the city
 2021-09-19 17:56:38 +03:00
SimonCeder
027057874d
Update and generalize Siam UP (#5237) 
* refactor and generalize Siam UP, display correct values in diplo screen

* enable preferred diplomatic victory

* allow compatibility mode

* revisions, restore timesInPlace

* don't change game.png

* don't change game.png

* objectify and enum city state bonuses

* objectify and enum city state bonuses

* template.properties

* refactored city state bonuses into Unique

* further enumization, fix toStringWithDecimals

* reviews
 2021-09-19 06:28:10 +03:00
Xander Lenstra
ba679191f8
Fixed intercept chance being invertes (#5259) 
Edit made on mobile and as such untested
 2021-09-18 23:42:10 +03:00
SomeTroglodyte
ec0801ccef
Nation picker portraits (#5250) 
* New game nation picker spruce-up

* New game nation picker spruce-up - Ctext icon control
 2021-09-18 23:31:03 +03:00
Xander Lenstra
01bfd17594
Implementation of conditionals, but better than before (#5187) 
* Implementation of conditionals, but better than before

* Updated the unique while I was at it

* Fixed bug where conditionals would never apply

* Capitalization

* Minor code cleaning

* Better documentation & variable names

* Changed translation strategy

* Added missing import?
 2021-09-18 23:07:53 +03:00
SomeTroglodyte
8cff3fda49
Start preference Avoid shown with red X (#5253) 2021-09-18 23:05:14 +03:00
yairm210
f02675c5b0 Merge remote-tracking branch 'origin/master' 2021-09-18 23:03:26 +03:00
yairm210
81a12920df Merge branch 'temp' 2021-09-18 23:03:00 +03:00
yairm210
807f175567 3.16.15-patch2 2021-09-18 23:02:35 +03:00
SimonCeder
803575665d fix bug on capturing capital (#5263) 
(cherry picked from commit 47d1a5c009)
 2021-09-18 23:02:04 +03:00
SimonCeder
47d1a5c009
fix bug on capturing capital (#5263) 2021-09-18 23:01:42 +03:00
SimonCeder
8eb24ac273
Carthage civ (#5224) 
* Add Carthage

* Implement uniques

* performance improvement, better elephant

* AI avoids taking too much damage from mountains

* more performance

* better AI

* can't settle cities on mountains

* AI improvement

* AI improvement

* revisions, damagePerTurn in Terrains.json

* terrain damage stored as unique in json, damage also works for terrain features

* don't change game.png
 2021-09-18 20:28:12 +03:00
yairm210
7e05a56e37 Tile resource uniques now work to provide stat bonuses 2021-09-17 16:05:21 +03:00
yairm210
103f1daf36 tileResources unique -> uniques 2021-09-17 15:00:19 +03:00
yairm210
54ea0c89a8 Ruleset check finds errors in uniques of all kinds! 2021-09-17 14:47:03 +03:00
yairm210
b0a169cf01 Translation generation so translators won't have to merge conflicts 2021-09-17 14:12:08 +03:00
Yair Morgenstern
82104d89c1
Translations update (#5249) 
* Update German translation (#5240)

* Update Swedish.properties (#5235)

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#5225)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Spanish.properties (#5221)

* Update Russian.properties (#5232)

* Update Russian.properties

* Update Russian.properties

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: SapronovMaxim <msapronov89@gmail.com>
 2021-09-17 14:11:03 +03:00
yairm210
fa462d830f Use enum to generate parameter names when translating - more accurate than auto-detect by parameter name! 2021-09-17 14:10:40 +03:00
SimonCeder
c2fa1366bb
Add a fixed base strength to motivationToAttack (#5248) 2021-09-17 13:23:03 +03:00
yairm210
38231bf937 More reorg, first unique with cityFilter 2021-09-17 10:53:03 +03:00
yairm210
55a77096c1 Added city filter as parameter type, some reorg 2021-09-17 10:48:16 +03:00