From 62e3dbe0146a02bf56321c5dbf36c733db0a3264 Mon Sep 17 00:00:00 2001 From: Xander Lenstra <71121390+xlenstra@users.noreply.github.com> Date: Sun, 19 Sep 2021 17:03:41 +0200 Subject: [PATCH] Moved uniques to their own folder (#5269) --- core/src/com/unciv/logic/battle/Battle.kt | 3 +-- core/src/com/unciv/logic/battle/MapUnitCombatant.kt | 2 +- core/src/com/unciv/logic/city/CityConstructions.kt | 2 +- core/src/com/unciv/logic/city/CityInfo.kt | 4 ++-- core/src/com/unciv/logic/city/CityReligion.kt | 2 +- core/src/com/unciv/logic/city/CityStats.kt | 4 ++-- core/src/com/unciv/logic/city/IConstruction.kt | 1 - .../src/com/unciv/logic/civilization/CityStateFunctions.kt | 4 ++-- core/src/com/unciv/logic/civilization/CivInfoStats.kt | 3 +-- core/src/com/unciv/logic/civilization/CivilizationInfo.kt | 3 ++- core/src/com/unciv/logic/civilization/PolicyManager.kt | 6 ++---- .../unciv/logic/civilization/RuinsManager/RuinsManager.kt | 2 +- core/src/com/unciv/logic/civilization/TechManager.kt | 4 ++-- .../unciv/logic/civilization/diplomacy/DiplomacyManager.kt | 2 +- core/src/com/unciv/logic/map/MapUnit.kt | 2 +- core/src/com/unciv/logic/map/TileInfo.kt | 2 +- core/src/com/unciv/logic/map/UnitPromotions.kt | 3 +-- core/src/com/unciv/models/Religion.kt | 1 - core/src/com/unciv/models/ruleset/Belief.kt | 1 + core/src/com/unciv/models/ruleset/Building.kt | 3 +++ core/src/com/unciv/models/ruleset/Difficulty.kt | 1 + core/src/com/unciv/models/ruleset/Era.kt | 5 +---- core/src/com/unciv/models/ruleset/IHasUniques.kt | 3 +++ core/src/com/unciv/models/ruleset/Nation.kt | 1 + core/src/com/unciv/models/ruleset/Policy.kt | 1 + core/src/com/unciv/models/ruleset/RuinReward.kt | 1 + core/src/com/unciv/models/ruleset/Ruleset.kt | 2 ++ core/src/com/unciv/models/ruleset/tech/Technology.kt | 2 +- core/src/com/unciv/models/ruleset/tile/Terrain.kt | 2 +- core/src/com/unciv/models/ruleset/tile/TileImprovement.kt | 2 +- core/src/com/unciv/models/ruleset/tile/TileResource.kt | 2 +- core/src/com/unciv/models/ruleset/{ => unique}/Unique.kt | 7 +++---- .../models/ruleset/{ => unique}/UniqueParameterType.kt | 4 +++- .../models/ruleset/{ => unique}/UniqueTriggerActivation.kt | 3 ++- .../com/unciv/models/ruleset/{ => unique}/UniqueType.kt | 3 ++- core/src/com/unciv/models/ruleset/unit/BaseUnit.kt | 4 ++-- core/src/com/unciv/models/ruleset/unit/Promotion.kt | 2 +- core/src/com/unciv/models/ruleset/unit/UnitType.kt | 2 +- .../com/unciv/models/translations/TranslationFileWriter.kt | 2 ++ core/src/com/unciv/models/translations/Translations.kt | 2 +- core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt | 1 + core/src/com/unciv/ui/civilopedia/CivilopediaText.kt | 2 +- core/src/com/unciv/ui/trade/DiplomacyScreen.kt | 4 ++-- core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt | 2 +- 44 files changed, 62 insertions(+), 52 deletions(-) rename core/src/com/unciv/models/ruleset/{ => unique}/Unique.kt (95%) rename core/src/com/unciv/models/ruleset/{ => unique}/UniqueParameterType.kt (98%) rename core/src/com/unciv/models/ruleset/{ => unique}/UniqueTriggerActivation.kt (99%) rename core/src/com/unciv/models/ruleset/{ => unique}/UniqueType.kt (97%) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index fa9cd00dd4..7297e925a6 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -6,12 +6,11 @@ import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.* import com.unciv.logic.civilization.diplomacy.DiplomaticModifiers import com.unciv.logic.civilization.diplomacy.DiplomaticStatus -import com.unciv.logic.map.MapUnit import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.models.AttackableTile import com.unciv.models.UnitActionType -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.ui.utils.toPercent diff --git a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt index d0a3b8bc28..56bc9c6c5c 100644 --- a/core/src/com/unciv/logic/battle/MapUnitCombatant.kt +++ b/core/src/com/unciv/logic/battle/MapUnitCombatant.kt @@ -4,7 +4,7 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.map.MapUnit import com.unciv.logic.map.TileInfo import com.unciv.models.UncivSound -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.unit.UnitType class MapUnitCombatant(val unit: MapUnit) : ICombatant { diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 548422a80b..a1beef55be 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -6,7 +6,7 @@ import com.unciv.logic.civilization.NotificationIcon import com.unciv.logic.civilization.PopupAlert import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.UniqueMap +import com.unciv.models.ruleset.unique.UniqueMap import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index a5802a52c5..62ef29d81a 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -10,8 +10,8 @@ import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo import com.unciv.logic.map.TileMap import com.unciv.models.Counter -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.unit.BaseUnit diff --git a/core/src/com/unciv/logic/city/CityReligion.kt b/core/src/com/unciv/logic/city/CityReligion.kt index 90a03ba366..2c1b910716 100644 --- a/core/src/com/unciv/logic/city/CityReligion.kt +++ b/core/src/com/unciv/logic/city/CityReligion.kt @@ -5,7 +5,7 @@ import com.unciv.logic.civilization.NotificationIcon import com.unciv.models.Counter import com.unciv.models.Religion import com.unciv.models.metadata.GameSpeed -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique class CityInfoReligionManager { @Transient diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt index 91b1a3f23d..93ab7c410b 100644 --- a/core/src/com/unciv/logic/city/CityStats.kt +++ b/core/src/com/unciv/logic/city/CityStats.kt @@ -7,8 +7,8 @@ import com.unciv.logic.map.RoadStatus import com.unciv.models.Counter import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.ModOptionsConstants -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats diff --git a/core/src/com/unciv/logic/city/IConstruction.kt b/core/src/com/unciv/logic/city/IConstruction.kt index 1f7d2b74d2..9f67ae945c 100644 --- a/core/src/com/unciv/logic/city/IConstruction.kt +++ b/core/src/com/unciv/logic/city/IConstruction.kt @@ -2,7 +2,6 @@ package com.unciv.logic.city import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.ruleset.IHasUniques -import com.unciv.models.ruleset.Unique import com.unciv.models.stats.INamed import com.unciv.models.stats.Stat import com.unciv.ui.utils.Fonts diff --git a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt index b998b5d022..cdd54865a2 100644 --- a/core/src/com/unciv/logic/civilization/CityStateFunctions.kt +++ b/core/src/com/unciv/logic/civilization/CityStateFunctions.kt @@ -5,8 +5,8 @@ import com.unciv.logic.automation.NextTurnAutomation import com.unciv.logic.civilization.diplomacy.* import com.unciv.models.metadata.GameSpeed import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.ui.victoryscreen.RankingType import java.util.* diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 989ab75d25..c040bce1c5 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -5,8 +5,7 @@ import com.unciv.logic.map.RoadStatus import com.unciv.models.metadata.BASE_GAME_DURATION_TURNS import com.unciv.models.ruleset.BeliefType import com.unciv.models.ruleset.Policy -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.stats.Stat import com.unciv.models.stats.StatMap diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index ce47c3fbe1..afe98560bf 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -1,7 +1,6 @@ package com.unciv.logic.civilization import com.badlogic.gdx.math.Vector2 -import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.GameInfo import com.unciv.logic.UncivShowableException @@ -19,6 +18,8 @@ import com.unciv.models.ruleset.* import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileResource +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats diff --git a/core/src/com/unciv/logic/civilization/PolicyManager.kt b/core/src/com/unciv/logic/civilization/PolicyManager.kt index 998a1d9504..98937e9ec3 100644 --- a/core/src/com/unciv/logic/civilization/PolicyManager.kt +++ b/core/src/com/unciv/logic/civilization/PolicyManager.kt @@ -1,14 +1,12 @@ package com.unciv.logic.civilization -import com.unciv.logic.city.INonPerpetualConstruction import com.unciv.logic.map.MapSize import com.unciv.models.ruleset.Policy import com.unciv.models.ruleset.Policy.PolicyBranchType -import com.unciv.models.ruleset.UniqueMap -import com.unciv.models.ruleset.UniqueTriggerActivation +import com.unciv.models.ruleset.unique.UniqueMap +import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.translations.equalsPlaceholderText import com.unciv.models.translations.getPlaceholderParameters -import kotlin.math.min import kotlin.math.pow import kotlin.math.roundToInt diff --git a/core/src/com/unciv/logic/civilization/RuinsManager/RuinsManager.kt b/core/src/com/unciv/logic/civilization/RuinsManager/RuinsManager.kt index fcf6e0345c..ded1fe436f 100644 --- a/core/src/com/unciv/logic/civilization/RuinsManager/RuinsManager.kt +++ b/core/src/com/unciv/logic/civilization/RuinsManager/RuinsManager.kt @@ -4,7 +4,7 @@ import com.unciv.Constants import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.map.MapUnit import com.unciv.models.ruleset.RuinReward -import com.unciv.models.ruleset.UniqueTriggerActivation +import com.unciv.models.ruleset.unique.UniqueTriggerActivation import kotlin.random.Random class RuinsManager { diff --git a/core/src/com/unciv/logic/civilization/TechManager.kt b/core/src/com/unciv/logic/civilization/TechManager.kt index c1d0999c12..175a290796 100644 --- a/core/src/com/unciv/logic/civilization/TechManager.kt +++ b/core/src/com/unciv/logic/civilization/TechManager.kt @@ -4,8 +4,8 @@ import com.unciv.logic.city.CityInfo import com.unciv.logic.map.MapSize import com.unciv.logic.map.RoadStatus import com.unciv.logic.map.TileInfo -import com.unciv.models.ruleset.UniqueMap -import com.unciv.models.ruleset.UniqueTriggerActivation +import com.unciv.models.ruleset.unique.UniqueMap +import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.tech.Technology import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.ui.utils.toPercent diff --git a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt index d4d2467d92..82a8e394f7 100644 --- a/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt +++ b/core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt @@ -6,7 +6,7 @@ import com.unciv.logic.civilization.* import com.unciv.logic.trade.Trade import com.unciv.logic.trade.TradeOffer import com.unciv.logic.trade.TradeType -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.tile.ResourceSupplyList import com.unciv.ui.utils.toPercent import kotlin.math.ceil diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index bcc3161956..3a05547dc2 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -11,7 +11,7 @@ import com.unciv.logic.civilization.LocationAction import com.unciv.logic.civilization.NotificationIcon import com.unciv.models.UnitActionType import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.UnitType diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index a76b3edbd3..7e313eaadd 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -7,7 +7,7 @@ import com.unciv.logic.HexMath import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.tile.* import com.unciv.models.stats.Stats import com.unciv.models.translations.tr diff --git a/core/src/com/unciv/logic/map/UnitPromotions.kt b/core/src/com/unciv/logic/map/UnitPromotions.kt index fda1bdc12a..0de27695e4 100644 --- a/core/src/com/unciv/logic/map/UnitPromotions.kt +++ b/core/src/com/unciv/logic/map/UnitPromotions.kt @@ -1,8 +1,7 @@ package com.unciv.logic.map -import com.unciv.models.ruleset.UniqueTriggerActivation +import com.unciv.models.ruleset.unique.UniqueTriggerActivation import com.unciv.models.ruleset.unit.Promotion -import com.unciv.models.translations.equalsPlaceholderText class UnitPromotions { // Having this as mandatory constructor parameter would be safer, but this class is part of a diff --git a/core/src/com/unciv/models/Religion.kt b/core/src/com/unciv/models/Religion.kt index fbac76df3d..8561210ba6 100644 --- a/core/src/com/unciv/models/Religion.kt +++ b/core/src/com/unciv/models/Religion.kt @@ -3,7 +3,6 @@ package com.unciv.models import com.unciv.logic.GameInfo import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.BeliefType -import com.unciv.models.ruleset.Unique import com.unciv.models.stats.INamed /** Data object for Religions */ diff --git a/core/src/com/unciv/models/ruleset/Belief.kt b/core/src/com/unciv/models/ruleset/Belief.kt index 07373663ed..01df7ec323 100644 --- a/core/src/com/unciv/models/ruleset/Belief.kt +++ b/core/src/com/unciv/models/ruleset/Belief.kt @@ -1,6 +1,7 @@ package com.unciv.models.ruleset import com.unciv.UncivGame +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.models.translations.tr import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index d1dd2801ad..29e9774c59 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -7,6 +7,9 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.Counter import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.ruleset.tile.TileImprovement +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueTriggerActivation +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.NamedStats import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats diff --git a/core/src/com/unciv/models/ruleset/Difficulty.kt b/core/src/com/unciv/models/ruleset/Difficulty.kt index 4f24d477c4..5030f42fea 100644 --- a/core/src/com/unciv/models/ruleset/Difficulty.kt +++ b/core/src/com/unciv/models/ruleset/Difficulty.kt @@ -1,5 +1,6 @@ package com.unciv.models.ruleset +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.ui.civilopedia.ICivilopediaText import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/Era.kt b/core/src/com/unciv/models/ruleset/Era.kt index a4a6098ffc..7f365d2b51 100644 --- a/core/src/com/unciv/models/ruleset/Era.kt +++ b/core/src/com/unciv/models/ruleset/Era.kt @@ -3,11 +3,8 @@ package com.unciv.models.ruleset import com.badlogic.gdx.graphics.Color import com.unciv.logic.civilization.CityStateType import com.unciv.logic.civilization.diplomacy.RelationshipLevel +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed -import com.unciv.models.stats.Stat -import com.unciv.models.stats.Stats -import com.unciv.models.translations.getPlaceholderParameters -import com.unciv.models.translations.getPlaceholderText import com.unciv.ui.utils.colorFromRGB class Era : INamed, IHasUniques { diff --git a/core/src/com/unciv/models/ruleset/IHasUniques.kt b/core/src/com/unciv/models/ruleset/IHasUniques.kt index 44c49484ec..a537c1bc02 100644 --- a/core/src/com/unciv/models/ruleset/IHasUniques.kt +++ b/core/src/com/unciv/models/ruleset/IHasUniques.kt @@ -1,5 +1,8 @@ package com.unciv.models.ruleset +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType + /** * Common interface for all 'ruleset objects' that have Uniques, like BaseUnit, Nation, etc. */ diff --git a/core/src/com/unciv/models/ruleset/Nation.kt b/core/src/com/unciv/models/ruleset/Nation.kt index 51e7b3a9ad..61c084e744 100644 --- a/core/src/com/unciv/models/ruleset/Nation.kt +++ b/core/src/com/unciv/models/ruleset/Nation.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color import com.unciv.Constants import com.unciv.UncivGame import com.unciv.logic.civilization.CityStateType +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.models.translations.squareBraceRegex import com.unciv.models.translations.tr diff --git a/core/src/com/unciv/models/ruleset/Policy.kt b/core/src/com/unciv/models/ruleset/Policy.kt index dd5edee6f9..b55f96958b 100644 --- a/core/src/com/unciv/models/ruleset/Policy.kt +++ b/core/src/com/unciv/models/ruleset/Policy.kt @@ -1,5 +1,6 @@ package com.unciv.models.ruleset +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.models.translations.tr import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/RuinReward.kt b/core/src/com/unciv/models/ruleset/RuinReward.kt index 0df9e9fcdb..0b26510849 100644 --- a/core/src/com/unciv/models/ruleset/RuinReward.kt +++ b/core/src/com/unciv/models/ruleset/RuinReward.kt @@ -1,5 +1,6 @@ package com.unciv.models.ruleset +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.ui.civilopedia.FormattedLine import com.unciv.ui.civilopedia.ICivilopediaText diff --git a/core/src/com/unciv/models/ruleset/Ruleset.kt b/core/src/com/unciv/models/ruleset/Ruleset.kt index ee57e69285..7b9a0e8790 100644 --- a/core/src/com/unciv/models/ruleset/Ruleset.kt +++ b/core/src/com/unciv/models/ruleset/Ruleset.kt @@ -11,6 +11,8 @@ import com.unciv.models.ruleset.tech.Technology import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.tile.TileResource +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.Promotion import com.unciv.models.ruleset.unit.UnitType diff --git a/core/src/com/unciv/models/ruleset/tech/Technology.kt b/core/src/com/unciv/models/ruleset/tech/Technology.kt index 3f89edc9e6..ce6e608dd6 100644 --- a/core/src/com/unciv/models/ruleset/tech/Technology.kt +++ b/core/src/com/unciv/models/ruleset/tech/Technology.kt @@ -6,7 +6,7 @@ import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.IHasUniques import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.translations.tr import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.stats.INamed diff --git a/core/src/com/unciv/models/ruleset/tile/Terrain.kt b/core/src/com/unciv/models/ruleset/tile/Terrain.kt index 76c7305c1e..180563c871 100644 --- a/core/src/com/unciv/models/ruleset/tile/Terrain.kt +++ b/core/src/com/unciv/models/ruleset/tile/Terrain.kt @@ -5,7 +5,7 @@ import com.unciv.Constants import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.IHasUniques import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.NamedStats import com.unciv.ui.civilopedia.FormattedLine import com.unciv.ui.civilopedia.ICivilopediaText diff --git a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt index eaa48a8a0d..660aefb13d 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileImprovement.kt @@ -7,7 +7,7 @@ import com.unciv.models.ruleset.Belief import com.unciv.logic.map.RoadStatus import com.unciv.models.ruleset.IHasUniques import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.NamedStats import com.unciv.models.translations.tr import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/tile/TileResource.kt b/core/src/com/unciv/models/ruleset/tile/TileResource.kt index 15569a9652..34acc23d4d 100644 --- a/core/src/com/unciv/models/ruleset/tile/TileResource.kt +++ b/core/src/com/unciv/models/ruleset/tile/TileResource.kt @@ -3,7 +3,7 @@ package com.unciv.models.ruleset.tile import com.unciv.models.ruleset.Belief import com.unciv.models.ruleset.IHasUniques import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.NamedStats import com.unciv.models.stats.Stats import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/Unique.kt b/core/src/com/unciv/models/ruleset/unique/Unique.kt similarity index 95% rename from core/src/com/unciv/models/ruleset/Unique.kt rename to core/src/com/unciv/models/ruleset/unique/Unique.kt index 96fcaed21c..f636525755 100644 --- a/core/src/com/unciv/models/ruleset/Unique.kt +++ b/core/src/com/unciv/models/ruleset/unique/Unique.kt @@ -1,10 +1,9 @@ -package com.unciv.models.ruleset +package com.unciv.models.ruleset.unique import com.unciv.models.stats.Stats import com.unciv.models.translations.* import com.unciv.logic.civilization.CivilizationInfo -import com.unciv.ui.worldscreen.unit.UnitActions -import kotlin.random.Random +import com.unciv.models.ruleset.Ruleset class Unique(val text:String) { @@ -39,7 +38,7 @@ class Unique(val text:String) { } private fun conditionalApplies( - condition: Unique, + condition: Unique, civInfo: CivilizationInfo? = null ): Boolean { return when (condition.placeholderText) { diff --git a/core/src/com/unciv/models/ruleset/UniqueParameterType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt similarity index 98% rename from core/src/com/unciv/models/ruleset/UniqueParameterType.kt rename to core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt index 7f5515038d..a19aad38fb 100644 --- a/core/src/com/unciv/models/ruleset/UniqueParameterType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueParameterType.kt @@ -1,4 +1,6 @@ -package com.unciv.models.ruleset +package com.unciv.models.ruleset.unique + +import com.unciv.models.ruleset.Ruleset // parameterName values should be compliant with autogenerated values in TranslationFileWriter.generateStringsFromJSONs // Eventually we'll merge the translation generation to take this as the source of that diff --git a/core/src/com/unciv/models/ruleset/UniqueTriggerActivation.kt b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt similarity index 99% rename from core/src/com/unciv/models/ruleset/UniqueTriggerActivation.kt rename to core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt index 32c8532eac..0d3fe7ccc7 100644 --- a/core/src/com/unciv/models/ruleset/UniqueTriggerActivation.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt @@ -1,10 +1,11 @@ -package com.unciv.models.ruleset +package com.unciv.models.ruleset.unique import com.badlogic.gdx.math.Vector2 import com.unciv.logic.city.CityInfo import com.unciv.logic.civilization.* import com.unciv.logic.map.MapUnit import com.unciv.logic.map.TileInfo +import com.unciv.models.ruleset.VictoryType import com.unciv.models.stats.Stat import com.unciv.models.translations.fillPlaceholders import com.unciv.models.translations.hasPlaceholderParameters diff --git a/core/src/com/unciv/models/ruleset/UniqueType.kt b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt similarity index 97% rename from core/src/com/unciv/models/ruleset/UniqueType.kt rename to core/src/com/unciv/models/ruleset/unique/UniqueType.kt index 780267c8ef..d9d86d2c12 100644 --- a/core/src/com/unciv/models/ruleset/UniqueType.kt +++ b/core/src/com/unciv/models/ruleset/unique/UniqueType.kt @@ -1,5 +1,6 @@ -package com.unciv.models.ruleset +package com.unciv.models.ruleset.unique +import com.unciv.models.ruleset.Ruleset import com.unciv.models.translations.getPlaceholderParameters import com.unciv.models.translations.getPlaceholderText diff --git a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt index ad7a96545e..bd49bf3074 100644 --- a/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/ruleset/unit/BaseUnit.kt @@ -6,8 +6,8 @@ import com.unciv.logic.city.* import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.map.MapUnit import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.INamed import com.unciv.models.stats.Stat import com.unciv.models.translations.tr diff --git a/core/src/com/unciv/models/ruleset/unit/Promotion.kt b/core/src/com/unciv/models/ruleset/unit/Promotion.kt index 10b3790eb1..9024da6c73 100644 --- a/core/src/com/unciv/models/ruleset/unit/Promotion.kt +++ b/core/src/com/unciv/models/ruleset/unit/Promotion.kt @@ -2,7 +2,7 @@ package com.unciv.models.ruleset.unit import com.unciv.models.ruleset.IHasUniques import com.unciv.models.ruleset.Ruleset -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.models.translations.tr import com.unciv.ui.civilopedia.FormattedLine diff --git a/core/src/com/unciv/models/ruleset/unit/UnitType.kt b/core/src/com/unciv/models/ruleset/unit/UnitType.kt index ca2541f5ba..02385633f7 100644 --- a/core/src/com/unciv/models/ruleset/unit/UnitType.kt +++ b/core/src/com/unciv/models/ruleset/unit/UnitType.kt @@ -1,7 +1,7 @@ package com.unciv.models.ruleset.unit import com.unciv.models.ruleset.IHasUniques -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index d711ae493c..20e5ae8662 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -10,6 +10,8 @@ import com.unciv.models.ruleset.tech.TechColumn import com.unciv.models.ruleset.tile.Terrain import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.tile.TileResource +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueParameterType import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.Promotion import com.unciv.models.ruleset.unit.UnitType diff --git a/core/src/com/unciv/models/translations/Translations.kt b/core/src/com/unciv/models/translations/Translations.kt index d85040eca0..a768db966b 100644 --- a/core/src/com/unciv/models/translations/Translations.kt +++ b/core/src/com/unciv/models/translations/Translations.kt @@ -2,7 +2,7 @@ package com.unciv.models.translations import com.badlogic.gdx.Gdx import com.unciv.UncivGame -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.Stats import java.util.* import kotlin.collections.HashMap diff --git a/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt b/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt index 03cddd16d8..73d09af070 100644 --- a/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt +++ b/core/src/com/unciv/ui/civilopedia/CivilopediaScreen.kt @@ -7,6 +7,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.* import com.unciv.Constants import com.unciv.UncivGame import com.unciv.models.ruleset.* +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.models.translations.tr import com.unciv.ui.utils.* diff --git a/core/src/com/unciv/ui/civilopedia/CivilopediaText.kt b/core/src/com/unciv/ui/civilopedia/CivilopediaText.kt index 5626022309..17c6533a29 100644 --- a/core/src/com/unciv/ui/civilopedia/CivilopediaText.kt +++ b/core/src/com/unciv/ui/civilopedia/CivilopediaText.kt @@ -10,7 +10,7 @@ import com.unciv.UncivGame import com.unciv.models.metadata.BaseRuleset import com.unciv.models.ruleset.Ruleset import com.unciv.models.ruleset.RulesetCache -import com.unciv.models.ruleset.Unique +import com.unciv.models.ruleset.unique.Unique import com.unciv.models.stats.INamed import com.unciv.ui.utils.* import kotlin.math.max diff --git a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt index f5e043f5ca..c0dfb0c1f7 100644 --- a/core/src/com/unciv/ui/trade/DiplomacyScreen.kt +++ b/core/src/com/unciv/ui/trade/DiplomacyScreen.kt @@ -15,8 +15,8 @@ import com.unciv.logic.trade.TradeOffer import com.unciv.logic.trade.TradeType import com.unciv.models.ruleset.ModOptionsConstants import com.unciv.models.ruleset.Quest -import com.unciv.models.ruleset.Unique -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.Unique +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.tile.ResourceType import com.unciv.models.stats.Stat import com.unciv.models.translations.fillPlaceholders diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index a15361bff2..b20647d655 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -16,7 +16,7 @@ import com.unciv.models.UncivSound import com.unciv.models.UnitAction import com.unciv.models.UnitActionType import com.unciv.models.ruleset.Building -import com.unciv.models.ruleset.UniqueType +import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.stats.Stat import com.unciv.models.stats.Stats import com.unciv.models.translations.tr