From 5fa75d99b035747dd81a08dc7684d723ded6b0c0 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Thu, 7 Jul 2022 13:19:42 -0400 Subject: [PATCH] Add new Vestigium sect --- .../flags}/aedon-cultists.inkscape.svg | 0 .../flag => plan/flags}/ccc.inkscape.svg | 0 .../coleman-sf-base-vestigium.inkscape.svg | 0 .../flag => plan/flags}/corsairs.inkscape.svg | 0 .../corvus-cluster-vestigium.inkscape.svg | 0 .../flags}/felinae-felices.inkscape.svg | 0 .../flags}/ferthlon-exiles.inkscape.svg | 0 .../flags}/isarnareykk.inkscape.svg | 0 .../flags}/lyudareykk.inkscape.svg | 0 .../flags}/masra-draetsen.inkscape.svg | 0 .../flags}/mechyrdia.inkscape.svg | 0 .../flags}/mjolnir-energy.inkscape.svg | 0 .../flag => plan/flags}/ndrc.inkscape.svg | 0 .../flags}/neuia-fulkreykk.inkscape.svg | 0 plan/flags/new-austin-vestigium.inkscape.svg | 495 ++++++++++++++++++ .../flag => plan/flags}/olympia.inkscape.svg | 0 .../flags}/res-nostra.inkscape.svg | 0 .../flags}/stahlareykk.inkscape.svg | 0 .../flags}/swartareykk.inkscape.svg | 0 .../flags}/texandria.inkscape.svg | 0 .../flags}/theudareykk.inkscape.svg | 0 .../flag => plan/flags}/tyla.inkscape.svg | 0 .../flags}/vestigium.inkscape.svg | 0 .../starshipfights/campaign/fleet_presence.kt | 32 ++ .../net/starshipfights/game/admiralty.kt | 1 + .../game/ship_faction_flavors.kt | 3 +- .../campaign/space_fleet_render.kt | 68 +-- .../starshipfights/campaign/cluster_fleets.kt | 30 -- .../data/admiralty/admiral_names.kt | 1 + .../starshipfights/data/space/fleet_names.kt | 5 +- .../images/flag/coleman-sf-base-vestigium.svg | 2 - .../static/images/flag/lyudareykk.svg | 2 - .../static/images/flag/mjolnir-energy.svg | 10 +- .../resources/static/images/flag/ndrc.svg | 3 +- .../images/flag/new-austin-vestigium.svg | 353 +++++++++++++ 35 files changed, 906 insertions(+), 99 deletions(-) rename {src/jvmMain/resources/static/images/flag => plan/flags}/aedon-cultists.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/ccc.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/coleman-sf-base-vestigium.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/corsairs.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/corvus-cluster-vestigium.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/felinae-felices.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/ferthlon-exiles.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/isarnareykk.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/lyudareykk.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/masra-draetsen.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/mechyrdia.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/mjolnir-energy.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/ndrc.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/neuia-fulkreykk.inkscape.svg (100%) create mode 100644 plan/flags/new-austin-vestigium.inkscape.svg rename {src/jvmMain/resources/static/images/flag => plan/flags}/olympia.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/res-nostra.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/stahlareykk.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/swartareykk.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/texandria.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/theudareykk.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/tyla.inkscape.svg (100%) rename {src/jvmMain/resources/static/images/flag => plan/flags}/vestigium.inkscape.svg (100%) create mode 100644 src/jvmMain/resources/static/images/flag/new-austin-vestigium.svg diff --git a/src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg b/plan/flags/aedon-cultists.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg rename to plan/flags/aedon-cultists.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/ccc.inkscape.svg b/plan/flags/ccc.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/ccc.inkscape.svg rename to plan/flags/ccc.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.inkscape.svg b/plan/flags/coleman-sf-base-vestigium.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.inkscape.svg rename to plan/flags/coleman-sf-base-vestigium.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg b/plan/flags/corsairs.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg rename to plan/flags/corsairs.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/corvus-cluster-vestigium.inkscape.svg b/plan/flags/corvus-cluster-vestigium.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/corvus-cluster-vestigium.inkscape.svg rename to plan/flags/corvus-cluster-vestigium.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/felinae-felices.inkscape.svg b/plan/flags/felinae-felices.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/felinae-felices.inkscape.svg rename to plan/flags/felinae-felices.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/ferthlon-exiles.inkscape.svg b/plan/flags/ferthlon-exiles.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/ferthlon-exiles.inkscape.svg rename to plan/flags/ferthlon-exiles.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/isarnareykk.inkscape.svg b/plan/flags/isarnareykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/isarnareykk.inkscape.svg rename to plan/flags/isarnareykk.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/lyudareykk.inkscape.svg b/plan/flags/lyudareykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/lyudareykk.inkscape.svg rename to plan/flags/lyudareykk.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/masra-draetsen.inkscape.svg b/plan/flags/masra-draetsen.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/masra-draetsen.inkscape.svg rename to plan/flags/masra-draetsen.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/mechyrdia.inkscape.svg b/plan/flags/mechyrdia.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/mechyrdia.inkscape.svg rename to plan/flags/mechyrdia.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/mjolnir-energy.inkscape.svg b/plan/flags/mjolnir-energy.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/mjolnir-energy.inkscape.svg rename to plan/flags/mjolnir-energy.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/ndrc.inkscape.svg b/plan/flags/ndrc.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/ndrc.inkscape.svg rename to plan/flags/ndrc.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/neuia-fulkreykk.inkscape.svg b/plan/flags/neuia-fulkreykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/neuia-fulkreykk.inkscape.svg rename to plan/flags/neuia-fulkreykk.inkscape.svg diff --git a/plan/flags/new-austin-vestigium.inkscape.svg b/plan/flags/new-austin-vestigium.inkscape.svg new file mode 100644 index 0000000..0e9b4c2 --- /dev/null +++ b/plan/flags/new-austin-vestigium.inkscape.svg @@ -0,0 +1,495 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/olympia.inkscape.svg b/plan/flags/olympia.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/olympia.inkscape.svg rename to plan/flags/olympia.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg b/plan/flags/res-nostra.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg rename to plan/flags/res-nostra.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg b/plan/flags/stahlareykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg rename to plan/flags/stahlareykk.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg b/plan/flags/swartareykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg rename to plan/flags/swartareykk.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/texandria.inkscape.svg b/plan/flags/texandria.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/texandria.inkscape.svg rename to plan/flags/texandria.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg b/plan/flags/theudareykk.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg rename to plan/flags/theudareykk.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/tyla.inkscape.svg b/plan/flags/tyla.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/tyla.inkscape.svg rename to plan/flags/tyla.inkscape.svg diff --git a/src/jvmMain/resources/static/images/flag/vestigium.inkscape.svg b/plan/flags/vestigium.inkscape.svg similarity index 100% rename from src/jvmMain/resources/static/images/flag/vestigium.inkscape.svg rename to plan/flags/vestigium.inkscape.svg diff --git a/src/commonMain/kotlin/net/starshipfights/campaign/fleet_presence.kt b/src/commonMain/kotlin/net/starshipfights/campaign/fleet_presence.kt index 822775c..da47bc7 100644 --- a/src/commonMain/kotlin/net/starshipfights/campaign/fleet_presence.kt +++ b/src/commonMain/kotlin/net/starshipfights/campaign/fleet_presence.kt @@ -35,6 +35,38 @@ val FactionFlavor.loyalties: List FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> listOf(Faction.VESTIGIUM) FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> listOf(Faction.VESTIGIUM) + FactionFlavor.NEW_AUSTIN_VESTIGIUM -> listOf(Faction.VESTIGIUM) + } + +val FactionFlavor.shipSource: Faction + get() = when (this) { + FactionFlavor.MECHYRDIA -> Faction.MECHYRDIA + FactionFlavor.TYLA -> Faction.MECHYRDIA + FactionFlavor.OLYMPIA -> Faction.MECHYRDIA + FactionFlavor.TEXANDRIA -> Faction.MECHYRDIA + + FactionFlavor.NDRC -> Faction.NDRC + FactionFlavor.CCC -> Faction.NDRC + FactionFlavor.MJOLNIR_ENERGY -> Faction.NDRC + + FactionFlavor.MASRA_DRAETSEN -> Faction.MASRA_DRAETSEN + FactionFlavor.AEDON_CULTISTS -> Faction.MASRA_DRAETSEN + FactionFlavor.FERTHLON_EXILES -> Faction.MASRA_DRAETSEN + + FactionFlavor.RES_NOSTRA -> Faction.FELINAE_FELICES + FactionFlavor.CORSAIRS -> Faction.FELINAE_FELICES + FactionFlavor.FELINAE_FELICES -> Faction.FELINAE_FELICES + + FactionFlavor.ISARNAREYKK -> Faction.ISARNAREYKK + FactionFlavor.SWARTAREYKK -> Faction.ISARNAREYKK + FactionFlavor.THEUDAREYKK -> Faction.ISARNAREYKK + FactionFlavor.STAHLAREYKK -> Faction.ISARNAREYKK + FactionFlavor.LYUDAREYKK -> Faction.ISARNAREYKK + FactionFlavor.NEUIA_FULKREYKK -> Faction.ISARNAREYKK + + FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> Faction.VESTIGIUM + FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> Faction.VESTIGIUM + FactionFlavor.NEW_AUSTIN_VESTIGIUM -> Faction.VESTIGIUM } @Serializable diff --git a/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt b/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt index 3024efc..19e767b 100644 --- a/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/admiralty.kt @@ -139,6 +139,7 @@ fun AdmiralRank.getDisplayName(factionFlavor: FactionFlavor) = when (factionFlav FactionFlavor.NEUIA_FULKREYKK -> getDisplayName(Faction.ISARNAREYKK) FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> getDisplayName(Faction.VESTIGIUM) FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> getDisplayName(Faction.VESTIGIUM) + FactionFlavor.NEW_AUSTIN_VESTIGIUM -> getDisplayName(Faction.VESTIGIUM) } @Serializable diff --git a/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt b/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt index 23ce471..ea8a9a2 100644 --- a/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt @@ -74,6 +74,7 @@ enum class FactionFlavor(val displayName: String, val colorReplacement: IntColor CORVUS_CLUSTER_VESTIGIUM("Vestigium Sect in the Corvus Cluster", IntColor(108, 96, 153)), COLEMAN_SF_BASE_VESTIGIUM("Vestigium Sect at Coleman Space Force Base", IntColor(153, 102, 102)), + NEW_AUSTIN_VESTIGIUM("Vestigium Sect at New Austin Colony", IntColor(220, 192, 111)), ; companion object { @@ -92,7 +93,7 @@ enum class FactionFlavor(val displayName: String, val colorReplacement: IntColor Faction.MASRA_DRAETSEN -> setOf(MASRA_DRAETSEN, AEDON_CULTISTS, RES_NOSTRA, CORSAIRS, FERTHLON_EXILES) Faction.FELINAE_FELICES -> setOf(FELINAE_FELICES, RES_NOSTRA, CORSAIRS) Faction.ISARNAREYKK -> setOf(ISARNAREYKK, SWARTAREYKK, THEUDAREYKK, STAHLAREYKK, LYUDAREYKK, NEUIA_FULKREYKK) - Faction.VESTIGIUM -> setOf(CORVUS_CLUSTER_VESTIGIUM, COLEMAN_SF_BASE_VESTIGIUM) + Faction.VESTIGIUM -> setOf(CORVUS_CLUSTER_VESTIGIUM, COLEMAN_SF_BASE_VESTIGIUM, NEW_AUSTIN_VESTIGIUM) } } } diff --git a/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt b/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt index 74a6495..4f40ce4 100644 --- a/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt +++ b/src/jsMain/kotlin/net/starshipfights/campaign/space_fleet_render.kt @@ -57,61 +57,21 @@ fun getFleetSide(fleetOwner: FactionFlavor) = } ?: FleetSide.ENEMY val FactionFlavor.mapColor: IntColor - get() = when (this) { - FactionFlavor.MECHYRDIA -> IntColor(255, 204, 51) - FactionFlavor.TYLA -> IntColor(255, 204, 51) - FactionFlavor.OLYMPIA -> IntColor(255, 204, 51) - FactionFlavor.TEXANDRIA -> IntColor(255, 204, 51) - - FactionFlavor.NDRC -> IntColor(255, 204, 51) - FactionFlavor.CCC -> IntColor(255, 204, 51) - FactionFlavor.MJOLNIR_ENERGY -> IntColor(255, 204, 51) - - FactionFlavor.MASRA_DRAETSEN -> IntColor(204, 34, 34) - FactionFlavor.AEDON_CULTISTS -> IntColor(204, 34, 34) - FactionFlavor.FERTHLON_EXILES -> IntColor(204, 34, 34) - - FactionFlavor.RES_NOSTRA -> IntColor(204, 102, 153) - FactionFlavor.CORSAIRS -> IntColor(204, 102, 153) - FactionFlavor.FELINAE_FELICES -> IntColor(204, 102, 153) - - FactionFlavor.ISARNAREYKK -> IntColor(34, 221, 34) - FactionFlavor.SWARTAREYKK -> IntColor(34, 221, 34) - FactionFlavor.THEUDAREYKK -> IntColor(255, 204, 51) // Mechyrdia - FactionFlavor.STAHLAREYKK -> IntColor(255, 204, 51) // Also Mechyrdia - FactionFlavor.LYUDAREYKK -> IntColor(34, 221, 34) - FactionFlavor.NEUIA_FULKREYKK -> IntColor(34, 221, 34) - - FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> IntColor(108, 96, 153) - FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> IntColor(108, 96, 153) + get() = when (loyalties.first()) { + Faction.MECHYRDIA -> IntColor(255, 204, 51) + Faction.NDRC -> IntColor(255, 204, 51) + Faction.MASRA_DRAETSEN -> IntColor(204, 34, 34) + Faction.FELINAE_FELICES -> IntColor(204, 102, 153) + Faction.ISARNAREYKK -> IntColor(34, 221, 34) + Faction.VESTIGIUM -> IntColor(108, 96, 153) } val FactionFlavor.mapCounterShipClass: ShipType - get() = when (this) { - FactionFlavor.MECHYRDIA -> ShipType.VENSCA - FactionFlavor.TYLA -> ShipType.VENSCA - FactionFlavor.OLYMPIA -> ShipType.VENSCA - FactionFlavor.TEXANDRIA -> ShipType.VENSCA - - FactionFlavor.NDRC -> ShipType.KRIJGSCHUIT - FactionFlavor.CCC -> ShipType.KRIJGSCHUIT - FactionFlavor.MJOLNIR_ENERGY -> ShipType.KRIJGSCHUIT - - FactionFlavor.MASRA_DRAETSEN -> ShipType.AZATHOTH - FactionFlavor.AEDON_CULTISTS -> ShipType.AZATHOTH - FactionFlavor.FERTHLON_EXILES -> ShipType.AZATHOTH - - FactionFlavor.RES_NOSTRA -> ShipType.BOBCAT - FactionFlavor.CORSAIRS -> ShipType.BOBCAT - FactionFlavor.FELINAE_FELICES -> ShipType.BOBCAT - - FactionFlavor.ISARNAREYKK -> ShipType.KHORR - FactionFlavor.SWARTAREYKK -> ShipType.KHORR - FactionFlavor.THEUDAREYKK -> ShipType.KHORR - FactionFlavor.STAHLAREYKK -> ShipType.KHORR - FactionFlavor.LYUDAREYKK -> ShipType.KHORR - FactionFlavor.NEUIA_FULKREYKK -> ShipType.KHORR - - FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> ShipType.IOWA - FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> ShipType.IOWA + get() = when (shipSource) { + Faction.MECHYRDIA -> ShipType.VENSCA + Faction.NDRC -> ShipType.KRIJGSCHUIT + Faction.MASRA_DRAETSEN -> ShipType.AZATHOTH + Faction.FELINAE_FELICES -> ShipType.BOBCAT + Faction.ISARNAREYKK -> ShipType.KHORR + Faction.VESTIGIUM -> ShipType.IOWA } diff --git a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt index e941c3b..156341e 100644 --- a/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt +++ b/src/jvmMain/kotlin/net/starshipfights/campaign/cluster_fleets.kt @@ -11,36 +11,6 @@ import net.starshipfights.game.ai.weightedRandom import kotlin.math.roundToInt import kotlin.random.Random -val FactionFlavor.shipSource: Faction - get() = when (this) { - FactionFlavor.MECHYRDIA -> Faction.MECHYRDIA - FactionFlavor.TYLA -> Faction.MECHYRDIA - FactionFlavor.OLYMPIA -> Faction.MECHYRDIA - FactionFlavor.TEXANDRIA -> Faction.MECHYRDIA - - FactionFlavor.NDRC -> Faction.NDRC - FactionFlavor.CCC -> Faction.NDRC - FactionFlavor.MJOLNIR_ENERGY -> Faction.NDRC - - FactionFlavor.MASRA_DRAETSEN -> Faction.MASRA_DRAETSEN - FactionFlavor.AEDON_CULTISTS -> Faction.MASRA_DRAETSEN - FactionFlavor.FERTHLON_EXILES -> Faction.MASRA_DRAETSEN - - FactionFlavor.RES_NOSTRA -> Faction.FELINAE_FELICES - FactionFlavor.CORSAIRS -> Faction.FELINAE_FELICES - FactionFlavor.FELINAE_FELICES -> Faction.FELINAE_FELICES - - FactionFlavor.ISARNAREYKK -> Faction.ISARNAREYKK - FactionFlavor.SWARTAREYKK -> Faction.ISARNAREYKK - FactionFlavor.THEUDAREYKK -> Faction.ISARNAREYKK - FactionFlavor.STAHLAREYKK -> Faction.ISARNAREYKK - FactionFlavor.LYUDAREYKK -> Faction.ISARNAREYKK - FactionFlavor.NEUIA_FULKREYKK -> Faction.ISARNAREYKK - - FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> Faction.VESTIGIUM - FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> Faction.VESTIGIUM - } - fun generateNPCFleet(owner: FactionFlavor, rank: AdmiralRank, sizeMult: Double): Map, Ship> { val battleSize = BattleSize.values().filter { rank.maxShipTier >= it.maxTier }.associateWith { 100.0 / it.numPoints }.weightedRandom() diff --git a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt index cf9bd45..6fd1dc4 100644 --- a/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/admiralty/admiral_names.kt @@ -62,6 +62,7 @@ enum class AdmiralNameFlavor { FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> setOf(AMERICAN, HISPANIC_AMERICAN) FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> setOf(AMERICAN, HISPANIC_AMERICAN) + FactionFlavor.NEW_AUSTIN_VESTIGIUM -> setOf(AMERICAN, HISPANIC_AMERICAN) } } } diff --git a/src/jvmMain/kotlin/net/starshipfights/data/space/fleet_names.kt b/src/jvmMain/kotlin/net/starshipfights/data/space/fleet_names.kt index fb6d769..c823b2e 100644 --- a/src/jvmMain/kotlin/net/starshipfights/data/space/fleet_names.kt +++ b/src/jvmMain/kotlin/net/starshipfights/data/space/fleet_names.kt @@ -36,6 +36,7 @@ fun FactionFlavor.generateFleetName(): String = when (this) { FactionFlavor.STAHLAREYKK -> "${rangedOrdinal(1999, 200)} Fulksflott" FactionFlavor.LYUDAREYKK -> "${rangedOrdinal(1999, 200)} Vaerflott" FactionFlavor.NEUIA_FULKREYKK -> "${rangedOrdinal(499, 20)} Fulkreyksk Kriygsflott" - FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> "${rangedOrdinal(499, 20)} Expeditionary Fleet" - FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> "${rangedOrdinal(499, 20)} Exploratory Fleet" + FactionFlavor.CORVUS_CLUSTER_VESTIGIUM -> "${rangedOrdinal(499, 20)} Extermination Fleet" + FactionFlavor.COLEMAN_SF_BASE_VESTIGIUM -> "${rangedOrdinal(499, 20)} Expeditionary Fleet" + FactionFlavor.NEW_AUSTIN_VESTIGIUM -> "${rangedOrdinal(499, 20)} Exploratory Fleet" } diff --git a/src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.svg b/src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.svg index be39ac4..12b697d 100644 --- a/src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.svg +++ b/src/jvmMain/resources/static/images/flag/coleman-sf-base-vestigium.svg @@ -1,6 +1,4 @@ - - - - + id="text4800"> + id="text4840"> diff --git a/src/jvmMain/resources/static/images/flag/ndrc.svg b/src/jvmMain/resources/static/images/flag/ndrc.svg index 6b12cf3..430548f 100644 --- a/src/jvmMain/resources/static/images/flag/ndrc.svg +++ b/src/jvmMain/resources/static/images/flag/ndrc.svg @@ -48,11 +48,10 @@ diff --git a/src/jvmMain/resources/static/images/flag/new-austin-vestigium.svg b/src/jvmMain/resources/static/images/flag/new-austin-vestigium.svg new file mode 100644 index 0000000..e3ad0b3 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/new-austin-vestigium.svg @@ -0,0 +1,353 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.25.1