Фиксы спавнов стража клинка и ИИ (#4)

* fix role StationAi on CorvaxPaper * resprite SpawnPointJediNt * add SpawnPointJediNt for maps
MetalSage · Dec 15, 2024 · 7debdb0 · 7debdb0
1 parent fd1a331
commit 7debdb0
Show file tree

Hide file tree

Showing 16 changed files with 104 additions and 15 deletions.
diff --git a/Resources/Maps/_Stories/bagel.yml b/Resources/Maps/_Stories/bagel.yml
@@ -131160,6 +131160,13 @@ entities:
     - type: Transform
       pos: -9.5,-27.5
       parent: 60
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 23891
+    components:
+    - type: Transform
+      pos: -27.5,-14.5
+      parent: 60
 - proto: SpawnPointLatejoin
   entities:
   - uid: 4702

diff --git a/Resources/Maps/_Stories/box.yml b/Resources/Maps/_Stories/box.yml
@@ -143682,6 +143682,13 @@ entities:
     - type: Transform
       pos: 6.5,-34.5
       parent: 8364
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 27922
+    components:
+    - type: Transform
+      pos: 11.5,33.5
+      parent: 8364
 - proto: SpawnPointLatejoin
   entities:
   - uid: 12515

diff --git a/Resources/Maps/_Stories/cog.yml b/Resources/Maps/_Stories/cog.yml
@@ -170496,6 +170496,13 @@ entities:
     - type: Transform
       pos: 45.5,20.5
       parent: 12
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 31047
+    components:
+    - type: Transform
+      pos: -33.5,32.5
+      parent: 12
 - proto: SpawnPointLawyer
   entities:
   - uid: 30266

diff --git a/Resources/Maps/_Stories/core.yml b/Resources/Maps/_Stories/core.yml
@@ -121145,6 +121145,13 @@ entities:
     - type: Transform
       pos: -18.5,-26.5
       parent: 2
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 21452
+    components:
+    - type: Transform
+      pos: -8.5,29.5
+      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 5022

diff --git a/Resources/Maps/_Stories/fland.yml b/Resources/Maps/_Stories/fland.yml
@@ -189141,6 +189141,13 @@ entities:
     - type: Transform
       pos: 4.5,12.5
       parent: 13329
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 35822
+    components:
+    - type: Transform
+      pos: 31.5,18.5
+      parent: 13329
 - proto: SpawnPointLatejoin
   entities:
   - uid: 13242

diff --git a/Resources/Maps/_Stories/marathon.yml b/Resources/Maps/_Stories/marathon.yml
@@ -117063,6 +117063,13 @@ entities:
     - type: Transform
       pos: -31.5,9.5
       parent: 30
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 18082
+    components:
+    - type: Transform
+      pos: -33.5,53.5
+      parent: 30
 - proto: SpawnPointLatejoin
   entities:
   - uid: 3656

diff --git a/Resources/Maps/_Stories/meta.yml b/Resources/Maps/_Stories/meta.yml
@@ -137421,6 +137421,13 @@ entities:
     - type: Transform
       pos: -25.5,27.5
       parent: 5350
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 6164
+    components:
+    - type: Transform
+      pos: 5.5,39.5
+      parent: 5350
 - proto: SpawnPointLatejoin
   entities:
   - uid: 5046

diff --git a/Resources/Maps/_Stories/oasis.yml b/Resources/Maps/_Stories/oasis.yml
@@ -162003,6 +162003,13 @@ entities:
     - type: Transform
       pos: 23.5,-3.5
       parent: 2
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 29616
+    components:
+    - type: Transform
+      pos: 35.5,-15.5
+      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 23201

diff --git a/Resources/Maps/_Stories/omega.yml b/Resources/Maps/_Stories/omega.yml
@@ -72489,6 +72489,13 @@ entities:
     - type: Transform
       pos: -21.5,-8.5
       parent: 4812
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 13709
+    components:
+    - type: Transform
+      pos: -25.5,11.5
+      parent: 4812
 - proto: SpawnPointLatejoin
   entities:
   - uid: 4707

diff --git a/Resources/Maps/_Stories/packed.yml b/Resources/Maps/_Stories/packed.yml
@@ -77727,6 +77727,13 @@ entities:
     - type: Transform
       pos: 5.5,-4.5
       parent: 2
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 15085
+    components:
+    - type: Transform
+      pos: 30.5,25.5
+      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 15

diff --git a/Resources/Maps/_Stories/saltern.yml b/Resources/Maps/_Stories/saltern.yml
@@ -57840,6 +57840,13 @@ entities:
     - type: Transform
       pos: -18.5,-11.5
       parent: 31
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 3424
+    components:
+    - type: Transform
+      pos: -3.5,13.5
+      parent: 31
 - proto: SpawnPointLatejoin
   entities:
   - uid: 9749

diff --git a/Resources/Maps/_Stories/train.yml b/Resources/Maps/_Stories/train.yml
@@ -89204,6 +89204,13 @@ entities:
     - type: Transform
       pos: -3.5,-54.5
       parent: 2
+- proto: SpawnPointJediNt
+  entities:
+  - uid: 13890
+    components:
+    - type: Transform
+      pos: -4.5,-358.5
+      parent: 2
 - proto: SpawnPointLatejoin
   entities:
   - uid: 13344

diff --git a/Resources/Prototypes/_Stories/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Stories/Entities/Markers/Spawners/jobs.yml
@@ -1,17 +1,3 @@
-# JediNt
-
-- type: entity
-  id: SpawnPointJediNt
-  parent: SpawnPointJobBase
-  name: jedint
-  components:
-  - type: SpawnPoint
-    job_id: JediNt
-  - type: Sprite
-    layers:
-      - state: green
-      - state: hos
-
 # Base
 
 - type: entity
@@ -24,3 +10,17 @@
     spawn_type: Job
   - type: Sprite
     sprite: _Stories/Markers/jobs.rsi
+
+# JediNt
+
+- type: entity
+  id: SpawnPointJediNt
+  parent: SpawnPointJobBaseStories
+  name: jedint
+  components:
+  - type: SpawnPoint
+    job_id: JediNt
+  - type: Sprite
+    layers:
+    - state: green
+    - state: jedint
diff --git a/Resources/Prototypes/_Stories/Maps/paper.yml b/Resources/Prototypes/_Stories/Maps/paper.yml
@@ -54,7 +54,6 @@
             ResearchDirector: [ 1, 1 ]
             Scientist: [ 2, 3 ]
             ResearchAssistant: [ 2, 2 ]
-            Borg: [ 2, 2 ]
             # security
             HeadOfSecurity: [ 1, 1 ]
             Warden: [ 1, 1 ]
@@ -65,6 +64,9 @@
             Quartermaster: [ 1, 1 ]
             SalvageSpecialist: [ 3, 3 ]
             CargoTechnician: [ 2, 3 ]
+            # silicon
+            StationAi: [ 1, 1 ]
+            Borg: [ 2, 2 ]
             #stories content
             JediNt: [ 1, 1 ]
 
diff --git a/Resources/Textures/_Stories/Markers/jobs.rsi/jedint.png b/Resources/Textures/_Stories/Markers/jobs.rsi/jedint.png
diff --git a/Resources/Textures/_Stories/Markers/jobs.rsi/meta.json b/Resources/Textures/_Stories/Markers/jobs.rsi/meta.json
@@ -27,6 +27,9 @@
     },
     {
       "name": "doctor"
+    },
+    {
+      "name": "jedint"
     }
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,9 @@ @@
         },
         {
           "name": "doctor"
+        },
+        {
+          "name": "jedint"
         }
       ]
     }