From: Golinth Date: Sun, 13 Oct 2024 04:55:51 +0000 (-0500) Subject: Firebot Tweaks (#32629) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=561d55e7a4ce18974ef89e422e651f0afd9ef919;p=space-station-14.git 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 index 0000000000..c614d5ecd0 --- /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 9314de9791..46edd7bafe 100644 --- 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 612e49baec..f82f4c43ff 100644 --- 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 acea6498bd..2da9da50d2 100644 --- 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