# HG changeset patch # User Wuzzy # Date 1491505071 -7200 # Node ID fe2946e2a859466531d100c4c0808d1454a407e3 # Parent 115867d779820c07d2ea3bb4af04cab03d378d80 Implement random round draw / team win messages diff -r 115867d77982 -r fe2946e2a859 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Thu Apr 06 20:14:05 2017 +0200 +++ b/hedgewars/uTeams.pas Thu Apr 06 20:57:51 2017 +0200 @@ -54,7 +54,7 @@ function CheckForWin: boolean; var AliveClan: PClan; - s, ts: ansistring; + s, ts, cap: ansistring; t, AliveCount, i, j: LongInt; begin CheckForWin:= false; @@ -81,18 +81,25 @@ begin if AliveCount = 0 then begin // draw - AddCaption(trmsg[sidDraw], cWhiteColor, capgrpGameState); + AddCaption(GetEventString(eidRoundDraw), cWhiteColor, capgrpGameState); SendStat(siGameResult, shortstring(trmsg[sidDraw])); - AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000) + AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000); end else // win with AliveClan^ do begin ts:= ansistring(Teams[0]^.TeamName); - if TeamsNumber = 1 then - s:= FormatA(trmsg[sidWinner], ts) // team wins - else - s:= FormatA(trmsg[sidWinner], ts); // clan wins + if TeamsNumber = 1 then // team wins + begin + s:= FormatA(trmsg[sidWinner], ts); + cap:= FormatA(GetEventString(eidRoundWin), ts); + end + else // clan wins + // FIXME: Clan needs a different message + begin + s:= FormatA(trmsg[sidWinner], ts); + cap:= FormatA(GetEventString(eidRoundWin), ts); + end; for j:= 0 to Pred(TeamsNumber) do with Teams[j]^ do @@ -105,7 +112,7 @@ else AddVoice(sndVictory, Teams[0]^.voicepack); - AddCaption(s, cWhiteColor, capgrpGameState); + AddCaption(cap, cWhiteColor, capgrpGameState); SendStat(siGameResult, shortstring(s)); AddGear(0, 0, gtATFinishGame, 0, _0, _0, 3000) end; diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/ar.txt --- a/share/hedgewars/Data/Locale/ar.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/ar.txt Thu Apr 06 20:57:51 2017 +0200 @@ -220,11 +220,11 @@ 02:02=Have no fear! 02:02=Be brave and conquer -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 يفوز -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=تعادل ; New health crate 02:05=Incoming aid! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/cs.txt --- a/share/hedgewars/Data/Locale/cs.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/cs.txt Thu Apr 06 20:57:51 2017 +0200 @@ -243,11 +243,11 @@ 02:02=Neměj strach! 02:02=Buď statečný a dobývej -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 vyhráli! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Kolo nerozhodně ; New health crate 02:05=Přichází pomoc! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/da.txt --- a/share/hedgewars/Data/Locale/da.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/da.txt Thu Apr 06 20:57:51 2017 +0200 @@ -243,11 +243,11 @@ 02:02=Frygt intet! 02:02=Vær modig og tapper -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 vinder! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Runde uafgjort ; New health crate 02:05=Så er der hjælp at hente! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/de.txt --- a/share/hedgewars/Data/Locale/de.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/de.txt Thu Apr 06 20:57:51 2017 +0200 @@ -283,11 +283,11 @@ 02:02=Zeigt’s ihnen! 02:02=Habt keine Angst! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 gewinnt! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Unentschieden ; New health crate 02:05=Alles Gute kommt von oben! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/el.txt --- a/share/hedgewars/Data/Locale/el.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/el.txt Thu Apr 06 20:57:51 2017 +0200 @@ -223,11 +223,11 @@ 02:02=Μην φοβάσαι, να είσαι ατρόμητος! 02:02=Να είσαι γενναίος και να κατακτάς! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=Οι %1 Νικούν! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Ισόπαλος Γύρος ; New health crate 02:05=Εισερχόμενη βοήθεια! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/en.txt --- a/share/hedgewars/Data/Locale/en.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/en.txt Thu Apr 06 20:57:51 2017 +0200 @@ -288,11 +288,11 @@ 02:02=Have no fear! 02:02=Be brave and conquer -; Round ends (win; unused atm) -02:03=... +; Round ends and a team/clan (%1) wins +02:03=%1 wins! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Round draw ; New health crate 02:05=Incoming aid! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/es.txt --- a/share/hedgewars/Data/Locale/es.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/es.txt Thu Apr 06 20:57:51 2017 +0200 @@ -239,11 +239,11 @@ 02:02=¡Dadles caña! 02:02=¡No temáis! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=¡%1 venció! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Empate ; Botiquín 02:05=¡Ayuda en camino! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/fi.txt --- a/share/hedgewars/Data/Locale/fi.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/fi.txt Thu Apr 06 20:57:51 2017 +0200 @@ -235,11 +235,11 @@ 02:02=Älkää pelätko! 02:02=Olkaa urheita ja voittakaa -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 voitti! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Tasapeli ; New health crate 02:05=Apua tulossa! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/fr.txt --- a/share/hedgewars/Data/Locale/fr.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/fr.txt Thu Apr 06 20:57:51 2017 +0200 @@ -217,11 +217,11 @@ 02:02=Combattez jusqu'à la fin ! 02:02=Que la force soit avec vous ! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 gagne ! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Round ex-aequo ; New health crate 02:05=Pharmacie ! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/gl.txt --- a/share/hedgewars/Data/Locale/gl.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/gl.txt Thu Apr 06 20:57:51 2017 +0200 @@ -143,11 +143,11 @@ 02:02=Espetádeos contra o chan! 02:02=Ourizada! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 gaña! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Empate ; New health crate 02:05=Haberá aspirinas? diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/hu.txt --- a/share/hedgewars/Data/Locale/hu.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/hu.txt Thu Apr 06 20:57:51 2017 +0200 @@ -202,11 +202,11 @@ 02:02=Sünik, előre! 02:02=Szedd őket miszlikbe! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 nyert! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Döntetlen ; New health crate 02:05=Egy kis segítség! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/it.txt --- a/share/hedgewars/Data/Locale/it.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/it.txt Thu Apr 06 20:57:51 2017 +0200 @@ -234,11 +234,11 @@ 02:02=Preparatevi alla gloria! 02:02=Forza e coraggio, che la vita è un passaggio! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 vince! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=Round in parità ; New health crate 02:05=Pronto soccorso in arrivo! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/ja.txt --- a/share/hedgewars/Data/Locale/ja.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/ja.txt Thu Apr 06 20:57:51 2017 +0200 @@ -246,11 +246,11 @@ 02:02=恐れを持っていません! 02:02=勇気をだして征服される -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 勝った! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=ドロー! ; New health crate 02:05=救援物資が入って来る! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/ko.txt --- a/share/hedgewars/Data/Locale/ko.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/ko.txt Thu Apr 06 20:57:51 2017 +0200 @@ -77,11 +77,11 @@ ; Round starts 02:02=시~작! -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +02:03=%1 승리! -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +02:04=무승부 ; New health crate 02:05=구급상자! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/lt.txt --- a/share/hedgewars/Data/Locale/lt.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/lt.txt Thu Apr 06 20:57:51 2017 +0200 @@ -248,11 +248,11 @@ 02:02=Nebijok! 02:02=Būk drąsus ir laimėk -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 Laimėjo! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Lygiosios ; New Health Crate 02:05=Atskrenda pagalba! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/nl.txt --- a/share/hedgewars/Data/Locale/nl.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/nl.txt Thu Apr 06 20:57:51 2017 +0200 @@ -232,11 +232,11 @@ 02:02=Have no fear! 02:02=Be brave and conquer -; Round ends (win; unused atm) -02:03=... +; Round ends and team/clan (%1) wins +;02:03=... -; Round ends (draw; unused atm) -02:04=... +; Round ends in a draw +;02:04=... ; New health crate 02:05=Incoming aid! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/pl.txt --- a/share/hedgewars/Data/Locale/pl.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/pl.txt Thu Apr 06 20:57:51 2017 +0200 @@ -266,11 +266,11 @@ 02:02=Nie odczuwaj strachu! 02:02=Bądź odważny i podbijaj! -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 wygrywają! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Remis ; New health crate 02:05=Przybyła pomoc! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/pt_BR.txt --- a/share/hedgewars/Data/Locale/pt_BR.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/pt_BR.txt Thu Apr 06 20:57:51 2017 +0200 @@ -154,11 +154,11 @@ 02:02=Apiiiita o árbitro! 02:02=Ao vencedor as batatas! -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 ganhou! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Partida empatou ; New health crate 02:05=Socorro a caminho! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/pt_PT.txt --- a/share/hedgewars/Data/Locale/pt_PT.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/pt_PT.txt Thu Apr 06 20:57:51 2017 +0200 @@ -246,11 +246,11 @@ 02:02=Não temas! 02:02=Sê corajoso e conquista -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 venceu! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Ronda empatada ; New health crate 02:05=Auxílio iminente! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/ro.txt --- a/share/hedgewars/Data/Locale/ro.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/ro.txt Thu Apr 06 20:57:51 2017 +0200 @@ -243,11 +243,11 @@ 02:02=Have no fear! 02:02=Be brave and conquer -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 a câștigat! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Remizăr ; New health crate 02:05=Incoming aid! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/ru.txt --- a/share/hedgewars/Data/Locale/ru.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/ru.txt Thu Apr 06 20:57:51 2017 +0200 @@ -252,11 +252,11 @@ 02:02=Не бойся! 02:02=Будь храбрым и победи -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=Победила команда %1! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Ничья ; New health crate 02:05=Помощь пришла! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/sk.txt --- a/share/hedgewars/Data/Locale/sk.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/sk.txt Thu Apr 06 20:57:51 2017 +0200 @@ -149,10 +149,13 @@ 02:02=Dajme im na frak! 02:02=Nikdy sa nevzdávaj 02:02=Bojuj čestne! -; Kolo končí (výhra, momentálne nepoužívané) -02:03=... -; Kolo končí (remíza, momentálne nepoužívané) -02:04=... + +; Team %1 wins +02:03=%1 vyhrali! + +; Round draw +02:04=Remíza + ; Nová krabica so zdravím 02:05=Doktora! 02:05=Prvá pomoc z nebies! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/sv.txt --- a/share/hedgewars/Data/Locale/sv.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/sv.txt Thu Apr 06 20:57:51 2017 +0200 @@ -256,11 +256,11 @@ 02:02=Ooh, det börjar! 02:02=Inga mesar tillåtna -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 vinner! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Oavgjort ; New health crate 02:05=Inkommande bistånd! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/tr.txt --- a/share/hedgewars/Data/Locale/tr.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/tr.txt Thu Apr 06 20:57:51 2017 +0200 @@ -248,11 +248,11 @@ 02:02=Asla korkma! 02:02=Cesur ol ve fethet -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=%1 kazandı! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Beraberlik ; New health crate 02:05=Yardım geliyor! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/uk.txt --- a/share/hedgewars/Data/Locale/uk.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/uk.txt Thu Apr 06 20:57:51 2017 +0200 @@ -154,11 +154,11 @@ 02:02=Щасти 02:02=Не здавайся! -; Round ends (win; unused atm) -02:03=... +; Round ends (team/clan %1 wins) +02:03=Перемогла команда %1! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=Нічия ; New health crate 02:05=Допомога прийшла! diff -r 115867d77982 -r fe2946e2a859 share/hedgewars/Data/Locale/zh_TW.txt --- a/share/hedgewars/Data/Locale/zh_TW.txt Thu Apr 06 20:14:05 2017 +0200 +++ b/share/hedgewars/Data/Locale/zh_TW.txt Thu Apr 06 20:57:51 2017 +0200 @@ -251,11 +251,11 @@ 02:02=勇敢前進! 02:02=敢於征服! -; Round ends (win; unused atm) -02:03=... +; Round ends (%1 wins) +02:03=%1 勝利! -; Round ends (draw; unused atm) -02:04=... +; Round ends (draw) +02:04=平局 ; New health crate 02:05=醫療包!