Снежки (#179)

* snowballs

* nah

* reviewe

* oops + better offset

* a

Content.Server/Destructible/Thresholds/Behaviors/SpillBehavior.cs

@@ -12,6 +12,11 @@ public sealed partial class SpillBehavior : IThresholdBehavior
         [DataField]
         public string? Solution;
 
+        // Corvax-Next-Snowballs-Start
+        [DataField]
+        public bool SpillSound = true;
+        // Corvax-Next-Snowballs-End
+
         /// <summary>
         /// If there is a SpillableComponent on EntityUidowner use it to create a puddle/smear.
         /// Or whatever solution is specified in the behavior itself.
@@ -35,7 +40,7 @@ public void Execute(EntityUid owner, DestructibleSystem system, EntityUid? cause
             else if (Solution != null &&
                      solutionContainerSystem.TryGetSolution(owner, Solution, out _, out var behaviorSolution))
             {
-                spillableSystem.TrySplashSpillAt(owner, coordinates, behaviorSolution, out _, user: cause);
+                spillableSystem.TrySplashSpillAt(owner, coordinates, behaviorSolution, out _, SpillSound, user: cause); // Corvax-Next-Snowballs
             }
         }
     }

Content.Shared/_CorvaxNext/FromTileCrafter/Components/FromTileCrafterComponent.cs

@@ -0,0 +1,60 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.GameStates;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._CorvaxNext.FromTileCrafter.Components;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class FromTileCrafterComponent : Component
+{
+    /// <summary>
+    /// Object that will be created
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadOnly)]
+    [ValidatePrototypeId<EntityPrototype>]
+    public string EntityToSpawn;
+
+    /// <summary>
+    /// Tiles that allowed to use to craft an object
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public HashSet<string> AllowedTileIds = new();
+
+    /// <summary>
+    /// The time it takes to craft.
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Delay = 1f;
+
+    /// <summary>
+    /// How far spawned item can offset from tile center
+    /// </summary>
+    [DataField, ViewVariables(VVAccess.ReadWrite)]
+    public float Spread = 0.3f;
+}
+
+[Serializable, NetSerializable]
+public sealed partial class FromTileCraftDoAfterEvent : DoAfterEvent
+{
+    public NetEntity Grid;
+    public Vector2i GridTile;
+
+    public FromTileCraftDoAfterEvent(NetEntity grid, Vector2i gridTile)
+    {
+        Grid = grid;
+        GridTile = gridTile;
+    }
+
+    public override DoAfterEvent Clone()
+    {
+        return this;
+    }
+
+    public override bool IsDuplicate(DoAfterEvent other)
+    {
+        return other is FromTileCraftDoAfterEvent otherTile
+               && Grid == otherTile.Grid
+               && GridTile == otherTile.GridTile;
+    }
+}

Content.Shared/_CorvaxNext/FromTileCrafter/Systems/FromTileCrafterSystem.cs

@@ -0,0 +1,85 @@
+using System.Numerics;
+using Content.Shared._CorvaxNext.FromTileCrafter.Components;
+using Content.Shared.DoAfter;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Interaction;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Network;
+using Robust.Shared.Random;
+
+
+namespace Content.Shared._CorvaxNext.FromTileCrafter.Systems;
+
+public sealed class FromTileCrafterSystem : EntitySystem
+{
+    [Dependency] private readonly SharedHandsSystem _handsSystem = default!;
+    [Dependency] private readonly SharedMapSystem _maps = default!;
+    [Dependency] private readonly IMapManager _mapManager = default!;
+    [Dependency] private readonly SharedTransformSystem _transformSystem = default!;
+    [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!;
+    [Dependency] private readonly ITileDefinitionManager _tileDefManager = default!;
+    [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
+    [Dependency] private readonly IRobustRandom _robustRandom = default!;
+    [Dependency] private readonly INetManager _netManager = default!;
+
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<FromTileCrafterComponent, FromTileCraftDoAfterEvent>(OnFromTileCraftComplete);
+        SubscribeLocalEvent<FromTileCrafterComponent, AfterInteractEvent>(OnAfterInteract);
+    }
+
+    private void OnFromTileCraftComplete(Entity<FromTileCrafterComponent> ent, ref FromTileCraftDoAfterEvent args)
+    {
+        if (_netManager.IsClient)
+            return;
+
+        if (args.Handled || args.Cancelled)
+            return;
+
+        var comp = ent.Comp;
+
+        var gridUid = GetEntity(args.Grid);
+        if (!TryComp<MapGridComponent>(gridUid, out var grid))
+            return;
+
+        var tileRef = _maps.GetTileRef(gridUid, grid, args.GridTile);
+        var coords = _maps.ToCoordinates(tileRef, grid);
+
+        var offset = new Vector2(
+            ((_robustRandom.NextFloat() - 0.5f) * comp.Spread + 0.5f) * grid.TileSize,
+            ((_robustRandom.NextFloat() - 0.5f) * comp.Spread + 0.5f) * grid.TileSize);
+
+        Spawn(ent.Comp.EntityToSpawn, coords.Offset(offset));
+    }
+
+    private void OnAfterInteract(Entity<FromTileCrafterComponent> ent, ref AfterInteractEvent args)
+    {
+        if (args.Handled || args.Target != null)
+            return;
+
+        var comp = ent.Comp;
+
+        if (!_mapManager.TryFindGridAt(_transformSystem.ToMapCoordinates(args.ClickLocation), out var gridUid, out var mapGrid))
+            return;
+
+        var tileRef = _maps.GetTileRef(gridUid, mapGrid, args.ClickLocation);
+        var tileId = _tileDefManager[tileRef.Tile.TypeId].ID;
+
+        if (!comp.AllowedTileIds.Contains(tileId))
+            return;
+
+        var coordinates = _maps.GridTileToLocal(gridUid, mapGrid, tileRef.GridIndices);
+        if (!_interactionSystem.InRangeUnobstructed(args.User, coordinates, popup: false))
+            return;
+
+        var doAfterEvent = new FromTileCraftDoAfterEvent(GetNetEntity(gridUid), tileRef.GridIndices);
+        var doAfterArgs = new DoAfterArgs(EntityManager, args.User, comp.Delay, doAfterEvent, ent, used: ent)
+        {
+            BreakOnMove = true,
+            BlockDuplicate = true,
+            DuplicateCondition = DuplicateConditions.SameTool,
+        };
+        _doAfterSystem.TryStartDoAfter(doAfterArgs, out _);
+    }
+}

Resources/Locale/ru-RU/_corvaxnext/flavors/flavors.ftl

@@ -1,3 +1,4 @@
 flavor-complex-bear = как медведь, карты и что-то про футбол
 flavor-complex-sumer = как лето
 flavor-complex-holidais = как новый год
+flavor-base-snow = как снег

Resources/Locale/ru-RU/ss14-ru/prototypes/_corvaxnext/entities/objects/misc/snowball.ftl

@@ -0,0 +1,5 @@
+ent-ItemSnowballMaker = снежколеп
+    .desc = Позволяет быстро лепить снежки из снега (или из астро-снега, когда сезон не тот).
+
+ent-ItemSnowball = снежок
+    .desc = Небольшой комочек снега, что можно бросить в кого-то.

Resources/Prototypes/Entities/Structures/Machines/lathe.yml

@@ -204,6 +204,7 @@
       - CassetteTape
       - TapeRecorder
       - PlantAnalyzer # Corvax-Next-PlantAnalyzer
+      - SnowballMaker # Corvax-Next-Snowballs
   - type: EmagLatheRecipes
     emagStaticRecipes:
       - BoxLethalshot

Resources/Prototypes/_CorvaxNext/Entities/Fun/snowball.yml

@@ -0,0 +1,78 @@
+- type: entity
+  name: snowball maker
+  parent: BaseItem
+  id: ItemSnowballMaker
+  description: Makes snowballs.
+  components:
+  - type: Sprite
+    sprite: _CorvaxNext/Objects/Misc/snowball_maker.rsi
+    layers:
+    - state: snowball-maker
+  - type: Item
+  - type: PhysicalComposition
+    materialComposition:
+      Plastic: 200
+  - type: FromTileCrafter
+    delay: 0.5
+    entityToSpawn: ItemSnowball
+    allowedTileIds:
+    - FloorAstroSnow
+    - FloorSnow
+    - FloorSnowDug
+    - PlatingSnow
+
+- type: entity
+  parent: [BaseItem, FoodBase]
+  id: ItemSnowball
+  name: snowball
+  description: Fun
+  components:
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1
+      behaviors:
+      - !type:SpillBehavior
+        solution: snowball
+        spillSound: False
+      - !type:PlaySoundBehavior
+        sound:
+          path: /Audio/Effects/chop.ogg
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 3
+  - type: StaminaDamageOnCollide
+    damage: 8.1
+  - type: Sprite
+    sprite: _CorvaxNext/Objects/Misc/snowball.rsi
+    state: snowball
+  - type: Item
+    size: Tiny
+  - type: SolutionContainerManager
+    solutions:
+      snowball:
+        maxVol: 10
+        reagents:
+        - ReagentId: Water
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - snow
+    ignoreReagents:
+    - Water
+  - type: Food
+    solution: snowball
+  - type: MixableSolution
+    solution: snowball
+  - type: InjectableSolution
+    solution: snowball
+  - type: RefillableSolution
+    solution: snowball
+  - type: LandAtCursor
+

Resources/Prototypes/_CorvaxNext/Flavors/flavors.yml

@@ -11,4 +11,8 @@
 - type: flavor
   id: holidais
   flavorType: Complex
-  description: flavor-complex-holidais
+  description: flavor-complex-holidais
+
+- type: flavor
+  id: snow
+  description: flavor-base-snow

Resources/Prototypes/_CorvaxNext/Recipes/Lathes/Misc.yml

@@ -0,0 +1,6 @@
+- type: latheRecipe
+  id: SnowballMaker
+  result: ItemSnowballMaker
+  completetime: 2
+  materials:
+    Plastic: 200

Resources/Textures/_CorvaxNext/Objects/Misc/snowball.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedTerror (Discord, id 748161739056611428)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "snowball"
+        }
+    ]
+}

Resources/Textures/_CorvaxNext/Objects/Misc/snowball_maker.rsi/meta.json

@@ -0,0 +1,22 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by RedTerror (Discord, id 748161739056611428)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "snowball-maker"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}