From 4772d9e6f5da6062a96c73d0a622205143c90b1c Mon Sep 17 00:00:00 2001 From: kxv <136233650+kxvvv@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:33:34 +0300 Subject: [PATCH] stun prod (#17467) * stunprod * update alphabetical correct, the battery charge is less, stamina damage is less (5 hits now), graph id fixed * update crafting has become more difficult * update makeshiftstunprod * remove netsync * Update meta.json * fix * remove bluntStaminaDamageFactor --- .../Objects/Consumable/Drinks/drinks_fun.yml | 5 +- .../Entities/Objects/Misc/machine_parts.yml | 3 + .../Entities/Objects/Power/powercells.yml | 3 + .../Objects/Weapons/Melee/stunprod.yml | 47 ++++++++++ .../Graphs/improvised/makeshiftstunprod.yml | 31 +++++++ .../Recipes/Crafting/improvised.yml | 11 +++ Resources/Prototypes/tags.yml | 9 ++ .../Melee/stunprod.rsi/equipped-BACKPACK.png | Bin 0 -> 356 bytes .../Weapons/Melee/stunprod.rsi/meta.json | 82 ++++++++++++++++++ .../Melee/stunprod.rsi/off-inhand-left.png | Bin 0 -> 476 bytes .../Melee/stunprod.rsi/off-inhand-right.png | Bin 0 -> 477 bytes .../Melee/stunprod.rsi/on-inhand-left.png | Bin 0 -> 631 bytes .../Melee/stunprod.rsi/on-inhand-right.png | Bin 0 -> 640 bytes .../Melee/stunprod.rsi/stunprod_nocell.png | Bin 0 -> 191 bytes .../Melee/stunprod.rsi/stunprod_off.png | Bin 0 -> 227 bytes .../Melee/stunprod.rsi/stunprod_on.png | Bin 0 -> 292 bytes 16 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml create mode 100644 Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_nocell.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml index edbe6e6865..aa29a09f74 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_fun.yml @@ -30,6 +30,9 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill + - type: Tag + tags: + - DrinkSpaceGlue - type: entity parent: DrinkBase @@ -62,4 +65,4 @@ - type: SolutionContainerVisuals maxFillLevels: 6 fillBaseName: fill - - type: Lube + - type: Lube \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml index 9dfa4d9258..be1f4f65ee 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/machine_parts.yml @@ -27,6 +27,9 @@ - type: MachinePart part: Capacitor rating: 1 + - type: Tag + tags: + - CapacitorStockPart - type: entity id: MicroManipulatorStockPart diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 8ea097e479..4b1c910428 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -62,6 +62,9 @@ - type: Battery maxCharge: 360 startingCharge: 360 + - type: Tag + tags: + - PowerCellSmall - type: entity id: PowerCellSmallPrinted diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml new file mode 100644 index 0000000000..8ecd97827c --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -0,0 +1,47 @@ +- type: entity + name: stun prod + parent: BaseItem + id: Stunprod + description: A stun prod for illegal incapacitation. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/stunprod.rsi + layers: + - state: stunprod_off + map: [ "enum.ToggleVisuals.Layer" ] + - type: Stunbaton + energyPerUse: 70 + - type: MeleeWeapon + damage: + types: + Blunt: 9 + angle: 60 + animation: WeaponArcThrust + - type: StaminaDamageOnHit + damage: 20 + - type: Battery + maxCharge: 360 + startingCharge: 360 + - type: ItemCooldown + - type: Item + heldPrefix: off + size: 100 + - type: Clothing + sprite: Objects/Weapons/Melee/stunprod.rsi + quickEquip: false + slots: + - back + - type: DisarmMalus + malus: 0.225 + - type: Appearance + - type: GenericVisualizer + visuals: + enum.ToggleVisuals.Toggled: + enum.ToggleVisuals.Layer: + True: {state: stunprod_on} + False: {state: stunprod_off} + - type: StaticPrice + price: 100 + - type: Construction + graph: makeshiftstunprod + node: msstunprod \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml new file mode 100644 index 0000000000..fa006a938b --- /dev/null +++ b/Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml @@ -0,0 +1,31 @@ +- type: constructionGraph + id: makeshiftstunprod + start: start + graph: + - node: start + edges: + - to: msstunprod + steps: + - material: MetalRod + amount: 1 + - material: Cable + amount: 15 + - tag: DrinkSpaceGlue + name: Drink Space Glue + icon: + sprite: Objects/Consumable/Drinks/glue-tube.rsi + state: icon + - tag: PowerCellSmall + name: Power Cell Small + icon: + sprite: Objects/Power/power_cells.rsi + state: small + - tag: CapacitorStockPart + name: Capacitor Stock Part + icon: + sprite: Objects/Misc/stock_parts.rsi + state: capacitor + doAfter: 20 + - node: msstunprod + entity: Stunprod + diff --git a/Resources/Prototypes/Recipes/Crafting/improvised.yml b/Resources/Prototypes/Recipes/Crafting/improvised.yml index 277a67e283..2f3b34db2b 100644 --- a/Resources/Prototypes/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/Recipes/Crafting/improvised.yml @@ -35,6 +35,17 @@ icon: { sprite: Objects/Misc/cablecuffs.rsi, state: cuff } objectType: Item +- type: construction + name: makeshift stunprod + id: makeshiftstunprod + graph: makeshiftstunprod + startNode: start + targetNode: msstunprod + category: construction-category-weapons + description: "Homemade stunprod." + icon: { sprite: Objects/Weapons/Melee/stunprod.rsi, state: stunprod_off } + objectType: Item + - type: construction name: muzzle id: muzzle diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 7926027eb1..df832a7793 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -97,6 +97,9 @@ - type: Tag id: CableCoil +- type: Tag + id: CapacitorStockPart + - type: Tag id: Carrot @@ -275,6 +278,9 @@ - type: Tag id: Donut +- type: Tag + id: DrinkSpaceGlue + - type: Tag id: DroneUsable @@ -663,6 +669,9 @@ id: PlushieGhost +- type: Tag + id: PowerCellSmall + - type: Tag id: Powerdrill diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..dd49c3dabc14542bb75bf903e4e74d8a925d6b99 GIT binary patch literal 356 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`s0a9jxE?rg z;L|LZ9B;YViB2ms-8bZW?W_u)%Fq8sPDNWwtGcrC&Ye47np%CXI$8p?@RkJm1vC6d z0=g`YYk?A%JY5_^B3j>0JIL2;z~lUKR!PeL{|B{obHtN^&3v7^`j6DHwRkMo{Nlf> zcSi2xO1MFZY*~}?jz$*kGR+aDoQr-Aq+87pLIVfOsveAE9NRU2zoRsNW?`8TV{(kW}MGBBJ9Z(3`Y!`lyN=%ZTg9YsbbXo~@NX s{}^rH;{TvF=Ty8$KmYSP0>8G-3l(7wY88Gu2k1KnPgg&ebxsLQ01aN3asU7T literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json new file mode 100644 index 0000000000..d854da81c4 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/meta.json @@ -0,0 +1,82 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite by https://github.com/noudoit", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "stunprod_off" + }, + { + "name": "stunprod_nocell" + }, + { + "name": "stunprod_on", + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "off-inhand-left", + "directions": 4 + }, + { + "name": "off-inhand-right", + "directions": 4 + }, + { + "name": "on-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "on-inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ], + [ + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/off-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..13354dd3acdd49ad4dedc2749bb267139b3a2c5f GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+Kz7PB_gTwsoyq;!5X{K%Aa$=>=ymh|GfiDB-h4l1+?_D(d0M}*;Kj&!?zJY{(*EkmrwIO= zyYQcrn!eL!o9nCA>F(OKqI|n^pvcAh_g!7O7rofW5v#NB;%p@WK`8huGKrhx=|uSg z+h+cgtSz5T@&9Px$mq|oHRCt{2+RJUiKokYgYm`+=z!f}JNHk!{G~o)^rUIf+0b92~ns5V=ScMAg z1=+KGSpW`6{Qr!{aL>xXNX#3}n9qFx5fKp)5z(X5aG@fiL(iiRBBB~D{?+DOFK%C) zZBIBH4$j}fVi-<0Le^mE@rSEt9aXz+1xYzG8 zRHW$+osrmw{LdG+An>=(3{m{h|5#76Q1gqsO TFkxFD00000NkvXXu0mjfN72~o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e0fada66791c53831fa343a83b2fd3c79aa6ea03 GIT binary patch literal 631 zcmV--0*L*IP)Px%F-b&0RCt{2+&ymFKoG_8w??WQ!92mL5}*qZpf15afZN=_h)kt0000m7bz)O!<_}R+1YD|F{ZRxdBQ)) z54pm3Uq5%>ho{#px!2@BWUJ!o_+|0^XSPUd{^Mgx(&^|)DaM#$jMpKTqqbvVQ8f=HKP7z`Cl^;qC1nKWcpWbzNIuIM)1GKRf^c0002M|FHJ!+X7rg z*!uMsi`c9z|6+3HKS)vt3hm{A-EN<~vEa^^bZR3fr6kWOaOZbLocGhE-+lI}=3i_Z z#~9Ocxl~z}IvfuA_VS{T={imB{EHVPPW|*GNo84PefZq@f4w2n7V+c#y|3&Kx$`?Q z#^h{#y7LE7ggYNN<35h={H}<)uB{(}Gk*|8xbp!300000M#0{KXK%oO_6D?i9iNXe zrrmBY>3I1eguFe*Yw~-U9{)pFN$FLKMeIFl5cy--8_>Gz2^iDffYx2#0q(hdcfKV5 z=sJ4?*c$)<00000000;__6ukLmm8#M?iaYKH|U=4cjrs;&-c6YyCSBxU*M+p@s#!p z+;l-=O8W(Fz9HhC?|0{S+_Svy{6Q4q&Iiu8kE1)kD`NJe_3k3v`2a8qzW~p!AQt8< RD;NL(002ovPDHLkV1j}_HzWW6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/on-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..59c279671672b942b56ef1ea582186c01a369dda GIT binary patch literal 640 zcmV-`0)PF9P)Px%I!Q!9RCt{2-91jjKoAAsw}^@(VEF)(DpD?B$+?7kBwB8O-~_a}jW2+d%059T zLQgvsQC5-2AHmsYS_JDgqstB7qb^&-R~7Be@qLS?r001*{cesOd7qIhV5oYEN#3JtRJy|h~{BWp{>2!*sD6m?s z@bdbKaNxbykTU;v-!I#?4Z!BXR1`(h#i!2SdjWQf_*}2Am3OF3xA{Yv0XXL3J77pN0LNVX3}E-*+4%tYZD`E^u=4Xf zr!JnFpXWKX7st*Q5fKp)5fKp)5$Tl98bA+*8-VegHSnW1$lmLpoezM&*FQTy7BPmi z22Qq=|NB`3CkG_{`&k2LO^C4f`e)}y?0vo2`MoHDoiDP3eLJ%AV-cg@W}jUIJ6}X( au)YDj<0Wps#5Z*S0000L**qNJ)t4aS)Gyead zL0?brKZEgq28J{ShPt{s7Z(=|4ULSnv~MA$?|@nuOM?7@862M707^5sdAc};XiQ8_ zSYRaJ^w?Nx5hsWBVogp@$G}5zfe&>WbOH|Clj~TucoD2!m39AVML#VyzO0zjRPk|;fc)I$ztaD0e0st9UI{N?s literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_off.png new file mode 100644 index 0000000000000000000000000000000000000000..32057f57a2b37ddb6a770d5313741042feaf84ca GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dymH|E?t_KbruroIoSCjsqX8iv@ zgT9{Le+J|K3=C-u3{q16FI~Fy{Q2`0D^}Fi)d6+5xw*NxxM*l-WTd5iez!CVD8yJ2 z$t#Q|A1-qI`S*8n^n--P_4C;8 Xtz${_`Q!Z@Xa|F*tDnm{r-UW|qw-gA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png b/Resources/Textures/Objects/Weapons/Melee/stunprod.rsi/stunprod_on.png new file mode 100644 index 0000000000000000000000000000000000000000..861795434687e0e2221ec21d08dfa70d1183267c GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4ax4RULR=3V zIACXPF0Lm1|3Ab3G-G`|z5fix{}~w47#O6a{$ILu>G|{LD^{$itE*!;!{FxT=HlX_ zp`nqHmUc7IJq2ipa7mC~FvEWgU}t|v7bsoj>EamT(fRh=L7@f(4%fgl9NuTY{I@q- zy|rI*cG$^pMG_r#wqjw%kvjsc_avl!-gNt>&)>N>^hy_R@3ttsTYGoOI*W(r{Opdb zHlH89>&J%W6)AUwx4&QB@aJ-)de?>fvcGmQ{w-zvz37M0pAYiC)>MSqq`v7CwSRVZ Z&W;D{A5DB;B?4W+;OXk;vd$@?2>_Mig8Bde literal 0 HcmV?d00001