Pettable Animals (#6530)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
This commit is contained in:
@@ -308,6 +308,7 @@ namespace Content.Client.Entry
|
|||||||
"RandomArtifactSprite",
|
"RandomArtifactSprite",
|
||||||
"EnergySword",
|
"EnergySword",
|
||||||
"DoorRemote",
|
"DoorRemote",
|
||||||
|
"InteractionPopup",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
using Content.Shared.Window;
|
|
||||||
using Robust.Shared.GameObjects;
|
|
||||||
|
|
||||||
namespace Content.Client.Window
|
|
||||||
{
|
|
||||||
[RegisterComponent]
|
|
||||||
[ComponentReference(typeof(SharedWindowComponent))]
|
|
||||||
public class WindowComponent : SharedWindowComponent
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -8,7 +8,6 @@ using Content.Server.NodeContainer.Nodes;
|
|||||||
using Content.Server.Power.Components;
|
using Content.Server.Power.Components;
|
||||||
using Content.Server.Power.EntitySystems;
|
using Content.Server.Power.EntitySystems;
|
||||||
using Content.Server.Power.NodeGroups;
|
using Content.Server.Power.NodeGroups;
|
||||||
using Content.Server.Window;
|
|
||||||
using Content.Shared.Damage;
|
using Content.Shared.Damage;
|
||||||
using Content.Shared.Damage.Prototypes;
|
using Content.Shared.Damage.Prototypes;
|
||||||
using Content.Shared.Database;
|
using Content.Shared.Database;
|
||||||
@@ -21,6 +20,7 @@ using Content.Shared.Pulling.Components;
|
|||||||
using Content.Shared.Speech.EntitySystems;
|
using Content.Shared.Speech.EntitySystems;
|
||||||
using Content.Shared.StatusEffect;
|
using Content.Shared.StatusEffect;
|
||||||
using Content.Shared.Stunnable;
|
using Content.Shared.Stunnable;
|
||||||
|
using Content.Shared.Tag;
|
||||||
using Content.Shared.Weapons.Melee;
|
using Content.Shared.Weapons.Melee;
|
||||||
using Robust.Shared.GameObjects;
|
using Robust.Shared.GameObjects;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
@@ -166,12 +166,14 @@ namespace Content.Server.Electrocution
|
|||||||
if (!electrified.Enabled)
|
if (!electrified.Enabled)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
var tagSystem = EntitySystem.Get<TagSystem>();
|
||||||
|
|
||||||
if (electrified.NoWindowInTile)
|
if (electrified.NoWindowInTile)
|
||||||
{
|
{
|
||||||
foreach (var entity in transform.Coordinates.GetEntitiesInTile(
|
foreach (var entity in transform.Coordinates.GetEntitiesInTile(
|
||||||
LookupFlags.Approximate | LookupFlags.IncludeAnchored, _entityLookup))
|
LookupFlags.Approximate | LookupFlags.IncludeAnchored, _entityLookup))
|
||||||
{
|
{
|
||||||
if (EntityManager.HasComponent<WindowComponent>(entity))
|
if (tagSystem.HasTag(entity, "Window"))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,67 @@
|
|||||||
|
using Content.Shared.Sound;
|
||||||
|
|
||||||
|
namespace Content.Server.Interaction.Components;
|
||||||
|
|
||||||
|
[RegisterComponent, Friend(typeof(InteractionPopupSystem))]
|
||||||
|
|
||||||
|
public sealed class InteractionPopupComponent : Component
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Time delay between interactions to avoid spam.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("interactDelay")]
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public TimeSpan InteractDelay = TimeSpan.FromSeconds(1.0);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// String will be used to fetch the localized message to be played if the interaction succeeds.
|
||||||
|
/// Nullable in case none is specified on the yaml prototype.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("interactSuccessString")]
|
||||||
|
public string? InteractSuccessString;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// String will be used to fetch the localized message to be played if the interaction fails.
|
||||||
|
/// Nullable in case no message is specified on the yaml prototype.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("interactFailureString")]
|
||||||
|
public string? InteractFailureString;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sound effect to be played when the interaction succeeds.
|
||||||
|
/// Nullable in case no path is specified on the yaml prototype.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("interactSuccessSound")]
|
||||||
|
public SoundSpecifier? InteractSuccessSound;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sound effect to be played when the interaction fails.
|
||||||
|
/// Nullable in case no path is specified on the yaml prototype.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("interactFailureSound")]
|
||||||
|
public SoundSpecifier? InteractFailureSound;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Chance that an interaction attempt will succeed.
|
||||||
|
/// 1 = always play "success" popup and sound.
|
||||||
|
/// 0.5 = 50% chance to play either success or failure popup and sound.
|
||||||
|
/// 0 = always play "failure" popup and sound.
|
||||||
|
/// </summary>
|
||||||
|
[DataField("successChance")]
|
||||||
|
public float SuccessChance = 1.0f; // Always succeed, unless specified otherwise on the yaml prototype.
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Will the popup message be perceived by entities not involved in the interaction?
|
||||||
|
/// </summary>
|
||||||
|
[DataField("popupPerceivedByOthers")]
|
||||||
|
public bool PopupPerceivedByOthers = false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Will the sound effect be perceived by entities not involved in the interaction?
|
||||||
|
/// </summary>
|
||||||
|
[DataField("soundPerceivedByOthers")]
|
||||||
|
public bool SoundPerceivedByOthers = true;
|
||||||
|
|
||||||
|
[ViewVariables(VVAccess.ReadWrite)]
|
||||||
|
public TimeSpan LastInteractTime;
|
||||||
|
}
|
||||||
72
Content.Server/Interaction/InteractionPopupSystem.cs
Normal file
72
Content.Server/Interaction/InteractionPopupSystem.cs
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
using Content.Server.Popups;
|
||||||
|
using Content.Server.Interaction.Components;
|
||||||
|
using Content.Shared.Interaction;
|
||||||
|
using Content.Shared.MobState.Components;
|
||||||
|
using Robust.Shared.Audio;
|
||||||
|
using Robust.Shared.Player;
|
||||||
|
using Robust.Shared.Timing;
|
||||||
|
using Robust.Shared.Random;
|
||||||
|
|
||||||
|
|
||||||
|
namespace Content.Server.Interaction;
|
||||||
|
|
||||||
|
public sealed class InteractionPopupSystem : EntitySystem
|
||||||
|
{
|
||||||
|
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
||||||
|
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
||||||
|
[Dependency] private readonly IRobustRandom _random = default!;
|
||||||
|
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
base.Initialize();
|
||||||
|
SubscribeLocalEvent<InteractionPopupComponent, InteractHandEvent>(OnInteractHand);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnInteractHand(EntityUid uid, InteractionPopupComponent component, InteractHandEvent args)
|
||||||
|
{
|
||||||
|
if (args.Handled)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var curTime = _gameTiming.CurTime;
|
||||||
|
|
||||||
|
if (curTime < component.LastInteractTime + component.InteractDelay)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (TryComp<MobStateComponent>(uid, out var state) // if it has a MobStateComponent,
|
||||||
|
&& !state.IsAlive()) // AND if that state is not Alive (e.g. dead/incapacitated/critical)
|
||||||
|
return;
|
||||||
|
|
||||||
|
string msg = ""; // Stores the text to be shown in the popup message
|
||||||
|
string sfx = ""; // Stores the filepath of the sound to be played
|
||||||
|
|
||||||
|
if (_random.Prob(component.SuccessChance))
|
||||||
|
{
|
||||||
|
if (component.InteractSuccessString != null)
|
||||||
|
msg = Loc.GetString(component.InteractSuccessString, ("target", uid)); // Success message (localized).
|
||||||
|
|
||||||
|
if (component.InteractSuccessSound != null)
|
||||||
|
sfx = component.InteractSuccessSound.GetSound();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (component.InteractFailureString != null)
|
||||||
|
msg = Loc.GetString(component.InteractFailureString, ("target", uid)); // Failure message (localized).
|
||||||
|
|
||||||
|
if (component.InteractFailureSound != null)
|
||||||
|
sfx = component.InteractFailureSound.GetSound();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (component.PopupPerceivedByOthers)
|
||||||
|
_popupSystem.PopupEntity(msg, uid, Filter.Pvs(uid)); //play for everyone in range
|
||||||
|
else
|
||||||
|
_popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User)); //play only for the initiating entity.
|
||||||
|
|
||||||
|
if (component.SoundPerceivedByOthers)
|
||||||
|
SoundSystem.Play(Filter.Pvs(args.Target), sfx, args.Target); //play for everyone in range
|
||||||
|
else
|
||||||
|
SoundSystem.Play(Filter.Entities(args.User, args.Target), sfx, args.Target); //play only for the initiating entity and its target.
|
||||||
|
|
||||||
|
component.LastInteractTime = curTime;
|
||||||
|
args.Handled = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
using System;
|
|
||||||
using Content.Shared.Sound;
|
|
||||||
using Content.Shared.Window;
|
|
||||||
using Robust.Shared.GameObjects;
|
|
||||||
using Robust.Shared.Serialization.Manager.Attributes;
|
|
||||||
using Robust.Shared.ViewVariables;
|
|
||||||
|
|
||||||
namespace Content.Server.Window
|
|
||||||
{
|
|
||||||
[RegisterComponent]
|
|
||||||
[ComponentReference(typeof(SharedWindowComponent))]
|
|
||||||
public class WindowComponent : SharedWindowComponent
|
|
||||||
{
|
|
||||||
[DataField("knockDelay")]
|
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
|
||||||
public TimeSpan KnockDelay = TimeSpan.FromSeconds(0.5);
|
|
||||||
|
|
||||||
[DataField("knockSound")]
|
|
||||||
public SoundSpecifier KnockSound = new SoundPathSpecifier("/Audio/Effects/glass_knock.ogg");
|
|
||||||
|
|
||||||
[ViewVariables(VVAccess.ReadWrite)]
|
|
||||||
public TimeSpan LastKnockTime;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
using Content.Server.Popups;
|
|
||||||
using Content.Shared.Audio;
|
|
||||||
using Content.Shared.Interaction;
|
|
||||||
using Robust.Shared.Audio;
|
|
||||||
using Robust.Shared.GameObjects;
|
|
||||||
using Robust.Shared.IoC;
|
|
||||||
using Robust.Shared.Localization;
|
|
||||||
using Robust.Shared.Player;
|
|
||||||
using Robust.Shared.Timing;
|
|
||||||
|
|
||||||
namespace Content.Server.Window;
|
|
||||||
|
|
||||||
public class WindowSystem : EntitySystem
|
|
||||||
{
|
|
||||||
[Dependency] private readonly IGameTiming _gameTiming = default!;
|
|
||||||
[Dependency] private readonly PopupSystem _popupSystem = default!;
|
|
||||||
|
|
||||||
public override void Initialize()
|
|
||||||
{
|
|
||||||
base.Initialize();
|
|
||||||
SubscribeLocalEvent<WindowComponent, InteractHandEvent>(OnInteractHand);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnInteractHand(EntityUid uid, WindowComponent component, InteractHandEvent args)
|
|
||||||
{
|
|
||||||
if (args.Handled)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (component.KnockDelay.TotalSeconds <= 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (_gameTiming.CurTime < component.LastKnockTime + component.KnockDelay)
|
|
||||||
return;
|
|
||||||
|
|
||||||
SoundSystem.Play(Filter.Pvs(args.Target), component.KnockSound.GetSound(),
|
|
||||||
Transform(args.Target).Coordinates, AudioHelpers.WithVariation(0.05f));
|
|
||||||
|
|
||||||
var msg = Loc.GetString("comp-window-knock");
|
|
||||||
_popupSystem.PopupEntity(msg, uid, Filter.Pvs(uid));
|
|
||||||
|
|
||||||
component.LastKnockTime = _gameTiming.CurTime;
|
|
||||||
args.Handled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Content.Shared.Maps;
|
using Content.Shared.Maps;
|
||||||
using Content.Shared.Window;
|
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using Robust.Shared.GameObjects;
|
using Robust.Shared.GameObjects;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using Content.Shared.Maps;
|
using Content.Shared.Maps;
|
||||||
using Content.Shared.Window;
|
using Content.Shared.Tag;
|
||||||
using JetBrains.Annotations;
|
using JetBrains.Annotations;
|
||||||
using Robust.Shared.GameObjects;
|
using Robust.Shared.GameObjects;
|
||||||
using Robust.Shared.IoC;
|
using Robust.Shared.IoC;
|
||||||
@@ -15,9 +15,10 @@ namespace Content.Shared.Construction.Conditions
|
|||||||
{
|
{
|
||||||
public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
|
public bool Condition(EntityUid user, EntityCoordinates location, Direction direction)
|
||||||
{
|
{
|
||||||
|
var tagSystem = EntitySystem.Get<TagSystem>();
|
||||||
foreach (var entity in location.GetEntitiesInTile(LookupFlags.Approximate | LookupFlags.IncludeAnchored))
|
foreach (var entity in location.GetEntitiesInTile(LookupFlags.Approximate | LookupFlags.IncludeAnchored))
|
||||||
{
|
{
|
||||||
if (IoCManager.Resolve<IEntityManager>().HasComponent<SharedWindowComponent>(entity))
|
if (tagSystem.HasTag(entity, "Window"))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
using Robust.Shared.GameObjects;
|
|
||||||
using Robust.Shared.GameStates;
|
|
||||||
|
|
||||||
namespace Content.Shared.Window
|
|
||||||
{
|
|
||||||
[NetworkedComponent]
|
|
||||||
public class SharedWindowComponent : Component
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
BIN
Resources/Audio/Animals/cat_meow.ogg
Normal file
BIN
Resources/Audio/Animals/cat_meow.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Animals/chicken_cluck_happy.ogg
Normal file
BIN
Resources/Audio/Animals/chicken_cluck_happy.ogg
Normal file
Binary file not shown.
BIN
Resources/Audio/Animals/duck_quack_happy.ogg
Normal file
BIN
Resources/Audio/Animals/duck_quack_happy.ogg
Normal file
Binary file not shown.
9
Resources/Audio/Animals/license.txt
Normal file
9
Resources/Audio/Animals/license.txt
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
The following sounds were used from freesound:
|
||||||
|
|
||||||
|
cat_meow.ogg: modified from "Meow 4.wav" by freesound user "TRNGLE" (https://freesound.org/people/TRNGLE/sounds/368006/) licensed under CCBY 3.0. The original audio was trimmed, split to mono, and converted from WAV to OGG format.
|
||||||
|
|
||||||
|
small_dog_bark_happy.ogg: modified from "Dog bark2.wav" by freesound user "MisterTood" (https://freesound.org/people/MisterTood/sounds/9032/) licensed under CC0 1.0 (public domain). The original audio was trimmed and converted from WAV to OGG format.
|
||||||
|
|
||||||
|
duck_quack_happy.ogg: modified from "Duck Quack - Sound Effect (HD).mp3" by freesound user "Tabby+Gus." (https://freesound.org/people/Tabby+Gus./sounds/515408/) licensed under CC0 1.0 (public domain). The original audio was trimmed, looped, split to mono, and converted from MP3 to OGG format.
|
||||||
|
|
||||||
|
chicken_cluck_happy.ogg: modified from "Chicken Single Alarm Call" by freesound user "Rudmer_Rotteveel" (https://freesound.org/people/Rudmer_Rotteveel/sounds/316920/) licensed under CC0 1.0 (public domain). The original audio was trimmed and converted from WAV to OGG format.
|
||||||
BIN
Resources/Audio/Animals/small_dog_bark_happy.ogg
Normal file
BIN
Resources/Audio/Animals/small_dog_bark_happy.ogg
Normal file
Binary file not shown.
@@ -0,0 +1,34 @@
|
|||||||
|
### Interaction Popup component
|
||||||
|
|
||||||
|
## Petting animals
|
||||||
|
|
||||||
|
petting-success-generic = You pet {THE($target)} on {POSS-ADJ($target)} head.
|
||||||
|
petting-success-soft-floofy = You pet {THE($target)} on {POSS-ADJ($target)} soft floofy head.
|
||||||
|
|
||||||
|
petting-success-bird = You pet {THE($target)} on {POSS-ADJ($target)} cute feathery head.
|
||||||
|
petting-success-cat = You pet {THE($target)} on {POSS-ADJ($target)} fuzzy little head.
|
||||||
|
petting-success-corrupted-corgi = In an act of hubris, you pet {THE($target)} on {POSS-ADJ($target)} cursed little head.
|
||||||
|
petting-success-crab = You pet {THE($target)} on {POSS-ADJ($target)} smooth little head.
|
||||||
|
petting-success-dog = You pet {THE($target)} on {POSS-ADJ($target)} soft floofy head.
|
||||||
|
petting-success-frog = You pet {THE($target)} on {POSS-ADJ($target)} slippery little head.
|
||||||
|
petting-success-goat = You pet {THE($target)} on {POSS-ADJ($target)} horned floofy head.
|
||||||
|
petting-success-goose = Against all odds, you manage to pet {THE($target)} on {POSS-ADJ($target)} horrible little head.
|
||||||
|
petting-success-reptile = You pet {THE($target)} on {POSS-ADJ($target)} scaly little head.
|
||||||
|
petting-success-sloth = You pet {THE($target)} on {POSS-ADJ($target)} slow moving head.
|
||||||
|
petting-success-space-cat = You pet {THE($target)} on {POSS-ADJ($target)} glass domed head.
|
||||||
|
petting-success-tarantula = You pet {THE($target)} on {POSS-ADJ($target)} hairy little head.
|
||||||
|
|
||||||
|
|
||||||
|
petting-failure-generic = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} aloof towards you.
|
||||||
|
|
||||||
|
petting-failure-bat = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too hard to catch!
|
||||||
|
petting-failure-corrupted-corgi = You reach out to pet {THE($target)}, but think better of it.
|
||||||
|
petting-failure-crab = You reach out to pet {THE($target)}, but {SUBJECT($target)} snaps {POSS-ADJ($target)} claws in your general direction!
|
||||||
|
petting-failure-goat = You reach out to pet {THE($target)}, but {SUBJECT($target)} stubbornly refuses!
|
||||||
|
petting-failure-goose = You reach out to pet {THE($target)}, but {SUBJECT($target)} {CONJUGATE-BE($target)} too horrible!
|
||||||
|
petting-failure-sloth = You reach out to pet {THE($target)}, but {SUBJECT($target)} somehow dodge with ludicrous speed!
|
||||||
|
|
||||||
|
## Knocking on windows
|
||||||
|
|
||||||
|
# Shown when knocking on a window
|
||||||
|
comp-window-knock = *knock knock*
|
||||||
@@ -39,6 +39,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.2
|
||||||
|
interactSuccessString: petting-success-soft-floofy
|
||||||
|
interactFailureString: petting-failure-bat
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: bee
|
name: bee
|
||||||
@@ -130,6 +134,12 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatChicken
|
meat: FoodMeatChicken
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.8
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/chicken_cluck_happy.ogg
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: mallard duck #Quack
|
name: mallard duck #Quack
|
||||||
@@ -152,6 +162,12 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatDuck
|
meat: FoodMeatDuck
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.9
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/duck_quack_happy.ogg
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: white duck #Quack
|
name: white duck #Quack
|
||||||
@@ -174,6 +190,12 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatDuck
|
meat: FoodMeatDuck
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.9
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/duck_quack_happy.ogg
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: brown duck #Quack
|
name: brown duck #Quack
|
||||||
@@ -196,6 +218,12 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatDuck
|
meat: FoodMeatDuck
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.9
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/duck_quack_happy.ogg
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: butterfly
|
name: butterfly
|
||||||
@@ -295,6 +323,13 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 5
|
pieces: 5
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: female # Here because of UdderComponent
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.7
|
||||||
|
interactSuccessString: petting-success-soft-floofy
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: crab
|
name: crab
|
||||||
@@ -332,12 +367,16 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatCrab
|
meat: FoodMeatCrab
|
||||||
pieces: 2
|
pieces: 2
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.5
|
||||||
|
interactSuccessString: petting-success-crab
|
||||||
|
interactFailureString: petting-failure-crab
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: goat
|
name: goat
|
||||||
parent: SimpleMobBase
|
parent: SimpleMobBase
|
||||||
id: MobGoat
|
id: MobGoat
|
||||||
description: His spine consists of long sharp segments, no wonder he is so grumpy.
|
description: Her spine consists of long sharp segments, no wonder she is so grumpy.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
drawdepth: Mobs
|
drawdepth: Mobs
|
||||||
@@ -366,6 +405,13 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 4
|
pieces: 4
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: female # Here because of UdderComponent
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.2
|
||||||
|
interactSuccessString: petting-success-goat
|
||||||
|
interactFailureString: petting-failure-goat
|
||||||
|
|
||||||
# Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
|
# Note that we gotta make this bitch vomit someday when you feed it anthrax or sumthin. Needs to be a small item thief too and aggressive if attacked.
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -389,6 +435,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatChicken
|
meat: FoodMeatChicken
|
||||||
pieces: 2
|
pieces: 2
|
||||||
|
- type: InteractionPopup # TODO: Make it so there's a separate chance to make certain animals outright hostile towards you.
|
||||||
|
successChance: 0.1 # Yeah, good luck with that.
|
||||||
|
interactSuccessString: petting-success-goose
|
||||||
|
interactFailureString: petting-failure-goose
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: gorilla
|
name: gorilla
|
||||||
@@ -679,6 +729,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.3
|
||||||
|
interactSuccessString: petting-success-reptile
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: frog
|
name: frog
|
||||||
@@ -718,6 +772,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.6
|
||||||
|
interactSuccessString: petting-success-frog
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
# Would be cool to have some functionality for the parrot to be able to sit on stuff
|
# Would be cool to have some functionality for the parrot to be able to sit on stuff
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -758,6 +816,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.6
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: penguin
|
name: penguin
|
||||||
@@ -794,6 +856,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatPenguin
|
meat: FoodMeatPenguin
|
||||||
pieces: 3
|
pieces: 3
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.5
|
||||||
|
interactSuccessString: petting-success-bird
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: snake
|
name: snake
|
||||||
@@ -833,6 +899,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 1
|
pieces: 1
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.6
|
||||||
|
interactSuccessString: petting-success-reptile
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|
||||||
# Code unique spider prototypes or combine them all into one spider and get a
|
# Code unique spider prototypes or combine them all into one spider and get a
|
||||||
# random sprite state when you spawn it.
|
# random sprite state when you spawn it.
|
||||||
@@ -871,3 +941,7 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeatSpider
|
meat: FoodMeatSpider
|
||||||
pieces: 2
|
pieces: 2
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.5
|
||||||
|
interactSuccessString: petting-success-tarantula
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
|||||||
@@ -38,6 +38,14 @@
|
|||||||
pieces: 3
|
pieces: 3
|
||||||
- type: ReplacementAccent
|
- type: ReplacementAccent
|
||||||
accent: dog
|
accent: dog
|
||||||
|
- type: InteractionPopup
|
||||||
|
interactSuccessString: petting-success-dog
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/small_dog_bark_happy.ogg
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: corrupted corgi
|
name: corrupted corgi
|
||||||
@@ -71,6 +79,13 @@
|
|||||||
- type: AiFactionTag
|
- type: AiFactionTag
|
||||||
factions:
|
factions:
|
||||||
- SimpleHostile
|
- SimpleHostile
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0 # Override the automatic success that would normally be inherited from MobCorgi.
|
||||||
|
interactSuccessString: petting-success-corrupted-corgi # Normally impossible but added an easter egg just in case.
|
||||||
|
interactFailureString: petting-failure-corrupted-corgi
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: Ian
|
name: Ian
|
||||||
@@ -90,6 +105,10 @@
|
|||||||
normal: ian
|
normal: ian
|
||||||
crit: ian_dead
|
crit: ian_dead
|
||||||
dead: ian_dead
|
dead: ian_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
proper: true
|
||||||
|
gender: male
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: Old Ian
|
name: Old Ian
|
||||||
@@ -109,6 +128,10 @@
|
|||||||
normal: old_ian
|
normal: old_ian
|
||||||
crit: old_ian_dead
|
crit: old_ian_dead
|
||||||
dead: old_ian_dead
|
dead: old_ian_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
proper: true
|
||||||
|
gender: male
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: Lisa
|
name: Lisa
|
||||||
@@ -128,6 +151,10 @@
|
|||||||
normal: lisa
|
normal: lisa
|
||||||
crit: lisa_dead
|
crit: lisa_dead
|
||||||
dead: lisa_dead
|
dead: lisa_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
proper: true
|
||||||
|
gender: female
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: corgi puppy
|
name: corgi puppy
|
||||||
@@ -147,6 +174,9 @@
|
|||||||
normal: puppy
|
normal: puppy
|
||||||
crit: puppy_dead
|
crit: puppy_dead
|
||||||
dead: puppy_dead
|
dead: puppy_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: cat
|
name: cat
|
||||||
@@ -185,6 +215,15 @@
|
|||||||
pieces: 2
|
pieces: 2
|
||||||
- type: ReplacementAccent
|
- type: ReplacementAccent
|
||||||
accent: cat
|
accent: cat
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.7
|
||||||
|
interactSuccessString: petting-success-cat
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/cat_meow.ogg
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: calico cat
|
name: calico cat
|
||||||
@@ -204,6 +243,9 @@
|
|||||||
normal: cat2
|
normal: cat2
|
||||||
crit: cat2_dead
|
crit: cat2_dead
|
||||||
dead: cat2_dead
|
dead: cat2_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: space cat
|
name: space cat
|
||||||
@@ -223,6 +265,15 @@
|
|||||||
normal: spacecat
|
normal: spacecat
|
||||||
crit: spacecat_dead
|
crit: spacecat_dead
|
||||||
dead: spacecat_dead
|
dead: spacecat_dead
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.7
|
||||||
|
interactSuccessString: petting-success-space-cat
|
||||||
|
interactFailureString: petting-failure-generic
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Animals/cat_meow.ogg
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: caracal cat
|
name: caracal cat
|
||||||
@@ -242,6 +293,9 @@
|
|||||||
normal: caracal_flop
|
normal: caracal_flop
|
||||||
crit: caracal_dead
|
crit: caracal_dead
|
||||||
dead: caracal_dead
|
dead: caracal_dead
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
name: sloth
|
name: sloth
|
||||||
@@ -281,3 +335,10 @@
|
|||||||
- type: Butcherable
|
- type: Butcherable
|
||||||
meat: FoodMeat
|
meat: FoodMeat
|
||||||
pieces: 3
|
pieces: 3
|
||||||
|
- type: InteractionPopup
|
||||||
|
successChance: 0.9
|
||||||
|
interactSuccessString: petting-success-sloth
|
||||||
|
interactFailureString: petting-failure-sloth
|
||||||
|
- type: Grammar
|
||||||
|
attributes:
|
||||||
|
gender: epicene
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
tags:
|
tags:
|
||||||
- RCDDeconstructWhitelist
|
- RCDDeconstructWhitelist
|
||||||
- ForceFixRotations
|
- ForceFixRotations
|
||||||
|
- Window
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
netsync: false
|
netsync: false
|
||||||
drawdepth: WallTops
|
drawdepth: WallTops
|
||||||
@@ -64,7 +65,11 @@
|
|||||||
- type: IconSmooth
|
- type: IconSmooth
|
||||||
key: windows
|
key: windows
|
||||||
base: window
|
base: window
|
||||||
- type: Window
|
- type: InteractionPopup
|
||||||
|
interactSuccessString: comp-window-knock
|
||||||
|
popupPerceivedByOthers: true
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Effects/glass_knock.ogg
|
||||||
- type: Construction
|
- type: Construction
|
||||||
graph: Window
|
graph: Window
|
||||||
node: window
|
node: window
|
||||||
@@ -89,6 +94,9 @@
|
|||||||
components:
|
components:
|
||||||
# Attention! If adding tags here:
|
# Attention! If adding tags here:
|
||||||
# Keep WindowTintedDirectional in mind
|
# Keep WindowTintedDirectional in mind
|
||||||
|
- type: Tag
|
||||||
|
tags:
|
||||||
|
- Window
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
netsync: false
|
netsync: false
|
||||||
sprite: Structures/Windows/directional.rsi
|
sprite: Structures/Windows/directional.rsi
|
||||||
@@ -96,6 +104,11 @@
|
|||||||
- type: Icon
|
- type: Icon
|
||||||
sprite: Structures/Windows/directional.rsi
|
sprite: Structures/Windows/directional.rsi
|
||||||
state: window
|
state: window
|
||||||
|
- type: InteractionPopup
|
||||||
|
interactSuccessString: comp-window-knock
|
||||||
|
popupPerceivedByOthers: true
|
||||||
|
interactSuccessSound:
|
||||||
|
path: /Audio/Effects/glass_knock.ogg
|
||||||
- type: Physics
|
- type: Physics
|
||||||
- type: Fixtures
|
- type: Fixtures
|
||||||
fixtures:
|
fixtures:
|
||||||
@@ -136,7 +149,6 @@
|
|||||||
noAirWhenFullyAirBlocked: false
|
noAirWhenFullyAirBlocked: false
|
||||||
airBlockedDirection:
|
airBlockedDirection:
|
||||||
- South
|
- South
|
||||||
- type: Window
|
|
||||||
- type: Construction
|
- type: Construction
|
||||||
graph: WindowDirectional
|
graph: WindowDirectional
|
||||||
node: windowDirectional
|
node: windowDirectional
|
||||||
|
|||||||
@@ -285,6 +285,9 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
id: Wall
|
id: Wall
|
||||||
|
|
||||||
|
- type: Tag
|
||||||
|
id: Window
|
||||||
|
|
||||||
- type: Tag
|
- type: Tag
|
||||||
id: Wirecutter
|
id: Wirecutter
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user