From 28174a5062b4fbd95f599ca2aaafa92d767f99b7 Mon Sep 17 00:00:00 2001 From: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Date: Sat, 8 Mar 2025 22:02:22 +0300 Subject: [PATCH] [Part of #32893] Localize arachnid dataset names (#33353) * Localize arachnid dataset names * Correct prototype ids to follow naming conventions * Combine arachnid_first.yml and arachnid_last.yml * Upstream names --- .../en-US/datasets/names/arachnid_first.ftl | 73 ++++++++++++++++++ .../en-US/datasets/names/arachnid_last.ftl | 68 +++++++++++++++++ .../Prototypes/Datasets/Names/arachnid.yml | 11 +++ .../Datasets/Names/arachnid_first.yml | 76 ------------------- .../Datasets/Names/arachnid_last.yml | 71 ----------------- Resources/Prototypes/Species/arachnid.yml | 6 +- 6 files changed, 155 insertions(+), 150 deletions(-) create mode 100644 Resources/Locale/en-US/datasets/names/arachnid_first.ftl create mode 100644 Resources/Locale/en-US/datasets/names/arachnid_last.ftl create mode 100644 Resources/Prototypes/Datasets/Names/arachnid.yml delete mode 100644 Resources/Prototypes/Datasets/Names/arachnid_first.yml delete mode 100644 Resources/Prototypes/Datasets/Names/arachnid_last.yml diff --git a/Resources/Locale/en-US/datasets/names/arachnid_first.ftl b/Resources/Locale/en-US/datasets/names/arachnid_first.ftl new file mode 100644 index 0000000000..10723aa35a --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/arachnid_first.ftl @@ -0,0 +1,73 @@ +names-arachnid-first-dataset-1 = Amblyocarenum +names-arachnid-first-dataset-2 = Aname +names-arachnid-first-dataset-3 = Aptostichus +names-arachnid-first-dataset-4 = Archoleptoneta +names-arachnid-first-dataset-5 = Argyroneta +names-arachnid-first-dataset-6 = Atypoides +names-arachnid-first-dataset-7 = Callobius +names-arachnid-first-dataset-8 = Clubiona +names-arachnid-first-dataset-9 = Cteniza +names-arachnid-first-dataset-10 = Deinopis +names-arachnid-first-dataset-11 = Delena +names-arachnid-first-dataset-12 = Diploglena +names-arachnid-first-dataset-13 = Drassodes +names-arachnid-first-dataset-14 = Dysdera +names-arachnid-first-dataset-15 = Entypesa +names-arachnid-first-dataset-16 = Envia +names-arachnid-first-dataset-17 = Eratigena +names-arachnid-first-dataset-18 = Eresus +names-arachnid-first-dataset-19 = Euagrus +names-arachnid-first-dataset-20 = Goeldia +names-arachnid-first-dataset-21 = Hersilia +names-arachnid-first-dataset-22 = Hexathele +names-arachnid-first-dataset-23 = Hibana +names-arachnid-first-dataset-24 = Hickmania +names-arachnid-first-dataset-25 = Huttonia +names-arachnid-first-dataset-26 = Hypochilus +names-arachnid-first-dataset-27 = Idiosoma +names-arachnid-first-dataset-28 = Illawarra +names-arachnid-first-dataset-29 = Kimura +names-arachnid-first-dataset-30 = Kukulcania +names-arachnid-first-dataset-31 = Lampona +names-arachnid-first-dataset-32 = Latrodectus +names-arachnid-first-dataset-33 = Leucauge +names-arachnid-first-dataset-34 = Linyphia +names-arachnid-first-dataset-35 = Loxosceles +names-arachnid-first-dataset-36 = Lycosa +names-arachnid-first-dataset-37 = Madagascarchaea +names-arachnid-first-dataset-38 = Microhexura +names-arachnid-first-dataset-39 = Missulena +names-arachnid-first-dataset-40 = Misumena +names-arachnid-first-dataset-41 = Moggridgea +names-arachnid-first-dataset-42 = Nesticella +names-arachnid-first-dataset-43 = Oarces +names-arachnid-first-dataset-44 = Oecobius +names-arachnid-first-dataset-45 = Oonops +names-arachnid-first-dataset-46 = Paratropis +names-arachnid-first-dataset-47 = Patu +names-arachnid-first-dataset-48 = Peucetia +names-arachnid-first-dataset-49 = Philodromus +names-arachnid-first-dataset-50 = Pholcus +names-arachnid-first-dataset-51 = Phoneutria +names-arachnid-first-dataset-52 = Phryganoporus +names-arachnid-first-dataset-53 = Pimoa +names-arachnid-first-dataset-54 = Pisaura +names-arachnid-first-dataset-55 = Progradungula +names-arachnid-first-dataset-56 = Salticus +names-arachnid-first-dataset-57 = Sason +names-arachnid-first-dataset-58 = Scytodes +names-arachnid-first-dataset-59 = Segestria +names-arachnid-first-dataset-60 = Selenops +names-arachnid-first-dataset-61 = Sphodros +names-arachnid-first-dataset-62 = Spiroctenus +names-arachnid-first-dataset-63 = Tartarus +names-arachnid-first-dataset-64 = Tayshaneta +names-arachnid-first-dataset-65 = Theotima +names-arachnid-first-dataset-66 = Theraphosa +names-arachnid-first-dataset-67 = Theridiosoma +names-arachnid-first-dataset-68 = Trogloraptor +names-arachnid-first-dataset-69 = Uloborus +names-arachnid-first-dataset-70 = Ummidia +names-arachnid-first-dataset-71 = Zodarion +names-arachnid-first-dataset-72 = Zoropsis +names-arachnid-first-dataset-73 = Zygiella diff --git a/Resources/Locale/en-US/datasets/names/arachnid_last.ftl b/Resources/Locale/en-US/datasets/names/arachnid_last.ftl new file mode 100644 index 0000000000..826b3bc837 --- /dev/null +++ b/Resources/Locale/en-US/datasets/names/arachnid_last.ftl @@ -0,0 +1,68 @@ +names-arachnid-last-dataset-1 = Agrestis +names-arachnid-last-dataset-2 = Algarve +names-arachnid-last-dataset-3 = Andohahela +names-arachnid-last-dataset-4 = Aquatica +names-arachnid-last-dataset-5 = Atra +names-arachnid-last-dataset-6 = Blondi +names-arachnid-last-dataset-7 = Cancerides +names-arachnid-last-dataset-8 = Candidus +names-arachnid-last-dataset-9 = Carraiensis +names-arachnid-last-dataset-10 = Crocata +names-arachnid-last-dataset-11 = Cthulhu +names-arachnid-last-dataset-12 = Digua +names-arachnid-last-dataset-13 = Dispar +names-arachnid-last-dataset-14 = Diversicolor +names-arachnid-last-dataset-15 = Domesticus +names-arachnid-last-dataset-16 = Fera +names-arachnid-last-dataset-17 = Florentina +names-arachnid-last-dataset-18 = Formosanus +names-arachnid-last-dataset-19 = Garciai +names-arachnid-last-dataset-20 = Gemmosum +names-arachnid-last-dataset-21 = Germanicum +names-arachnid-last-dataset-22 = Gertschi +names-arachnid-last-dataset-23 = Gracilicollis +names-arachnid-last-dataset-24 = Hasselti +names-arachnid-last-dataset-25 = Hibernalis +names-arachnid-last-dataset-26 = Hochstetteri +names-arachnid-last-dataset-27 = Marapu +names-arachnid-last-dataset-28 = Marchingtoni +names-arachnid-last-dataset-29 = Minutissima +names-arachnid-last-dataset-30 = Mirabilis +names-arachnid-last-dataset-31 = Montivaga +names-arachnid-last-dataset-32 = Mullamullangensis +names-arachnid-last-dataset-33 = Myopica +names-arachnid-last-dataset-34 = Navus +names-arachnid-last-dataset-35 = Nigrum +names-arachnid-last-dataset-36 = Nuragicus +names-arachnid-last-dataset-37 = Obscura +names-arachnid-last-dataset-38 = Palpimanoides +names-arachnid-last-dataset-39 = Personatus +names-arachnid-last-dataset-40 = Phalangioides +names-arachnid-last-dataset-41 = Radiatus +names-arachnid-last-dataset-42 = Rainbowi +names-arachnid-last-dataset-43 = Reclusa +names-arachnid-last-dataset-44 = Reticulatus +names-arachnid-last-dataset-45 = Riversi +names-arachnid-last-dataset-46 = Rufipes +names-arachnid-last-dataset-47 = Sandaliatus +names-arachnid-last-dataset-48 = Sauvagesi +names-arachnid-last-dataset-49 = Savignyi +names-arachnid-last-dataset-50 = Scenicus +names-arachnid-last-dataset-51 = Simus +names-arachnid-last-dataset-52 = Spinimana +names-arachnid-last-dataset-53 = Subrufa +names-arachnid-last-dataset-54 = Sundaicum +names-arachnid-last-dataset-55 = Tarantula +names-arachnid-last-dataset-56 = Thoracica +names-arachnid-last-dataset-57 = Thorelli +names-arachnid-last-dataset-58 = Triangularis +names-arachnid-last-dataset-59 = Trivialis +names-arachnid-last-dataset-60 = Tuxtlensis +names-arachnid-last-dataset-61 = Vatia +names-arachnid-last-dataset-62 = Velox +names-arachnid-last-dataset-63 = Venusta +names-arachnid-last-dataset-64 = Viridans +names-arachnid-last-dataset-65 = Walckenaeri +names-arachnid-last-dataset-66 = Walckenaerius +names-arachnid-last-dataset-67 = Wisharti +names-arachnid-last-dataset-68 = X-Notata \ No newline at end of file diff --git a/Resources/Prototypes/Datasets/Names/arachnid.yml b/Resources/Prototypes/Datasets/Names/arachnid.yml new file mode 100644 index 0000000000..8e98e5927d --- /dev/null +++ b/Resources/Prototypes/Datasets/Names/arachnid.yml @@ -0,0 +1,11 @@ +- type: localizedDataset + id: NamesArachnidFirst + values: + prefix: names-arachnid-first-dataset- + count: 73 + +- type: localizedDataset + id: NamesArachnidLast + values: + prefix: names-arachnid-last-dataset- + count: 68 diff --git a/Resources/Prototypes/Datasets/Names/arachnid_first.yml b/Resources/Prototypes/Datasets/Names/arachnid_first.yml deleted file mode 100644 index b11a9c280e..0000000000 --- a/Resources/Prototypes/Datasets/Names/arachnid_first.yml +++ /dev/null @@ -1,76 +0,0 @@ -- type: dataset - id: names_arachnid_first - values: - - Amblyocarenum - - Aname - - Aptostichus - - Archoleptoneta - - Argyroneta - - Atypoides - - Callobius - - Clubiona - - Cteniza - - Deinopis - - Delena - - Diploglena - - Drassodes - - Dysdera - - Entypesa - - Envia - - Eratigena - - Eresus - - Euagrus - - Goeldia - - Hersilia - - Hexathele - - Hibana - - Hickmania - - Huttonia - - Hypochilus - - Idiosoma - - Illawarra - - Kimura - - Kukulcania - - Lampona - - Latrodectus - - Leucauge - - Linyphia - - Loxosceles - - Lycosa - - Madagascarchaea - - Microhexura - - Missulena - - Misumena - - Moggridgea - - Nesticella - - Oarces - - Oecobius - - Oonops - - Paratropis - - Patu - - Peucetia - - Philodromus - - Pholcus - - Phoneutria - - Phryganoporus - - Pimoa - - Pisaura - - Progradungula - - Salticus - - Sason - - Scytodes - - Segestria - - Selenops - - Sphodros - - Spiroctenus - - Tartarus - - Tayshaneta - - Theotima - - Theraphosa - - Theridiosoma - - Trogloraptor - - Uloborus - - Ummidia - - Zodarion - - Zoropsis - - Zygiella diff --git a/Resources/Prototypes/Datasets/Names/arachnid_last.yml b/Resources/Prototypes/Datasets/Names/arachnid_last.yml deleted file mode 100644 index f6e7f3680b..0000000000 --- a/Resources/Prototypes/Datasets/Names/arachnid_last.yml +++ /dev/null @@ -1,71 +0,0 @@ -- type: dataset - id: names_arachnid_last - values: - - Agrestis - - Algarve - - Andohahela - - Aquatica - - Atra - - Blondi - - Cancerides - - Candidus - - Carraiensis - - Crocata - - Cthulhu - - Digua - - Dispar - - Diversicolor - - Domesticus - - Fera - - Florentina - - Formosanus - - Garciai - - Gemmosum - - Germanicum - - Gertschi - - Gracilicollis - - Hasselti - - Hibernalis - - Hochstetteri - - Marapu - - Marchingtoni - - Minutissima - - Mirabilis - - Montivaga - - Mullamullangensis - - Myopica - - Navus - - Nigrum - - Nuragicus - - Obscura - - Palpimanoides - - Personatus - - Phalangioides - - Radiatus - - Rainbowi - - Reclusa - - Reticulatus - - Riversi - - Rufipes - - Sandaliatus - - Sauvagesi - - Savignyi - - Scenicus - - Simus - - Spinimana - - Subrufa - - Sundaicum - - Tarantula - - Thoracica - - Thorelli - - Triangularis - - Trivialis - - Tuxtlensis - - Vatia - - Velox - - Venusta - - Viridans - - Walckenaeri - - Walckenaerius - - Wisharti - - X-Notata diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 9786b1da2e..f9bedda3be 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -8,9 +8,9 @@ markingLimits: MobArachnidMarkingLimits dollPrototype: MobArachnidDummy skinColoration: Hues - maleFirstNames: names_arachnid_first - femaleFirstNames: names_arachnid_first - lastNames: names_arachnid_last + maleFirstNames: NamesArachnidFirst + femaleFirstNames: NamesArachnidFirst + lastNames: NamesArachnidLast sexes: - Unsexed