Change Vestigium rank names and add currency names

diff --git a/src/commonMain/kotlin/starshipfights/game/admiralty.kt b/src/commonMain/kotlin/starshipfights/game/admiralty.kt
index ca2bd9073fbdb8588236233bb92610e5a264c53e..dbeb4700e5526891afb302d3e15b4c75523090f8 100644 (file)
--- a/src/commonMain/kotlin/starshipfights/game/admiralty.kt
+++ b/src/commonMain/kotlin/starshipfights/game/admiralty.kt
@@ -68,11 +68,11 @@ fun AdmiralRank.getDisplayName(faction: Faction) = when (faction) {
                AdmiralRank.LORD_ADMIRAL -> "Hokst Fletsleydar"
        }
        Faction.VESTIGIUM -> when (this) {
-               AdmiralRank.REAR_ADMIRAL -> "Lieutenant Colonel"
-               AdmiralRank.VICE_ADMIRAL -> "Colonel"
-               AdmiralRank.ADMIRAL -> "Brigadier General"
-               AdmiralRank.HIGH_ADMIRAL -> "Major General"
-               AdmiralRank.LORD_ADMIRAL -> "Lieutenant General"
+               AdmiralRank.REAR_ADMIRAL -> "Rear Marshal"
+               AdmiralRank.VICE_ADMIRAL -> "Vice Marshal"
+               AdmiralRank.ADMIRAL -> "Marshal"
+               AdmiralRank.HIGH_ADMIRAL -> "Grand Marshal"
+               AdmiralRank.LORD_ADMIRAL -> "Chief Marshal"
        }
 }
 

diff --git a/src/commonMain/kotlin/starshipfights/game/ship_factions.kt b/src/commonMain/kotlin/starshipfights/game/ship_factions.kt
index d18079bc8953a0acd562312f06cfa64e44020a11..45ef87caf178606765e6bb5f971933bfcc20bb0d 100644 (file)
--- a/src/commonMain/kotlin/starshipfights/game/ship_factions.kt
+++ b/src/commonMain/kotlin/starshipfights/game/ship_factions.kt
@@ -9,6 +9,7 @@ enum class Faction(
        val navyName: String,
        val polityName: String,
        val demonymSingular: String,
+       val currencyName: String,
        val shipPrefix: String,
        val blurbDesc: TagConsumer<*>.() -> Unit,
 ) {
@@ -18,6 +19,7 @@ enum class Faction(
                navyName = "Mechyrdian Star Fleet",
                polityName = "Empire of Mechyrdia",
                demonymSingular = "Mechyrdian",
+               currencyName = "throne",
                shipPrefix = "CMS ", // Ciarstuos Mehurdiasi Štelnau
                blurbDesc = {
                        p {
@@ -34,6 +36,7 @@ enum class Faction(
                navyName = "Masra Draetsen Khoy'qan",
                polityName = "Diadochus Masra Draetsen",
                demonymSingular = "Diadochi",
+               currencyName = "sylaph",
                shipPrefix = "", // The Diadochi don't use ship prefixes
                blurbDesc = {
                        p {
@@ -50,6 +53,7 @@ enum class Faction(
                navyName = "Isarnareyksk Styurnamariyn",
                polityName = "Isarnareyksk Iunta",
                demonymSingular = "Isarnareyksk",
+               currencyName = "mark",
                shipPrefix = "ISMS ", // Isarnareyksk StyurnaMariyn nu Skyf
                blurbDesc = {
                        p {
@@ -66,6 +70,7 @@ enum class Faction(
                navyName = "Imperial States Space Force",
                polityName = "Imperial States of America",
                demonymSingular = "American",
+               currencyName = "dollar",
                shipPrefix = "ISFC ", // Imperial Space Force Craft
                blurbDesc = {
                        p {

diff --git a/src/jvmMain/kotlin/starshipfights/info/views_user.kt b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
index 53e35cc425879528b5b9995cd39a61be2cebf158..607bf42319c9f73acf72d190302f86de496c41fb 100644 (file)
--- a/src/jvmMain/kotlin/starshipfights/info/views_user.kt
+++ b/src/jvmMain/kotlin/starshipfights/info/views_user.kt
@@ -468,7 +468,7 @@ suspend fun ApplicationCall.admiralPage(): HTML.() -> Unit {
                                                td {
                                                        val opponent = recordOpponents[record.id]
                                                        if (opponent == null)
-                                                               +"(Deleted Admiral)"
+                                                               i { +"(Deleted Admiral)" }
                                                        else
                                                                a(href = "/admiral/${opponent.id}") {
                                                                        +opponent.fullName
@@ -574,7 +574,7 @@ suspend fun ApplicationCall.manageAdmiralPage(): HTML.() -> Unit {
                section {
                        h2 { +"Manage Fleet" }
                        p {
-                               +"${admiral.fullName} currently owns ${admiral.money} Electro-Ducats, and earns ${admiral.rank.dailyWage} Electro-Ducats every day."
+                               +"${admiral.fullName} currently owns ${admiral.money} ${admiral.faction.currencyName}s, and earns ${admiral.rank.dailyWage} ${admiral.faction.currencyName}s every day."
                        }
                        table {
                                tr {
@@ -611,7 +611,9 @@ suspend fun ApplicationCall.manageAdmiralPage(): HTML.() -> Unit {
                                                }
                                                td {
                                                        +ship.shipType.weightClass.sellPrice.toString()
-                                                       +" Electro-Ducats"
+                                                       +" "
+                                                       +admiral.faction.currencyName
+                                                       +"s"
                                                        if (ship.status == DrydockStatus.Ready && !ship.shipType.weightClass.isUnique) {
                                                                br
                                                                a(href = "/admiral/${admiralId}/sell/${ship.id}") { +"Sell" }
@@ -633,7 +635,9 @@ suspend fun ApplicationCall.manageAdmiralPage(): HTML.() -> Unit {
                                                }
                                                td {
                                                        +st.weightClass.buyPrice.toString()
-                                                       +" Electro-Ducats"
+                                                       +" "
+                                                       +admiral.faction.currencyName
+                                                       +"s"
                                                        br
                                                        a(href = "/admiral/${admiralId}/buy/${st.toUrlSlug()}") {
                                                                +"Buy"
@@ -714,7 +718,7 @@ suspend fun ApplicationCall.sellShipConfirmPage(): HTML.() -> Unit {
                section {
                        h1 { +"Are You Sure?" }
                        p {
-                               +"${admiral.fullName} is about to sell the ${ship.shipType.fullDisplayName} ${ship.shipData.fullName} for ${ship.shipType.weightClass.sellPrice} Electro-Ducats."
+                               +"${admiral.fullName} is about to sell the ${ship.shipType.fullDisplayName} ${ship.shipData.fullName} for ${ship.shipType.weightClass.sellPrice} ${admiral.faction.currencyName}s."
                        }
                        form(method = FormMethod.get, action = "/admiral/${admiral.id}/manage") {
                                submitInput {
@@ -749,7 +753,7 @@ suspend fun ApplicationCall.buyShipConfirmPage(): HTML.() -> Unit {
                        section {
                                h1 { +"Too Expensive" }
                                p {
-                                       +"Unfortunately, the ${shipType.fullDisplayName} is out of ${admiral.fullName}'s budget. It costs ${shipType.weightClass.buyPrice} Electro-Ducats, and ${admiral.name} only has ${admiral.money} Electro-Ducats."
+                                       +"Unfortunately, the ${shipType.fullDisplayName} is out of ${admiral.fullName}'s budget. It costs ${shipType.weightClass.buyPrice} ${admiral.faction.currencyName}s, and ${admiral.name} only has ${admiral.money} ${admiral.faction.currencyName}s."
                                }
                                form(method = FormMethod.get, action = "/admiral/${admiral.id}/manage") {
                                        submitInput {
@@ -766,7 +770,7 @@ suspend fun ApplicationCall.buyShipConfirmPage(): HTML.() -> Unit {
                section {
                        h1 { +"Are You Sure?" }
                        p {
-                               +"${admiral.fullName} is about to buy a ${shipType.fullDisplayName} for ${shipType.weightClass.buyPrice} Electro-Ducats."
+                               +"${admiral.fullName} is about to buy a ${shipType.fullDisplayName} for ${shipType.weightClass.buyPrice} ${admiral.faction.currencyName}s."
                        }
                        form(method = FormMethod.get, action = "/admiral/${admiral.id}/manage") {
                                submitInput {