Merge pull request #316 from fenndragon/xenos

Xenos
Fansana · Nov 7, 2024 · 64d6737 · 64d6737
2 parents aef34f6 + 775bc11
commit 64d6737
Showing 1 changed file with 100 additions and 70 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xenopet.yml
@@ -22,6 +22,30 @@
     description: ghost-role-information-friendlyxeno-description
     rules: ghost-role-information-friendlyxeno-rules
   - type: GhostTakeoverAvailable
+  - type: Inventory
+    templateId: friendxeno
+  - type: IdExaminable
+  - type: InventorySlots
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Body
+    prototype: Friendshaped
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/lizard_happy.ogg
   - type: LanguageKnowledge
     speaks:
     - Xeno
@@ -52,6 +76,30 @@
     description: ghost-role-information-friendlyxeno-description
     rules: ghost-role-information-friendlyxeno-rules
   - type: GhostTakeoverAvailable
+  - type: Inventory
+    templateId: friendxeno
+  - type: IdExaminable
+  - type: InventorySlots
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Body
+    prototype: Friendshaped
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/lizard_happy.ogg
   - type: LanguageKnowledge
     speaks:
     - Xeno
@@ -82,6 +130,30 @@
     description: ghost-role-information-friendlyxeno-description
     rules: ghost-role-information-friendlyxeno-rules
   - type: GhostTakeoverAvailable
+  - type: Inventory
+    templateId: friendxeno
+  - type: IdExaminable
+  - type: InventorySlots
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Body
+    prototype: Friendshaped
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/lizard_happy.ogg
   - type: LanguageKnowledge
     speaks:
     - Xeno
@@ -112,6 +184,30 @@
     description: ghost-role-information-friendlyxeno-description
     rules: ghost-role-information-friendlyxeno-rules
   - type: GhostTakeoverAvailable
+  - type: Inventory
+    templateId: friendxeno
+  - type: IdExaminable
+  - type: InventorySlots
+  - type: Stripping
+  - type: Strippable
+  - type: UserInterface
+    interfaces:
+      enum.StrippingUiKey.Key:
+        type: StrippableBoundUserInterface
+  - type: Grammar
+    attributes:
+      proper: true
+      gender: male
+  - type: Body
+    prototype: Friendshaped
+    requiredLegs: 1 # TODO: More than 1 leg
+  - type: InteractionPopup
+    successChance: 0.5
+    interactSuccessString: petting-success-reptile
+    interactFailureString: petting-failure-generic
+    interactSuccessSpawn: EffectHearts
+    interactSuccessSound:
+      path: /Audio/Animals/lizard_happy.ogg
   - type: LanguageKnowledge
     speaks:
     - Xeno
@@ -197,39 +293,13 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speed: 6
     qualities:
       - Prying
   - type: Sprite
     drawdepth: Mobs
     sprite: Mobs/Aliens/FXS/rouny.rsi
-    scale: 0.5, 0.5
-  - type: GhostRole
-  - type: GhostTakeoverAvailable
-  - type: Inventory
-    templateId: friendxeno
-  - type: IdExaminable
-  - type: InventorySlots
-  - type: Stripping
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-  - type: Grammar
-    attributes:
-      proper: true
-      gender: male
-  - type: Body
-    prototype: Friendshaped
-    requiredLegs: 1 # TODO: More than 1 leg
-  - type: InteractionPopup
-    successChance: 0.5
-    interactSuccessString: petting-success-reptile
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/lizard_happy.ogg
+    scale: 0.6, 0.6
 
 # Floofstation - commented out for reasons unknown
 - type: entity
@@ -242,7 +312,7 @@
     factions:
     - PetsNT
   - type: Tool
-    speed: 3
+    speed: 6
     qualities:
       - Prying
   - type: Sprite
@@ -259,26 +329,6 @@
         Base: patriarch_crit
       Dead:
         Base: patriarch_dead
-  - type: Inventory
-    templateId: friendxeno
-  - type: IdExaminable
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-  - type: Grammar
-    attributes:
-      proper: true
-      gender: male
-  - type: InteractionPopup
-    successChance: 0.5
-    interactSuccessString: petting-success-reptile
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/lizard_happy.ogg
 
 - type: entity
   name: FXE Subject 7355
@@ -290,7 +340,7 @@
     factions:
      - PetsNT
   - type: Tool
-    speed: 3
+    speed: 6
     qualities:
       - Prying
   - type: Sprite
@@ -314,26 +364,6 @@
         Base: subject7355_crit
       Dead:
         Base: subject7355_dead
-  - type: Inventory
-    templateId: friendxeno
-  - type: IdExaminable
-  - type: InventorySlots
-  - type: Strippable
-  - type: UserInterface
-    interfaces:
-      enum.StrippingUiKey.Key:
-        type: StrippableBoundUserInterface
-  - type: Grammar
-    attributes:
-      proper: true
-      gender: male
-  - type: InteractionPopup
-    successChance: 0.5
-    interactSuccessString: petting-success-reptile
-    interactFailureString: petting-failure-generic
-    interactSuccessSpawn: EffectHearts
-    interactSuccessSound:
-      path: /Audio/Animals/lizard_happy.ogg
 
 - type: entity
   name: Friendly Xeno spawner