From ccefb98c10879117faf9df48e9f04d7f0eb4b733 Mon Sep 17 00:00:00 2001 From: TheSaminator Date: Tue, 21 Jun 2022 13:21:34 -0400 Subject: [PATCH] Add faction flavor flags --- .../game/ship_faction_flavors.kt | 6 + .../kotlin/net/starshipfights/game/popup.kt | 6 +- .../images/flag/aedon-cultists.inkscape.svg | 181 ++++++ .../static/images/flag/aedon-cultists.svg | 50 ++ .../static/images/flag/ccc.inkscape.svg | 177 ++++++ .../resources/static/images/flag/ccc.svg | 45 ++ .../static/images/flag/corsairs.inkscape.svg | 285 +++++++++ .../resources/static/images/flag/corsairs.svg | 46 ++ .../static/images/flag/felinae-felices.svg | 3 +- .../images/flag/ferthlon-exiles.inkscape.svg | 224 ++++++++ .../static/images/flag/ferthlon-exiles.svg | 54 ++ .../static/images/flag/isarnareykk.svg | 3 +- .../images/flag/lyudareykk.inkscape.svg | 296 ++++++++++ .../static/images/flag/lyudareykk.svg | 59 ++ .../static/images/flag/masra-draetsen.svg | 3 +- .../static/images/flag/mechyrdia.svg | 3 +- .../images/flag/mjolnir-energy.inkscape.svg | 210 +++++++ .../static/images/flag/mjolnir-energy.svg | 79 +++ .../resources/static/images/flag/ndrc.svg | 3 +- .../images/flag/neuia-fulkreykk.inkscape.svg | 329 +++++++++++ .../static/images/flag/neuia-fulkreykk.svg | 89 +++ .../static/images/flag/olympia.inkscape.svg | 193 +++++++ .../resources/static/images/flag/olympia.svg | 61 ++ .../images/flag/res-nostra.inkscape.svg | 177 ++++++ .../static/images/flag/res-nostra.svg | 46 ++ .../images/flag/stahlareykk.inkscape.svg | 543 ++++++++++++++++++ .../static/images/flag/stahlareykk.svg | 306 ++++++++++ .../images/flag/swartareykk.inkscape.svg | 319 ++++++++++ .../static/images/flag/swartareykk.svg | 82 +++ .../static/images/flag/texandria.inkscape.svg | 199 +++++++ .../static/images/flag/texandria.svg | 68 +++ .../images/flag/theudareykk.inkscape.svg | 304 ++++++++++ .../static/images/flag/theudareykk.svg | 67 +++ .../static/images/flag/tyla.inkscape.svg | 228 ++++++++ .../resources/static/images/flag/tyla.svg | 98 ++++ .../static/images/flag/vestigium.svg | 3 +- 36 files changed, 4832 insertions(+), 13 deletions(-) create mode 100644 src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/aedon-cultists.svg create mode 100644 src/jvmMain/resources/static/images/flag/ccc.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/ccc.svg create mode 100644 src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/corsairs.svg create mode 100644 src/jvmMain/resources/static/images/flag/ferthlon-exiles.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/ferthlon-exiles.svg create mode 100644 src/jvmMain/resources/static/images/flag/lyudareykk.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/lyudareykk.svg create mode 100644 src/jvmMain/resources/static/images/flag/mjolnir-energy.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/mjolnir-energy.svg create mode 100644 src/jvmMain/resources/static/images/flag/neuia-fulkreykk.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/neuia-fulkreykk.svg create mode 100644 src/jvmMain/resources/static/images/flag/olympia.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/olympia.svg create mode 100644 src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/res-nostra.svg create mode 100644 src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/stahlareykk.svg create mode 100644 src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/swartareykk.svg create mode 100644 src/jvmMain/resources/static/images/flag/texandria.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/texandria.svg create mode 100644 src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/theudareykk.svg create mode 100644 src/jvmMain/resources/static/images/flag/tyla.inkscape.svg create mode 100644 src/jvmMain/resources/static/images/flag/tyla.svg 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 0441c91..96bd473 100644 --- a/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt +++ b/src/commonMain/kotlin/net/starshipfights/game/ship_faction_flavors.kt @@ -87,3 +87,9 @@ enum class FactionFlavor(val displayName: String, val colorReplacement: IntColor } } } + +val FactionFlavor.flagUrl: String + get() = if (name.endsWith("VESTIGIUM")) + "/static/images/flag/vestigium.svg" + else + "/static/images/flag/${toUrlSlug()}.svg" diff --git a/src/jsMain/kotlin/net/starshipfights/game/popup.kt b/src/jsMain/kotlin/net/starshipfights/game/popup.kt index 5dd7619..a9564e4 100644 --- a/src/jsMain/kotlin/net/starshipfights/game/popup.kt +++ b/src/jsMain/kotlin/net/starshipfights/game/popup.kt @@ -260,7 +260,7 @@ sealed class Popup { button { +faction.navyName +Entities.nbsp - img(alt = faction.shortName, src = faction.flagUrl) { + img(src = faction.flagUrl) { style = "width:1.2em;height:0.75em" } @@ -300,6 +300,10 @@ sealed class Popup { for (flavor in FactionFlavor.optionsForAiEnemy(forFaction)) { button { +flavor.displayName + +Entities.nbsp + img(src = flavor.flagUrl) { + style = "width:1.2em;height:0.75em" + } onClickFunction = { e -> e.preventDefault() diff --git a/src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg b/src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg new file mode 100644 index 0000000..6eb98e9 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/aedon-cultists.inkscape.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/aedon-cultists.svg b/src/jvmMain/resources/static/images/flag/aedon-cultists.svg new file mode 100644 index 0000000..e9c62af --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/aedon-cultists.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/ccc.inkscape.svg b/src/jvmMain/resources/static/images/flag/ccc.inkscape.svg new file mode 100644 index 0000000..d636171 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/ccc.inkscape.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/ccc.svg b/src/jvmMain/resources/static/images/flag/ccc.svg new file mode 100644 index 0000000..6b42558 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/ccc.svg @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg b/src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg new file mode 100644 index 0000000..1279733 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/corsairs.inkscape.svg @@ -0,0 +1,285 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/corsairs.svg b/src/jvmMain/resources/static/images/flag/corsairs.svg new file mode 100644 index 0000000..dfe7a57 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/corsairs.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/felinae-felices.svg b/src/jvmMain/resources/static/images/flag/felinae-felices.svg index 8380e9e..f9c0f4f 100644 --- a/src/jvmMain/resources/static/images/flag/felinae-felices.svg +++ b/src/jvmMain/resources/static/images/flag/felinae-felices.svg @@ -5,8 +5,7 @@ viewBox="0 0 128 80" height="160px" width="256px"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/ferthlon-exiles.svg b/src/jvmMain/resources/static/images/flag/ferthlon-exiles.svg new file mode 100644 index 0000000..372d437 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/ferthlon-exiles.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/isarnareykk.svg b/src/jvmMain/resources/static/images/flag/isarnareykk.svg index 775f9a6..93fbd4a 100644 --- a/src/jvmMain/resources/static/images/flag/isarnareykk.svg +++ b/src/jvmMain/resources/static/images/flag/isarnareykk.svg @@ -5,8 +5,7 @@ viewBox="0 0 128 80" height="160px" width="256px"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/lyudareykk.svg b/src/jvmMain/resources/static/images/flag/lyudareykk.svg new file mode 100644 index 0000000..4dca336 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/lyudareykk.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/masra-draetsen.svg b/src/jvmMain/resources/static/images/flag/masra-draetsen.svg index cf3713f..ec1b2ab 100644 --- a/src/jvmMain/resources/static/images/flag/masra-draetsen.svg +++ b/src/jvmMain/resources/static/images/flag/masra-draetsen.svg @@ -5,8 +5,7 @@ viewBox="0 0 128 80" height="160px" width="256px"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/mjolnir-energy.svg b/src/jvmMain/resources/static/images/flag/mjolnir-energy.svg new file mode 100644 index 0000000..52daabf --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/mjolnir-energy.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/ndrc.svg b/src/jvmMain/resources/static/images/flag/ndrc.svg index 7f07e45..6b12cf3 100644 --- a/src/jvmMain/resources/static/images/flag/ndrc.svg +++ b/src/jvmMain/resources/static/images/flag/ndrc.svg @@ -5,8 +5,7 @@ viewBox="0 0 128 80" height="160px" width="256px"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/neuia-fulkreykk.svg b/src/jvmMain/resources/static/images/flag/neuia-fulkreykk.svg new file mode 100644 index 0000000..47867e4 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/neuia-fulkreykk.svg @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/olympia.inkscape.svg b/src/jvmMain/resources/static/images/flag/olympia.inkscape.svg new file mode 100644 index 0000000..8fc9a50 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/olympia.inkscape.svg @@ -0,0 +1,193 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/olympia.svg b/src/jvmMain/resources/static/images/flag/olympia.svg new file mode 100644 index 0000000..0fc73c7 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/olympia.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg b/src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg new file mode 100644 index 0000000..80959b6 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/res-nostra.inkscape.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/res-nostra.svg b/src/jvmMain/resources/static/images/flag/res-nostra.svg new file mode 100644 index 0000000..198c1d3 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/res-nostra.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg b/src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg new file mode 100644 index 0000000..b2128ff --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/stahlareykk.inkscape.svg @@ -0,0 +1,543 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/stahlareykk.svg b/src/jvmMain/resources/static/images/flag/stahlareykk.svg new file mode 100644 index 0000000..58b6a95 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/stahlareykk.svg @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg b/src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg new file mode 100644 index 0000000..3939248 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/swartareykk.inkscape.svg @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/swartareykk.svg b/src/jvmMain/resources/static/images/flag/swartareykk.svg new file mode 100644 index 0000000..52d50f6 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/swartareykk.svg @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/texandria.inkscape.svg b/src/jvmMain/resources/static/images/flag/texandria.inkscape.svg new file mode 100644 index 0000000..af45e64 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/texandria.inkscape.svg @@ -0,0 +1,199 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/texandria.svg b/src/jvmMain/resources/static/images/flag/texandria.svg new file mode 100644 index 0000000..eb95caa --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/texandria.svg @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg b/src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg new file mode 100644 index 0000000..854cdb1 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/theudareykk.inkscape.svg @@ -0,0 +1,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/theudareykk.svg b/src/jvmMain/resources/static/images/flag/theudareykk.svg new file mode 100644 index 0000000..83a9910 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/theudareykk.svg @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/tyla.inkscape.svg b/src/jvmMain/resources/static/images/flag/tyla.inkscape.svg new file mode 100644 index 0000000..658add0 --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/tyla.inkscape.svg @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/tyla.svg b/src/jvmMain/resources/static/images/flag/tyla.svg new file mode 100644 index 0000000..d486aaf --- /dev/null +++ b/src/jvmMain/resources/static/images/flag/tyla.svg @@ -0,0 +1,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/jvmMain/resources/static/images/flag/vestigium.svg b/src/jvmMain/resources/static/images/flag/vestigium.svg index 01c84f9..61ede1e 100644 --- a/src/jvmMain/resources/static/images/flag/vestigium.svg +++ b/src/jvmMain/resources/static/images/flag/vestigium.svg @@ -6,8 +6,7 @@ viewBox="0 0 128 80" height="160px" width="256px"> - +