Request for take-over: Rewritten Map Editor (#5694)

* New Map editor - attempts 1

* New Map editor - attempts 2

* New Map editor - attempts 3

* New Map editor - attempts 4

* New Map editor - attempts 5

* New Map editor - attempts 6

* New Map editor - attempts 7

* New Map editor - attempts 8

* New Map editor - attempts 9

* New Map editor - attempts 10

* New Map editor - merge

* Revert included Stat icons in favour of #f90b22a

* Adapt to renamed TileGroup methods

* Manual merge of some baseruleset code for the map loader only

* Kludge for disappeared `getBaseRuleset`

* Fix after-merge conflicts, run convertTerrains in stepwise map generation

* Fix merge error

* Adapt to latest merge

* Baseruleset control - unpolished draft + max zoom out

* MapEditorV2 - merge fixes, base ruleset and mod control, texture loader fix, pedia links, translation, load mod maps, continent visualization, minor improvements and fixes

* MapEditorV2 - removed old editor
This commit is contained in:
SomeTroglodyte
2022-04-19 12:17:44 +02:00
committed by GitHub
parent 5ad258ca47
commit 9e3df8605e
36 changed files with 2513 additions and 1427 deletions

View File

@ -10,9 +10,13 @@
StartWithCapitalLetter = true
# Starting from here normal translations start, as written on
# Starting from here normal translations start, as described in
# https://yairm210.github.io/Unciv/Other/Translating/
# Base ruleset names
Civ V - Vanilla = Civ V - Vanilla
Civ V - Gods & Kings = Civ V - Götter & Könige
# Tutorial tasks
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup = Eine Einheit bewegen!\nKlicke auf eine Einheit > Klicke auf ein Ziel > Klicke auf das Pfeil-Popup.
@ -87,7 +91,6 @@ Add to queue = Hinzufügen zur Warteschlange
Remove from queue = Entferne aus Warteschlange
Show stats drilldown = Zeige Statistiken
Show construction queue = Zeige Produktionswarteschlange
Save = Speichern
Cancel = Abbrechen
Diplomacy = Diplomatie
@ -320,8 +323,6 @@ Map Type = Kartentyp
Map file = Karten-Datei
Max Turns = Maximale Runden
Could not load map! = Diese Karte konnte nicht geladen werden!
Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Üngültige Karte: Die Fläche ([area]) stimmt nicht mit den gespeicherten Abmessungen ([dimensions]) überein.
The dimensions have now been fixed for you. = Die Abmessungen wurden für dich korrigiert.
Generated = Generiert
Existing = Bestehende
Custom = Benutzerdefiniert
@ -432,6 +433,80 @@ World wrap maps are very memory intensive - creating large world wrap maps on An
Anything above 80 by 50 may work very slowly on Android! = Auf Android kann alles über 80 mal 50 sehr langsam sein.
Anything above 40 may work very slowly on Android! = Auf Android kann alles über 40 sehr langsam sein.
# Map editor
## Tabs/Buttons
Map editor = Karteneditor
View = Ansehen
Generate = Generieren
Partial = Partiell
Generator steps = Generator-Schritte
Edit = Bearbeiten
Rivers = Flüsse
Load = Laden
Save = Speichern
New map = Neue Karte
Empty = Leer
Save map = Karte speichern
Exit map editor = Karteneditor verlassen
Change map ruleset = Regelsatz ändern
Change the map to use the ruleset selected on this page = Diesen Regelsatz für die\naktuelle Karte speichern und anwenden
Revert to map ruleset = Regelsatz zurücksetzen
Reset the controls to reflect the current map ruleset = Den Regelsatz der Karte wieder\nin diesen Steuerelementen anzeigen
Features = Geländemerkmale
Starting locations = Startpositionen
Tile Matching Criteria = Genauigkeit Feldvergleich
Complete match = Exakte Übereinstimmung
Except improvements = Außer Verbesserungen
Base and terrain features = Gelände und -Merkmale
Base terrain only = Gelände
Land or water only = Nur Land/Wasser
## Labels/messages
Brush ([size]): = Pinsel ([size]):
# The letter shown in the [size] parameter above for setting "Floodfill"
F = A
Error loading map! = Fehler beim Laden der Karte
Map saved successfully! = Karte erfolgreich gespeichert!
It looks like your map can't be saved! = Deine Karte kann aus irgendeinem Grund nicht gespeichert werden!
Current map RNG seed: [amount] = Seed der aktuellen Karte: [amount]
Map copy and paste = Karte kopieren/einfügen
Position: [param] = Position: [param]
Starting location(s): [param] = Startpositionen: [param]
Continent: [param] ([amount] tiles) = Kontinent: [param] ([amount] Felder)
Change map to fit selected ruleset? = Karte ändern, um sie dem neuen Regelsatz anzupassen?
Area: [amount] tiles, [amount2] continents/islands = Fläche: [amount] Felder, [amount2] Kontinente/Inseln
Do you want to leave without saving the recent changes? = Willst Du wirklich den Editor verlassen ohne die Änderungen zu speichern?
Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). = Ungültige Karte: Die Fläche ([area]) stimmt nicht mit den gespeicherten Abmessungen ([dimensions]) überein.
The dimensions have now been fixed for you. = Die Abmessungen wurden für dich korrigiert.
River generation failed! = Flüsse generieren ist fehlgeschlagen!
Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. = Bitte statt Einzelschritt 'Landmasse generieren' mit Typ 'Leer' gleich eine neue leere Karte generieren!
## Map/Tool names
My new map = Meine neue Karte
Generate landmass = Landmasse generieren
Raise mountains and hills = Geländeerhebungen
Humidity and temperature = Feuchtigkeit und Temperatur
Lakes and coastline = Seen und Küstenlinien
Sprout vegetation = Pflanzen sprießen lassen
Spawn rare features = Außergewöhnliches Gelände
Distribute ice = Eis verteilen
Assign continent IDs = Kontinent-IDs zuweisen
Let the rivers flow = Flüsse fließen lassen
Spread Resources = Ressourcen verteilen
Create ancient ruins = Ruinen verteilen
Floodfill = Ausfüllen
[nation] starting location = Startposition von [nation]
Remove features = Geländemerkmale entfernen
Remove improvement = Verbesserungen entfernen
Remove resource = Ressource entfernen
Remove starting locations = Startpositionen entfernen
Remove rivers = Flüsse entfernen
Spawn river from/to = Fluß von/nach generieren
Bottom left river = Fluss unten links
Bottom right river = Fluss unten rechts
Bottom river = Fluss unten
# Multiplayer
Help = Hilfe
@ -492,9 +567,6 @@ Saved at = Gespeichert um
Load map = Karte laden
Delete map = Karte löschen
Are you sure you want to delete this map? = Bist du dir sicher, dass du diese Karte löschen möchtest?
Upload map = Karte hochladen
Could not upload map! = Karte konnte nicht hochgeladen werden!
Map uploaded successfully! = Karte wurde erfolgreich hochgeladen!
Saving... = Speichere...
Overwrite existing file? = Vorhandene Datei überschreiben?
It looks like your saved game can't be loaded! = Dieser Spielstand konnte nicht geladen werden!
@ -1095,41 +1167,16 @@ for = für
Missing translations: = Fehlende Übersetzungen:
Resolution = Auflösung
Tileset = Feldgrafik-Satz
Map editor = Karteneditor
Create = Erstellen
New map = Neue Karte
Empty = Leer
Language = Sprache
Terrains & Resources = Gelände & Ressourcen
Improvements = Verbesserungen
Clear current map = Lösche aktuelle Karte
Save map = Karte speichern
Download map = Karte herunterladen
Loading... = Lade...
Error loading map! = Fehler beim Laden der Karte
Filter: = Filter:
OK = OK
Exit map editor = Karteneditor verlassen
[nation] starting location = Startposition von [nation]
Clear terrain features = Lösche Geländemerkmale
Clear improvements = Lösche Verbesserungen
Clear resource = Lösche Ressource
Remove units = Entferne Einheiten
Player [index] = Spieler [index]
Player [playerIndex] starting location = Spieler [playerIndex] Startgebiet
Bottom left river = Fluss unten links
Bottom right river = Fluss unten rechts
Bottom river = Fluss unten
Requires = Benötigt
Menu = Menü
Brush Size = Pinselgröße
Map saved = Karte gespeichert
Change ruleset = Regelsatz ändern
Base terrain [terrain] does not exist in ruleset! = Gelände [terrain] fehlt im Regelsatz!
Terrain feature [feature] does not exist in ruleset! = Geländemerkmal [feature] fehlt im Regelsatz!
Resource [resource] does not exist in ruleset! = Ressource [resource] fehlt im Regelsatz!
Improvement [improvement] does not exist in ruleset! = Verbesserung [improvement] fehlt im Regelsatz!
Change map to fit selected ruleset? = Karte ändern, um sie dem neuen Regelsatz anzupassen?
# Civilopedia difficulty levels
Player settings = Spieler-Einstellungen

View File

@ -11,9 +11,13 @@ StartWithCapitalLetter =
# Starting from here normal translations start, as written on
# Starting from here normal translations start, as described in
# https://yairm210.github.io/Unciv/Other/Translating/
# Base ruleset names
Civ V - Vanilla =
Civ V - Gods & Kings =
# Tutorial tasks
Move a unit!\nClick on a unit > Click on a destination > Click the arrow popup =
@ -88,7 +92,6 @@ Add to queue =
Remove from queue =
Show stats drilldown =
Show construction queue =
Save =
Cancel =
Diplomacy =
@ -324,8 +327,6 @@ Map Type =
Map file =
Max Turns =
Could not load map! =
Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). =
The dimensions have now been fixed for you. =
Generated =
Existing =
Custom =
@ -437,6 +438,84 @@ World wrap maps are very memory intensive - creating large world wrap maps on An
Anything above 80 by 50 may work very slowly on Android! =
Anything above 40 may work very slowly on Android! =
# Map editor
## Tabs/Buttons
Map editor =
View =
Generate =
Partial =
Generator steps =
Edit =
Rivers =
Load =
Save =
New map =
Empty =
Save map =
Load map =
Delete map =
Are you sure you want to delete this map? =
It looks like your map can't be saved! =
Exit map editor =
Change map ruleset =
Change the map to use the ruleset selected on this page =
Revert to map ruleset =
Reset the controls to reflect the current map ruleset =
Features =
Starting locations =
Tile Matching Criteria =
Complete match =
Except improvements =
Base and terrain features =
Base terrain only =
Land or water only =
## Labels/messages
Brush ([size]): =
# The letter shown in the [size] parameter above for setting "Floodfill"
F =
Error loading map! =
Map saved successfully! =
It looks like your map can't be saved! =
Current map RNG seed: [amount] =
Map copy and paste =
Position: [param] =
Starting location(s): [param] =
Continent: [param] ([amount] tiles) =
Change map to fit selected ruleset? =
Area: [amount] tiles, [amount2] continents/islands =
Do you want to leave without saving the recent changes? =
Invalid map: Area ([area]) does not match saved dimensions ([dimensions]). =
The dimensions have now been fixed for you. =
River generation failed! =
Please don't use step 'Landmass' with map type 'Empty', create a new empty map instead. =
## Map/Tool names
My new map =
Generate landmass =
Raise mountains and hills =
Humidity and temperature =
Lakes and coastline =
Sprout vegetation =
Spawn rare features =
Distribute ice =
Assign continent IDs =
Let the rivers flow =
Spread Resources =
Create ancient ruins =
Floodfill =
[nation] starting location =
Remove features =
Remove improvement =
Remove resource =
Remove starting locations =
Remove rivers =
Spawn river from/to =
Bottom left river =
Bottom right river =
Bottom river =
# Multiplayer
Help =
@ -494,12 +573,6 @@ Could not load game =
Load [saveFileName] =
Delete save =
Saved at =
Load map =
Delete map =
Are you sure you want to delete this map? =
Upload map =
Could not upload map! =
Map uploaded successfully! =
Saving... =
Overwrite existing file? =
It looks like your saved game can't be loaded! =
@ -1104,41 +1177,16 @@ Missing translations: =
Version =
Resolution =
Tileset =
Map editor =
Create =
New map =
Empty =
Language =
Terrains & Resources =
Improvements =
Clear current map =
Save map =
Download map =
Loading... =
Error loading map! =
Filter: =
OK =
Exit map editor =
[nation] starting location =
Clear terrain features =
Clear improvements =
Clear resource =
Remove units =
Player [index] =
Player [playerIndex] starting location =
Bottom left river =
Bottom right river =
Bottom river =
Requires =
Menu =
Brush Size =
Map saved =
Change ruleset =
Base terrain [terrain] does not exist in ruleset! =
Terrain feature [feature] does not exist in ruleset! =
Resource [resource] does not exist in ruleset! =
Improvement [improvement] does not exist in ruleset! =
Change map to fit selected ruleset? =
# Civilopedia difficulty levels
Player settings =