diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl new file mode 100644 index 00000000000..32d3ab61c37 --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/cargo/cargo-fun.ftl @@ -0,0 +1,2 @@ +ent-CrateFunBBGun = { ent-CrateFunBBGun } + .desc = { ent-CrateFunBBGun.desc } diff --git a/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl new file mode 100644 index 00000000000..13291e9539a --- /dev/null +++ b/Resources/Locale/en-US/deltav/prototypes/catalog/fills/crates/fun-crates.ftl @@ -0,0 +1,2 @@ +ent-CrateFunBBGun = BB gun crate + .desc = Contains 1 BB gun and 2 boxes of BBs. diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml new file mode 100644 index 00000000000..d994967a2aa --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: CrateFunBBGun + icon: + sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi + state: display + product: CrateFunBBGun + cost: 1000 + category: Fun + group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml new file mode 100644 index 00000000000..45e371ac63b --- /dev/null +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml @@ -0,0 +1,10 @@ +- type: entity + id: CrateFunBBGun + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: WeaponRifleBB + amount: 1 + - id: BoxCartridgeBB + amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml new file mode 100644 index 00000000000..b5077d4a955 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml @@ -0,0 +1,42 @@ +- type: entity + name: BB Gun + parent: BaseItem + id: WeaponRifleBB + description: The classic Red Ryder BB gun. Don't shoot your eye out. + components: + - type: Sprite + netsync: false + size: 50 + sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi ## + quickEquip: false + slots: + - Back + - suitStorage + - type: AmmoCounter + - type: Gun + selectedMode: SemiAuto + availableModes: + - SemiAuto + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/click.ogg + - type: BallisticAmmoProvider + cycleable: false + proto: BulletBB + whitelist: + tags: + - BulletBB + soundInsert: + path: /Audio/Weapons/drawbow2.ogg #here + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + ents: [] + - type: Appearance + - type: StaticPrice + price: 275 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml new file mode 100644 index 00000000000..e5a401edd87 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml @@ -0,0 +1,17 @@ +- type: entity + parent: BoxDonkSoftBase + id: BoxCartridgeBB + name: box of BBs + components: + - type: SpeedLoader + - type: BallisticAmmoProvider + whitelist: + tags: + - BulletBB + proto: BulletBB + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi + layers: + - state: bbbox + - type: StaticPrice + price: 25 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml new file mode 100644 index 00000000000..1f8f91a1d1c --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml @@ -0,0 +1,69 @@ +- type: entity + id: BulletBB + description: Don't shoot your eye out. + name: BB + parent: BaseItem + components: + - type: Item + size: 1 + - type: Reflective + - type: Appearance + - type: FlyBySound + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi + layers: + - state: bbbullet + - type: Tag + tags: + - BulletBB + - Trash + - type: Physics + bodyType: Dynamic + linearDamping: 0.1 + angularDamping: 0.1 + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.01 + density: 1 + mask: + - ItemMask + restitution: 0.3 #bounce + friction: 0.2 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.15,0.15,0.15" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: &flybyfixture + shape: !type:PhysShapeCircle + radius: 1.5 + layer: + - Impassable + - MidImpassable + - HighImpassable + - LowImpassable + hard: False + - type: TileFrictionModifier + modifier: 0.01 + - type: Projectile + impactEffect: BulletImpactEffect + deleteOnCollide: false + onlyCollideWhenShot: true + damage: + types: + Blunt: 1 + soundHit: + path: /Audio/Weapons/Guns/Hits/bullet_hit.ogg + - type: Ammo + muzzleFlash: null + - type: PhysicalComposition + materialComposition: + Steel: 1 + - type: SpaceGarbage + #- type: StaticPrice + # price: 0.05 diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml index 412a91a142d..a1b704d9b29 100644 --- a/Resources/Prototypes/DeltaV/tags.yml +++ b/Resources/Prototypes/DeltaV/tags.yml @@ -3,6 +3,9 @@ - type: Tag id: BeltSlotNotBelt #not a 'belt' +- type: Tag + id: BulletBB + - type: Tag id: CartridgeSpecial # For the .38 special ammo and revolver diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png new file mode 100644 index 00000000000..cc5df022ee5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbox.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png new file mode 100644 index 00000000000..0093a3e2e71 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/bbbullet.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json new file mode 100644 index 00000000000..4e6ba54e34e --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Ammunition/Boxes/bbgun.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bbbullet" + }, + { + "name": "bbbox" + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png new file mode 100644 index 00000000000..a83d8e92b62 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/base.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..ce3d78d944d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png new file mode 100644 index 00000000000..a83d8e92b62 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png new file mode 100644 index 00000000000..45651d59122 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-right.png new file mode 100644 index 00000000000..f6590bb5c06 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json new file mode 100644 index 00000000000..702b7c61322 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Guns/Rifles/bbgun.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Base by ∆∆Molotovthief, equipped sprites by Velcroboy", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + } + ] +}