mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-12 03:48:16 +07:00
Code Issues Packages Projects Releases Wiki Activity

Hide Unit or Building as Unique (#3181)

Browse Source 
* This allows for unique unit or building not to be displayed as a unique on the nation select screen and nation civilopedia entry.

The primary usage of this to allow modders to avoid having their dummy unit/building that is used to disallow a nation from making the unit/building it replaces, from
appearing as a unique to the player. In other words, it won't show the comparison stats/etc.

In conjunction with this PR https://github.com/yairm210/Unciv/pull/3180 it allows modders to cleanly disallow nations from making certain units/buildings.

This would also be useful for Venice from the Brave New World expansion as it cannot build Settlers. https://civilization.fandom.com/wiki/Venetian_(Civ5)

Here is a mod to test this PR:
https://cdn.discordapp.com/attachments/670547794951405584/758550228126793759/Test_Hide_As_Unique.zip

This mod disallows Babylon from making Scout and Horseman and also doesn't show the dummy replacement unit/building on Babylon's nation info.
It also makes Babylon have a unique Monument replacement that it can build, but is still not shown as a unique on Babylon's nation info.
It also adds an example Venice nation that can't build Settlers.

* "Will not be displayed in Civilopedia" unique prevents a unit or building from being shown in Civilopedia or shown as a unique
This commit is contained in:
givehub99 2020-09-25 02:37:23 -07:00 committed by GitHub
parent 24b4997e85
commit 1f52a8ad88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -46,7 +46,6 @@ class Building : NamedStats(), IConstruction {
*/
var resourceBonusStats: Stats? = null
fun getShortDescription(ruleset: Ruleset): String { // should fit in one line
val infoList= mutableListOf<String>()
val str = getStats(null).toString()

4
core/src/com/unciv/models/ruleset/Nation.kt
View File

@ -114,7 +114,7 @@ class Nation : INamed {
private fun addUniqueBuildingsText(textList: ArrayList<String>, ruleset: Ruleset) {
for (building in ruleset.buildings.values
.filter { it.uniqueTo == name }) {
.filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) {
if (building.replaces == null) textList += building.getShortDescription(ruleset)
else {
val originalBuilding = ruleset.buildings[building.replaces!!]!!
@ -142,7 +142,7 @@ class Nation : INamed {
private fun addUniqueUnitsText(textList: ArrayList<String>, ruleset: Ruleset) {
for (unit in ruleset.units.values
.filter { it.uniqueTo == name }) {
.filter { it.uniqueTo == name && "Will not be displayed in Civilopedia" !in it.uniques}) {
if (unit.replaces != null) {
val originalUnit = ruleset.units[unit.replaces!!]!!
textList += unit.name.tr() + " - " + "Replaces [${originalUnit.name}]".tr()

1
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -39,7 +39,6 @@ class BaseUnit : INamed, IConstruction {
var uniqueTo:String?=null
var attackSound:String?=null
fun getShortDescription(): String {
val infoList = mutableListOf<String>()
if (strength != 0) infoList += "$strength${Fonts.strength}"

2
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -49,6 +49,7 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
onBackButtonClicked { UncivGame.Current.setWorldScreen() }
categoryToEntries["Buildings"] = ruleset.buildings.values
.filter { "Will not be displayed in Civilopedia" !in it.uniques }
.map { CivilopediaEntry(it.name,it.getDescription(false, null,ruleset),
ImageGetter.getConstructionImage(it.name).surroundWithCircle(50f)) }
categoryToEntries["Resources"] = ruleset.tileResources.values
@ -61,6 +62,7 @@ class CivilopediaScreen(ruleset: Ruleset) : CameraStageBaseScreen() {
.map { CivilopediaEntry(it.name,it.getDescription(ruleset,false),
ImageGetter.getImprovementIcon(it.name,50f)) }
categoryToEntries["Units"] = ruleset.units.values
.filter { "Will not be displayed in Civilopedia" !in it.uniques }
.map { CivilopediaEntry(it.name,it.getDescription(false),
ImageGetter.getConstructionImage(it.name).surroundWithCircle(50f)) }
categoryToEntries["Nations"] = ruleset.nations.values