Airship + Unittest (#496)

* wings * update cargo shuttle * update goblin sound * add new unit test * Update CP14EntityTest.cs * Update CP14RitualTest.cs * add buy and sell hints * paper reading * hardwork * clean task * body forkfiltered * Update crystal.yml * more fork flitered * Update basic.yml * Update wild.yml * Update CP14EntityTest.cs * realise pusharing * pusharing alchemical vials * coin disappear works * Fix
2024-10-19 01:09:15 +03:00
parent f14177bf86
commit 78e94b1623
46 changed files with 817 additions and 321 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
@@ -0,0 +1,24 @@
+- type: entity
+  parent: CP14BrassChest
+  id: CP14BrassChestFilledAlchemy
+  suffix: Alchemical vials
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14VialTiny
+        amount: 9
+      - id: CP14VialSmall
+        amount: 8
+        #Gift
+      - id: CP14Dropper
+        prob: 0.2
+      - id: CP14Mortar
+        prob: 0.2
+      - id: CP14Pestle
+        prob: 0.2
+      - id: CP14VialSmall
+        prob: 0.2
+      - id: CP14VialTiny
+        prob: 0.2
+      - id: ShardGlass #Lol. Something broken
+        prob: 0.2
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/flame_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/flame_creation.yml
@@ -61,6 +61,7 @@
  - ItemHeftyBase
  name: artificial flame
  description: A magically created artificial flame burning directly into the air. Not a bad light source, or a weapon if you throw it in someone's face.
+  categories: [ ForkFiltered ]
  components:
  - type: Item
    size: Ginormous
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/flash_light.yml
@@ -56,6 +56,7 @@

 - type: entity
  id: CP14SpawnEffectFlashLight
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: /Textures/Objects/Fun/goldbikehorn.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/ice_floor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/ice_floor.yml
@@ -60,6 +60,7 @@
  parent: IceCrust
  name: ice crust
  description: It's cold and slippery.
+  categories: [ ForkFiltered ]
  components:
  - type: Slippery
    paralyzeTime: 1
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/sphere_of_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/sphere_of_light.yml
@@ -59,6 +59,7 @@
  name: Sphere of light
  parent: BaseItem
  description: A lump of bright light in the shape of a sphere.
+  categories: [ ForkFiltered ]
  components:
  - type: TimedDespawn
    lifetime: 300 # 5 min
--- a/Resources/Prototypes/_CP14/Entities/Body/Parts/human.yml
+++ b/Resources/Prototypes/_CP14/Entities/Body/Parts/human.yml
@@ -2,6 +2,7 @@
 - type: entity
  id: CP14TorsoHuman
  parent: TorsoHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -10,6 +11,7 @@
 - type: entity
  id: CP14HeadHuman
  parent: HeadHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -18,6 +20,7 @@
 - type: entity
  id: CP14LeftArmHuman
  parent: LeftArmHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -25,6 +28,7 @@
 - type: entity
  id: CP14RightArmHuman
  parent: RightArmHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -32,6 +36,7 @@
 - type: entity
  id: CP14LeftHandHuman
  parent: LeftHandHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -39,6 +44,7 @@
 - type: entity
  id: CP14RightHandHuman
  parent: RightHandHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -46,6 +52,7 @@
 - type: entity
  id: CP14LeftLegHuman
  parent: LeftLegHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -53,6 +60,7 @@
 - type: entity
  id: CP14RightLegHuman
  parent: RightLegHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -60,6 +68,7 @@
 - type: entity
  id: CP14LeftFootHuman
  parent: LeftFootHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
@@ -67,6 +76,7 @@
 - type: entity
  id: CP14RightFootHuman
  parent: RightFootHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Human/parts.rsi
--- a/Resources/Prototypes/_CP14/Entities/Body/Parts/zombie.yml
+++ b/Resources/Prototypes/_CP14/Entities/Body/Parts/zombie.yml
@@ -1,6 +1,7 @@
 - type: entity
  id: CP14TorsoZombie
  parent: CP14TorsoHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -9,6 +10,7 @@
 - type: entity
  id: CP14HeadZombie
  parent: CP14HeadHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -17,6 +19,7 @@
 - type: entity
  id: CP14LeftArmZombie
  parent: CP14LeftArmHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -24,6 +27,7 @@
 - type: entity
  id: CP14RightArmZombie
  parent: CP14RightArmHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -31,6 +35,7 @@
 - type: entity
  id: CP14LeftHandZombie
  parent: CP14LeftHandHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -38,14 +43,15 @@
 - type: entity
  id: CP14RightHandZombie
  parent: CP14RightHandHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi

 - type: entity
  id: CP14LeftLegZombie
-  name: "left zombie leg"
  parent: CP14LeftLegHuman
+  categories: [ ForkFiltered ]
  components:
    - type: Sprite
      sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -63,8 +69,8 @@

 - type: entity
  id: CP14RightLegZombie
-  name: "right zombie leg"
  parent: CP14RightLegHuman
+  categories: [ ForkFiltered ]
  components:
    - type: Sprite
      sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -83,6 +89,7 @@
 - type: entity
  id: CP14LeftFootZombie
  parent: CP14LeftFootHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
@@ -90,6 +97,7 @@
 - type: entity
  id: CP14RightFootZombie
  parent: CP14RightFootHuman
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Mobs/Species/Zombie/parts.rsi
--- a/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml
+++ b/Resources/Prototypes/_CP14/Entities/Effects/alchemy_effects.yml
@@ -2,6 +2,7 @@
  parent: BaseFoam
  id: CP14Mist
  name: mist
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    sprite: _CP14/Effects/mist.rsi
@@ -14,20 +15,4 @@
  - type: SolutionContainerManager
    solutions:
      solutionArea:
-        maxVol: 100
-
- type: entity
-  parent: CP14Mist
-  id: CP14MistVitalExtract
-  components:
-  - type: Sprite
-    sprite: _CP14/Effects/mist.rsi
-    layers:
-    - state: chemmist
-      color: "#db2a2a"
-  - type: SolutionContainerManager
-    solutions:
-      solutionArea:
-        reagents:
-        - ReagentId: CP14VitalExtract
-          Quantity: 10
+        maxVol: 100
--- a/Resources/Prototypes/_CP14/Entities/Ritual/basic.yml
+++ b/Resources/Prototypes/_CP14/Entities/Ritual/basic.yml
@@ -17,6 +17,7 @@
  parent: CP14BaseRitualPhase
  id: CP14RitualEnd
  name: end of ritual
+  categories: [ HideSpawnMenu ]
  components:
  - type: CP14MagicRitualPhase
    deadEnd: true
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/base.yml
@@ -6,6 +6,7 @@
  components:
  - type: Sprite
    snapCardinals: true
+    drawdepth: FloorTiles
  - type: Transform
    anchored: true
  - type: Physics
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml
@@ -176,6 +176,7 @@
  id: CP14QuartzCrystal
  name: quartz
  description: Quartz is an essential mineral capable of interacting with magical energy. It is highly sought after by alchemists for extracting beneficial properties from liquids
+  categories: [ HideSpawnMenu ]
  components:
  - type: Sprite
    drawdepth: Mobs
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/grasshighbush.yml
@@ -48,7 +48,6 @@
        - FullTileMask 
        layer:
        - Opaque
-        
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: Wood
@@ -98,6 +97,7 @@
  id: CP14RandomBushOffsetSpawner
  name: random bush offset spawner
  parent: MarkerBase
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    layers:
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/cabinets.yml
@@ -98,7 +98,7 @@
 - type: entity
  parent: C14IronCabinet
  id: C14IronCabinetCargo
-  name: money box
+  name: trade box
  description: An armored vault for storing money for trade with the city. City workers will unload their earnings here, or take them from here when you want to buy something.
  components:
  - type: CP14CargoMoneyBox
--- a/Resources/Prototypes/_CP14/Entities/Structures/Shuttle/shuttle_elements.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Shuttle/shuttle_elements.yml
@@ -0,0 +1,76 @@
+- type: entity
+  id: CP14TravelingStoreshipAnchor
+  name: traveling storeship anchor
+  categories: [ ForkFiltered ]
+  placement:
+    mode: SnapgridCenter
+  description: the point of adhesion of a traveling storeship to the surface. Keep your eyes to the sky so you don't get crushed!
+  components:
+  - type: Clickable
+  - type: Sprite
+    sprite: _CP14/Structures/Shuttle/traveling_storeship_anchor.rsi
+    state: base
+    drawdepth: FloorTiles
+  - type: Icon
+    sprite: _CP14/Structures/Shuttle/traveling_storeship_anchor.rsi
+    state: base
+  - type: Transform
+    anchored: true
+  - type: CP14TravelingStoreShipFTLTarget
+  - type: FTLSmashImmune
+
+- type: entity
+  id: CP14ShuttleWingBase
+  abstract: true
+  categories: [ ForkFiltered ]
+  name: airship wing
+  description: Giant webbed wings, capable, along with magic, of holding the heaviest objects in the air.
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+  - type: Clickable
+  - type: Transform
+    anchored: true
+
+- type: entity
+  parent: CP14ShuttleWingBase
+  id: CP14ShuttleWingSmallR
+  suffix: Right, Small
+  components:
+  - type: Sprite
+    offset: 1, -0.75
+    sprite: _CP14/Structures/Shuttle/wing_small.rsi
+    state: right
+
+- type: entity
+  parent: CP14ShuttleWingBase
+  id: CP14ShuttleWingSmallL
+  suffix: Left, Small
+  components:
+  - type: Sprite
+    offset: -1, -0.75
+    sprite: _CP14/Structures/Shuttle/wing_small.rsi
+    state: left
+
+
+- type: entity
+  parent: CP14ShuttleWingBase
+  id: CP14ShuttleWingBigL
+  suffix: Left, Big
+  components:
+  - type: Sprite
+    offset: -1.75, -1.5
+    sprite: _CP14/Structures/Shuttle/wing_big.rsi
+    state: left
+
+- type: entity
+  parent: CP14ShuttleWingBase
+  id: CP14ShuttleWingBigR
+  suffix: Right, Big
+  components:
+  - type: Sprite
+    offset: 1.75, -1.5
+    sprite: _CP14/Structures/Shuttle/wing_big.rsi
+    state: right
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Farming/soil.yml
@@ -50,7 +50,7 @@
    key: walls
    mode: NoSprite
  - type: Sprite
-    drawdepth: FloorTiles
+    drawdepth: BelowFloor
    sprite: _CP14/Structures/Specific/Farming/seedbed.rsi
    layers:
      - state: seedbed_default
--- a/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/crystal.yml
@@ -7,6 +7,7 @@
  abstract: true
  name: sparkling quartz
  description: bioluminescent quartz crystals that can take on any color - a very handy light source in a deep caves. Unfortunately, the luminous properties are very hard to preserve.
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    drawdepth: Mobs
@@ -124,6 +125,7 @@
  parent: BaseRock
  name: sparkling quartz
  description: bioluminescent quartz crystals that can take on any color - a very handy light source in a deep caves. Unfortunately, the luminous properties are very hard to preserve.
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    drawdepth: Mobs
--- a/Resources/Prototypes/_CP14/Entities/Structures/trabeling_storeship_anchor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/trabeling_storeship_anchor.yml
@@ -1,20 +0,0 @@
- type: entity
-  id: CP14TravelingStoreshipAnchor
-  name: traveling storeship anchor
-  categories: [ ForkFiltered ]
-  placement:
-    mode: SnapgridCenter
-  description: the point of adhesion of a traveling storeship to the surface. Keep your eyes to the sky so you don't get crushed!
-  components:
-  - type: Clickable
-  - type: Sprite
-    sprite: _CP14/Structures/traveling_storeship_anchor.rsi
-    state: base
-    drawdepth: FloorTiles
-  - type: Icon
-    sprite: _CP14/Structures/traveling_storeship_anchor.rsi
-    state: base
-  - type: Transform
-    anchored: true
-  - type: CP14TravelingStoreShipFTLTarget
-  - type: FTLSmashImmune
--- a/Resources/Prototypes/_CP14/Entities/keys.yml
+++ b/Resources/Prototypes/_CP14/Entities/keys.yml
@@ -26,6 +26,7 @@
  id: CP14BaseLockpick
  name: lockpick
  description: A thief's tool that, with proper skill and skill, allows you to pick any lock.
+  categories: [ ForkFiltered ]
  components:
  - type: Sprite
    sprite: _CP14/Objects/keys.rsi
--- a/Resources/Prototypes/_CP14/Store/buy.yml
+++ b/Resources/Prototypes/_CP14/Store/buy.yml
@@ -2,6 +2,7 @@
  id: CP14AlchemyNormalizer
  name: cp14-store-buy-alchemy-normalizer-name
  desc: cp14-store-buy-alchemy-normalizer-desc
+  code: ALH-NRML
  icon: 
    sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi
    state: base
@@ -11,4 +12,20 @@
  services:
  - !type:CP14BuyItemsService
    product:
-      CP14AlchemyNormalizer: 1
+      CP14AlchemyNormalizer: 1
+
+- type: storePositionBuy
+  id: CP14AlchemyVials
+  name: cp14-store-buy-alchemy-vials-name
+  desc: cp14-store-buy-alchemy-vials-desc
+  code: ALH-VIAL
+  icon: 
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  price: 
+    min: 200
+    max: 300
+  services:
+  - !type:CP14BuyItemsService
+    product:
+      CP14BrassChestFilledAlchemy: 1
--- a/Resources/Prototypes/_CP14/debug.yml
+++ b/Resources/Prototypes/_CP14/debug.yml
@@ -3,6 +3,7 @@
  id: CP14DebugWorldSprite
  name: strange copper bar
  suffix: CP, DEBUG
+  categories: [ ForkFiltered ]
  components:
  # Just copy me, I am block with name Bob
  - type: Appearance