mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-27 08:00:34 +07:00
Code Issues Packages Projects Releases Wiki Activity
6,080 Commits 6 Branches 1,041 Tags 1.2 GiB
3220206bce
Commit Graph

3869 Commits

Author SHA1 Message Date
SomeTroglodyte
4c87d98aaa
Fix Mod unpack folder move (#5346) 
* Fix Mod unpack folder move

* Fix Mod unpack folder move - comment
 2021-09-29 12:34:58 +03:00
Xander Lenstra
bb5825a325
First step into unifying strength bonuses using conditionals (#5345) 2021-09-29 08:35:37 +03:00
SomeTroglodyte
8ee36d43d7
Allow Deciv Redux start with >0 City States (#5348) 2021-09-29 06:19:49 +03:00
SomeTroglodyte
070c41592f
Fix era of Wonders without tech in Wonder overview (#5347) 2021-09-29 06:19:28 +03:00
SomeTroglodyte
d3868dae62
Rework game start again (continents) (#5335) 
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-09-28 23:48:06 +03:00
SimonCeder
8e3d2a1b87
Fix Polynesian vision when embarked (#5325) 
* fix polynesia unique

* fix polynesia unique

* Update MapUnit.kt
 2021-09-28 22:44:54 +03:00
Xander Lenstra
861a42e881
Moved the check for conditionals applying to getMatchingUniques functions; rewrote civInfo.getMatchingUniques (#5342) 
* Moved the check for conditionals applying to `getMatchingUniques` functions. Rewrote `civInfo.getMatchingUniques`.

* Clarified comment
 2021-09-28 22:42:18 +03:00
SomeTroglodyte
0aea74d3a9
Fix right side of player nation picker no longer entirely clickable (#5338) 2021-09-27 17:29:47 +03:00
SomeTroglodyte
a487c2c373
Fix new game Mod nation icons on first open (#5334) 2021-09-27 17:28:26 +03:00
SimonCeder
e0e701058d
Proper great general points (#5329) 2021-09-27 13:38:42 +03:00
SomeTroglodyte
2e72fd52c8
Double movement unique parameterized (#5319) 
* Double movement unique parameterized

* Double movement unique - all filters
 2021-09-27 12:35:38 +03:00
yairm210
96511e16ef Merge remote-tracking branch 'origin/master' 2021-09-26 17:17:04 +03:00
yairm210
bb8c9d3175 More unique typing 2021-09-26 17:16:50 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299) 
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
 2021-09-26 16:58:24 +03:00
SomeTroglodyte
e1b2814b5d
Mini-UI to see Religion info on foreign cities (#5321) 2021-09-26 11:04:33 +03:00
SomeTroglodyte
3a858a7051
Oversight - "base hurry cost" in pedia should be multiple of 10 (#5320) 2021-09-26 10:54:38 +03:00
SomeTroglodyte
8d33dacc3c
Softcode Fountain of Youth (#5308) 
* Softcode Rejuvenation

* Softcode Rejuvenation - comments
 2021-09-25 22:15:03 +03:00
SomeTroglodyte
a4c38174b6
Extra embarrassing fix - Textures missing on Android (#5313) 2021-09-25 22:08:37 +03:00
Yair Morgenstern
8d631254aa
Unified many implementations of common interfaces into abstract classes (#5312) 
* Unified many implementations of common interfaces into abstract classes

* RulesetObject interface
 2021-09-24 17:48:06 +03:00
yairm210
ed47f16c6e Added modder warning for deprecated fields 2021-09-24 16:35:22 +03:00
SomeTroglodyte
c05bf0a2a6
Fix a Nation Picker crash (#5311) 2021-09-24 15:49:56 +03:00
Yair Morgenstern
12302deef6
Precursor to mod target check - (#5303) 
* Precursor to mod target check -
Define acceptable targets for each unique holder

* Warn for bad unique targets, and divide between different types of beliefs

* Moved the belief type logic into the class, rather than being external

* Added comment that getUniqueTarget is currently unneeded, but planned for future use
 2021-09-24 15:02:41 +03:00
SimonCeder
fa813f8f5e
Quests fixes and additions (#5301) 
* enable all quests

* implement more quests

* weighting for quests

* global quests

* fixes

* fixes

* Update template.properties

* general string

* reviews
 2021-09-24 10:05:30 +03:00
SomeTroglodyte
e9e0f2c55f
World and Natural Wonders Overview (#5297) 
* World and Natural Wonders Overview

* World and Natural Wonders Overview - icon

* World and Natural Wonders Overview - groups and tuning

* World and Natural Wonders Overview - atlas

* World and Natural Wonders Overview - lint
 2021-09-24 10:04:30 +03:00
SomeTroglodyte
8ef84d785e
Music controller - Fix pause (#5307) 2021-09-24 10:00:46 +03:00
yairm210
bae8bd2468 Mod error detection improvements! 
Separated Warning vs Error, show "options only" warning in options only, color warnings by severity
 2021-09-23 12:04:16 +03:00
SimonCeder
2e8934af17
Newly Allied city states declare war on your enemies, even unmet ones (#5298) 
* new allies dow, unmet civs meet first and then dow

* no gifts for bad people
 2021-09-23 11:31:36 +03:00
SomeTroglodyte
4a83bed4ba
Nation Picker visual help where to click (#5287) 
* Nation Picker visual help where to click

* Nation Picker visual help where to click - circles
 2021-09-23 11:23:40 +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
SomeTroglodyte
8161da26de
Texture pack/load for mods also distributes by Images.*X* (#5296) 2021-09-22 22:11:39 +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
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
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
aee087ec01 tileResource unique fully replaceable by uniques 2021-09-19 20:58:17 +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
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