From c2234407d55cafa6cfe6398182e75b311d59f253 Mon Sep 17 00:00:00 2001 From: Kara Date: Thu, 14 Jul 2022 20:43:49 -0700 Subject: [PATCH 1/4] Proto-kinetic accelerator --- .../Objects/Weapons/Guns/Basic/base_pka.yml | 0 .../Weapons/Guns/{Magic => Basic}/base_staff.yml | 4 ++-- .../Weapons/Guns/{Magic => Basic}/base_wand.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Basic/pka.yml | 0 .../Weapons/Guns/{Magic => Basic}/staves.yml | 0 .../Objects/Weapons/Guns/{Magic => Basic}/wands.yml | 0 .../staves.rsi/animation-inhand-left.png | Bin .../staves.rsi/animation-inhand-right.png | Bin .../Guns/{Magic => Basic}/staves.rsi/animation.png | Bin .../staves.rsi/change-inhand-left.png | Bin .../staves.rsi/change-inhand-right.png | Bin .../Guns/{Magic => Basic}/staves.rsi/change.png | Bin .../staves.rsi/chaos-inhand-left.png | Bin .../staves.rsi/chaos-inhand-right.png | Bin .../Guns/{Magic => Basic}/staves.rsi/chaos.png | Bin .../staves.rsi/door-inhand-left.png | Bin .../staves.rsi/door-inhand-right.png | Bin .../Guns/{Magic => Basic}/staves.rsi/door.png | Bin .../staves.rsi/healing-inhand-left.png | Bin .../staves.rsi/healing-inhand-right.png | Bin .../Guns/{Magic => Basic}/staves.rsi/healing.png | Bin .../Guns/{Magic => Basic}/staves.rsi/meta.json | 0 .../Guns/{Magic => Basic}/staves.rsi/nothing.png | Bin .../staves.rsi/staff-inhand-left.png | Bin .../staves.rsi/staff-inhand-right.png | Bin .../{Magic => Basic}/staves.rsi/staffofchange.png | Bin .../{Magic => Basic}/wands.rsi/death-effect.png | Bin .../Guns/{Magic => Basic}/wands.rsi/death.png | Bin .../Guns/{Magic => Basic}/wands.rsi/door-effect.png | Bin .../Guns/{Magic => Basic}/wands.rsi/door.png | Bin .../Guns/{Magic => Basic}/wands.rsi/fire-effect.png | Bin .../Guns/{Magic => Basic}/wands.rsi/fire.png | Bin .../Guns/{Magic => Basic}/wands.rsi/meta.json | 0 .../Guns/{Magic => Basic}/wands.rsi/nothing.png | Bin .../Guns/{Magic => Basic}/wands.rsi/poly-effect.png | Bin .../Guns/{Magic => Basic}/wands.rsi/poly.png | Bin .../{Magic => Basic}/wands.rsi/wand-inhand-left.png | Bin .../wands.rsi/wand-inhand-right.png | Bin 38 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml rename Resources/Prototypes/Entities/Objects/Weapons/Guns/{Magic => Basic}/base_staff.yml (79%) rename Resources/Prototypes/Entities/Objects/Weapons/Guns/{Magic => Basic}/base_wand.yml (85%) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml rename Resources/Prototypes/Entities/Objects/Weapons/Guns/{Magic => Basic}/staves.yml (100%) rename Resources/Prototypes/Entities/Objects/Weapons/Guns/{Magic => Basic}/wands.yml (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/animation-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/animation-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/animation.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/change-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/change-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/change.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/chaos-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/chaos-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/chaos.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/door-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/door-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/door.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/healing-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/healing-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/healing.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/meta.json (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/nothing.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/staff-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/staff-inhand-right.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/staves.rsi/staffofchange.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/death-effect.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/death.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/door-effect.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/door.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/fire-effect.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/fire.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/meta.json (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/nothing.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/poly-effect.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/poly.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/wand-inhand-left.png (100%) rename Resources/Textures/Objects/Weapons/Guns/{Magic => Basic}/wands.rsi/wand-inhand-right.png (100%) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml similarity index 79% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_staff.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index b11a763c74af..1a102edca413 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -4,9 +4,9 @@ parent: BaseItem components: - type: Sprite - sprite: Objects/Weapons/Guns/Magic/staves.rsi + sprite: Objects/Weapons/Guns/Basic/staves.rsi - type: Item - sprite: Objects/Weapons/Guns/Magic/staves.rsi + sprite: Objects/Weapons/Guns/Basic/staves.rsi HeldPrefix: staff size: 60 - type: Gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml similarity index 85% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_wand.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml index 2c3e73ba669f..1d479e5b6adb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/base_wand.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml @@ -4,9 +4,9 @@ parent: BaseItem components: - type: Sprite - sprite: Objects/Weapons/Guns/Magic/wands.rsi + sprite: Objects/Weapons/Guns/Basic/wands.rsi - type: Item - sprite: Objects/Weapons/Guns/Magic/wands.rsi + sprite: Objects/Weapons/Guns/Basic/wands.rsi HeldPrefix: wand size: 30 - type: Gun diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/staves.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/staves.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/staves.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Weapons/Guns/Magic/wands.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/animation.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/animation.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/change.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/change.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/chaos.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/chaos.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/door.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/door.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/healing.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/healing.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/nothing.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/nothing.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/nothing.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/nothing.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staff-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staff-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staff-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staff-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staff-inhand-right.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staffofchange.png b/Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/staves.rsi/staffofchange.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/staves.rsi/staffofchange.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death-effect.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/death-effect.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death-effect.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/death-effect.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/death.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/death.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/death.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door-effect.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/door-effect.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door-effect.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/door-effect.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/door.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/door.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/door.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire-effect.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/fire-effect.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire-effect.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/fire-effect.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/fire.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/fire.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/fire.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/meta.json rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/meta.json diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/nothing.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/nothing.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/nothing.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/nothing.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly-effect.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/poly-effect.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly-effect.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/poly-effect.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/poly.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/poly.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/poly.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/wand-inhand-left.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-left.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/wand-inhand-left.png diff --git a/Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/wand-inhand-right.png similarity index 100% rename from Resources/Textures/Objects/Weapons/Guns/Magic/wands.rsi/wand-inhand-right.png rename to Resources/Textures/Objects/Weapons/Guns/Basic/wands.rsi/wand-inhand-right.png From 2816411baa2089fa9421c5913b249027559bc137 Mon Sep 17 00:00:00 2001 From: Kara Date: Thu, 14 Jul 2022 20:43:59 -0700 Subject: [PATCH 2/4] Sprite and basic entity --- .../Objects/Weapons/Guns/Basic/base_pka.yml | 29 ++++++++++++++++ .../Objects/Weapons/Guns/Basic/pka.yml | 13 ++++++++ .../Weapons/Guns/Projectiles/magic.yml | 12 +++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 19 +++++++++++ .../Basic/kinetic_accelerator.rsi/empty.png | Bin 0 -> 216 bytes .../Basic/kinetic_accelerator.rsi/gun.png | Bin 0 -> 778 bytes .../kinetic_accelerator.rsi/inhand-left.png | Bin 0 -> 959 bytes .../kinetic_accelerator.rsi/inhand-right.png | Bin 0 -> 962 bytes .../Basic/kinetic_accelerator.rsi/meta.json | 31 ++++++++++++++++++ 9 files changed, 104 insertions(+) create mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index e69de29bb2d1..9363949a5044 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -0,0 +1,29 @@ +- type: entity + id: WeaponProtoKineticAcceleratorBase + abstract: true + parent: BaseItem + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + - type: Item + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + size: 30 + - type: Gun + fireRate: 0.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: AmmoCounter + - type: Appearance + - type: GenericVisualizer + visuals: + enum.AmmoVisuals.HasAmmo: + overlay: + True: { visible: False } + False: { visible: True } + - type: RechargeBasicEntityAmmo + minRechargeCooldown: 3 + maxRechargeCooldown: 5 + - type: BasicEntityAmmoProvider + proto: BulletKinetic + capacity: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index e69de29bb2d1..ec854093a4c2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -0,0 +1,13 @@ +- type: entity + name: proto-kinetic accelerator + id: WeaponProtoKineticAccelerator + parent: WeaponProtoKineticAcceleratorBase + description: Fires low-damage kinetic bolts at a short range. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi + layers: + - state: gun + - state: empty + visible: false + map: [ "overlay" ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 531bba60c379..d08e1591504c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -99,3 +99,15 @@ types: Piercing: 300 ignoreResistances: true + +- type: entity + id: BulletKinetic + name: kinetic bolt + parent: BaseBulletHighVelocity + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Projectile + damage: + types: + Blunt: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 1cbe993cd9bc..39ba99d2003a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -186,6 +186,25 @@ tags: - EmitterBolt +- type: entity + id: BulletKinetic + name: kinetic bolt + parent: BaseBulletHighVelocity + noSpawn: true + description: Not too bad, but you still don't want to get hit by it. + components: + - type: Sprite + netsync: false + noRot: false + sprite: Objects/Weapons/Guns/Projectiles/magic.rsi + layers: + - state: chronobolt + shader: unshaded + - type: Projectile + damage: + types: + Blunt: 10 + # Launcher projectiles (grenade / rocket) - type: entity id: BulletRocket diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/empty.png new file mode 100644 index 0000000000000000000000000000000000000000..327fa954ffb5b989b883d35d50955d960a1b383c GIT binary patch literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YtN1 z>EaktG3V`#wY&`m0&NeK51PF25;zlZ_v8ehgFbVaR2+km>`I zCI*HHJU8Af*}Y=T^NXSEI%QXO?shGi5TnX?@9OLF*jxrxCa@v|F^TbBb+4fp$HIU0 s2P~H#lQLsyoApVO>$mS}{sj{9boFyt=akR{0JiHz{Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/gun.png new file mode 100644 index 0000000000000000000000000000000000000000..c7657c7e3f5299d24864867ac92e6ed1e79c9026 GIT binary patch literal 778 zcmV+l1NHogP)Y^^Z@v@s*L4*`VP#50x&m^oEWiwK=+S;I2+T5x|ea@m}*4Ou*?R@*z z=A0!&@I5#0d(OV|KELyxb2bbASSo-DpaQ4>|1Ut}N~?Ibbv5?44q&Qy_hp|(x%Th| zr})PJKWwH5xH5g0&SwMjNyx3~lcT1+fI)9z0JG&*eTBO&$${a(KY zSyZmKi*xpF#kUL6;PrW&bM@eZ@FQm=nN}DO9w~;yR)F5_U=oa!1R(Q0+bswTjiKwo zvq^VfwqO)m*DjU|v%liht=m{usLL6(#YM2|DzR^(3G=oHs9HKdt)|=oGS5eCN1GAw zyrd0hKy5~(x2jF6=1h42R>%s5CfodC(#1Zdh1T{eqV=-$<4`x06qOaHc#y( z5yYY04N_)iV{Yz$6_R1QMz2T)W_CAjxD$7h@{A5p(c@*C0V~AVcQ2cx;$+SNcf?C@ zZ&5t$vYxyQQQ1AJ!_8@3QDHTUp6D=aSjFZeWAS7Mq=mdV<#b*Iab(CVx0nCU_4`Yq zb@g?L!qg#Ur?`gSCnCS3@)2;+d66ECOD`djvJ1w|sbDY^)|@~X+0;~TWRY4w*;D2U zCTqw5Wd7!Dm>C2^9qb5b7x}yngP}$`)K3ZEJYN$R10Yi=h{_-65>^`Y;?0Z-5DaeoX9e`exy)2&C{2R^7SeZF>*NKH zOR1t^XbNf=Oe7R#Gh`kLJ)f58v;ma*8?zY!m}#j1Du4>`3*5SZ7uevaZ~y=R07*qo IM6N<$f+l@vzyJUM literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..711a82aa3711245e53d79661c72d0d1a49dc3960 GIT binary patch literal 959 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|RrR zr;B4q#hkaZ{5?V(WsdLXc8vQ~{$ayH(Mf9}GgD;G=#?3AIa!4yP5+?aDROU-lbQ1_ zk)#}Hxo_9xw7QH=?aE=9nV7kB=UNTHjaxkGZ}ccknDOmk8uCMjl?6n80eU@=tVqI{Ri+$EZ-KfS-haz5iu@);c zvBt;EV9$?KJ=7?4MLzTRzq_HEmakT0&e)XwY0ryYg%X_y<4k@%^kCWdN#xJGz0*H@ zt3H&cEV%B@%Zbxif#!7vifx%|-LNTES7OiYR~o{X!soqPp7UsR{r`&--n?9Ovf=6J zX^U3xK0nK5?Sc%olyx?D{U2YbNVi@edFWF4Ob_t|3lf-D|9i19?DY03P9tMQqiKKd zotY}%xo;cO^S5DTj66btlNg^LZ?}G$_n4y)t(4crfpuduG<7QZc3u=TN8cKwB9 z_DeCbN59Fg-g;|t_x^_&f6c5b?8JJxSv5{F*hNNNo%L2aSFmR3YmEvM(j&@^I^sN6m`A_gDBjio9eB$j#T=#}IgF^$CX)`|S3<^4Zd(7t5f2HDP;7 z*hJ&PAh+py4bkxp8k>KzYi0jV|KeFUvmrw=b{9il4dbGe&-?|Kv`;KbEqTeb<0ET_ z(d_z$f89SqC(e5`e=pn0HBXO-D|ngxXQ+R>Q+K|0VMoU=CYPU+>mP({;4gOUbaVnr zTg}V*-!N(Jf)0HLk*oh0Q==0FfwpP=Wj-aVRR5W^W6>%51%C`wiiMXXh3|ae*X##M e@ms_nsL#3Q$Q=43;43gkGI+ZBxvXC8Ip`yX=E+THnvF$LRwT} zi^7E@QMk1bGo(!*hE2GzRW2$DGkR?%g3PeAvYbYes2CjRg(X2CahmVoozC2xd(X_= zoX0so(0O?;=lh*+?!*7dh2m%dP#i4)ilYTUakKy^jursL(E^}2S^%<$V)trhJbxFQ z&XL*1Qozo2m8`dYGfEEiN$o6^Q1NZewfuR9_a5F}Ze&gEFW{RRwH$j)0aScNVIExN zRTv&9Wevx=q^+ik$q%!*a(f8(ixil z1AD3?uW7Q@=D9F<<0wMo!)R(pObP!85NE!8cN@2v3A2Cy(JTH)BB%>G&mH9BAHUOK z*$Ghs%rj5L58fTY$`#9j;55>mneRVvw)a}jmJOwh#!cg=I;=V&N`QIhC;e}@*_tm) z@X5WA1%t2CwhO3uqf5so0y*Iyc#86wxf6U-(c47?khL@2N4PPXaVnmUrnJ+s@aOKZ z0Hi76*V8Rb6pg>F8N42&6CT!oWhBV>doG}*rkd?PQHT1IH!-v9CyqC4=NlV4q{nog zeGwYx-^uzmFQFFa`yccAE_62HYWD!^dN9Q6$))0(8%yEs9zbhY!lb`|Z$t+ZYX7l` z%qU#Mm@Mk*T{|{KBzVf!Q}LjB!*B_?^CsAu5)XP#U&rw0k3#W*j4NJbe*F9tNfN3G z{Mfp!4Box~A{{`#=taZKZ$=-6d~;b*yn!Kst_!HXXHWg;fBq!;7(mdQq1ibmY?L)n zJ#>n{<$DRs)1cjTb0#BwC8!!&02D_HfZ}KYP#i4)ilYTUakKy^jursL(E^}2(gKX= zIo%_&c##qyM$d;^FCm+d?f@ft7Lm>1o#211Rj?HxM$hKYZa>MM&Tq<0>tQ9OkZU)_(X`cR>5g(1uS&h zGbDJ5@_CGIm%%4OthEYG6ZeIXIVP9M;N!(=tpXe-sVl)#-VrPXY%}85mL8}ZtUKVq$f}^*?PF@5p k)>;Mq{{SeC768Th1A8t{Gd&{_j{pDw07*qoM6N<$f}K3Nvj6}9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json new file mode 100644 index 000000000000..0e57bf9fe419 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at https://github.com/tgstation/tgstation/commit/8b7f8ba6a3327c7381967c550f185dffafd11a57", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "gun" + }, + { + "name": "empty", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} From f3d3dc0211b92e9f7b3cfa5321d9966a5224a5ba Mon Sep 17 00:00:00 2001 From: Kara Date: Thu, 14 Jul 2022 21:00:10 -0700 Subject: [PATCH 3/4] Finish --- .../Systems/RechargeBasicEntityAmmoSystem.cs | 2 +- .../Weapons/Guns/Gunshots/kinetic_accel.ogg | Bin 0 -> 20681 bytes .../Audio/Weapons/Guns/Gunshots/license.txt | 2 +- .../Audio/Weapons/Guns/MagIn/kinetic_reload.ogg | Bin 0 -> 15951 bytes .../Objects/Weapons/Guns/Basic/base_pka.yml | 6 +++++- .../Weapons/Guns/Projectiles/impacts.yml | 15 +++++++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 4 ++++ 7 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg create mode 100644 Resources/Audio/Weapons/Guns/MagIn/kinetic_reload.ogg diff --git a/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs b/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs index bc62d3a4fac4..4f942338c2cc 100644 --- a/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs +++ b/Content.Server/Weapon/Ranged/Systems/RechargeBasicEntityAmmoSystem.cs @@ -36,7 +36,7 @@ public override void Update(float frameTime) recharge.AccumulatedFrameTime += frameTime; if (recharge.AccumulatedFrameTime < recharge.NextRechargeTime) - return; + continue; recharge.AccumulatedFrameTime -= recharge.NextRechargeTime; UpdateCooldown(recharge); diff --git a/Resources/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg b/Resources/Audio/Weapons/Guns/Gunshots/kinetic_accel.ogg new file mode 100644 index 0000000000000000000000000000000000000000..a74c4d45961da68b7636fa4264aff1d7c7e3f561 GIT binary patch literal 20681 zcmagG1ymft(=R%Ud$8aT2)bBsvPh6X2<{HSA-F?u2o?wsWO28}-JL*iceg+wSO^Zm z-je*k`+e`eckZ3j+oz|iyQ;hDS3T7|1BwaKLCF8Qg2i8JfB-aj4W}G+kN-!rUl`$@!lT&%K$MfB$B|+Ht_>BoDJNb{XW=<#`8l{M9yRiRz5@Q@ z1wIj)bn^r&e>CoBqrYnLhqEQgMthC*PZGSrr|d22l<}0)5eQDokE|lX)TyswYN?D( zMMcrdvqD|tM{c~lxJCI4T^13wkDtY{KmN4k@S(@SauZ)Z7~f?Bko z1@Egpp0ZuoL1lkge|68H=*mpOV_4pzedm>>;8B6 zh{Ek=G*8l-{*l@z3dNX^21XM{!fj{JL2k zmVBs+3^@OvN5PFsZ5l0xLi*Q9LXw;Y!3A)y_@9RRO*e)|Iq^Tz*fE7NK0Q25aIvX! z3#+TCYr5HLC%P^*1nbYcuFd(Z%|#jzhy3rr`d^*{z?~-OuTMgaBRKog0u{v3{~7qd zJjao+FNR_uhEBGcPJWVgjO3v6V z%E9>GJm-CQK~i|Zr|_LmQA}Y8mSHKyO*uA$<@?S5*Yv+UN6Lu~p5UG%=|uNGJg1YB z;x*ixs#)bv|IJZ&0fbgNCAKrZsZ``aHnW-J7Fy}&TTs6YzRvBHADKj zQwh1iNP7M#YV0nUp7f8GXz*nZ2~Y+Af6ji+ZzN8m(gRr%qnzmJ(0&MGe%z!qm@R>X z8%z(wH`z?fos=HPgObRGr|03Dgq6WN0jTgFX7+gWQ;;Yj02pJbV1R?6Dx=`-Xq7?E z9~3Gwkb*STQ3x7k&>$yDdLS-1pF(vM+(!{KEcPQUa9oTD0H`}b@SivnkEtYp%LuGH z(2d3M$P&`a5=f2_n#~c&&&BhM@bD_DsSgpT�*{5y`99)5{ac%b%&K6G*B*Ri8?b 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/Weapons/Guns/Gunshots/license.txt b/Resources/Audio/Weapons/Guns/Gunshots/license.txt index 9b375674fc5e..238c8056c424 100644 --- a/Resources/Audio/Weapons/Guns/Gunshots/license.txt +++ b/Resources/Audio/Weapons/Guns/Gunshots/license.txt @@ -1,5 +1,5 @@ atreides.ogg, c-20r.ogg, flaregun.ogg, mateba.ogg, minigun.ogg, mk58.ogg were taken from https://gitlab.com/cmdevs/colonial-warfare/-/tree/32cb5892413243cc74bb2d11df8e3085f8ef1164/sound/weapons They are licensed under CC-BY-SA 3.0 -taser2.ogg was taken from https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac +taser2.ogg and kinetic_accel.ogg were taken from https://github.com/tgstation/tgstation/tree/88d7dbfc105fbf40284d7b7c4587f8d23c0ac3ac It is licensed under CC-BY-SA 3.0 \ No newline at end of file diff --git a/Resources/Audio/Weapons/Guns/MagIn/kinetic_reload.ogg b/Resources/Audio/Weapons/Guns/MagIn/kinetic_reload.ogg new file mode 100644 index 0000000000000000000000000000000000000000..29a91d01b772b78557bbde741fe5995b5256bd8c GIT binary patch literal 15951 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 Date: Thu, 14 Jul 2022 21:06:59 -0700 Subject: [PATCH 4/4] tweaks --- Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml | 1 + .../Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml index 2fa879834fd0..a0f17e0e371f 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml @@ -16,3 +16,4 @@ - id: ClothingBeltUtilityFilled prob: 0.8 - id: SurvivalKnife + - id: WeaponProtoKineticAccelerator diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 5dd05334db57..c14e97991cc9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -207,7 +207,7 @@ Blunt: 10 # Short lifespan - type: TimedDespawn - lifetime: 0.5 + lifetime: 0.4 # Launcher projectiles (grenade / rocket) - type: entity