Add evil twin + Secrets (#823)

.github/workflows/publish.yml

@@ -16,6 +16,8 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'recursive'
+        ssh-key: ${{ secrets.SECRETS_PRIVATE_KEY }}
+        
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v3
       with:

.github/workflows/test-packaging.yml

@@ -46,6 +46,20 @@ jobs:
         run: |
           cd RobustToolbox/
           git submodule update --init --recursive
+          
+      # Corvax-Secrets-Start
+      - name: Setup secrets
+        env:
+          SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+        if: ${{ env.SSH_KEY != '' }}
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo "HOST *" > ~/.ssh/config
+          echo "StrictHostKeyChecking no" >> ~/.ssh/config
+          git -c submodule.Secrets.update=checkout submodule update --init
+      # Corvax-Secrets-End
 
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v3

.github/workflows/validate-rgas.yml

@@ -13,6 +13,19 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup Submodule
       run: git submodule update --init
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+    # Corvax-Secrets-End
     - name: Pull engine updates
       uses: space-wizards/submodule-dependency@v0.1.5
     - uses: PaulRitter/yaml-schema-validator@v1

.github/workflows/validate-rsis.yml

@@ -14,6 +14,19 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Submodule
         run: git submodule update --init
+      # Corvax-Secrets-Start
+      - name: Setup secrets
+        env:
+          SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+        if: ${{ env.SSH_KEY != '' }}
+        run: |
+          mkdir ~/.ssh
+          echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          echo "HOST *" > ~/.ssh/config
+          echo "StrictHostKeyChecking no" >> ~/.ssh/config
+          git -c submodule.Secrets.update=checkout submodule update --init
+      # Corvax-Secrets-End
       - name: Pull engine updates
         uses: space-wizards/submodule-dependency@v0.1.5
       - name: Install Python dependencies

.github/workflows/validate_mapfiles.yml

@@ -13,6 +13,19 @@ jobs:
     - uses: actions/checkout@v2
     - name: Setup Submodule
       run: git submodule update --init
+    # Corvax-Secrets-Start
+    - name: Setup secrets
+      env:
+        SSH_KEY: ${{ secrets.SECRETS_PRIVATE_KEY }}
+      if: ${{ env.SSH_KEY != '' }}
+      run: |
+        mkdir ~/.ssh
+        echo "${{ secrets.SECRETS_PRIVATE_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        echo "HOST *" > ~/.ssh/config
+        echo "StrictHostKeyChecking no" >> ~/.ssh/config
+        git -c submodule.Secrets.update=checkout submodule update --init
+    # Corvax-Secrets-End
     - name: Pull engine updates
       uses: space-wizards/submodule-dependency@v0.1.5
     - uses: PaulRitter/yaml-schema-validator@v1

.gitignore

@@ -10,6 +10,10 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+# Secret
+Resources/Prototypes/CorvaxSecrets
+Resources/Prototypes/CorvaxSecretsServer
+
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/

.gitmodules

@@ -1,4 +1,9 @@
 [submodule "RobustToolbox"]
 	path = RobustToolbox
 	url = https://github.com/space-wizards/RobustToolbox.git
-	branch = master
+	branch = master
+[submodule "Secrets"]
+	path = Secrets
+	url = git@gitlab.com:Morbo/corvax-secrets.git
+	branch = master
+	update = none

Resources/Locale/ru-RU/corvax-secrets/prototypes/roles/antags.ftl

@@ -0,0 +1,2 @@
+roles-antag-evil-twin-name = Злой двойник
+roles-antag-evil-twin-objective = Замените свой оригинал.

Resources/Locale/ru-RU/corvax-secrets/station-events/events/evil-twin.ftl

@@ -0,0 +1,14 @@
+evil-twin-round-end-result = { $evil-twin-count ->
+    [one] Был один
+    *[other] Было { $evil-twin-count }
+} { $evil-twin-count ->
+    [one] злой двойник
+    [few] злых двойника
+    *[other] злых двойников
+}.
+evil-twin-user-was-an-evil-twin = [color=gray]{$user}[/color] был злым двойником.
+evil-twin-user-was-an-evil-twin-named = [color=white]{$name}[/color] ([color=gray]{$user}[/color]) был злым двойником.
+evil-twin-was-an-evil-twin-named = [color=white]{$name}[/color] был злым двойником.
+evil-twin-user-was-an-evil-twin-with-objectives = [color=gray]{$user}[/color] был(а) злым двойником со следующими целями:
+evil-twin-user-was-an-evil-twin-with-objectives-named = [color=White]{$name}[/color] ([color=gray]{$user}[/color]) был(а) злым двойником со следующими целями:
+evil-twin-was-an-evil-twin-with-objectives-named = [color=white]{$name}[/color] был(а) злым двойником со следующими целями:

Resources/Locale/ru-RU/game-ticking/game-presets/preset-traitor.ftl

@@ -10,9 +10,9 @@ traitor-round-end-result =
 traitor-user-was-a-traitor = [color=gray]{ $user }[/color] был(а) предателем.
 traitor-user-was-a-traitor-named = [color=White]{ $name }[/color] ([color=gray]{ $user }[/color]) был(а) предателем.
 traitor-was-a-traitor-named = [color=White]{ $name }[/color] был(а) предателем.
-traitor-user-was-a-traitor-with-objectives = [color=gray]{ $user }[/color] был(а) предателем, у которого(-ой) были следующие цели:
-traitor-user-was-a-traitor-with-objectives-named = [color=White]{ $name }[/color] ([color=gray]{ $user }[/color]) был(а) предателем, у которого(-ой) были следующие цели:
-traitor-was-a-traitor-with-objectives-named = [color=White]{ $name }[/color] был(а) предателем, у которого(-ой) были следующие цели:
+traitor-user-was-a-traitor-with-objectives = [color=gray]{ $user }[/color] был(а) предателем со следующими целями:
+traitor-user-was-a-traitor-with-objectives-named = [color=White]{ $name }[/color] ([color=gray]{ $user }[/color]) был(а) предателем со следующими целями:
+traitor-was-a-traitor-with-objectives-named = [color=White]{ $name }[/color] был(а) предателем со следующими целями:
 preset-traitor-objective-issuer-syndicate = [color=#87cefa]Синдикат[/color]
 # Shown at the end of a round of Traitor
 traitor-objective-condition-success = { $condition } | [color={ $markupColor }]Успех![/color]

Tools/package_client_build.py

@@ -40,6 +40,7 @@ CLIENT_IGNORED_RESOURCES = {
     "ConfigPresets",
     "emotes.xml",
     "Groups",
+    "Prototypes/CorvaxSecretsServer", # Corvax-Secrets
     "engineCommandPerms.yml"
 }
 

Tools/package_server_build.py

@@ -61,6 +61,7 @@ SERVER_IGNORED_RESOURCES = {
 # Assembly names to copy from content.
 # PDBs are included if available, .dll/.pdb appended automatically.
 SERVER_CONTENT_ASSEMBLIES = [
+    "Content.CorvaxServer", # Corvax-Secrets
     "Content.Server.Database",
     "Content.Server",
     "Content.Shared",
@@ -168,6 +169,22 @@ def build_platform(platform: PlatformReg, skip_build: bool, hybrid_acz: bool) ->
             "/p:FullRelease=True",
             "/m"
         ], check=True)
+        # Corvax-Secrets-Start
+        if os.path.exists(p("Secrets", "Content.CorvaxServer")):
+            print(Fore.GREEN + f"Secrets found. Building secret project for {platform.rid}..." + Style.RESET_ALL)
+            subprocess.run([
+                "dotnet",
+                "build",
+                p("Secrets","Content.CorvaxServer", "Content.CorvaxServer.csproj"),
+                "-c", "Release",
+                "--nologo",
+                "/v:m",
+                f"/p:TargetOS={platform.target_os}",
+                "/t:Rebuild",
+                "/p:FullRelease=True",
+                "/m"
+            ], check=True)
+        # Corvax-Secrets-End
 
         publish_client_server(platform.rid, platform.target_os)
 
@@ -271,7 +288,8 @@ def copy_content_assemblies(target, zipf):
 
     # Include content assemblies.
     for asm in base_assemblies:
-        files.append(asm + ".dll")
+        if os.path.exists(p(source_dir, asm + ".dll")): # Corvax-Secrets: Allow optional assemblies
+            files.append(asm + ".dll")
         # If PDB available, include it aswell.
         pdb_path = asm + ".pdb"
         if os.path.exists(p(source_dir, pdb_path)):

Tools/setup_secrets.ps1

@@ -0,0 +1,2 @@
+New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecrets" -Target "Secrets\Prototypes"
+New-Item -ItemType Junction -Path "Resources\Prototypes\CorvaxSecretsServer" -Target "Secrets\ServerPrototypes"