Several playtest fixes (#180)

* spear container and wild yarrow fix

* fixes impassible water for bullets

* more fixes

* increases food and thirst rates

* angle fixes

Content.Shared/Nutrition/Components/HungerComponent.cs

@@ -34,7 +34,7 @@ public sealed partial class HungerComponent : Component
     /// </summary>
     /// <remarks>Any time this is modified, <see cref="HungerSystem.SetAuthoritativeHungerValue"/> should be called.</remarks>
     [DataField("baseDecayRate"), ViewVariables(VVAccess.ReadWrite)]
-    public float BaseDecayRate = 0.01666666666f;
+    public float BaseDecayRate = 0.1f;
 
     /// <summary>
     /// The actual amount at which <see cref="LastAuthoritativeHungerValue"/> decays.

Content.Shared/Nutrition/Components/ThirstComponent.cs

@@ -15,7 +15,7 @@ public sealed partial class ThirstComponent : Component
     [ViewVariables(VVAccess.ReadWrite)]
     [DataField("baseDecayRate")]
     [AutoNetworkedField]
-    public float BaseDecayRate = 0.1f;
+    public float BaseDecayRate = 0.15f;
 
     [ViewVariables(VVAccess.ReadWrite)]
     [AutoNetworkedField]

Resources/Prototypes/Civ14/Entities/Flora/wild_crops.yml

@@ -192,6 +192,9 @@
     - id: YarrowHealingHerbs
       amount: 2
       maxAmount: 3
+    - id: YarrowSeedsCiv
+      amount: 2
+      maxAmount: 2
 
 - type: entity
   name: wild milk thistle

Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml

@@ -34,12 +34,6 @@
   abstract: true
   parent: ClothingHandsBase
   id: ClothingHandsButcherable
-  components:
-    - type: Butcherable
-      butcheringType: Knife
-      spawned:
-        - id: MaterialCloth1
-          amount: 1
 
 # gloves that cover the fingertips and have synthetic fibers
 - type: entity

Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml

@@ -32,11 +32,6 @@
   parent: ClothingHeadBase
   id: ClothingHeadBaseButcherable
   components:
-    - type: Butcherable
-      butcheringType: Knife
-      spawned:
-        - id: MaterialCloth1
-          amount: 1
     - type: Tag
       tags:
         - ClothMade

Resources/Prototypes/Entities/Clothing/Masks/base_clothingmask.yml

@@ -36,11 +36,6 @@
   parent: ClothingMaskBase
   abstract: true
   components:
-    - type: Butcherable
-      butcheringType: Knife
-      spawned:
-        - id: MaterialCloth1
-          amount: 1
     - type: Food
       requiresSpecialDigestion: true
     - type: SolutionContainerManager

Resources/Prototypes/Entities/Clothing/Neck/base_clothingneck.yml

@@ -17,7 +17,7 @@
       butcheringType: Knife
       spawned:
         - id: MaterialCloth1
-          amount: 2
+          amount: 1
     - type: Food
       requiresSpecialDigestion: true
     - type: SolutionContainerManager

Resources/Prototypes/Entities/Clothing/Shoes/base_clothingshoes.yml

@@ -31,12 +31,6 @@
   abstract: true
   parent: ClothingShoesBase
   id: ClothingShoesBaseButcherable
-  components:
-    - type: Butcherable
-      butcheringType: Knife
-      spawned:
-        - id: MaterialCloth1
-          amount: 1
 
 # stuff common to all military boots
 - type: entity

Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml

@@ -13,7 +13,7 @@
     butcheringType: Knife
     spawned:
     - id: MaterialCloth1
-      amount: 3
+      amount: 1
   - type: Food
     requiresSpecialDigestion: true
   - type: SolutionContainerManager

Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/arrows.yml

@@ -30,7 +30,7 @@
       sound: /Audio/Weapons/star_hit.ogg
       embedOnThrow: false
     - type: ThrowingAngle
-      angle: 0
+      angle: 225
     - type: Ammo
       muzzleFlash: null
     - type: Tag
@@ -39,6 +39,7 @@
     - type: Projectile
       deleteOnCollide: false
       onlyCollideWhenShot: true
+      angle: 0
       damage:
         types:
           Piercing: 25
@@ -72,7 +73,7 @@
     - type: ThrowingAngle
       angle: 225
     - type: Projectile
-      angle: 225
+      angle: 0
       damage:
         types:
           Piercing: 22

Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml

@@ -31,9 +31,6 @@
       sprite: Objects/Weapons/Melee/spear.rsi
       layers:
         - state: spear
-        - state: spear
-          map: ["enum.SolutionContainerLayers.Fill"]
-          visible: false
     - type: MeleeWeapon
       wideAnimationRotation: -135
       damage:
@@ -59,21 +56,6 @@
     - type: Construction
       graph: Spear
       node: spear
-    - type: SolutionContainerManager
-      solutions:
-        melee:
-          maxVol: 2
-    - type: MeleeChemicalInjector
-      solution: melee
-    - type: RefillableSolution
-      solution: melee
-    - type: InjectableSolution
-      solution: melee
-    - type: SolutionInjectOnEmbed
-      transferAmount: 2
-      solution: melee
-    - type: SolutionTransfer
-      maxTransferAmount: 2
     - type: Wieldable
     - type: IncreaseDamageOnWield
       damage:
@@ -96,11 +78,6 @@
                 collection: GlassBreak
                 params:
                   volume: -4
-            - !type:SpawnEntitiesBehavior
-              spawn:
-                PartRodMetal1:
-                  min: 1
-                  max: 1
             - !type:DoActsBehavior
               acts: ["Destruction"]
     - type: DamageOnLand
@@ -109,13 +86,6 @@
           Blunt: 5
     - type: UseDelay
     - type: Appearance
-    - type: SolutionContainerVisuals
-      maxFillLevels: 1
-      fillBaseName: spear
-      inHandsFillBaseName: -fill-
-      inHandsMaxFillLevels: 1
-      equippedFillBaseName: -fill-
-      equippedMaxFillLevels: 1
 
 - type: entity
   name: reinforced spear

Resources/Prototypes/Entities/Tiles/water.yml

@@ -86,9 +86,10 @@
             bounds: "-0.5,-0.5,0.5,0.5"
           density: 100
           mask:
-            - Impassable
+            - MidImpassable
             - HighImpassable
           layer:
+            - MidImpassable
             - HighImpassable
     - type: Tag
       tags:
@@ -112,9 +113,10 @@
             bounds: "-0.5,-0.5,0.5,0.5"
           density: 100
           mask:
-            - Impassable
+            - MidImpassable
             - HighImpassable
           layer:
+            - MidImpassable
             - HighImpassable
     - type: Tag
       tags: