Random bullfix go! (#1197)

* some fixes for AI pathfinding

* cobblestone tile

* stonebrick update

* fix #1194

* fix #1193

* Update stonebricks_square_carved.png

Content.Server/_CP14/MagicSpell/CP14MagicSystem.cs

@@ -8,6 +8,7 @@ using Content.Shared._CP14.MagicSpell.Components;
 using Content.Shared._CP14.MagicSpell.Events;
 using Content.Shared._CP14.MagicSpell.Spells;
 using Content.Shared.Actions;
+using Content.Shared.CombatMode.Pacification;
 using Content.Shared.FixedPoint;
 using Content.Shared.Projectiles;
 using Content.Shared.Throwing;
@@ -62,6 +63,12 @@ public sealed  class CP14MagicSystem : CP14SharedMagicSystem
 
     private void OnMeleeHit(Entity<CP14SpellEffectOnHitComponent> ent, ref MeleeHitEvent args)
     {
+        if (HasComp<PacifiedComponent>(args.User)) //IDK how to check if the user is pacified in a better way
+            return;
+
+        if (!args.IsHit)
+            return;
+
         if (!_random.Prob(ent.Comp.Prob))
             return;
 

Content.Shared/_CP14/Farming/CP14SharedFarmingSystem.Interactions.cs

@@ -71,6 +71,7 @@ public abstract partial class CP14SharedFarmingSystem
             {
                 BreakOnDamage = true,
                 BlockDuplicate = false,
+                CancelDuplicate = false,
                 BreakOnMove = true,
                 BreakOnHandChange = true,
             };
@@ -156,6 +157,7 @@ public abstract partial class CP14SharedFarmingSystem
             {
                 BreakOnDamage = true,
                 BlockDuplicate = false,
+                CancelDuplicate = false,
                 BreakOnMove = true,
                 BreakOnHandChange = true,
             };

Content.Shared/_CP14/TileEditTool/CP14EditTileToolSystem.cs

@@ -37,6 +37,7 @@ public sealed class CP14EditTileToolSystem : EntitySystem
             {
                 BreakOnDamage = true,
                 BlockDuplicate = false,
+                CancelDuplicate = false,
                 BreakOnMove = true,
                 BreakOnHandChange = true,
             };
@@ -65,7 +66,7 @@ public sealed class CP14EditTileToolSystem : EntitySystem
             return;
 
         args.Handled = true;
-        
+
         _map.SetTile((map.Value, gridComp), location, new Tile(_proto.Index(replaceTile).TileId));
         _audio.PlayPredicted(ent.Comp.Sound, location, args.User);
     }

Resources/Locale/en-US/_CP14/tiles/tiles.ftl

@@ -11,6 +11,7 @@ cp14-tiles-snow = snow
 cp14-tiles-snow-deep = deep snow
 cp14-tiles-snow-deep-deep = deep deep snow
 cp14-tiles-marble-cave = marble floor
+cp14-tiles-cobblestone = cobblestone
 
 # Produced
 cp14-tiles-foundation = foundation

Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl

@@ -11,6 +11,7 @@ cp14-tiles-snow = снег
 cp14-tiles-snow-deep = глубокий снег
 cp14-tiles-snow-deep-deep = очень глубокий снег
 cp14-tiles-marble-cave = мраморный пол
+cp14-tiles-cobblestone = булыжник
 
 # Produced
 cp14-tiles-foundation = фундамент

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/misc.yml

@@ -10,6 +10,18 @@
     chance: 1
     deleteSpawnerAfterSpawn: false
 
+- type: entity
+  id: CP14RandomStoneLootSpawner
+  name: dirt spawner
+  parent: CP14DirtEffect
+  categories: [ ForkFiltered ]
+  components:
+  - type: RandomSpawner
+    prototypes:
+    - CP14StoneBlock1
+    chance: 1
+    deleteSpawnerAfterSpawn: false
+
 - type: entity
   id: CP14RandomSnowLootSpawner
   name: snow spawner

Resources/Prototypes/_CP14/Entities/Objects/Materials/rocks.yml

@@ -77,6 +77,14 @@
   - type: CP14MagicEssenceContainer
     essences:
       Earth: 1
+  - type: FloorTile
+    placeTileSound:
+      collection: CP14Digging #TODO
+      params:
+        variation: 0.03
+        volume: 2
+    outputs:
+      - CP14FloorCobblestone
 
 - type: entity
   id: CP14StoneBlock10

Resources/Prototypes/_CP14/Entities/Structures/Floor/chasm.yml

@@ -45,6 +45,13 @@
         - ItemMask
         density: 1000
         hard: false
+      fix2: # For block AI movement
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        density: 30
+        mask:
+        - ItemMask
   - type: Tag
     tags:
     - HideContextMenu

Resources/Prototypes/_CP14/Entities/Structures/Floor/floorLava.yml

@@ -55,6 +55,15 @@
           - ItemMask
         density: 1000
         hard: false
+      fix2: # For block AI movement
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        density: 30
+        mask:
+        - ItemMask
+  - type: CollisionWake
+    enabled: false
   - type: Tag
     tags:
       - HideContextMenu

Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml

@@ -39,15 +39,6 @@
         - TableMask
         layer:
         - TableLayer
-      fix2: #For melee or laser
-        hard: true
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.35,-0.35,0.35,0.35"
-        mask:
-        - FullTileMask 
-        layer:
-        - Opaque
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood

Resources/Prototypes/_CP14/Tiles/natural.yml

@@ -40,6 +40,37 @@
   heatCapacity: 10000
   weather: true
 
+- type: tile
+  editorHidden: false
+  id: CP14FloorCobblestone
+  name: cp14-tiles-cobblestone
+  sprite: /Textures/_CP14/Tiles/Cobblestone/cobble.png
+  variants: 5
+  placementVariants:
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
+  edgeSpritePriority: 2
+  edgeSprites:
+    SouthEast: /Textures/_CP14/Tiles/Cobblestone/single_edge_SE.png
+    NorthEast: /Textures/_CP14/Tiles/Cobblestone/single_edge_NE.png
+    NorthWest: /Textures/_CP14/Tiles/Cobblestone/single_edge_NW.png
+    SouthWest: /Textures/_CP14/Tiles/Cobblestone/single_edge_SW.png
+    South: /Textures/_CP14/Tiles/Cobblestone/double_edge_S.png
+    East: /Textures/_CP14/Tiles/Cobblestone/double_edge_E.png
+    North: /Textures/_CP14/Tiles/Cobblestone/double_edge_N.png
+    West: /Textures/_CP14/Tiles/Cobblestone/double_edge_W.png
+  baseTurf: CP14FloorDirt
+  deconstructTools: [ CP14Digging ]
+  itemDrop: CP14RandomStoneLootSpawner
+  isSubfloor: true
+  footstepSounds:
+    collection: FootstepAsteroid
+  heatCapacity: 10000
+  weather: true
+
 - type: tile
   editorHidden: false
   id: CP14FloorMarbleCave
@@ -83,7 +114,7 @@
   - 1.0
   - 1.0
   - 1.0
-  edgeSpritePriority: 2
+  edgeSpritePriority: 3
   edgeSprites:
     SouthEast: /Textures/_CP14/Tiles/Sand/single_edge_SE.png
     NorthEast: /Textures/_CP14/Tiles/Sand/single_edge_NE.png
@@ -115,7 +146,7 @@
   - 1.0
   - 1.0
   - 1.0
-  edgeSpritePriority: 3
+  edgeSpritePriority: 4
   edgeSprites:
     SouthEast: /Textures/_CP14/Tiles/Grass/single_edge_SE.png
     NorthEast: /Textures/_CP14/Tiles/Grass/single_edge_NE.png
@@ -147,7 +178,7 @@
   - 1.0
   - 1.0
   - 1.0
-  edgeSpritePriority: 4
+  edgeSpritePriority: 5
   edgeSprites:
     SouthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_SE.png
     NorthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_NE.png
@@ -179,7 +210,7 @@
   - 1.0
   - 1.0
   - 1.0
-  edgeSpritePriority: 5
+  edgeSpritePriority: 6
   edgeSprites:
     SouthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_SE.png
     NorthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_NE.png

Resources/Prototypes/_CP14/Tiles/produced.yml

@@ -158,9 +158,12 @@
   id: CP14FloorStonebricksSquareCarved
   name: cp14-tiles-stonebricks-square-carved
   sprite: /Textures/_CP14/Tiles/Stonebricks/stonebricks_square_carved.png
-  variants: 1
+  variants: 4
   placementVariants:
   - 1.0
+  - 1.0
+  - 1.0
+  - 1.0
   edgeSpritePriority: 101
   edgeSprites:
     SouthEast: /Textures/_CP14/Tiles/Stonebricks/single_edge_SE.png

Resources/Textures/_CP14/Tiles/Cobblestone/attributions.yml

@@ -0,0 +1,4 @@
+- files: ["cobble.png", "double_edge_E.png", "double_edge_N.png", "double_edge_S.png", "double_edge_W.png", "single_edge_NE.png", "single_edge_NW.png", "single_edge_SE.png", "single_edge_SW.png"]
+  license: "CC-BY-SA-4.0"
+  copyright: "Created by .vladimirs"
+  source: "https://github.com/crystallpunk-14/crystall-punk-14/"