mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into pr/1061

This commit is contained in:
TerryCavanagh 2023-12-05 22:01:31 +01:00
parent 382d3c9a21 1ddc8c8cf4
commit ec06e652ca
40 changed files with 110 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desktop_version/fonts/font.fontmeta
View File

@ -56,7 +56,6 @@
<range start="0x260E" end="0x260F"/>
<range start="0x261C" end="0x2620"/>
<range start="0x2622" end="0x2623"/>
<range start="0x263A" end="0x263B"/>
<range start="0x262E" end="0x262E"/>
<range start="0x263A" end="0x2640"/>
<range start="0x2642" end="0x2653"/>

2
desktop_version/lang/ca/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="Espero que en Verdet estigui bé..."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Si aconseguissis trobar-lo, seria de gran ajuda a l’hora|de reparar la nau!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Si aconseguissis trobar-lo, seria de gran ajuda a l’hora|de reparar la nau!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="L’enginyer en cap Verdet és valent i intel·ligent alhora!"/>

2
desktop_version/lang/cy/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Gobeithio bod Verdigris yn iawn."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Os gallet ti ddod o hyd iddo, byddai&apos;n help mawr i drwsio&apos;r llong!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Os gallet ti ddod o hyd iddo, byddai&apos;n help mawr i drwsio&apos;r llong!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Mae Prif Verdigris mor ddewr a mor glyfar!"/>

2
desktop_version/lang/de/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Ich hoffe, Verdigris geht es gut."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Wenn du ihn finden kannst, wäre er eine große Hilfe bei der Reparatur des Schiffes!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Wenn du ihn finden kannst, wäre er eine große Hilfe bei der Reparatur des Schiffes!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Chief Verdigris ist so mutig und schlau!"/>

2
desktop_version/lang/de/strings.xml
View File

@ -69,7 +69,7 @@
<string english="Toggle between MMMMMM and PPPPPP." translation="Wechsle zwischen MMMMMM und PPPPPP." explanation="" max="38*2"/>
<string english="Current soundtrack: PPPPPP" translation="Aktueller Soundtrack: PPPPPP" explanation="" max="38*3"/>
<string english="Current soundtrack: MMMMMM" translation="Aktueller Soundtrack: MMMMMM" explanation="" max="38*3"/>
<string english="toggle fullscreen" translation="Vollbild umschalten" explanation="menu option"/>
<string english="toggle fullscreen" translation="vollbild umschalten" explanation="menu option"/>
<string english="Toggle Fullscreen" translation="Vollbild umschalten" explanation="title" max="20"/>
<string english="Change to fullscreen/windowed mode." translation="Wechselt zwischen Vollbild-/Fenstermodus." explanation="" max="38*3"/>
<string english="Current mode: FULLSCREEN" translation="Aktueller Modus: VOLLBILD" explanation="" max="38*2"/>

2
desktop_version/lang/en/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation=""/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation=""/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation=""/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation=""/>

2
desktop_version/lang/eo/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="...Mi esperas, ke Verdigriso enordas."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Se vi povas trovi lin, li estus helpego por ripari la ŝipon!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Se vi povas trovi lin, li estus helpego por ripari la ŝipon!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Ĉefo Verdigriso tiel kuraĝas kaj ĉiel lertas!"/>

2
desktop_version/lang/es/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="Espero que Verdigrís esté bien..."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Si le encuentras, ¡serviría de gran ayuda para arreglar la nave!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Si le encuentras, ¡serviría de gran ayuda para arreglar la nave!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="¡El jefe Verdigrís es tan valiente e inteligente!"/>

2
desktop_version/lang/es/meta.xml
View File

@ -3,7 +3,7 @@
<active>1</active>
<!-- should be lowercase because menu style, and should be in the language itself -->
<nativename>español</nativename>
<nativename>español (es)</nativename>
<!-- English translation by X -->
<credit>Traducción al español de Felipe Mercader y Sara Marín</credit>

2
desktop_version/lang/es/strings.xml
View File

@ -220,7 +220,7 @@
<string english="E" translation="E" explanation="keyboard key E. Speedrunner options menu"/>
<string english="ENTER" translation="ENTRAR" explanation="keyboard key ENTER. Speedrunner options menu"/>
<string english="ESC" translation="ESC" explanation="keyboard key ESC"/>
<string english="ACTION" translation="ACTION" explanation="the ACTION key is either the SPACE key, Z or V (this is explained on the title screen). It&apos;s used in strings like `Press ACTION to advance text`"/>
<string english="ACTION" translation="ACCIÓN" explanation="the ACTION key is either the SPACE key, Z or V (this is explained on the title screen). It&apos;s used in strings like `Press ACTION to advance text`"/>
<string english="Interact button: {button}" translation="Botón de interacción: {button}" explanation="keyboard key (E or ENTER) is filled in for {button}. Speedrunner options menu" max="38*2"/>
<string english="fake load screen" translation="pantalla de carga" explanation="menu option"/>
<string english="Fake Load Screen" translation="Pantalla de carga" explanation="title, allows the loading screen which counts to 100% to be turned off" max="20"/>

2
desktop_version/lang/fr/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="J&apos;espère que Vert-de-gris va bien..."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Si vous parvenez à le trouver, il me serait d&apos;une grande aide pour réparer le vaisseau !"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Si vous parvenez à le trouver, il me serait d&apos;une grande aide pour réparer le vaisseau !"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Le Chef Vert-de-gris est si courageux et tellement intelligent !"/>

2
desktop_version/lang/ga/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Tá súil agam go bhfuil Verdigris ceart go leor."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Más féidir leat teacht air, cúnamh mór a bheas ann agus an long á dheisiú!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Más féidir leat teacht air, cúnamh mór a bheas ann agus an long á dheisiú!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Tá an Ceannaire Verdigris an-chróga agus an-éirimiúil ar fad."/>

2
desktop_version/lang/it/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="Spero che Verdigris stia bene."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Se lei riuscisse a trovarlo, ci sarebbe di enorme aiuto nel riparare la nave!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Se lei riuscisse a trovarlo, ci sarebbe di enorme aiuto nel riparare la nave!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Il Capo Verdigris è coraggioso e intelligentissimo!"/>

4
desktop_version/lang/it/strings.xml
View File

@ -207,8 +207,8 @@
<string english="toggle in-game timer" translation="timer nel gioco" explanation="menu option"/>
<string english="In-Game Timer" translation="Timer nel gioco" explanation="title" max="20"/>
<string english="Toggle the in-game timer outside of time trials." translation="Attiva o disattiva il timer nel gioco al di fuori delle prove a tempo." explanation="" max="38*3"/>
<string english="In-Game Timer is ON" translation="Timer nel gioco: NO" explanation="" max="38*2"/>
<string english="In-Game Timer is OFF" translation="Timer nel gioco: SÌ" explanation="" max="38*2"/>
<string english="In-Game Timer is ON" translation="Timer nel gioco: SÌ" explanation="" max="38*2"/>
<string english="In-Game Timer is OFF" translation="Timer nel gioco: NO" explanation="" max="38*2"/>
<string english="english sprites" translation="sprite inglesi" explanation="menu option"/>
<string english="English Sprites" translation="Sprite inglesi" explanation="title" max="20"/>
<string english="Show the original English word enemies regardless of your language setting." translation="Mostra le parole nemiche in inglese indipendentemente dalla lingua impostata." explanation="" max="38*3"/>

2
desktop_version/lang/ja/cutscenes.xml
View File

@ -518,7 +518,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="ヴァーディさん無事かなぁ…。"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="彼ならフネの修理もすぐだろうから
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="彼ならフネの修理もすぐだろうから
早く見つけてあげてねセンチョー!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">

2
desktop_version/lang/ja/strings.xml
View File

@ -347,7 +347,7 @@ Sランク以上を獲得" explanation="ranks are B A S V, see below" max="38*3"
<string english="Keep trying! You&apos;ll get there!" translation="頑張れ! やればできるっ!!" explanation="player died before managing to save anybody" max="38*2" max_local="38*1"/>
<string english="Nice one!" translation="ナイス!" explanation="player died after saving one crewmate" max="38*2" max_local="38*1"/>
<string english="Wow! Congratulations!" translation="WOW! おめでとう!!" explanation="player died after saving two crewmates" max="38*2" max_local="38*1"/>
<string english="Incredible!" translation="凄い!" explanation="player died after saving three crewmates" max="38*2" max_local="38*1"/>
<string english="Incredible!" translation="すごい!" explanation="player died after saving three crewmates" max="38*2" max_local="38*1"/>
<string english="Unbelievable! Well done!" translation="信じられない! 良くやった!!" explanation="player died after saving four crewmates" max="38*2" max_local="38*1"/>
<string english="Er, how did you do that?" translation="えっ? 今のどうやったの…?" explanation="player died even though they were finished, lol" max="38*2" max_local="38*1"/>
<string english="WOW" translation="WOW!" explanation="even bigger title" max="10" max_local="10"/>

2
desktop_version/lang/ko/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="...베르디그리스가 무사하면 좋겠어."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="녀석이 있으면 함선을 고치는 데 큰 도움이 될 텐데!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="녀석이 있으면 함선을 고치는 데 큰 도움이 될 텐데!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="베르디그리스 대장은 용감하고 정말 똑똑해!"/>

BIN
desktop_version/lang/ko/graphics/flipsprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
desktop_version/lang/ko/graphics/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

10
desktop_version/lang/nl/cutscenes.xml
View File

@ -2,7 +2,7 @@
<!-- Please read README.txt for information about the language files -->
<cutscenes>
<cutscene id="intro" explanation="">
<dialogue speaker="cyan" english="Uh oh..." translation="O jee..."/>
<dialogue speaker="cyan" english="Uh oh..." translation="O nee..."/>
<dialogue speaker="purple" english="Is everything ok?" translation="Is alles in orde?"/>
<dialogue speaker="cyan" english="No! We&apos;ve hit some kind of interference..." translation="Nee! We hebben last van een soort interferentie..."/>
<dialogue speaker="cyan" english="Something&apos;s wrong! We&apos;re going to crash!" translation="Dit gaat fout! We gaan neerstorten!"/>
@ -11,7 +11,7 @@
<dialogue speaker="red" english="Everyone off the ship!" translation="Iedereen van het schip!"/>
<dialogue speaker="yellow" english="This shouldn&apos;t be happening!" translation="Dit hoort niet te gebeuren!"/>
<dialogue speaker="cyan" english="Phew! That was scary!" translation="Pfieuw! Dat was eng!"/>
<dialogue speaker="cyan" english="At least we all escaped, right guys?" translation="We zijn in ieder geval ontkomen, toch jongens?"/>
<dialogue speaker="cyan" english="At least we all escaped, right guys?" translation="We zijn in ieder geval ontsnapt, toch jongens?"/>
<dialogue speaker="cyan" english="...guys?" translation="...jongens?"/>
</cutscene>
<cutscene id="firststeps" explanation="">
@ -26,7 +26,7 @@
<dialogue speaker="cyan" english="Oh no!" translation="O nee!"/>
<dialogue speaker="purple" english="I&apos;m on the ship - it&apos;s damaged badly, but it&apos;s still intact!" translation="Ik ben op het schip - het is ernstig beschadigd, maar nog steeds intact!"/>
<dialogue speaker="purple" english="Where are you, Captain?" translation="Waar ben jij, Kapitein?"/>
<dialogue speaker="cyan" english="I&apos;m on some sort of space station... It seems pretty modern..." translation="Ik ben in een soort ruimtestation... Het ziet er best modern uit..."/>
<dialogue speaker="cyan" english="I&apos;m on some sort of space station... It seems pretty modern..." translation="Ik zit in een soort ruimtestation... Het ziet er best modern uit..."/>
<dialogue speaker="purple" english="There seems to be some sort of interference in this dimension..." translation="Er lijkt een soort interferentie te zijn in deze dimensie..."/>
<dialogue speaker="purple" english="I&apos;m broadcasting the coordinates of the ship to you now." translation="Ik zend nu de coördinaten van het schip uit naar jou."/>
<dialogue speaker="purple" english="I can&apos;t teleport you back, but..." translation="Ik kan je niet terugteleporteren, maar..."/>
@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Ik hoop dat Verdigris in orde is."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Als je hem kunt vinden zou hij goed kunnen helpen met het repareren van het schip!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Als je hem kunt vinden zou hij goed kunnen helpen met het repareren van het schip!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Meester Verdigris is zo dapper en altijd zo slim!"/>
@ -687,7 +687,7 @@ Weet u heel zeker dat u dit wilt doen?"/>
DIMENSIONAL STABILISER OFFLINE" translation="-= WAARSCHUWING =-
DIMENSIONALE STABILISATOR INACTIEF" centertext="1" pad="1"/>
<dialogue speaker="cyan" english="Uh oh..." translation="O jee..."/>
<dialogue speaker="cyan" english="Uh oh..." translation="O-o..."/>
</cutscene>
<cutscene id="gamecomplete" explanation="">
<dialogue speaker="yellow" english="Any moment now..." translation="Het kan nu ieder moment gebeuren..."/>

2
desktop_version/lang/nl/strings.xml
View File

@ -494,7 +494,7 @@
<string english="yes, quit" translation="ja, afsluiten" explanation="quit program menu option"/>
<string english="return to game" translation="terug naar het spel" explanation="pause menu option" max="27"/>
<string english="quit to menu" translation="stoppen" explanation="pause menu option" max="19"/>
<string english="Press Left/Right to choose a Teleporter" translation="Links/Rechts: kies teleport" explanation="tight fit, so maybe `Left/Right: choose teleporter`, or use ←/→" max="40"/>
<string english="Press Left/Right to choose a Teleporter" translation="Links/Rechts: kies bestemming" explanation="tight fit, so maybe `Left/Right: choose teleporter`, or use ←/→" max="40"/>
<string english="Press {button} to Teleport" translation="Druk op {button} om te teleporteren" explanation="keyboard key (E or ENTER) or controller button glyph is filled in for {button}. max is when displayed" max="40"/>
<string english="- Press {button} to Teleport -" translation="- Druk op {button} om te teleporteren -" explanation="keyboard key (E or ENTER) or controller button glyph is filled in for {button}" max="40"/>
<string english="Press {button} to explode" translation="{button}: Opblazen" explanation="keyboard key (E or ENTER) or controller button glyph is filled in for {button}. max is when displayed. This was for testing, but people sometimes find it in custom levels" max="37"/>

2
desktop_version/lang/pl/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="...mam nadzieję, że Verdigris jest cały."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Jeśli go znajdziesz, bardzo by pomógł w naprawie statku!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Jeśli go znajdziesz, bardzo by pomógł w naprawie statku!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Inżynier Verdigis jest taki odważny i bystry!"/>

2
desktop_version/lang/pl/roomnames.xml
View File

@ -125,7 +125,7 @@
<roomname x="17" y="2" english="The Brown Gate" translation="Brązowa brama" explanation="I think this is an Ultima 7 reference? A literal translation is fine here"/>
<roomname x="17" y="3" english="Edge Games" translation="Skrajne ryzyko" explanation="Contains a trinket that you get by navigating around the edge of the screen. The use of the word EDGE is deliberate, refering to the trademark of a notoriously litigious individual who sued an indie developer around the time VVVVVV was made"/>
<roomname x="17" y="7" english="Brass Sent Us Under The Top" translation="Przysłała nas tu góra" explanation="The enemies in this room look like little army guys"/>
<roomname x="17" y="8" english="The Warning" translation="Ostrzeżenie" explanation="This room has lots of checkpoints in it. It&apos;s beside the game&apos;s most difficult challenge, the Veni, Vidi, Vici section. The checkpoints don&apos;t really do anything, but they&apos;re a warning of the challenge ahead."/>
<roomname x="17" y="8" english="The Warning" translation="Przestroga" explanation="This room has lots of checkpoints in it. It&apos;s beside the game&apos;s most difficult challenge, the Veni, Vidi, Vici section. The checkpoints don&apos;t really do anything, but they&apos;re a warning of the challenge ahead."/>
<roomname x="17" y="9" english="Just Pick Yourself Down" translation="Upadnij osiem" explanation="A two part room name. From the expression &apos;If you fall down, just pick yourself up&apos;."/>
<roomname x="17" y="10" english="If You Fall Up" translation="Wstań siedem razy" explanation="A two part room name. From the expression &apos;If you fall down, just pick yourself up&apos;."/>
<roomname x="17" y="11" english="Chipper Cipher" translation="Szczęśliwy szyfr" explanation="Just some nice wordplay. Chipper means &apos;Jolly&apos; or &apos;Happy&apos;."/>

2
desktop_version/lang/pt_BR/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Espero que Verdete esteja bem."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Se você puder encontrá-lo, ele será uma grande ajuda pra consertar a nave!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Se você puder encontrá-lo, ele será uma grande ajuda pra consertar a nave!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Chefe Verdete é tão corajoso e tão inteligente!"/>

2
desktop_version/lang/pt_PT/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="Espero que o Verdusco esteja bem."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Daria uma ajuda preciosa a consertar a nave. Vê se o encontras!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Daria uma ajuda preciosa a consertar a nave. Vê se o encontras!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="O Chefe Verdusco é tão corajoso... e transpira inteligência!"/>

2
desktop_version/lang/ru/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="... Надеюсь, с Вердигри ничего не стряслось."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Если найдёшь его, он сильно поможет нам с починкой корабля!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Если найдёшь его, он сильно поможет нам с починкой корабля!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Старший инженер Вердигри такой смелый и такой умный!"/>

2
desktop_version/lang/szl/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="Ufōm co Verdigis je ok."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Kej ônego znojdziesz, byłby fest pōmocny przi reparacji szifa!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Kej ônego znojdziesz, byłby fest pōmocny przi reparacji szifa!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Inżinier Verdigris je taki ôpowŏżny i zŏwdy taki mōndry!"/>

2
desktop_version/lang/tr/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="...Umarım Verdigris iyidir."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Onu bulabilirsek gemiyi onarmamıza yardımcı olabilir!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Onu bulabilirsek gemiyi onarmamıza yardımcı olabilir!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Mühendis Verdigris hem çok cesur|hem de çok zekidir!"/>

BIN
desktop_version/lang/tr/graphics/flipsprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
desktop_version/lang/tr/graphics/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

2
desktop_version/lang/uk/cutscenes.xml
View File

@ -365,7 +365,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="...надіюся, з Вердіґрісом усе гаразд."/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="Якщо знайдеш його, він допоможе полагодити корабель!"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="Якщо знайдеш його, він допоможе полагодити корабель!"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="Інженер Вердіґріс такий сміливий і такий розумний!"/>

2
desktop_version/lang/zh/cutscenes.xml
View File

@ -381,7 +381,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="……我希望维碧格里没事。"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="如果你能找到他，修理飞船他会帮上很大的忙！"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="如果你能找到他，修理飞船他会帮上很大的忙！"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="维碧格里总工既勇敢又那么聪明！"/>

2
desktop_version/lang/zh_TW/cutscenes.xml
View File

@ -381,7 +381,7 @@
</cutscene>
<cutscene id="talkpurple_1" explanation="">
<dialogue speaker="purple" english="... I hope Verdigris is alright." translation="……我希望維碧格里沒事。"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a a big help fixing the ship!" translation="如果你能找到他，修理飛船他會幫上很大的忙！"/>
<dialogue speaker="purple" english="If you can find him, he&apos;d be a big help fixing the ship!" translation="如果你能找到他，修理飛船他會幫上很大的忙！"/>
</cutscene>
<cutscene id="talkpurple_2" explanation="">
<dialogue speaker="purple" english="Chief Verdigris is so brave and ever so smart!" translation="維碧格里總工既勇敢又那麼聰明！"/>

19
desktop_version/src/ButtonGlyphs.cpp
View File

@ -178,14 +178,31 @@ void BUTTONGLYPHS_keyboard_set_active(bool active)
keyboard_is_active = active;
}
void BUTTONGLYPHS_update_layout(Uint16 vendor, Uint16 product)
void BUTTONGLYPHS_update_layout(SDL_GameController *c)
{
Uint16 vendor = SDL_GameControllerGetVendor(c);
Uint16 product = SDL_GameControllerGetProduct(c);
if (vendor == 0x054c)
{
layout = LAYOUT_PLAYSTATION;
}
else if (vendor == 0x28de)
{
/* Steam Virtual Gamepads can hypothetically tell us that the physical
* device is a PlayStation controller, so try to catch that scenario */
const char *mapping = SDL_GameControllerMapping(c);
if (SDL_strstr(mapping, "type:") != NULL)
{
SDL_GameControllerType gct = SDL_GameControllerGetType(c);
if ( gct == SDL_CONTROLLER_TYPE_PS3 ||
gct == SDL_CONTROLLER_TYPE_PS4 ||
gct == SDL_CONTROLLER_TYPE_PS5 )
{
layout = LAYOUT_PLAYSTATION;
return;
}
}
layout = LAYOUT_DECK;
}
else if (vendor == 0x057e)

2
desktop_version/src/ButtonGlyphs.h
View File

@ -17,7 +17,7 @@ bool BUTTONGLYPHS_keyboard_is_available(void);
bool BUTTONGLYPHS_keyboard_is_active(void);
void BUTTONGLYPHS_keyboard_set_active(bool active);
void BUTTONGLYPHS_update_layout(Uint16 vendor, Uint16 product);
void BUTTONGLYPHS_update_layout(SDL_GameController *c);
const char* BUTTONGLYPHS_get_wasd_text(void);
const char* BUTTONGLYPHS_get_button(ActionSet actionset, Action action, int binding);

56
desktop_version/src/Editor.cpp
View File

@ -259,13 +259,13 @@ editorclass::editorclass(void)
register_tilecol(EditorTileset_OUTSIDE, 6, "basic", 498, "outside", 698);
register_tilecol(EditorTileset_OUTSIDE, 7, "basic", 501, "outside", 701);
register_tilecol(EditorTileset_LAB, 0, "lab_cyan", 280, "none", 0);
register_tilecol(EditorTileset_LAB, 1, "lab_red", 283, "none", 0);
register_tilecol(EditorTileset_LAB, 2, "lab_pink", 286, "none", 0);
register_tilecol(EditorTileset_LAB, 3, "basic", 289, "none", 0);
register_tilecol(EditorTileset_LAB, 4, "lab_yellow", 292, "none", 0);
register_tilecol(EditorTileset_LAB, 5, "lab_green", 295, "none", 0);
register_tilecol(EditorTileset_LAB, 6, "none", 0, "none", 0, true);
register_tilecol(EditorTileset_LAB, 0, "lab_cyan", 280, "none", 713);
register_tilecol(EditorTileset_LAB, 1, "lab_red", 283, "none", 713);
register_tilecol(EditorTileset_LAB, 2, "lab_pink", 286, "none", 713);
register_tilecol(EditorTileset_LAB, 3, "basic", 289, "none", 713);
register_tilecol(EditorTileset_LAB, 4, "lab_yellow", 292, "none", 713);
register_tilecol(EditorTileset_LAB, 5, "lab_green", 295, "none", 713);
register_tilecol(EditorTileset_LAB, 6, "none", 0, "none", 713, true);
register_tilecol(EditorTileset_WARP_ZONE, 0, "basic", 80, "none", 120);
register_tilecol(EditorTileset_WARP_ZONE, 1, "basic", 83, "none", 123);
@ -4017,8 +4017,48 @@ bool editorclass::lines_can_pass(int x, int y)
return false;
}
void editorclass::make_autotiling_base(void)
{
if (cl.getroomprop(levx, levy)->directmode == 1)
{
return;
}
for (int i = 0; i < SCREEN_WIDTH_TILES * SCREEN_HEIGHT_TILES; i++)
{
int tile_x = i % SCREEN_WIDTH_TILES;
int tile_y = i / SCREEN_WIDTH_TILES;
int tile = get_tile(tile_x, tile_y);
if (tile == 0)
{
continue;
}
TileTypes type = get_tile_type(tile_x, tile_y, false);
switch (type)
{
case TileType_NONSOLID:
if (type == TileType_NONSOLID || is_warp_zone_background(tile))
{
set_tile(tile_x, tile_y, 2);
}
break;
case TileType_SOLID:
set_tile(tile_x, tile_y, 1);
break;
case TileType_SPIKE:
set_tile(tile_x, tile_y, 6);
break;
}
}
}
void editorclass::switch_tileset(const bool reversed)
{
make_autotiling_base();
int tiles = cl.getroomprop(levx, levy)->tileset;
if (reversed)
@ -4052,6 +4092,8 @@ void editorclass::switch_tileset(const bool reversed)
void editorclass::switch_tilecol(const bool reversed)
{
make_autotiling_base();
int tilecol = cl.getroomprop(levx, levy)->tilecol;
if (reversed)

2
desktop_version/src/Editor.h
View File

@ -177,6 +177,8 @@ public:
bool lines_can_pass(int x, int y);
void make_autotiling_base(void);
int get_enemy_tile(int t);
void switch_tileset(const bool reversed);

3
desktop_version/src/Game.cpp
View File

@ -2881,6 +2881,7 @@ void Game::updatestate(void)
graphics.createtextboxflipme(loc::gettext("All Crew Members Rescued!"), -1, 64, TEXT_COLOUR("transparent"));
graphics.textboxprintflags(PR_FONT_INTERFACE);
graphics.textboxcenterx();
char buffer[SCREEN_WIDTH_CHARS + 1];
timestringcenti(buffer, sizeof(buffer));
savetime = buffer;
@ -2956,11 +2957,13 @@ void Game::updatestate(void)
);
graphics.createtextboxflipme(buffer, -1, 158, TEXT_COLOUR("transparent"));
graphics.textboxprintflags(PR_FONT_INTERFACE);
graphics.textboxcenterx();
graphics.createtextboxflipme(
loc::gettext_roomname(map.custommode, hardestroom_x, hardestroom_y, hardestroom.c_str(), hardestroom_specialname),
-1, 170, TEXT_COLOUR("transparent")
);
graphics.textboxprintflags(PR_FONT_INTERFACE);
graphics.textboxcenterx();
break;
}
case 3508:

15
desktop_version/src/KeyPoll.cpp
View File

@ -280,10 +280,7 @@ void KeyPoll::Poll(void)
BUTTONGLYPHS_keyboard_set_active(false);
controller = controllers[evt.cbutton.which];
BUTTONGLYPHS_update_layout(
SDL_GameControllerGetVendor(controller),
SDL_GameControllerGetProduct(controller)
);
BUTTONGLYPHS_update_layout(controller);
break;
case SDL_CONTROLLERBUTTONUP:
buttonmap[(SDL_GameControllerButton) evt.cbutton.button] = false;
@ -319,10 +316,7 @@ void KeyPoll::Poll(void)
BUTTONGLYPHS_keyboard_set_active(false);
controller = controllers[evt.caxis.which];
BUTTONGLYPHS_update_layout(
SDL_GameControllerGetVendor(controller),
SDL_GameControllerGetProduct(controller)
);
BUTTONGLYPHS_update_layout(controller);
break;
}
case SDL_CONTROLLERDEVICEADDED:
@ -335,10 +329,7 @@ void KeyPoll::Poll(void)
);
controllers[SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller))] = controller;
BUTTONGLYPHS_keyboard_set_active(false);
BUTTONGLYPHS_update_layout(
SDL_GameControllerGetVendor(controller),
SDL_GameControllerGetProduct(controller)
);
BUTTONGLYPHS_update_layout(controller);
break;
}
case SDL_CONTROLLERDEVICEREMOVED:

2
desktop_version/src/Scripts.cpp
View File

@ -4598,7 +4598,7 @@ bool scriptclass::load(const std::string& name)
"squeak(purple)",
"changemood(purple,0)",
"text(purple,0,0,2)",
"If you can find him, he'd be a",
"If you can find him, he'd be",
"a big help fixing the ship!",
"position(purple,above)",
"speak_active",