Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add some animals basic mechanics (#5132)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
FoLoKe
2021-11-13 04:48:05 +03:00
committed by GitHub
parent 2353d340d0
commit 5f3ae602ed
49 changed files with 522 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Climbing/Components/ClimbingComponent.cs
View File

@@ -79,7 +79,10 @@ namespace Content.Server.Climbing.Components
if (velocity <= 0.0f) return;
Body.ApplyLinearImpulse((to - from).Normalized * velocity * 400);
// Since there are bodies with different masses:
// mass * 5 seems enough to move entity
// instead of launching cats like rockets against the walls with constant impulse value.
Body.ApplyLinearImpulse((to - from).Normalized * velocity * Body.Mass * 5);
OwnerIsTransitioning = true;
Owner.SpawnTimer((int) (BufferTime * 1000), () =>

12
Content.Server/Temperature/Components/HeatResistanceComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Clothing.Components;
using Content.Server.Clothing.Components;
using Content.Server.Inventory.Components;
using Content.Shared.Inventory;
using Robust.Shared.GameObjects;
@@ -12,7 +12,15 @@ namespace Content.Server.Temperature.Components
public int GetHeatResistance()
{
if (Owner.GetComponent<InventoryComponent>().TryGetSlotItem(EquipmentSlotDefines.Slots.GLOVES, out ClothingComponent? gloves))
// TODO: When making into system: Any animal that touches bulb that has no
// InventoryComponent but still would have default heat resistance in the future (maybe)
if (!Owner.TryGetComponent<InventoryComponent>(out var inventoryComp))
{
// Magical number just copied from below
return int.MinValue;
}
if (inventoryComp.TryGetSlotItem(EquipmentSlotDefines.Slots.GLOVES, out ClothingComponent? gloves))
{
return gloves?.HeatResistance ?? int.MinValue;
}