From 587d3fa7b909b6b542283e327b96971cfa34a65d Mon Sep 17 00:00:00 2001 From: Swept Date: Fri, 2 Apr 2021 08:54:08 +0000 Subject: [PATCH] Debug SWEPs (#3755) --- .../Entities/Debugging/debug_sweps.yml | 88 ++++++++++++++++++ .../Prototypes/Entities/Objects/Fun/toys.yml | 9 -- .../Weapons/Guns/Pistols/debug.rsi/base.png | Bin 0 -> 277 bytes .../Guns/Pistols/debug.rsi/bolt-closed.png | Bin 0 -> 277 bytes .../Guns/Pistols/debug.rsi/bolt-open.png | Bin 0 -> 277 bytes .../Weapons/Guns/Pistols/debug.rsi/icon.png | Bin 0 -> 277 bytes .../Guns/Pistols/debug.rsi/inhand-left.png | Bin 0 -> 520 bytes .../Guns/Pistols/debug.rsi/inhand-right.png | Bin 0 -> 525 bytes .../Weapons/Guns/Pistols/debug.rsi/mag-0.png | Bin 0 -> 140 bytes .../Weapons/Guns/Pistols/debug.rsi/meta.json | 34 +++++++ .../Objects/Weapons/Melee/debug.rsi/icon.png | Bin 0 -> 358 bytes .../Weapons/Melee/debug.rsi/inhand-left.png | Bin 0 -> 420 bytes .../Weapons/Melee/debug.rsi/inhand-right.png | Bin 0 -> 465 bytes .../Objects/Weapons/Melee/debug.rsi/meta.json | 22 +++++ 14 files changed, 144 insertions(+), 9 deletions(-) create mode 100644 Resources/Prototypes/Entities/Debugging/debug_sweps.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-closed.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/bolt-open.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/debug.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Debugging/debug_sweps.yml b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml new file mode 100644 index 0000000000..23e51b08f8 --- /dev/null +++ b/Resources/Prototypes/Entities/Debugging/debug_sweps.yml @@ -0,0 +1,88 @@ +- type: entity + name: bang, ded + parent: PistolBase + id: PistolDebug + description: ded + suffix: DEBUG + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: Icon + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: Item + size: 1 + sprite: Objects/Weapons/Guns/Pistols/debug.rsi + - type: RangedWeapon + - type: MagazineBarrel + caliber: Pistol + magazineTypes: + - Pistol + fireRate: 100 + magFillPrototype: MagazinePistolDebug + minAngle: 10 + maxAngle: 10 + +- type: entity + id: MagazinePistolDebug + name: bang, ded mag + parent: MagazinePistolBase + suffix: DEBUG + components: + - type: RangedMagazine + fillPrototype: CartridgeDebug + capacity: 1000 + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_mag.rsi + +- type: entity + id: BulletDebug + name: bang, ded bullet + parent: BulletBase + abstract: true + suffix: DEBUG + components: + - type: Projectile + damages: + Blunt: 20000 + +- type: entity + id: CartridgeDebug + name: bang, ded cartridge + parent: CartridgePistolBase + suffix: DEBUG + components: + - type: Ammo + projectile: BulletDebug + +- type: entity + name: bang stick gibber + parent: BaseItem + id: MeleeDebugGib + description: hit hard ye + suffix: DEBUG + components: + - type: Sprite + sprite: Objects/Weapons/Melee/debug.rsi + state: icon + - type: MeleeWeapon + damage: 20000 + - type: Item + size: 1 + sprite: Objects/Weapons/Melee/debug.rsi + prefix: inhand + +- type: entity + name: bang stick 100dmg + parent: MeleeDebug + id: MeleeDebug100 + components: + - type: MeleeWeapon + damage: 100 + +- type: entity + name: bang stick 200dmg + parent: MeleeDebug + id: MeleeDebug200 + components: + - type: MeleeWeapon + damage: 200 diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 8f6bd266ce..64b32c7112 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -535,15 +535,6 @@ HeldPrefix: foamblade - type: ItemCooldown -- type: entity - name: foamblade - parent: FoamBlade - id: FoamBladeAdminbus - suffix: adminbused - components: - - type: MeleeWeapon - damage: 1000 - # MISC - type: entity diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..185e83cbf98630ae5c4d02e960608752d427b8b4 GIT binary patch literal 277 zcmV+w0qXvVP)AI0+ZwBGAB%Kp;iRn%EiQMN8pVX0tQSI3EgvAQ&4S z!2h9)L)zaKpqaJ8vVfrts^kTj=Euw7W9+m$!*jL&rk?6+MhFwPf)6gXAYWN2W_0C7 zi#UBtEhw5ByaZ}{h7qlnJ@8I#z1hAI0+ZwBGAB%Kp;iRn%EiQMN8pVX0tQSI3EgvAQ&4S z!2h9)L)zaKpqaJ8vVfrts^kTj=Euw7W9+m$!*jL&rk?6+MhFwPf)6gXAYWN2W_0C7 zi#UBtEhw5ByaZ}{h7qlnJ@8I#z1hAI0+ZwBGAB%Kp;iRn%EiQMN8pVX0tQSI3EgvAQ&4S z!2h9)L)zaKpqaJ8vVfrts^kTj=Euw7W9+m$!*jL&rk?6+MhFwPf)6gXAYWN2W_0C7 zi#UBtEhw5ByaZ}{h7qlnJ@8I#z1hAI0+ZwBGAB%Kp;iRn%EiQMN8pVX0tQSI3EgvAQ&4S z!2h9)L)zaKpqaJ8vVfrts^kTj=Euw7W9+m$!*jL&rk?6+MhFwPf)6gXAYWN2W_0C7 zi#UBtEhw5ByaZ}{h7qlnJ@8I#z1hJ%(9aVS+Yw!mm1zlVc>tDHZ^K%q(a`#R&Plamqs-uSGD&JYCri6RBk+b z`R=s_*AEe(nGo=!+~ZW!?sd}Vrw08k(E9t{GQi8#eeYwB7mpv_71f`$?B(IeI6CcCw!?F8^-mFLW?dG@sJkqnDRgdw_-TIid zZz@AW10VA?3OrHTzyZ{9R(8tm!?#MBu0)+a@$%U*Pd&kRCzWEAn}6RkQRs3Ox&g|PM!7B24@BMq;kC*yzUgPU%{Jm7OC0F!^u0sP;(FraV z4TbhKBrzHK7U=JeJ)fD`ebCY9x@WJmUV~>&b%eF^#pzL`Ibm5TXQYq0%yvO3K2iUmm(Z%aN-yTzLGp0VyAPoKW$$7BVq9c$kve!n^6^W~pc*~T$^s0(#UJLYo7Y?9ni}Z|N4Xw*KN0s z`53$pxEE+JF5dfqdtzu{XA!^<2%rEBSwR2=XvhizC_qD25I_MMvVs5#(2x}bP=JQ4 zAb7Say!1kdD4GFQtsW z1pZP4sfb2O$@Xj6ez8Ibga)n6x7)GXccC@F>cFZ-WQ>C7n%^8({AIahDVEsi89+zC zh%xUJ=vPvL3YD|OIGJHd-cty@53tPAmn#D39B)ETSzrMG0002y1!L?23X76RNtcZc P00000NkvXXu0mjfygT8G literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/mag-0.png new file mode 100644 index 0000000000000000000000000000000000000000..e67a5fecc6341f42d50b1aa2b50859edcdc83f07 GIT binary patch literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU{4pvkcif|mkjw17;rcTT7Tbf zEZaTd(3J~{|8qMSPdfqC?3kzOs&!ECea7z!`_*R*3r$w@Ub$PiwJ}HhO>k_3AWKB> m`D?5amD}_Vtk>gLc**E+l0#xDlbRM#D}$%2pUXO@geCx}^)8?Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json new file mode 100644 index 0000000000..96a7003a99 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Pistols/debug.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "bolt-closed" + }, + { + "name": "bolt-open" + }, + { + "name": "mag-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0403f27a357ed2b7078d921437f7d55fff9a4290 GIT binary patch literal 358 zcmV-s0h#`ZP)1I%S@0Nl^dUA$1b=ZP$Z7u>_^X}*5wIeT1^uBe7 z--a~Y)a%}Z&1Rd-=B;FLs**$?fmp6~cy{k=as;qo0*@osTv7buu=_FoW} z_JJ97Oe)8w%jG92+9nvBJeig8``EVH&)*(Bu>Nqh#lsOhISadRNr5&wCj0uv7E@cZ@`+-LlbycTt;s##h8ak008jr4@8?Hp3;lw?)D za0)7ia@BoUzDqcJ{?xqQ$dh?jc8K4Yv#Ckt!CA`%a~^1~U$W$w&Ua&uHy{5Vt9H0; zet5E%?~#hT1z{c!_8b)c)pH@``}8Q*>0f_74YW~O)GwL*E<88R@5{>WT43lic)I$z JtaD0e0sza)#QFdL literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/debug.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..99e0e13dd110363d7bae9e7a991d658aaae9ec51 GIT binary patch literal 465 zcmV;?0WSWDP)NVjo1}D8{tv{m-E3#F zGh1jv00000000000HE>5zgBoF=6>G|j@?X1sHMb{Wb(nSJitzJ?+>4RfV)W4c^tcO z;lJZ~@hc80Ae{94^mTaMaPkq4*{ovO0&cror!Lf*(b)gBK-BL$3e~XPt$9l{lYcDv zV-Dtdg9?xdrUot{Rch%z7CFYRtvP;_nh1Oyb#?bPS6g9 z{+C+n|0w3sV(b6_0000000026JXf)3I%RcObBW~7@|n345PwcL*Wk6E)~6U5TYVC8 zCqU8y%bo;ftT$d4E13YfsB#EQ+k{Z#x{3FT%$|T$iB?FS)7q>0lHIHcU