diff --git a/.gitattributes b/.gitattributes index 2bd8712..8edb123 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ -*.sub text working-tree-encoding=cp852 \ No newline at end of file +*.sub text working-tree-encoding=cp850 +.gitattributes export-ignore \ No newline at end of file diff --git a/.github/workflows/perform_release.yml b/.github/workflows/perform_release.yml new file mode 100644 index 0000000..5187900 --- /dev/null +++ b/.github/workflows/perform_release.yml @@ -0,0 +1,51 @@ +name: perform-release +on: + push: + tags: + - 'v*' + +permissions: + contents: read + + +# Check that pushed tag points to latest master commit, then build release and create GitHub release alongside. +jobs: + check-tag-latest: + name: Compare tag with master + runs-on: ubuntu-latest + outputs: + tag_hash: ${{ github.sha }} + master_hash: ${{ steps.master-commit-hash.outputs.master_hash }} + permissions: + contents: read + + steps: + - uses: actions/checkout@v4 + with: + ref: master + sparse-checkout: . + + - name: Get latest master commit hash + id: master-commit-hash + run: | + hash=$(git log -n1 --format=format:"%H") + echo "master_hash=$hash" >> "$GITHUB_OUTPUT" + + + gh-release: + needs: [check-tag-latest] + name: Create GitHub release + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Set tag name to env + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + + - name: Push GitHub release + uses: ncipollo/release-action@v1 + with: + generateReleaseNotes: true + skipIfReleaseExists: true + tag: ${{ env.RELEASE_VERSION }} \ No newline at end of file diff --git a/Anwendung-ReadMe.txt b/Anwendung-ReadMe.txt new file mode 100644 index 0000000..8a1401a --- /dev/null +++ b/Anwendung-ReadMe.txt @@ -0,0 +1,34 @@ +######################## +#SS2 Untertitel Deutsch# +######################## + +Diese Mod fügt System Shock 2 deutsche Untertitel hinzu. Die Untertitel stehen dabei sowohl für die offizielle deutsche Übersetzung als auch das Shock Community Project (https://www.systemshock.org/index.php?topic=7116.0) bereit. + +Das Timing der Untertitel entspricht der offiziellen deutschen Audioausgabe. + + +Anwendung +1. Patche deine SS2-Installation mit SS2Tool (https://www.systemshock.org/index.php?topic=4141.0). Dabei sollte die Option "Game Options" -> "Enable subtitle support" aktiviert sein. +2. Aktiviere diese Mod im Mod-Manager (siehe https://pshjt.github.io/dmm/). + + +Troubleshooting +# Ich kann keine Untertitel sehen. +--> Stelle sicher, dass die Mod aktiviert ist und Untertitel verfügbar sind. In der cam_ext.cfg sollte am Ende folgender Eintrag auftauchen: + enable_subtitles + ; subtitles_hide_types movie+player+convo+bark+nonverbal + subtitles_hide_types nonverbal + subtitles_dim 20 80 86 + subtitles_font_dir fonts\ + subtitles_font_name mainaa + subtitles_spacing 1 + ;subtitles_bg_color 0 0 0 0 + subtitles_show_descr + subtitles_max_dist_bark 50 + subtitles_extra_time 800 + +# Ich möchte Untertitel vom Typ "X" entfernen. +--> Ändere die Zeile beginnend mit "subtitles_hide_types" in cam_ext.cfg. Um z.B. Geräusche und Gegnerkommentare zu entfernen, würde die Zeile "subtitles_hide_types bark+nonverbal" lauten. Siehe auch die Dokumentation in docs\newdark\subtitles.txt. + +# Ich habe ein ungeklärts Problem - Hilfe! +--> Support gibt es auf SystemShock.org: https://www.systemshock.org/index.php?topic=8395 diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..2c217f9 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2023 pshjt + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/README.md b/README.md index 278d4b7..5650f42 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,13 @@ ## About This mod adds German subtitles to System Shock 2 based on the official German translation and audio. -See the [official thread](https://www.systemshock.org/index.php?topic=8395.0 "German subtitles@SystemShock.org") for more information. +See the [official thread](https://www.systemshock.org/index.php?topic=8395.0 "SS2 Untertitel Deutsch@SystemShock.org") for more information. -## Installation -Use the [SS2Tool](https://www.systemshock.org/index.php?topic=4141.0) with the "Enable subtitles" option and run SS2BMM. Extract the release archive to the DMM folder. +For subtitle development, refer to the official newdark documentation that ships with every modern SS2 install in `docs/newdark/subtitles.txt` -Refer to the Newdark documentation for an in-depth explanation about subtitle support in Dark engine games. +## Contribute +You want to improve the translation or otherwise help with development? Great! Contributions are always welcome. +Create your own branch, use a rebase workflow, and open a pull request once you're good to go. + +## License +SS2 Untertitel Deutsch is licensed under the MIT License. diff --git a/fonts/blueaa.fon b/fonts/blueaa.fon new file mode 100644 index 0000000..04a838c Binary files /dev/null and b/fonts/blueaa.fon differ diff --git a/fonts/dimmed.fon b/fonts/dimmed.fon new file mode 100644 index 0000000..732c50f Binary files /dev/null and b/fonts/dimmed.fon differ diff --git a/fonts/mainaa.fon b/fonts/mainaa.fon new file mode 100644 index 0000000..ab66187 Binary files /dev/null and b/fonts/mainaa.fon differ diff --git a/fonts/mainfont.fon b/fonts/mainfont.fon new file mode 100644 index 0000000..ed8edf0 Binary files /dev/null and b/fonts/mainfont.fon differ diff --git a/intrface/metafont.fon b/intrface/metafont.fon new file mode 100644 index 0000000..280a3df Binary files /dev/null and b/intrface/metafont.fon differ diff --git a/intrface/saveload.fon b/intrface/saveload.fon new file mode 100644 index 0000000..6f03ff6 Binary files /dev/null and b/intrface/saveload.fon differ diff --git a/subtitles/english/amb.sub b/subtitles/amb.sub similarity index 100% rename from subtitles/english/amb.sub rename to subtitles/amb.sub diff --git a/subtitles/english/assassin.sub b/subtitles/assassin.sub similarity index 100% rename from subtitles/english/assassin.sub rename to subtitles/assassin.sub diff --git a/subtitles/english/bbetty.sub b/subtitles/bbetty.sub similarity index 100% rename from subtitles/english/bbetty.sub rename to subtitles/bbetty.sub diff --git a/subtitles/english/bots.sub b/subtitles/bots.sub similarity index 100% rename from subtitles/english/bots.sub rename to subtitles/bots.sub diff --git a/subtitles/english/cutscenes.sub b/subtitles/cutscenes.sub similarity index 100% rename from subtitles/english/cutscenes.sub rename to subtitles/cutscenes.sub diff --git a/subtitles/english/devices.sub b/subtitles/devices.sub similarity index 100% rename from subtitles/english/devices.sub rename to subtitles/devices.sub diff --git a/subtitles/english/grub.sub b/subtitles/grub.sub similarity index 100% rename from subtitles/english/grub.sub rename to subtitles/grub.sub diff --git a/subtitles/english/midwife.sub b/subtitles/midwife.sub similarity index 100% rename from subtitles/english/midwife.sub rename to subtitles/midwife.sub diff --git a/subtitles/english/monkey.sub b/subtitles/monkey.sub similarity index 100% rename from subtitles/english/monkey.sub rename to subtitles/monkey.sub diff --git a/subtitles/english/ogrunt.sub b/subtitles/ogrunt.sub similarity index 100% rename from subtitles/english/ogrunt.sub rename to subtitles/ogrunt.sub diff --git a/subtitles/english/overlord.sub b/subtitles/overlord.sub similarity index 100% rename from subtitles/english/overlord.sub rename to subtitles/overlord.sub diff --git a/subtitles/english/protobot.sub b/subtitles/protobot.sub similarity index 100% rename from subtitles/english/protobot.sub rename to subtitles/protobot.sub diff --git a/subtitles/english/psi.sub b/subtitles/psi.sub similarity index 100% rename from subtitles/english/psi.sub rename to subtitles/psi.sub diff --git a/subtitles/english/rumbler.sub b/subtitles/rumbler.sub similarity index 100% rename from subtitles/english/rumbler.sub rename to subtitles/rumbler.sub diff --git a/subtitles/english/shodan.sub b/subtitles/shodan.sub similarity index 100% rename from subtitles/english/shodan.sub rename to subtitles/shodan.sub diff --git a/subtitles/english/spider.sub b/subtitles/spider.sub similarity index 100% rename from subtitles/english/spider.sub rename to subtitles/spider.sub diff --git a/subtitles/english/turcam.sub b/subtitles/turcam.sub similarity index 100% rename from subtitles/english/turcam.sub rename to subtitles/turcam.sub diff --git a/subtitles/english/vBriefs.sub b/subtitles/vBriefs.sub similarity index 97% rename from subtitles/english/vBriefs.sub rename to subtitles/vBriefs.sub index 98bcb8d..b59753c 100644 --- a/subtitles/english/vBriefs.sub +++ b/subtitles/vBriefs.sub @@ -205,6 +205,14 @@ SUB1 { time 27000 length 7600 text "Und wenn einer davon dunkel wird, ist Ihr Hacken automatisch gescheitert, und in manchen Fällen zerstören Sie das Objekt an dem Sie arbeiten, oder es passiert sogar noch Schlimmeres." } { time 34650 length 6100 text "Sie können jederzeit den Hackversuch erneut starten, indem Sie die Neustart-Taste drücken, wobei Sie dann wieder Naniten bezahlen müssen." } } + + multisub trg0035 { + { time 00 length 2100 text "Dies ist eine Überwachungskamera." } + { time 2490 length 6000 text "Wenn eine Kamera Sie entdeckt, löst sie einen Alarm aus und ruft Sicherheitskräfte zu Ihrem Standort." } + { time 8850 length 7600 text "Sie können entweder den Alarm abwarten oder auf den nächstgelegenen Überwachungscomputer zugreifen, um den Alarm sofort zu beenden." } + { time 17000 length 6100 text "Sie können auch Überwachungscomputer hacken, um alle Kameras und Geschütztürme in der Umgebung vorübergehend zu deaktivieren." } + { time 23450 length 7450 text "Um einen Überwachungscomputer zu hacken, klicken Sie mit der rechten Maustaste auf ihn und dann mit der linken Maustaste auf die Schaltfläche \"Hacken\"." } + } multisub trg0024 { { time 00 length 3900 text "Sie können mithilfe von Naniten Objekte in Replikatoren kaufen." } diff --git a/subtitles/english/vCs.sub b/subtitles/vCs.sub similarity index 100% rename from subtitles/english/vCs.sub rename to subtitles/vCs.sub diff --git a/subtitles/english/vEmails.sub b/subtitles/vEmails.sub similarity index 100% rename from subtitles/english/vEmails.sub rename to subtitles/vEmails.sub diff --git a/subtitles/english/vTriggers.sub b/subtitles/vTriggers.sub similarity index 99% rename from subtitles/english/vTriggers.sub rename to subtitles/vTriggers.sub index 1a6f2bc..4000db1 100644 --- a/subtitles/english/vTriggers.sub +++ b/subtitles/vTriggers.sub @@ -411,3 +411,9 @@ SUB1 descr "Delacroix" sub trg0601 { text "Vorsicht, mon petit. Vertraue nicht... [stirbt]" } } + +{ + type "convo" + descr "SHODAN" + sub shojump { text "Ein beeindruckender Sprung." } +} \ No newline at end of file