# HG changeset patch # User Wuzzy # Date 1520471984 -3600 # Node ID b14cac8ac56cddb40ef5396bc188e7704248d545 # Parent e0ec37c8104d49ad5e5cee55cf658f866fb8113a Slightly simplify Mutant mission panel diff -r e0ec37c8104d -r b14cac8ac56c share/hedgewars/Data/Locale/de.lua --- a/share/hedgewars/Data/Locale/de.lua Thu Mar 08 02:03:23 2018 +0100 +++ b/share/hedgewars/Data/Locale/de.lua Thu Mar 08 02:19:44 2018 +0100 @@ -456,6 +456,7 @@ ["Dark Strawberry"]="Dunkle Erdbeere", ["%d damage was dealt in this game."] = "In diesem Spiel wurde %d Schaden angerichtet.", -- Mutant ["%d / %d"] = "%d / %d", -- Battalion +["%d | %d"] = "%d | %d", -- Mutant ["%d/%d"] = "%d/%d", -- SpeedShoppa ["Deadly Grape"]="Traube des Todes", ["Deadweight"]="Gravitus", @@ -484,9 +485,9 @@ ["Destroyer of planes"]="Flugzeug-Zerstörer", ["Destroy him, Leaks A Lot! He is responsible for the deaths of many of us!"]="Zerstöre ihn, Undichte Stelle! Er ist verantwortlich für viele Tote auf unserer Seite!", ["Destroy invaders and collect bonuses to score points."] = "Zerstöre Invasoren und sammle Boni auf, um zu punkten.", -- Space_Invasion -["Destroy the targets!"] = "Zerstöre die Zielscheiben!", -- Basic_Training_-_Bazooka, Basic_Training_-_Grenade ["Destroy the targets!|Hint: Select the Shoryuken and hit [Space]|P.S. You can use it mid-air."]="Zerstör die Zielscheiben!|Tipp: Wähle das Shoryuken und drücke [Leertaste]|PS: Du kannst es in der Luft benutzen.", ["Destroy the targets!|Hint: [Up], [Down] to aim, [Space] to shoot"]="Zerstöre die Zielscheiben!|Tipp: [Hoch], [Runter] zum Zielen, [Leer] zum Schießen", +["Destroy the targets!"] = "Zerstöre die Zielscheiben!", -- Basic_Training_-_Bazooka, Basic_Training_-_Grenade ["+%d flamer fuel!"] = "+%d Flammenwerfertreibstoff", -- Tumbler ["%d Hapless Hogs left"]="%d Glücklose Igel verbleibend", ["%d-Hit Combo! +%d points!"] = "%d-Treffer-Kombi! +%d Punkte!", -- Space_Invasion @@ -634,7 +635,6 @@ ["Experienced beginner"]="Erfahrener Anfänger", ["Explore the tunnel with the other hedgehogs and search for the device"]="Erforsche den Tunnel mit den anderen Igeln und such nach dem Gerät.", ["Exploring the tunnel"]="Höhlenforscher", -["Retract/Extend rope: [Up]/[Down]"] = "Seil einziehen/ausfahren: [Hoch]/[Runter]", -- Basic_Training_-_Rope ["Eye Chewer"]="Augenkauer", ["Fair Wind"] = "Steife Brise", -- ["Fall Damage"] = "Fallschaden", -- Basic_Training_-_Movement @@ -753,6 +753,7 @@ ["Glassy"] = "Glasig", -- ["Goal Definition Mode"] = "Zieldefinierungsmodus", -- HedgeEditor ["GOAL DEFINITION MODE"] = "ZIELDEFINIERUNGSMODUS", -- HedgeEditor +["Goal: Score %d points or more to win!"] = "Ziel: Erreiche mindestens %d Punkte für den Sieg.", -- Mutant ["Go and collect the crate"]="Geh und sammle die Kiste auf.", ["Godai"] = "Godai", -- ["Go down and save these PAotH hogs!"]="Geh runter und rette diese PAdI-Igel!", @@ -792,8 +793,8 @@ ["Got you? You're acting weird."] = "Dich ertappt? Du bist ja komisch drauf.", -- A_Classic_Fairytale:queen ["Grab mines/barrels: [High jump]"] = "Minen/Fässer schnappen: [Hochsprung]", -- Tumbler ["Gravity: 100%"] = "Schwerkraft: 100%", -- Gravity +["Great choice, Steve! Mind if I call you that?"]="Großartige Entscheidung, Stefan! Stört es dich, wenn ich dich so nenne?", ["Great!"] = "Großartig!", -- Basic_Training_-_Rope -["Great choice, Steve! Mind if I call you that?"]="Großartige Entscheidung, Stefan! Stört es dich, wenn ich dich so nenne?", ["Great! Let’s kill all these enemies, using portals."] = "Großartig! Lasst uns diese Feinde vernichten, und zwar mit Portalen.", -- portal ["Great! You will be contacted soon for assistance."]="Gut! Du wirst schon bald für Unterstützung benachrichtigt.", ["Green areas aren't portal enabled"]="Grüne Bereiche sind portalabweisend", @@ -1244,8 +1245,8 @@ ["Jones"] = "Jonas", -- ["Judas"]="Judas", ["Juicy"] = "Saft", -- +["Jumping is disabled"]="Sprünge sind deaktiviert!", ["Jumping"] = "Springen", -- Basic_Training_-_Movement -["Jumping is disabled"]="Sprünge sind deaktiviert!", ["Just kidding, none of you have died!"]="Nur ein Witz! Niemand von euch ist gestorben!", ["Just look at Leaks, may he rest in peace!"] = "Schau dir nur Undichte an, möge er in Frieden ruhen!", -- A_Classic_Fairytale:queen ["Just on a walk."]="Nur spazieren.", @@ -1512,8 +1513,8 @@ ["Objectives"]="Ziele", ["Object Placer"] = "Objektplatzierer", -- Construction_Mode ["Obliterate them!|Hint: You might want to take cover..."]="Vernichte sie!|Tipp: Du solltest in Deckung gehen.", +["Obstacle course"]="Hindernisstrecke", ["Obstacle"] = "Hindernis", -- Basic_Training_-_Rope -["Obstacle course"]="Hindernisstrecke", ["Of course, but you're … special."] = "Natürlich, aber du bist … besonders.", -- A_Classic_Fairytale:epil ["Of course I am!"] = "Natürlich bin ich das!", -- A_Classic_Fairytale:queen ["Of course I have to save her. What did I expect?!"]="Natürlich muss ich sie retten. Was habe ich erwartet?", @@ -1733,6 +1734,7 @@ ["Rescue the imprisoned PAotH team and get the fuel!"]="Rette das gefangene PAdI-Team und hol dir den Treibstoff!", ["Respawner: Resurrects dead hogs."] = "Wiederbeleber: Belebt tote Igel wieder.", -- Construction_Mode ["Respawner"]="Wiederbeleber", +["Retract/Extend rope: [Up]/[Down]"] = "Seil einziehen/ausfahren: [Hoch]/[Runter]", -- Basic_Training_-_Rope ["- Return the enemy flag to your base to score"] = "- Bring die Feindesflagge zu deiner Basis, um zu punkten", -- Capture_the_Flag [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"]=" – Bringe die gegnerische Flagge zu deiner Heimatbasis, um zu punkten | – Das Team, das zuerst 3 Flaggen erobert, gewinnt | – Du kannst nur punkten, wenn deine eigene Flagge in deiner Basis ist | – Igel lassen die Flagge fallen, wenn sie sterben oder ertrinken | – Fallengelassene Flaggen können zurückgebracht oder wieder gestohlen werden | – Igel tauchen nach ihrem Tod wieder auf", ["Return to Leaks A Lot!"] = "Kehre zu Undichte Stelle zurück!", -- A_Classic_Fairytale:shadow @@ -1771,15 +1773,14 @@ ["RUBBER PLACEMENT MODE"]="GUMMIPLATZIERUNGSMODUS", ["Rules:"] = "Regeln:", -- Capture_the_Flag ["RULES:"] = "REGELN:", -- Frenzy -["Rules: "] = "Regeln: ", -- Mutant ["Run away, you coward!"]="Lauf weg, du Feigling!", -- A_Space_Adventure:desert01 ["Running displacement algorithm …"] = "Führe Deplatzierungsalgorithmus aus …", -- A_Classic_Fairytale:queen ["Running for survival"]="Lauf um dein Leben", ["Rusted Diego"] = "Rost-Diego", -- ["Rusty Joe"]="Rostjonas", ["Ryu"] = "Ryu", -- +["%s: %.1fs"] = "%s: %.1fs", -- Racer, TechRacer ["%s (+1)"] = "%s (+1)", -- A_Space_Adventure:fruit03 -["%s: %.1fs"] = "%s: %.1fs", -- Racer, TechRacer ["Sabotage/Flare: [Sabotage all hogs in the circle and deal ~1 dmg OR Fire a cluster up into the air]"]="Sabotage/Fackel: (Sabotiere alle Igel im Kreis und richte ca. 1 Schaden an, ODER feuer ein Splitterfragment in die Luft)", ["Saint"]="Sankt", ["Salivaslurper"]="Speichelschlürfer", @@ -1806,21 +1807,20 @@ ["Scenario"] = "Szenario", -- Big_Armory, portal, User_Mission_-_Bamboo_Thicket, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Newton_and_the_Hammock, User_Mission_-_Nobody_Laugh, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork_2, User_Mission_-_Teamwork, User_Mission_-_The_Great_Escape ["Scientist"]="Wissenschaftler", ["%s climbed home in %d seconds!"] = "%s ist in %d Sekunden nach Hause geklettert!", -- ClimbHome -["Score: %d | Deaths: %d"] = "Punkte: %d | Tode: d", -- Mutant ["Score: %d"] = "Punktzahl: %d", -- Space_Invasion ["Score goal: %d"] = "Punkteziel: %d", -- Control ["Score graph"] = "Punktegraph", -- Mutant -["Score points by killing other hedgehogs (see below)."] = "Hole Punkte, indem du andere Igel tötest (siehe unten).", -- Mutant +["Score points by killing other hedgehogs."] = "Hole Punkte, indem du andere Igel tötest.", -- Mutant ["Scores:"] = "Punktestand:", -- Mutant ["Scoring: "] = "Punktewertung: ", -- Mutant ["Script parameter examples:"] = "Skriptparameterbeispiele:", -- Gravity -["%s (+%d)"] = "%s (+%d)", -- Battalion ["%s: %d (deaths: %d)"] = "%s: %d (Tode: %d)", -- Mutant ["%s: Did not finish"] = "%s: Wurde nicht fertig", -- Racer, TechRacer ["%s did not finish the race."] = "%s hat das Rennen nicht abgeschlossen.", -- Racer, TechRacer ["%s didn't expect that."] = "%s hat damit nicht gerechnet.", -- User_Mission_-_Rope_Knock_Challenge ["%s died … and lives again!"] = "%s ist gestorben … und lebt wieder!", -- Construction_Mode ["%s doesn’t really know how to handle a rope properly."]="%s weiß nicht, wie man mit einem Seil umgeht.", +["%s (+%d)"] = "%s (+%d)", -- Battalion ["Search for the device with the help of the other hedgehogs "]="Such nach dem Gerät mit der Hilfe der anderen Igel.", ["Searching in the dust"]="Suche im Staub", ["Searching the stars!"]="Suche in den Sternen", @@ -1838,11 +1838,11 @@ ["Select/Place/Delete Gear: [Left Click]"] = "Gear wählen/platzieren/löschen: [Linksklick]", -- HedgeEditor ["Select, reposition and delete gears"] = "Wähle, repositioniere und lösche Gears", -- HedgeEditor ["Select Rope"] = "Seil auswählen", -- Basic_Training_-_Rope +["Select “Switch Hedgehog” from the ammo menu and|hit the “Attack” key to proceed."] = "Wähle »Igel wechseln« aus dem Munitionsmenü und|drücke [Angriff], um fortzufahren.", -- Basic_Training_-_Movement ["Select “Switch Hedgehog” from the ammo menu and|hit the “Attack” key."] = "Wähle »Igel wechseln« aus dem Munitionsmenü und|drücke [Angriff].", -- Basic_Training_-_Movement -["Select “Switch Hedgehog” from the ammo menu and|hit the “Attack” key to proceed."] = "Wähle »Igel wechseln« aus dem Munitionsmenü und|drücke [Angriff], um fortzufahren.", -- Basic_Training_-_Movement ["Select the rope to begin!"] = "Wähle das Seil aus, um anzufangen!", -- Basic_Training_-_Rope +["Select weapon: [Left click]"] = "Waffe auswählen: [Linksklick]", -- Basic_Training_-_Bazooka, Basic_Training_-_Grenade ["Select Weapon"] = "Waffe auswählen", -- Basic_Training_-_Bazooka, Basic_Training_-_Grenade -["Select weapon: [Left click]"] = "Waffe auswählen: [Linksklick]", -- Basic_Training_-_Bazooka, Basic_Training_-_Grenade ["Select win/lose condition: [Left], [Right]"] = "Sieg-/Niederlagebedingung wählen: [Links], [Rechts]", -- HedgeEditor ["Select your continent/weaponset: With the \"Up\" or \"Down\" keys. You can also select one with the weapons menu."] = "Wähle deinen Kontinent: Mit [Hoch]/[Runter]. Du kannst auch das Munitionsmenü benutzen.", -- Continental_supplies ["Sergey"] = "Sergey", -- @@ -2192,7 +2192,6 @@ ["The First Blood"]="Der erste Zusammenstoß", ["The First Encounter"]="Das erste Zusammentreffen", ["The first hedgehog to kill someone becomes the Mutant."] = "Der erste Igel, der einen anderen tötet, mutiert.", -- Mutant -["The first hedgehog which scores %d or more wins the game."] = "Der erste Igel, der %d oder mehr Punkte hat, gewinnt.", -- Mutant ["The first stop"]="Der erste Halt", ["The first turn will last 25 sec and every other turn 15 sec."]="Der 1. Zug wird 25 Sek., jeder andere Zug 15 Sek. dauern.", ["The first turn will last 25 sec and every other turn 15 sec"]="Der 1. Zug wird 25 Sek., jeder andere Zug 15 Sek. dauern", @@ -2223,8 +2222,8 @@ ["The meteorite has come too close and the anti-gravity device isn't powerful enough to stop it now."]="Der Meteorit kam zu nah und das Antischwerkraftgerät ist zu schwach, um ihn jetzt zu stoppen.", ["the moon"]="der Mond", ["The Moonwalk"]="Der Mondspaziergang", -["The Mutant has super-weapons and a lot of health."]="Der Mutant hat Superwaffen und eine hohe Gesundheit.", -["The Mutant loses health quickly if he doesn't keep scoring kills."]="Der Mutant verliert schnell an Gesundheit, wenn er nicht schnell andere Igel tötet.", +["The Mutant has super weapons and a lot of health."] = "Der Mutant hat Superwaffen und eine hohe Gesundheit.", -- Mutant +["The Mutant loses health quickly, but gains health by killing."] = "Der Mutant verliert schnell Gesundheit, heilt sich aber für jeden Abschuss.", -- Mutant ["The Nameless One"]="Der Namenlose", ["The Navy greets %s for managing to get in a distance of %d away from the mainland!"]="Die Marine grüßt %s für einen Abstand von %d vom Festland!", ["The next 4 times you play the \"The last encounter\" mission you'll get 20 more hit points and a laser sight."]="Die nächsten 4 Male, die du die Mission »Das letzte Gefecht« spielst, wirst du 20 weitere Trefferpunkte und ein Laservisier erhalten.", @@ -2254,6 +2253,7 @@ ["The respawner respawns %s"] = "Der Wiederbeleber belebt %s wieder", -- Construction_Mode ["The Rising"]="Der Aufstieg", ["The Savior"]="Der Erlöser", +["The score and deaths are shown next to the team bar."] = "Die Punkte und Tode werden neben der Teamleiste angezeigt.", -- Mutant ["These girders are slippery, like ice."] = "Diese Träger sind so rutschig wie Eis.", -- Basic_Training_-_Movement ["These primitive people are so funny!"]="Diese primitiven Leute sind so lustig!", ["The Shadow Falls"]="Die Schattenfälle", diff -r e0ec37c8104d -r b14cac8ac56c share/hedgewars/Data/Locale/stub.lua --- a/share/hedgewars/Data/Locale/stub.lua Thu Mar 08 02:03:23 2018 +0100 +++ b/share/hedgewars/Data/Locale/stub.lua Thu Mar 08 02:19:44 2018 +0100 @@ -416,6 +416,7 @@ -- ["Dark Strawberry"] = "", -- A_Space_Adventure:fruit02 -- ["%d damage was dealt in this game."] = "", -- Mutant -- ["%d / %d"] = "", -- Battalion +-- ["%d | %d"] = "", -- Mutant -- ["%d/%d"] = "", -- SpeedShoppa -- ["Deadly Grape"] = "", -- A_Space_Adventure:fruit02 -- ["Deadweight"] = "", @@ -578,7 +579,6 @@ -- ["Experienced beginner"] = "", -- User_Mission_-_RCPlane_Challenge -- ["Explore the tunnel with the other hedgehogs and search for the device"] = "", -- A_Space_Adventure:fruit02 -- ["Exploring the tunnel"] = "", -- A_Space_Adventure:fruit02 --- ["Retract/Extend rope: [Up]/[Down]"] = "", -- Basic_Training_-_Rope -- ["Eye Chewer"] = "", -- A_Classic_Fairytale:journey -- ["Fair Wind"] = "", -- -- ["Fall Damage"] = "", -- Basic_Training_-_Movement @@ -692,6 +692,7 @@ -- ["Glassy"] = "", -- -- ["Goal Definition Mode"] = "", -- HedgeEditor -- ["GOAL DEFINITION MODE"] = "", -- HedgeEditor +-- ["Goal: Score %d points or more to win!"] = "", -- Mutant -- ["Go and collect the crate"] = "", -- A_Space_Adventure:cosmos -- ["Godai"] = "", -- -- ["Go down and save these PAotH hogs!"] = "", -- A_Space_Adventure:moon01 @@ -1628,6 +1629,7 @@ -- ["Rescue the imprisoned PAotH team and get the fuel!"] = "", -- A_Space_Adventure:moon01 -- ["Respawner"] = "", -- Construction_Mode -- ["Respawner: Resurrects dead hogs."] = "", -- Construction_Mode +-- ["Retract/Extend rope: [Up]/[Down]"] = "", -- Basic_Training_-_Rope -- ["- Return the enemy flag to your base to score"] = "", -- Capture_the_Flag -- [" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = "", -- ["Return to Leaks A Lot!"] = "", -- A_Classic_Fairytale:shadow @@ -1665,7 +1667,6 @@ -- ["RUBBER PLACEMENT MODE"] = "", -- HedgeEditor -- ["Rules:"] = "", -- Capture_the_Flag -- ["RULES:"] = "", -- Frenzy --- ["Rules: "] = "", -- Mutant -- ["Run away, you coward!"] = "", -- A_Space_Adventure:desert01 -- ["Running displacement algorithm …"] = "", -- A_Classic_Fairytale:queen -- ["Running for survival"] = "", -- A_Space_Adventure:desert02 @@ -1699,11 +1700,10 @@ -- ["Scenario failed!"] = "", -- SimpleMission -- ["Scientist"] = "", -- Battalion -- ["%s climbed home in %d seconds!"] = "", -- ClimbHome --- ["Score: %d | Deaths: %d"] = "", -- Mutant -- ["Score: %d"] = "", -- Space_Invasion -- ["Score goal: %d"] = "", -- Control -- ["Score graph"] = "", -- Mutant, Space_Invasion --- ["Score points by killing other hedgehogs (see below)."] = "", -- Mutant +-- ["Score points by killing other hedgehogs."] = "", -- Mutant -- ["Scores:"] = "", -- Mutant -- ["Scoring: "] = "", -- Mutant -- ["Script parameter examples:"] = "", -- Gravity @@ -2068,7 +2068,6 @@ -- ["The First Blood"] = "", -- A_Classic_Fairytale:first_blood -- ["The First Encounter"] = "", -- A_Classic_Fairytale:shadow -- ["The first hedgehog to kill someone becomes the Mutant."] = "", -- Mutant --- ["The first hedgehog which scores %d or more wins the game."] = "", -- Mutant -- ["The first stop"] = "", -- A_Space_Adventure:moon01 -- ["The first turn will last 25 sec and every other turn 15 sec."] = "", -- A_Space_Adventure:fruit03 -- ["The flag will respawn next round."] = "", @@ -2094,8 +2093,8 @@ -- ["The Leap of Faith"] = "", -- A_Classic_Fairytale:first_blood -- ["The meteorite has come too close and the anti-gravity device isn't powerful enough to stop it now."] = "", -- A_Space_Adventure:cosmos -- ["The Moonwalk"] = "", -- A_Classic_Fairytale:journey --- ["The Mutant has super-weapons and a lot of health."] = "", -- Mutant --- ["The Mutant loses health quickly if he doesn't keep scoring kills."] = "", -- Mutant +-- ["The Mutant has super weapons and a lot of health."] = "", -- Mutant +-- ["The Mutant loses health quickly, but gains health by killing."] = "", -- Mutant -- ["The Nameless One"] = "", -- ["The Navy greets %s for managing to get in a distance of %d away from the mainland!"] = "", -- ClimbHome -- ["The next 4 times you play the \"The last encounter\" mission you'll get 20 more hit points and a laser sight."] = "", -- A_Space_Adventure:death02 @@ -2122,6 +2121,7 @@ -- ["The respawner respawns %s"] = "", -- Construction_Mode -- ["The Rising"] = "", -- A_Classic_Fairytale:first_blood -- ["The Savior"] = "", -- A_Classic_Fairytale:journey +-- ["The score and deaths are shown next to the team bar."] = "", -- Mutant -- ["These girders are slippery, like ice."] = "", -- Basic_Training_-_Movement -- ["These primitive people are so funny!"] = "", -- A_Classic_Fairytale:backstab -- ["The Shadow Falls"] = "", -- A_Classic_Fairytale:shadow diff -r e0ec37c8104d -r b14cac8ac56c share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Thu Mar 08 02:03:23 2018 +0100 +++ b/share/hedgewars/Data/Scripts/Multiplayer/Mutant.lua Thu Mar 08 02:19:44 2018 +0100 @@ -103,17 +103,16 @@ function rules() - local ruleSet = loc("Rules: ") .. "|" .. - loc("Hedgehogs will be revived after their death.") .. "|" .. + local ruleSet = loc("Hedgehogs will be revived after their death.") .. "|" .. string.format(loc("Mines explode after %d s."), div(MinesTime, 1000)) .. "|" .. - " |".. loc("The first hedgehog to kill someone becomes the Mutant.") .. "|" .. - loc("The Mutant has super-weapons and a lot of health.") .. "|" .. - loc("The Mutant loses health quickly if he doesn't keep scoring kills.") .. "|" .. + loc("The Mutant has super weapons and a lot of health.") .. "|" .. + loc("The Mutant loses health quickly, but gains health by killing.") .. "|" .. " |" .. - loc("Score points by killing other hedgehogs (see below).") .. "|" .. + loc("Score points by killing other hedgehogs.") .. "|" .. loc("The hedgehog with least points (or most deaths) becomes the Bottom Feeder.") .. "|" .. - string.format(loc("The first hedgehog which scores %d or more wins the game."), winScore) .. "|" .. + loc("The score and deaths are shown next to the team bar.") .. "|" .. + string.format(loc("Goal: Score %d points or more to win!"), winScore) .. "|" .. " |" .. loc("Scoring: ") .. "|" .. loc("+2 for becoming the Mutant") .. "|" .. @@ -371,7 +370,7 @@ function renderScores() for i=0, TeamsCount-1 do if teams[i]~= nil then - SetTeamLabel(teams[i], string.format(loc("Score: %d | Deaths: %d"), getTeamValue(teams[i], "Score"), getTeamValue(teams[i], "DeadHogs"))) + SetTeamLabel(teams[i], string.format(loc("%d | %d"), getTeamValue(teams[i], "Score"), getTeamValue(teams[i], "DeadHogs"))) end end end