# HG changeset patch # User Henek # Date 1292025600 -3600 # Node ID a8ab151bcae31dab4cfe2d4e12409694f0e5f6e6 # Parent 759c1a3bb1562057d0017b62bb77493a14b8730c also updated TrophyRace to new system diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/de.lua --- a/share/hedgewars/Data/Locale/de.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/de.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,9 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Basketball", - ["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", + ["Not So Friendly Match"] = "Kein-so-Freundschaftsspiel", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "Schlage deine Widersacher durch|die Körbe und aus der Karte hinaus!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Schlage Bälle auf deine Widersacher|und lass sie ins Meer fallen!", - ["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s ist draußen und Team %d|erhält einen Punkt!| |Punktestand:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s ist draußen und Team %d|erhält eine Strafe!| |Punktestand:", -- Basketball, Knockball } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/es.lua --- a/share/hedgewars/Data/Locale/es.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/es.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Baloncesto", - ["Not So Friendly Match"] = "Partido no-tan-amistoso", + ["Not So Friendly Match"] = "Partido no-tan-amistoso", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "¡Batea pelotas hacia tus enemigos|y hazlos caer al agua!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Schlage Bälle auf deine Widersacher|und lass sie ins Meer fallen!", - ["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", + ["%s is out and Team %d|scored a point!| |Score:"] = "¡%s cayó y Equipo %d|anotó un tanto!| |Puntuación:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "¡%s cayó y Equipo %d|anotó una falta!| |Puntuación:", -- Basketball, Knockball + ["TrophyRace"] = "TrophyRace", + ["Use your rope to get from start to finish as fast as you can!"] = "¡Usa tu cuerda para llegar a la salida lo más rápido que puedas!", + ["You've reached the goal!| |Time: "] = "¡Has llegado a la meta!| |Tiempo: ", + ["NEW fastest lap: "] = "NUEVA vuelta rápida: ", + ["Fastest lap: "] = "Vuelta rápida: ", + ["Best laps per team: "] = "Mejores tiempos por equipo: ", + ["Team %d: "] = "Equipo %d", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/pl.lua --- a/share/hedgewars/Data/Locale/pl.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/pl.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Koszykówka", - ["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski", + ["Not So Friendly Match"] = "Mecz Nie-Do-Końca Towarzyski", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "Uderzaj swoich przekiwników|wyrzucając przez kosz, poza mapę!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Uderzaj piłkami w swoich przeciwników|i strącaj ich do wody!", - ["%s is out and Team %d|scored a point!| |Score:"] = "%s utonął i drużyna %d|zdobyła punkt!| |Punktacja:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s utonął i drużyna %d|zdobyła punkt!| |Punktacja:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s utonął i drużyna %d|dostała punkt karny!| |Punktacja:", -- Basketball, Knockball + ["TrophyRace"] = "TrophyRace", + ["Use your rope to get from start to finish as fast as you can!"] = "Użyj liny by jak najszybciej dotrzec od startu do mety", + ["You've reached the goal!| |Time: "] = "Dotarłeś do celu!| |Czas: ", + ["NEW fastest lap: "] = "NOWE najszybsze okrążenie: ", + ["Fastest lap: "] = "Najszybsze okrążenie: ", + ["Best laps per team: "] = "Najszybsze okrążenie drużyny: ", + ["Team %d: "] = "Drużyna %d: ", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/pt_BR.lua --- a/share/hedgewars/Data/Locale/pt_BR.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/pt_BR.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { - ["Hedgewars-Basketball"] = "Hedgewars-Basketball" - ["Not So Friendly Match"] = "Partida não muito amigável" - ["Bat your opponents through the|baskets and out of the map!"] = "Rebata seus oponentes para|fora do mapa através dos cestos!" + ["Hedgewars-Basketball"] = "Hedgewars-Basketball", + ["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball + ["Bat your opponents through the|baskets and out of the map!"] = "Rebata seus oponentes para|fora do mapa através dos cestos!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", - ["Bat balls at your enemies and|push them into the sea!"] = "Rebata as bolas em direção ao seus|e derrube-os no mar!" - ["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a Equipe %d|marcou um ponto!| |Pontuação:" - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a Equipe %d|sofreu uma penalidade!| |Pontuação:" + ["Bat balls at your enemies and|push them into the sea!"] = "Rebata as bolas em direção ao seus|e derrube-os no mar!", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a Equipe %d|marcou um ponto!| |Pontuação:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a Equipe %d|sofreu uma penalidade!| |Pontuação:", -- Basketball, Knockball + ["TrophyRace"] = "TrophyRace", + ["Use your rope to get from start to finish as fast as you can!"] = "Use sua corda para ir do início ao fim o mais rápido que você puder!", + ["You've reached the goal!| |Time: "] = "Você alcançou o objetivo!| |Tempo: ", + ["NEW fastest lap: "] = "NOVA volta mais rápida: ", + ["Fastest lap: "] = "Volta mais rápida: ", + ["Best laps per team: "] = "Melhor volta por equipe: ", + ["Team %d: "] = "Equipe %d: ", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/pt_PT.lua --- a/share/hedgewars/Data/Locale/pt_PT.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/pt_PT.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Basketball", - ["Not So Friendly Match"] = "Partida não muito amigável", + ["Not So Friendly Match"] = "Partida não muito amigável", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "Bate os teus adversarios|fora do mapa acertando com eles no cesto!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Bate bolas contra os teus|enimigos e empurra-os ao mar!", - ["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a equipa %d|soma um ponto!| |Pontuação:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s está fora e a equipa %d|soma um ponto!| |Pontuação:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s está fora e a equipa %d|perde um ponto!| |Pontuação:", -- Basketball, Knockball + ["TrophyRace"] = "TrophyRace", + ["Use your rope to get from start to finish as fast as you can!"] = "Utilizando a corda, percorre o percurso do inicio ao fim o mais rápido que conseguires!", + ["You've reached the goal!| |Time: "] = "Chegaste ao fim!| |Tempo: ", + ["NEW fastest lap: "] = "NOVA volta recorde: ", + ["Fastest lap: "] = "Volta mais rápida: ", + ["Best laps per team: "] = "Melhores voltas por equipa: ", + ["Team %d: "] = "Equipa %d: ", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/sk.lua --- a/share/hedgewars/Data/Locale/sk.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/sk.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Basketbal", - ["Not So Friendly Match"] = "Nie tak celkom priateľský zápas", + ["Not So Friendly Match"] = "Nie tak celkom priateľský zápas", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "Odpálkujte vašich súperov do koša|a von z mapy!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Loptami triafajte vašich nepriateľov|a zhoďte ich tak do mora!", - ["%s is out and Team %d|scored a point!| |Score:"] = "%s je mimo hru a tím %d|získal bod!| |Skóre:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s je mimo hru a tím %d|získal bod!| |Skóre:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s je mimo hru a tím %d|dostal trestný bod!| |Skóre:", -- Basketball, Knockball + ["TrophyRace"] = "Preteky o trofej", + ["Use your rope to get from start to finish as fast as you can!"] = "Použite lano na presun zo štartovnej pozície do cieľa tak rýchlo, ako to len viete!", + ["You've reached the goal!| |Time: "] = "Dosiahli ste cieľ!| |Čas: ", + ["NEW fastest lap: "] = "NOVÉ najrýchlejšie kolo: ", + ["Fastest lap: "] = "Najrýchlejšie kolo: ", + ["Best laps per team: "] = "Najrýchlejšie kolá podľa tímov: ", + ["Team %d: "] = "Tím %d: ", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Locale/sv.lua --- a/share/hedgewars/Data/Locale/sv.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Locale/sv.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,9 +1,16 @@ locale = { ["Hedgewars-Basketball"] = "Hedgewars-Basket", - ["Not So Friendly Match"] = "En inte så vänlig match", + ["Not So Friendly Match"] = "En inte så vänlig match", -- Basketball, Knockball ["Bat your opponents through the|baskets and out of the map!"] = "Slå ner dina motståndare i|korgarna och ut ur kartan!", ["Hedgewars-Knockball"] = "Hedgewars-Knockball", ["Bat balls at your enemies and|push them into the sea!"] = "Slå bollar mot dina fiender|och slå ner dem i havet", - ["%s is out and Team %d|scored a point!| |Score:"] = "%s är ute och lag %d|fick ett poäng!| |Poängställning:", - ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s är ute och lag %d|fick ett straff!| |Poängställning:", + ["%s is out and Team %d|scored a point!| |Score:"] = "%s är ute och lag %d|fick ett poäng!| |Poängställning:", -- Basketball, Knockball + ["%s is out and Team %d|scored a penalty!| |Score:"] = "%s är ute och lag %d|fick ett straff!| |Poängställning:", -- Basketball, Knockball + ["TrophyRace"] = "TrophyRace", + ["Use your rope to get from start to finish as fast as you can!"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!", + ["You've reached the goal!| |Time: "] = "Du har nått målet!| |Tid: ", + ["NEW fastest lap: "] = "NYTT snabbast varv: ", + ["Fastest lap: "] = "Snabbast varv: ", + ["Best laps per team: "] = "Bästa varv per lag: ", + ["Team %d: "] = "Lag %d: ", } diff -r 759c1a3bb156 -r a8ab151bcae3 share/hedgewars/Data/Maps/TrophyRace/map.lua --- a/share/hedgewars/Data/Maps/TrophyRace/map.lua Fri Dec 10 23:58:15 2010 +0100 +++ b/share/hedgewars/Data/Maps/TrophyRace/map.lua Sat Dec 11 01:00:00 2010 +0100 @@ -1,93 +1,6 @@ --- Hedgewars - Roperace for 2+ Players - -local caption = { - ["en"] = "TrophyRace", - ["sv"] = "TrophyRace", - ["pt_PT"] = "TrophyRace", - ["pl"] = "TrophyRace", - ["es"] = "TrophyRace", - ["pt_BR"] = "TrophyRace", - ["sk"] = "Preteky o trofej" - } - -local goal = { - ["en"] = "Use your rope to get from start to finish as fast as you can!", - ["sv"] = "Använd ditt rep för att ta dig från start till mål så fort som möjligt!", - ["pt_PT"] = "Utilizando a corda, percorre o percurso do inicio ao fim o mais rápido que conseguires!", - ["pl"] = "Użyj liny by jak najszybciej dotrzec od startu do mety", - ["es"] = "¡Usa tu cuerda para llegar a la salida lo más rápido que puedas!", - ["pt_BR"] = "Use sua corda para ir do início ao fim o mais rápido que você puder!", - ["sk"] = "Použite lano na presun zo štartovnej pozície do cieľa tak rýchlo, ako to len viete!" - } - -local done = { - ["en"] = "You've reached the goal!| |Time: ", - ["sv"] = "Du har nått målet!| |Tid: ", - ["pt_PT"] = "Chegaste ao fim!| |Tempo: ", - ["pl"] = "Dotarłeś do celu!| |Czas: ", - ["es"] = "¡Has llegado a la meta!| |Tiempo: ", - ["pt_BR"] = "Você alcançou o objetivo!| |Tempo: ", - ["sk"] = "Dosiahli ste cieľ!| |Čas: " - } - -local eliminated = { - ["en"] = "Eliminating worst hedgehog this round...| |%s is OUT!", - ["sv"] = "Eliminerar sämsta igelkott den här rundan...| |%s är UTE!", - ["pt_PT"] = "A eliminar o pior ouriço da ronda...| |% está FORA!", - ["pl"] = "Eliminujemy najgorszego jeża tej rundy...| |%s ODPADŁ!", - ["es"] = "Eliminando al peor erizo de esta ronda...| |¡%s está FUERA!", - ["pt_BR"] = "Eliminando o ouriço mais lento...| |%s vai para o chuveiro!", - ["sk"] = "Eliminujem najhoršieho ježka tohto kola...| |%s je mimo hru!" - } +loadfile(GetDataPath() .. "Scripts/Locale.lua")() -local newbesttime = { - ["en"] = "NEW fastest lap: ", - ["sv"] = "NYTT snabbast varv: ", - ["pt_PT"] = "NOVA volta recorde: ", - ["pl"] = "NOWE najszybsze okrążenie: ", - ["es"] = "NUEVA vuelta rápida: ", - ["pt_BR"] = "NOVA volta mais rápida: ", - ["sk"] = "NOVÉ najrýchlejšie kolo: " - } - -local oldbesttime = { - ["en"] = "Fastest lap: ", - ["sv"] = "Snabbast varv: ", - ["pt_PT"] = "Volta mais rápida: ", - ["pl"] = "Najszybsze okrążenie: ", - ["es"] = "Vuelta rápida: ", - ["pt_BR"] = "Volta mais rápida: ", - ["sk"] = "Najrýchlejšie kolo: " - } - -local bestclantimes = { - ["en"] = "Best laps per team: ", - ["sv"] = "Bästa varv per lag: ", - ["pt_PT"] = "Melhores voltas por equipa: ", - ["pl"] = "Najszybsze okrążenie drużyny: ", - ["es"] = "Mejores tiempos por equipo: ", - ["pt_BR"] = "Melhor volta por equipe: ", - ["sk"] = "Najrýchlejšie kolá podľa tímov: " - } - -local clantime = { - ["en"] = "Team %d: ", - ["sv"] = "Lag %d: ", - ["pt_PT"] = "Equipa %d: ", - ["pl"] = "Drużyna %d: ", - ["es"] = "Equipo %d", - ["pt_BR"] = "Equipe %d: ", - ["sk"] = "Tím %d: " - } - -local function loc(text) - if text == nil then return "**missing**" - elseif text[L] == nil then return text["en"] - else return text[L] - end -end - ---------------------------------------------------------------- +-- Hedgewars - Roperace for 2+ Players -- store number of hedgehogs local numhhs = 0 @@ -140,7 +53,7 @@ end function onGameStart() - ShowMission(loc(caption), "", loc(goal), -amRope, 0) + ShowMission(loc("TrophyRace"), "", loc("Use your rope to get from start to finish as fast as you can!"), -amRope, 0) started = true p=1820 for i = 0, numhhs - 1 do @@ -196,15 +109,15 @@ if ttime < besttime then besttime = ttime besthog = CurrentHedgehog - hscore = hscore .. loc(newbesttime) + hscore = hscore .. loc("NEW fastest lap: ") else - hscore = hscore .. loc(oldbesttime) + hscore = hscore .. loc("Fastest lap: ") end if ttime > worsttime then worsttime = ttime worsthog = CurrentHedgehog end - hscore = hscore .. GetHogName(besthog) .. " - " .. (besttime / 1000) .. " s | |" .. loc(bestclantimes) + hscore = hscore .. GetHogName(besthog) .. " - " .. (besttime / 1000) .. " s | |" .. loc("Best laps per team: ") if clan == ClansCount -1 then -- Time for elimination - worst hog is out and the worst hog vars are reset. @@ -221,10 +134,10 @@ if clantimes[i] == 0 then tt = "--" end - hscore = hscore .. "|" .. string.format(loc(clantime), i+1) .. tt + hscore = hscore .. "|" .. string.format(loc("Team %d: "), i+1) .. tt end - ShowMission(loc(caption), "", loc(done) .. (ttime / 1000) .. " s" .. hscore, 0, 0) + ShowMission(loc("TrophyRace"), "", loc("You've reached the goal!| |Time: ") .. (ttime / 1000) .. " s" .. hscore, 0, 0) TurnTimeLeft = 0 end end