From 73cca78e6113c7a289b8804ea0e7169733caf77f Mon Sep 17 00:00:00 2001
From: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Date: Mon, 4 Sep 2023 12:03:37 +0300
Subject: [PATCH] Add mini-ebow (#357)

---
 .../Prototypes/Catalog/uplink_catalog.yml     |  17 +++++++++
 .../Weapons/Guns/Projectiles/bolts.yml        |  20 +++++++++++
 .../Objects/Weapons/Guns/mini_ebow.yml        |  34 ++++++++++++++++++
 .../Guns/Battery/mini-ebow.rsi/bolt.png       | Bin 0 -> 4819 bytes
 .../Guns/Battery/mini-ebow.rsi/empty.png      | Bin 0 -> 548 bytes
 .../Guns/Battery/mini-ebow.rsi/icon.png       | Bin 0 -> 616 bytes
 .../Battery/mini-ebow.rsi/inhand-left.png     | Bin 0 -> 352 bytes
 .../Battery/mini-ebow.rsi/inhand-right.png    | Bin 0 -> 356 bytes
 .../Guns/Battery/mini-ebow.rsi/meta.json      |  28 +++++++++++++++
 .../Guns/Projectiles/plasma.rsi/bullet.png    | Bin 0 -> 182 bytes
 .../Guns/Projectiles/plasma.rsi/meta.json     |  14 ++++++++
 11 files changed, 113 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png
 create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json

diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml
index 0922213bda..8a9c4badce 100644
--- a/Resources/Prototypes/Catalog/uplink_catalog.yml
+++ b/Resources/Prototypes/Catalog/uplink_catalog.yml
@@ -63,6 +63,23 @@
   - UplinkWeapons
   saleLimit: 1
 
+- type: listing
+  id: UplinkMiniEbow
+  name: маленький энергетический арбалет
+  description: Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия.
+  icon: { sprite: /Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi, state: icon }
+  productEntity: EnergyCrossbowMini
+  cost:
+    Telecrystal: 10
+  categories:
+  - UplinkWeapons
+  conditions:
+    - !type:StoreWhitelistCondition
+      blacklist:
+        tags:
+          - NukeOpsUplink
+  saleLimit: 1
+
 - type: listing
   id: UplinkEsword
   name: uplink-esword-name
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
new file mode 100644
index 0000000000..f2dbf59b25
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
@@ -0,0 +1,20 @@
+- type: entity
+  name: energy crossbow bolt
+  id: BoltEnergyCrossbow
+  parent: BaseBullet
+  noSpawn: true
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Projectiles/plasma.rsi
+    state: bullet
+  - type: Ammo
+    muzzleFlash: null
+  - type: Projectile
+    impactEffect: null
+    damage:
+      types:
+        Poison: 15
+  - type: StunOnCollide
+    stunAmount: 2
+    knockdownAmount: 2
+
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
new file mode 100644
index 0000000000..bb7ab800bb
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
@@ -0,0 +1,34 @@
+- type: entity
+  parent: BaseItem
+  id: EnergyCrossbowMini
+  name: маленький энергетический арбалет
+  description: Стреляет энергетическими болтами, которые отравляют и оглушают цель.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi
+  - type: Item
+    size: 10
+    sprite: Objects/Weapons/Guns/Battery/mini-ebow.rsi
+  - type: Clothing
+    slots:
+    - Belt
+  - type: Gun
+    fireRate: 0.4
+    soundGunshot:
+      path: /Audio/Weapons/click.ogg
+  - type: RechargeBasicEntityAmmo
+    rechargeCooldown: 2
+    rechargeSound:
+      path: /Audio/Weapons/Guns/MagIn/revolver_magin.ogg
+  - type: BasicEntityAmmoProvider
+    proto: BoltEnergyCrossbow
+    capacity: 1
+    count: 1
+  - type: AmmoCounter
+  - type: GenericVisualizer
+    visuals:
+      enum.AmmoVisuals.HasAmmo:
+        base:
+          True: { state: icon }
+          False: { state: empty }
+  - type: Appearance
diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/bolt.png
new file mode 100644
index 0000000000000000000000000000000000000000..70451918e4ff871d1c89cc764d505d1302965103
GIT binary patch
literal 4819
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..799e188ec829ff1cc8c42a40c84db10b1d4140c9
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<S)=5M`RCt{2mCtIzKoG_!rRYHvBw9i#K7k-4?;-RZG`)$}(w8XS
zioQa@2aw*Y=*?>pD>RJ;3LgAJG<6nt)zoZs6YM2(*_ma?_uJW-%{Bb9MF0^%V1QgM
z=VY^4=yto(#Q{(}lgU7-RKm~^fe7Ua>h(I5%Vi;mKmcpmhTcOD)E8A4B9sc4jsZ84
zA_NiI6ig-)z<xLvf(xK&+Q}yw4u_aWn(`d;1i%i@=kw?~UOC_EFXkiccswSR2nB$e
zEXz=>R#}W9IQO_dJwLMjN~HqR=@gR5Bv~=8)oQ*K^aV(zQqb#k4)#6=gI%B<?)_L6
zTknfSbh!{*0Mj&~-|s`a-9DZm@7&jBlli)?!&|FGe5@4DJOOA^6$%BgZ5vjr6(kY~
zn9t`ho6R7dPD5w#&hoA8$??k2J~kCW@$Glc2iP~mFvyAk)JFg}FgC6vNe6p=-#!UI
zQ51;9V)(;hd*sA>S3v&@_y#l@4G8=Y;Rmt&qtS@QWZgg2oqWqiR79K$Kn+iiwp=bf
zbMP4!5%&dHEEcSbarWJIWnF`+tHR>G0P%R7RRG8FSW^WN=K|0%bj5#iHsX$`I2XW6
m)NMh;eE}|E5kLeG0sI19#PxaD%#;-X0000<MNUMnLSTZ$YU`T-

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f19aa0082b2c4940e6158cdc6209eeaf5169f11
GIT binary patch
literal 616
zcmV-u0+;=XP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<T8c9S!RCt{2l{;_RP#A_^BLtC<Sj<fbp^OYjs5n!1mUK=20dA6w
zkzdfR-O|YZCv+`RLEy;}V;~l#TxKpcxc&~c+i<aq9i@w3$vWqJ=h*LazH@OH|5*V*
z0N@)SpU)e~WD=cDhkJDZGEXEDs8*}gG`v8($P!4B1W^<{LHGjL@H)CTU6dcno*`Z&
z17l-^6qoS?;Ta(JCTnQ7L*zbZp(#Tyln=B0a4Li&fFKC}Jd?p-K;sz1DLM*3JG@vd
zQq?%r|6}vruGi~zqtR$!GMQjHo#HNZ2RsPCg%1ErJkO(6tJ!Tbp>u!vbcyT66;f~0
zEMBQpSQ)z5@_xV<6J0RCIcLxnARdpS+ipLLJv}}G?*R3aic~s{e!p+`{fsZRm2>my
zxG$q4z<4}{s;X$UTKk<QK=kYk&1MsYLIJ&AZyPrY<yJ8(0<J%v<J+VSCmjW_HdU!q
zg0AaWuh)phVpuE|n9t|fh&mKWK~BtK_H|~zM@x3UxrclsGxOiyIUV3{jYcC@5`a}d
z0LwNm$8mdc-vF6R29ZdFemH-E{PQu^e}V1*S(f4ZBBBpc`ZZ0n+N`u^H2|gG(4-+N
z6Wr<MjsTWu_N3Knb#x3}!(Pl?0hY@pJNG0y`@0Iw!YIEldp36kh(@D!2Ix2*+Ejkb
z9RaLkxYOPnW11UY%^d-bneNJuxhueHC;$im0)SuAdjNb<x^oEt0000<MNUMnLSTZZ
C0SGSu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..df7af5c44da43aed7889d877bbec44295367c516
GIT binary patch
literal 352
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$Dv*Z&Ov{d{~B6ciX{GU)5+
zm6w-mX=?U#bupLi+XYm^SQ6wH%;50sMjDWlTNM&f;*wgNT$EW*l9`{!z)&$KIIN(k
z^!u0Kf{$OHXnE^uojY?rctfbcMdJsLbk6%|o@6NM>D^&r9Atdi*h^u~qe(|5g(w7T
z?$p@7!$Na^OlP;T>gE*^OZvNw*J>D=iykq15)@YOwU}`>55ocm>4qBu5Bh-?*Lu1*
zhIkxLPLN<-+~C$QvGXR2$3_Wb!=!Kpfs_MGK?f2<6dGb(H|=8XC<^yGkk~F6%-Ero
zWPD)Zfdh?_9!AC%4}u;rEsd06v)bc!P(vc{zzxP@hvM8AigjZcuNgJ1WI1>&%*{Z3
ug|fwsQyghxY&#UL88K}Qk<eAXz`&5^&Mm8V_k;n^Aq<|belF{r5}E+EG<|;n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca32199ccfc7dd8b9742476a46a60dee8817c83
GIT binary patch
literal 356
zcmV-q0h|7bP)<h;3K|Lk000e1NJLTq002M$002M)0{{R3SVwH_0000OP)t-s{{a6l
zE-nC>03aYBPE1U9cXy16iYh57&d(3@00001bW%=J06^y0W&i*HZF*E#bVOxyV{&P5
zbZKvH004NLQ&w<tb@%jBaPjrzDoZUY&dkqKuvIY8GvMMZ&rB)F0CJ3txHvOXGt)Cl
zAe`co#FA7XQz^M9zqmLlzg&rnGbOXA7^IJjGp#5wHx<M-<Wg2}^>YE63;>`28-Uml
z;Ew<R0D(zFK~xwS?ZGh)f-n?-;s3QYU7ri{69!kpz|0X$ynu!a5br+-h7hD3b?f(0
z6h9`l599>zF3g1HHjpvgO;}XjMAoZU7GpHBuKvNyp+=Ue<3p6JGeuGS+0fR?N@^0}
z)S;{dBN3Y?o2n(@rk>3hjUy)*D~B3KqU?xLe0u{o(+F}%Q49|N0000<MNUMnLSTZ=
CEQ*8x

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json
new file mode 100644
index 0000000000..7bc851308f
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Battery/mini-ebow.rsi/meta.json
@@ -0,0 +1,28 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "empty"
+        },
+        {
+            "name": "bolt"
+        },
+        {
+            "name": "inhand-left",
+            "directions": 4
+        },
+        {
+            "name": "inhand-right",
+            "directions": 4
+        }
+    ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/bullet.png
new file mode 100644
index 0000000000000000000000000000000000000000..c94779d864c50d4d01ec4c14f3e3abf32cf61694
GIT binary patch
literal 182
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)*8>L*aJDiC9$+Z{$e{I+
zVb5zHhJL2cf9x6j7(M>nn+sINSQ6wH%;50sMjDXg>FMGaqA@W!VS!?Ti+F-kEH~Q$
zgJ#KC2UkYl14kHq58MROBEGD%S4quk*e$(^p?w$IEQcz#Sqs<lW-y(7!Ib-gNrtDH
bhk@avIoqK)jdT7$Lm50>{an^LB{Ts5VjwtH

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json
new file mode 100644
index 0000000000..8436af22e0
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Guns/Projectiles/plasma.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "See copyright for above folder (Weapons/Guns/Projectiles)",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "bullet"
+    }
+  ]
+}