Skip to content

Commit

Permalink
Upgrade to SCP beta5 (#1)
Browse files Browse the repository at this point in the history
  • Loading branch information
pshjt authored Dec 1, 2023
2 parents 94999fd + 0a8abfc commit aea3283
Show file tree
Hide file tree
Showing 32 changed files with 130 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.sub text working-tree-encoding=cp852
*.sub text working-tree-encoding=cp850
.gitattributes export-ignore
51 changes: 51 additions & 0 deletions .github/workflows/perform_release.yml
Original file line number Diff line number Diff line change
@@ -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 }}
34 changes: 34 additions & 0 deletions Anwendung-ReadMe.txt
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -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.
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Binary file added fonts/blueaa.fon
Binary file not shown.
Binary file added fonts/dimmed.fon
Binary file not shown.
Binary file added fonts/mainaa.fon
Binary file not shown.
Binary file added fonts/mainfont.fon
Binary file not shown.
Binary file added intrface/metafont.fon
Binary file not shown.
Binary file added intrface/saveload.fon
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions subtitles/english/vBriefs.sub → subtitles/vBriefs.sub
Original file line number Diff line number Diff line change
Expand Up @@ -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." }
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 6 additions & 0 deletions subtitles/english/vTriggers.sub → subtitles/vTriggers.sub
Original file line number Diff line number Diff line change
Expand Up @@ -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." }
}

0 comments on commit aea3283

Please sign in to comment.