Firebot Tweaks (#32629)

Removed random sentience and some other minor tweaks

diff --git a/Resources/Locale/en-US/advertisements/other/firebot.ftl b/Resources/Locale/en-US/advertisements/other/firebot.ftl
new file mode 100644 (file)
index 0000000..c614d5e
--- /dev/null
+++ b/Resources/Locale/en-US/advertisements/other/firebot.ftl
@@ -0,0 +1,4 @@
+advertisement-firebot-1 = No fires detected.
+advertisement-firebot-2 = Only you can prevent station fires.
+advertisement-firebot-3 = Temperature nominal.
+advertisement-firebot-4 = Keep it cool.
\ No newline at end of file

diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
index 9314de979146129f794a8a476bc6edf6d1323543..46edd7bafefa4f381e9fcb98f9b360843d89403e 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml
@@ -130,6 +130,12 @@
     prefix: fat-extractor-fact-
     count: 6
 
+- type: localizedDataset
+  id: FirebotAd
+  values:
+    prefix: advertisement-firebot-
+    count: 4
+
 - type: localizedDataset
   id: GoodCleanFunAds
   values:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
index 612e49baec0cd7df37bf4e755506824aeefef1ff..f82f4c43ff7e604dcfd493afdaf2a24f6c14a9d5 100644 (file)
--- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
@@ -120,8 +120,6 @@
   - type: Construction
     graph: FireBot
     node: bot
-  - type: SentienceTarget
-    flavorKind: station-event-random-sentience-flavor-mechanical
   - type: HTN
     rootTask:
       task: FirebotCompound
@@ -148,12 +146,14 @@
     vaporSpread: 90
     sprayVelocity: 3.0
   - type: UseDelay
-    delay: 4
+    delay: 2
   - type: InteractionPopup
     interactSuccessString: petting-success-firebot
     interactFailureString: petting-failure-firebot
     interactSuccessSound:
       path: /Audio/Ambience/Objects/periodic_beep.ogg
+  - type: Advertise
+    pack: FirebotAd
 
 - type: entity
   parent: MobSiliconBase

diff --git a/Resources/Prototypes/NPCs/firebot.yml b/Resources/Prototypes/NPCs/firebot.yml
index acea6498bdbd8ed58848a629d899b72687831f80..2da9da50d25c0f73a265e1b5cef16ac1b8d5b4c7 100644 (file)
--- a/Resources/Prototypes/NPCs/firebot.yml
+++ b/Resources/Prototypes/NPCs/firebot.yml
@@ -29,6 +29,18 @@
             pathfindKey: TargetPathfind
             rangeKey: InteractRange
 
+        - !type:HTNPrimitiveTask
+          operator: !type:SetFloatOperator
+            targetKey: WaitTime
+            amount: 1
+
+        - !type:HTNPrimitiveTask
+          operator: !type:WaitOperator
+            key: WaitTime
+          preconditions:
+            - !type:KeyExistsPrecondition
+              key: WaitTime
+
         - !type:HTNPrimitiveTask
           preconditions:
             - !type:TargetInRangePrecondition