From 353fcd9cfe2ef04e3e8dbea9da6fee491105ad5a Mon Sep 17 00:00:00 2001
From: Agoichi <92464780+Agoichi@users.noreply.github.com>
Date: Sun, 28 Apr 2024 00:56:02 +0300
Subject: [PATCH] Magic Flashlight (#116)

* fucking flaslight

* flaslight

* Update objects.ftl
---
 .../ru-RU/_CP14/_PROTO/entities/objects.ftl   |   6 ++-
 .../Entities/Objects/Tools/flashlight.yml     |  40 ++++++++++++++++++
 .../Tools/magic-lamp.rsi/inhand-left.png      | Bin 0 -> 687 bytes
 .../Tools/magic-lamp.rsi/inhand-right.png     | Bin 0 -> 682 bytes
 .../Objects/Tools/magic-lamp.rsi/lamp.png     | Bin 0 -> 606 bytes
 .../Objects/Tools/magic-lamp.rsi/meta.json    |  23 ++++++++++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png
 create mode 100644 Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json

diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl
index 11a0c96b4e..c4244626e9 100644
--- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl
+++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl
@@ -1,7 +1,8 @@
 # Tools
 ent-CP14BaseSharpeningStone = точильный камень
     .desc = Позволит заточить притупленное оружие. Если перестараться, вы вполне можете сточить оружие полностью.
-
+ent-CP14OldLantern = Старая Лампа
+    .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове.
 # Weapons/Melee
 
 ent-CP14BaseDagger = кинжал
@@ -19,6 +20,7 @@ ent-CP14BaseThrowableSpear = метательное копьё
 ent-CP14BaseTwoHandedSword = двуручный меч
     .desc = Мощное оружие, требующее огромной силы и умения для эффективного использования.
 
+
 # Weapons/Ranged
 
 ent-CP14BaseLightCrossbow = легкий арбалет
@@ -61,4 +63,4 @@ ent-CP14OreIron = железо
 ent-CP14OreSilver = серебро
     .desc = Кусочек блестящего, теплого серебра.
 ent-CP14OreGold = золото
-    .desc = Кусочек мягкого, чистого золота.
\ No newline at end of file
+    .desc = Кусочек мягкого, чистого золота.
diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml
new file mode 100644
index 0000000000..a92f79972a
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml
@@ -0,0 +1,40 @@
+- type: entity
+  parent: BaseItem
+  id: CP14OldLantern
+  name: Old lantern 
+  description: Relic of the Techomagic's past. Large, weighty, unpractical. At least feels good to crack some skulls with it.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Tools/magic-lamp.rsi
+    noRot: false
+    layers:
+    - state: lamp    
+  - type: MeleeWeapon
+    attackRate: 0.7
+    wideAnimationRotation: 10
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Blunt: 8
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/toolbox_drop.ogg
+  - type: Item
+    sprite: _CP14/Objects/Tools/magic-lamp.rsi
+    size: Large
+    storedRotation: -90
+  - type: Rotatable
+  - type: PointLight
+    mask: /Textures/Effects/LightMasks/double_cone.png
+    color: "#47F8FFFF"
+    autoRot: true
+    energy: 4
+    radius: 4
+    netsync: false
+  - type: Appearance
+  
+ 
+  
diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..fccae91ce9fa8216e8081df2e9ca43f8f7a809e4
GIT binary patch
literal 687
zcmV;g0#N;lP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%X-PyuRCt{2+CNAeaTEve@7Y9B>=2AmYfURbJg~YL1hGqT$`Ax`E*<RPQZSoS
zq(kZ0LYC4kICqm;5Q>F17NnsdIusj<cDPWk30E=o{PS~4dLfCPckgmN`aV-QxR-bD
z<z0@v0E{ul7-Nhv#u#J&sF~ENa61RrOwMN<yZAOIf<Acq#xva_FTh+nCvYu55-Xla
zikZ}^$i93ijm2giDJppZbWOqX;*<mcR7p?HXGCCpnj%ykA7!w3A}KUgtzP(9=Pkq&
zN%3~&xnw0?SeD`M>P9Hs0|3Yp=2}5o001~T1!}tW<BR23+v{skBRPVsnj<YhSeD_x
zGmL&of&g%=|AFWz11r{J27CJO_{9<c;L-J0G>ICJ7NAkbLi?(%n8DtNt@AHKJ_5#$
zr5Bz6HVaTLDA+uv$gDB?0vI|L?2X_zwrs^4icR3g`yIP!HAP+kW5>z`#a66RQ9<@u
ziXf}z$O~ZX*idW&JDb+;;`#hXOJAQ?LHY*K=)HyyKCQSA#u#IaF~%5Uj4{Ss^j~j>
z0YFpj?E+ef^vBA|Qq(tcADwC*R+pl!MEVH`j8DU<HTFg3(z%+Eizkw%N04+cFno8k
z`uga*-_}y}Ds;{I0*15zpFX^+zHZ;$pbXtqrQ60oWBdw5F&3K@xzDdJ9YONVkQ=`3
z|Ew9kld^{Ho3~A!>-hqNWf}bgqjks4jv#3P^u52E;C9Nu7ua53gFbjrciij<k{00W
zMn<aa2TPQJ9Yj6?UR#7Z@+9abp1%o}iVA#t_5VUSESh^Z@O%LP;H0qYb_&e1&H)~s
VuHKFLVT}L)002ovPDHLkV1g+YJ7)j@

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6ec98c43bd0a809a14f629038931d599e1f046f
GIT binary patch
literal 682
zcmV;b0#*HqP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%WJyFpRCt{2+COL$Q5*;GZ#0&mK>{JQ79)~s4_fMwvr_Ellpz#KW^oY2MKqg>
z6$fX9E_D<Kr{Yqq5QJn<hte$COtphu66BH+|AeHi=MX&q<?i0ad$~LPewI8gKaw9`
z?%f^t9zaAyL_|bHL=<rI3#+=<J$UZIwMW7s91tnGbnn?eo2pO%I2gf|#d07*NUJ&h
z)zanA{KBf9$>wc)whSPx=5zpfeCuMU)2zDHqg0XUIY(0<Z1zPao7b!DeItaXrXiEf
z>(5v2hummXmWjzJ0KivWM^sUO73+G_007|dm<o)k0D$(sI}OTKc(G)R<J+2Ty=edm
zMZxgs85|mlAcStByW!8aiF)n!lZOC+#hZ75zX@QYSb&x+|8h(uQNM_dB=He%Z0jti
zK<wBku0OZ~Ks-^et?hO{TQ#wZw&h(QHj?Z)_OocIf@rCNadk$h-tr7+)vAsY_1e=L
zR~^+`1~9J9AX=&z<H}mus@xa0wq82AO`8^{QnNiDCY=5O5fKp)5fKp)QGaAD(26aN
z`an~Y^GZGt@Aop<yk3u|u=lnI04T37yVkemTVcP6OwV-(>&veFrtlQ_eXV_v`vnq;
zg0tslF)=x1tp2*C?=xVK`vo?N1$0h-lJeU^0i@NOUXQ1Yy#n6_VZVSKp#X-DpF|x$
z%|QU~wm;ygtgZ$~D1d~b;KZr(e;jWgX$@?@K<B;vQg=Uu0x+9{Lz}N%Z>X1@#*gcb
z+e>qSxDCo&j||L{pe+A=076q>r%^??$3^H%BN&?|tO#EN_G+6l`ylejH&iyVde<8y
QBme*a07*qoM6N<$f+#OLQ2+n{

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/lamp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a87d17e841643309a626c55384a62d03c719482b
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px%7)eAyRCt{2+P_QOU>FDRuRp6*>_O3_Qfm=WP`V@tg8#q`hs(`QH#^)P;3&8`
z+~nZw)J;l35FJVfF-wV4PQ-9<BH|%h+gNxzlw9w)49%1HhAZFCa=91seqWx;C6M<4
zh=_=YD85p~QKgEbx;ei$NqF$kK+SWpwsokz2&IanYMzVWp@B?(gtg62&Co0g(3+Vf
zUvvfJ3uT4AAy{@%S$0uXFZ@4an&b;*RlV?=`OP&6^e0)!(9&v>(-TW0UsQnc`FRYy
ze1(O@929`3;0M&mBe0)%J^!5l_Wg&BF-g9t0PfKNZl;{JvDf~MWGay~^TkhroH2=w
zy&Y`q?I34NN~aMs%;{#nVNQ$Zkr%+6iage3*f1lH;}YKlAFt{-dHQ>-TUz<zD`3uE
z#^~`GMvu=hXD^Evkad2K<fNIImB?rA`S};oeBG8$L_|bHL_|bHMBOXVOT^Y~>D_fp
z`wPi5@)Pw3)I1lv>sC+AbG7f$XPw{H9}x9jcfPa$qMe~|Pd@w%<qKu?d4K!a{|aF*
zKx=+*SBGU6m2>(rR=%hJ6K~!DXy2c&`qvnfOeR$IuRHn!!ga+V?hkk|W@2HneN*zM
zrXGQ){(x{iZoarbAeg=H7$5Y$N~X&+U;GsKU$6jKFCc58dqCs1j{eJU9pm3`^)yPP
snJ?}T`E}(<PfbPE`9wrSL_}TgH(Y<{D2if$!T<mO07*qoM6N<$g0_t!vH$=8

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json
new file mode 100644
index 0000000000..4806cdbf9c
--- /dev/null
+++ b/Resources/Textures/_CP14/Objects/Tools/magic-lamp.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "by Agoichi",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "lamp",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file