Add foolbox (#41473)

* Add foolbox to clown lockers

* this is beter

* updated table w/ new items

* more clown like

* Tweaks

* thank you iaada

* cleanup

* review

* fun!

* fixes and microbalance

* clowns start with it inhand now

diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
index d10a6fc4eacf46bcc6d8b5e0b305623f089a8cec..4d0a25c6dbd29d9ed7acd9e6eabca136a559022b 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
+++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml
@@ -157,3 +157,107 @@
         - id: IngotGold
         - id: DrinkGoldenCup
           prob: 0.05
+
+- type: entity
+  parent: Foolbox
+  id: FoolboxFilled
+  suffix: Filled
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: FoolboxTable
+
+- type: entityTable
+  id: FoolboxTable
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector # Offensive clown items
+      children:
+      - !type:NestedSelector
+        tableId: AllToyWeaponsTable
+      - id: EnergySword # ~1/1001
+        weight: 0.001
+    - !type:GroupSelector # Rarer clown tools
+      rolls: 2
+      children:
+      - !type:NestedSelector
+        tableId: AllMiscToysTable
+        weight: 10
+      - !type:NestedSelector
+        tableId: AllCrayonsTable
+        rolls: 1, 3
+        weight: 5
+      - id: BarberScissors
+        weight: 0.75
+      - id: DrinkSpaceLube
+      - id: DrinkSpaceGlue
+      - !type:NestedSelector
+        tableId: RandomBikeHornTable
+        weight: 0.75
+      - !type:NestedSelector
+        tableId: AllFigurinesTable
+        weight: 1.25
+      - id: RubberStampCaptain # ~1/100
+        weight: 0.2
+    - !type:GroupSelector # Common clown consumables
+      rolls: 2
+      children:
+      - !type:NestedSelector
+        tableId: SlipTable
+      - id: TrashBananaPeel
+      - id: FoodBanana
+      - id: FoodPieBananaCream
+        weight: 0.75
+    - !type:GroupSelector # Fun clothing
+      prob: 0.75
+      children:
+      - !type:NestedSelector
+        tableId: ClownOtherJobTable
+        weight: 6
+      - id: SprayFlowerPin
+      - id: ClothingHeadHatMagician
+      - id: ClothingHeadSafari
+      - id: ClothingHeadHatPirate
+      - id: ClothingHeadHatWizardFake
+      - id: ClothingHeadHatCowboyRed
+      - id: ClothingHeadHatBowlerHat
+      - id: ClothingHeadHatWitch
+      - id: ClothingOuterCoatExpensive
+      - id: ClothingOuterGhostSheet
+      - id: ClothingOuterHospitalGown
+      - id: ClothingShoesBling
+        weight: 0.5
+      - id: ClothingOuterCoatSpaceAsshole
+        weight: 0.5
+      - !type:NestedSelector
+        tableId: AllPartyHatsTable
+      - !type:NestedSelector
+        tableId: InsulsTable
+      - !type:GroupSelector # ~1/115
+        weight: 0.175
+        children:
+        - id: ClothingHeadHatCatEars
+        - id: ClothingHeadHatFancyCrown
+        - id: ClothingHeadHatChameleon
+
+- type: entityTable
+  id: ClownOtherJobTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatBeretCommand # Command
+    - id: ClothingOuterVestHazard # Engineering
+    - id: ClothingOuterCoatLab # Science
+    - id: ClothingMaskClownSecurity # Security
+    - id: ClothingHeadHatCargosoft # Cargo
+    - id: ClothingNeckStethoscope # Medical
+      weight: 0.5
+    - !type:NestedSelector
+      tableId: AllSergicalHatsTable
+      weight: 0.5
+    - id: ClothingUniformJumpsuitBartender # Bartender
+    - id: ClothingHeadHatChef # Chef
+    - id: ClothingHeadBandBotany # Botany
+    - id: ClothingHandsGlovesJanitor # Janitor
+    - id: ClothingUniformJumpsuitReporter # Reporter
+    - id: ClothingOuterWinterMime # Mime

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml
new file mode 100644 (file)
index 0000000..5ac9666
--- /dev/null
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/clothing.yml
@@ -0,0 +1,16 @@
+- type: entityTable
+  id: AllPartyHatsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatPartyRed
+    - id: ClothingHeadHatPartyYellow
+    - id: ClothingHeadHatPartyGreen
+    - id: ClothingHeadHatPartyBlue
+
+- type: entityTable
+  id: AllSergicalHatsTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingHeadHatSurgcapBlue
+    - id: ClothingHeadHatSurgcapPurple
+    - id: ClothingHeadHatSurgcapGreen

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
index c7ef7f4a07170728374656bf4494bfa94e2869be..9ec48b32bb2991c2336b490b3db37aa0aa87b76d 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/toy.yml
@@ -283,7 +283,7 @@
       - id: BoxCartridgeCap
 
 # A group of items with fun or unique properties. Highly varied (some are more fun than others)
-- type: entityTable # size 3x3  # price 100
+- type: entityTable # size 2x2  # price 100
   id: AllMiscToysTable
   table: !type:GroupSelector
     children:

diff --git a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
index 6c2b291cd134d1863ee30b33bdea7b380e4db951..574d6953f20502db318a0489760c62087b806d95 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/crayons.yml
@@ -298,6 +298,8 @@
   - type: Item
     sprite: Objects/Fun/crayons.rsi
     size: Small
+    shape:
+    - 0,0,1,1
     heldPrefix: box
   - type: EntityTableContainerFill
     containers:

diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
index 93f62ca4918eeeebc5b95f7716b6ffe0608937cf..cf8927caf1cc431e91c4c821c84191dc70257cf8 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -147,3 +147,37 @@
     state: icon
   - type: Item
     sprite: Objects/Tools/Toolboxes/toolbox_gold.rsi
+
+- type: entity
+  name: foolbox
+  parent: ToolboxBase
+  id: Foolbox
+  description: A toolbox for fools, stocked with clowning equipment.
+  components:
+  - type: Sprite
+    sprite: Objects/Tools/Toolboxes/foolbox.rsi
+    state: icon
+  - type: Item
+    sprite: Objects/Tools/Toolboxes/foolbox.rsi
+  - type: MeleeWeapon
+    damage:
+      types:
+        Blunt: 2
+    soundHit: &SoundRubberHammer
+      collection: RubberHammer
+      params:
+        variation: 0.03
+        volume: 3
+  - type: EmitSoundOnLand
+    sound: *SoundRubberHammer
+  - type: Storage
+    storageOpenSound: &SoundHorn
+      collection: BikeHorn
+      params:
+        variation: 0.125
+    storageCloseSound: *SoundHorn
+    storageInsertSound: &SoundSqueak
+      collection: FootstepClown
+      params:
+        variation: 0.125
+    storageRemoveSound: *SoundSqueak

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
index 8222481e92599af5950667041e3be39e79b4fa62..2d4d00ac76bdae4d631ea059df986ecd649287c0 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/watergun.yml
@@ -100,7 +100,7 @@
       map: [ "enum.DamageStateVisualLayers.Base" ]
   - type: Item
     sprite: Objects/Weapons/Guns/Pistols/soaker.rsi
-    size: Large
+    size: Normal
     shape:
     - 0,0,2,1
   - type: RandomSprite

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
index 52dbb241494a171fd1cecf9a9cb8bb2b3ca6a2a2..d3887b16dc1e16f9d43e29762eeb377e86d86a74 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -295,6 +295,7 @@
     sprite: Objects/Fun/Foam/foam_rifle.rsi
   - type: Item
     sprite: Objects/Fun/Foam/foam_rifle_inhand_64x.rsi
+    size: Normal
     shape:
     - 0,0,3,0
   - type: BallisticAmmoProvider

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
index 31ab9640e7ee78d6d5d519ea8acd94d6ae8c2e27..4d201f980b17def3509922840c6d21ee3181b42c 100644 (file)
--- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
+++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
@@ -35,6 +35,8 @@
     pocket2: ClownRecorder
     id: ClownPDA
     ears: ClothingHeadsetService
+  inhand:
+  - FoolboxFilled
   storage:
     back:
     - RubberStampClown

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png
new file mode 100644 (file)
index 0000000..7b86f03
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon-open.png differ

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png
new file mode 100644 (file)
index 0000000..c5fc593
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/icon.png differ

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..30c1548
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-left.png differ

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..4e962fb
Binary files /dev/null and b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/inhand-right.png differ

diff --git a/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json
new file mode 100644 (file)
index 0000000..bccb56d
--- /dev/null
+++ b/Resources/Textures/Objects/Tools/Toolboxes/foolbox.rsi/meta.json
@@ -0,0 +1,25 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from baystation at commit https://github.com/Baystation12/Baystation12/commit/a929584d9db319eb7484113221be25cfa1d5dc09 , modified by captainkawaii666 (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "icon"
+        },
+        {
+            "name": "icon-open"
+        }
+    ]
+}