From c8725825bee29d3c314e7e357767c09a55a4e34c Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Sun, 21 Jul 2024 02:04:33 -0500 Subject: [PATCH] Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947) * no more lasers for you, borg. * downgrade * echis * echis * itemtoggleupdate * daggerparenting * fixtypo * more bullet per bullet --- .../Specific/Robotics/borg_modules.yml | 4 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 35 ++++++++ .../Objects/Weapons/Melee/e_sword.yml | 57 ++++++++++--- .../Melee/e_dagger_loud.rsi/e_sword.png | Bin 0 -> 215 bytes .../Melee/e_dagger_loud.rsi/e_sword_blade.png | Bin 0 -> 385 bytes .../Weapons/Melee/e_dagger_loud.rsi/icon.png | Bin 0 -> 324 bytes .../e_dagger_loud.rsi/inhand-left-blade.png | Bin 0 -> 301 bytes .../Melee/e_dagger_loud.rsi/inhand-left.png | Bin 0 -> 167 bytes .../e_dagger_loud.rsi/inhand-right-blade.png | Bin 0 -> 6862 bytes .../Melee/e_dagger_loud.rsi/inhand-right.png | Bin 0 -> 166 bytes .../Weapons/Melee/e_dagger_loud.rsi/meta.json | 78 ++++++++++++++++++ 11 files changed, 160 insertions(+), 14 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index 1566a84e52..93b2e41572 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -505,8 +505,8 @@ - state: icon-syndicate - type: ItemBorgModule items: - - WeaponAdvancedLaser - - Machete + - WeaponPistolEchis + - EnergyDaggerLoud - type: entity id: BorgModuleOperative diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index ae309661fe..8f469f87a9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -102,6 +102,41 @@ gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot +- type: entity + name: echis + parent: BaseItem + id: WeaponPistolEchis + description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. + components: + - type: Gun + fireRate: 5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/viper.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: ProjectileBatteryAmmoProvider + proto: BulletPistol + fireCost: 100 + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 25 + - type: AmmoCounter + - type: entity name: cobra parent: BaseWeaponPistol diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index ce3545920a..1e0aaf61e5 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -81,26 +81,25 @@ temperature: 700 - type: entity - name: pen + name: energy dagger parent: EnergySword - id: EnergyDagger - suffix: E-Dagger - description: 'A dark ink pen.' + id: EnergyDaggerLoud + description: A not as loud and dangerous dagger with a beam made of pure, concentrated plasma. This one is completely undisguised. components: - type: ItemToggle soundActivate: path: /Audio/Weapons/ebladeon.ogg params: - volume: -6 + volume: -3 soundDeactivate: path: /Audio/Weapons/ebladeoff.ogg params: - volume: -6 + volume: -3 - type: ItemToggleMeleeWeapon activatedSoundOnSwing: path: /Audio/Weapons/eblademiss.ogg params: - volume: -6 + volume: -3 variation: 0.250 activatedDamage: types: @@ -111,14 +110,14 @@ activeSound: path: /Audio/Weapons/ebladehum.ogg params: - volume: -6 + volume: -3 - type: ComponentToggler components: - type: Sharp - type: DisarmMalus malus: 0.4 - type: Sprite - sprite: Objects/Weapons/Melee/e_dagger.rsi + sprite: Objects/Weapons/Melee/e_dagger_loud.rsi layers: - state: e_sword - state: e_sword_blade @@ -135,7 +134,7 @@ Blunt: 1 - type: Item size: Tiny - sprite: Objects/Weapons/Melee/e_dagger.rsi + sprite: Objects/Weapons/Melee/e_dagger_loud.rsi - type: UseDelay delay: 1.0 - type: PointLight @@ -154,11 +153,45 @@ right: - state: inhand-right-blade shader: unshaded + - type: DisarmMalus + malus: 0 + +- type: entity + name: pen + parent: EnergyDaggerLoud + id: EnergyDagger + suffix: E-Dagger + description: 'A dark ink pen.' + components: + - type: ItemToggle + soundActivate: + path: /Audio/Weapons/ebladeon.ogg + params: + volume: -6 + soundDeactivate: + path: /Audio/Weapons/ebladeoff.ogg + params: + volume: -6 + - type: ItemToggleActiveSound + activeSound: + path: /Audio/Weapons/ebladehum.ogg + params: + volume: -6 + - type: Sprite + sprite: Objects/Weapons/Melee/e_dagger.rsi + layers: + - state: e_sword + - state: e_sword_blade + color: "#FFFFFF" + visible: false + shader: unshaded + map: [ "blade" ] + - type: Item + size: Tiny + sprite: Objects/Weapons/Melee/e_dagger.rsi - type: Tag tags: - Write - - type: DisarmMalus - malus: 0 - type: entity parent: BaseItem diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..109a3230b984fc3824ed5770c1f177ba58b6d1b8 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^FvruyF(ktM?WKdf2NXD11Kx1lIZ`V#tF|L~ zi{ixU&`EN??z8&;`aBV+l)-Q7wRe?&{90b@)o<5c+johXK-nyh=Zapu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/e_sword_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..8b8c9f45a743a99dbd97db6f4f4b996e87dc2a77 GIT binary patch literal 385 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0WWg+Z8+Vb&Z8pawBd7srqc=eN@w`I-y_TvvOWui4vn{e!@U zhaou+1mX^7??`)mOHyK1TgdH8QA~fP`$YMCD34@TySdBlT=gAv^p)$cvg?#%b(AMmd8$yZL;}%?T?61jJ{*uss%=~bAJfbNGw`r zr26;mQH`@vpOfQy>{$(}r#}!m@FucpIz!rep*^eydYmG1Uuq3+sOX&J-}i8K%bc_R zGlZr+WB<#apwV%B*YZn`_ql!MdCF%$(eP(?zKMDx-v=4HI|>Jd4Gd?uJXV?v^b-(l aYYmeBSiU{^sCIrbi0|p@=d#Wzp$Pyl6PD!w literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4111eebaab4fe23f3486a1568522aaed3db71e7a GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=G`DAk4@xYmNj^@TRAWV@QPi+shkyn+*h7A1VuRUy$6yBeLX# zjL%UiPiMyJ3(EbD71wq;I{oNbSv3Dig2o5^#}k5Hy-%&N-E!^g?B#xDzVY+aK0bIY z`S`fqi&YmGUR0{|PGAw}Rj!-tHfJ8=gQFiftHdvwRNTou9A_)+$XF2WQowLWP?4+Q zir^y#4@t$};s$X?@)j3&D<^eVKK;oq+_{3`hP%!4o3_)t_!#6LitC@AbZcAeUEc*O zj0={mT6I;z*){Nj0gvPReOs8TPj5=O7Io22WgQu&X%Q~loCIGE6cyIs! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..03d50f98ef41f9ede1c4d6087e69dc3ea493363a GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE(}r(Vhn-{IZo#QMK}vQ zB8wRqxP?KOkzv*x383IvPZ!6Kid%2*80H-|;9H9v#R_@+P^brI!^2@@4NA*P7h+27r(1sOXuU00mp-*JEb g?+df}fvWa=XPL{Rk#U`Aiy=slr>mdKI;Vst0H51+&Hw-a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..639da1c18431e4ed27c39724b7061fae946c9603 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}r(Vhn-{IZo#QMK}vQ zB8wRq_>O=u<5X=vX`rCHr;B4q#jUrucJeYP@Gu`(Gtp2m>7N0M(4(ENCm++3Wdy2W zSd&$I<>dbzOF8{j=Fi;vnGYn!!0;f`jAhdQ3A~I92bwsAWdz@+e82AvlJIo(b6Mw< G&;$T58ZT%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right-blade.png new file mode 100644 index 0000000000000000000000000000000000000000..ae7c25221e3ddf345adc93c12e3cf87a4962f36a GIT binary patch literal 6862 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 RYFRJQwJ_aE&oOp8@Gn^jo=^Y) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..00d8e890aaac531928d8d4c8ad21742e79335e27 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Y)RhkE(}r(Vhn-{IZo#QMK}vQ zB8wRq_>O=u<5X=vX`rB+r;B4q#jUqDH}Wzl@Gx)KchOkzQQZxR3WmTp+(D+%N