From 33ed9eea82f0b22ec7179b3405de8a11b92f757b Mon Sep 17 00:00:00 2001
From: Swept <jamesurquhartwebb@gmail.com>
Date: Sun, 12 Jul 2020 20:49:20 +0000
Subject: [PATCH] Finished dark souls carvings (#1383)

---
 Resources/Prototypes/Entities/Items/toys.yml  |  20 ++++-----
 .../Objects/Misc/carvings.rsi/hello.png       | Bin 0 -> 822 bytes
 .../carvings.rsi/{helpme.png => help_me.png}  | Bin
 .../Objects/Misc/carvings.rsi/im_sorry.png    | Bin 0 -> 773 bytes
 .../Objects/Misc/carvings.rsi/meta.json       |  38 +++++++++++++++++-
 .../Objects/Misc/carvings.rsi/thank_you.png   | Bin 0 -> 829 bytes
 .../Objects/Misc/carvings.rsi/very_good.png   | Bin 0 -> 875 bytes
 7 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 Resources/Textures/Objects/Misc/carvings.rsi/hello.png
 rename Resources/Textures/Objects/Misc/carvings.rsi/{helpme.png => help_me.png} (100%)
 create mode 100644 Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png
 create mode 100644 Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png
 create mode 100644 Resources/Textures/Objects/Misc/carvings.rsi/very_good.png

diff --git a/Resources/Prototypes/Entities/Items/toys.yml b/Resources/Prototypes/Entities/Items/toys.yml
index f9613968dc..d1cebccd4e 100644
--- a/Resources/Prototypes/Entities/Items/toys.yml
+++ b/Resources/Prototypes/Entities/Items/toys.yml
@@ -157,10 +157,10 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: help_me
   - type: Icon
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: help_me
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -182,10 +182,10 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: hello
   - type: Icon
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: hello
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -205,10 +205,10 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: thank_you
   - type: Icon
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: thank_you
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -228,10 +228,10 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: very_good
   - type: Icon
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: very_good
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
@@ -251,10 +251,10 @@
   components:
   - type: Sprite
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: im_sorry
   - type: Icon
     sprite: Objects/Misc/carvings.rsi
-    state: helpme
+    state: im_sorry
   - type: Item
     sprite: Objects/Misc/carvings.rsi
   - type: EmitSoundOnThrow
diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/hello.png b/Resources/Textures/Objects/Misc/carvings.rsi/hello.png
new file mode 100644
index 0000000000000000000000000000000000000000..94bdd42dc3708c5deb5392a8d6981f505bd0bc71
GIT binary patch
literal 822
zcmV-61Ihe}P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%@JU2LR9J=WmQQOFK^Vq=t*vZo5`|5zx<Sk(Sg}eDf{~yV6)#?T5ETqIZEvC?
z=r`z1Pa+5sz4-4?q-Yh2et>vVG^h}wf+iK)?xjX|+a|1sbjCEB*+e~f$pZ_sv$OL&
z&pR{kJJ3cO{}~;B`{UVj=N!@Q>+O~Ofeq^cxOo0TOLPCR02OgP<`=#LaP8_9PmZPn
zqR{~WjvO6yRD_zQt$Md@yJZobt&oq6C7m~~Uh?3<#41wps04+A0RYZly6m_Ht)R<G
zfFPfG{D@Gm?joo~VRnw^Pp1J$rIKixhHcw~f&m$cMo>mTxCbyI+nAp-t8K$@jn#FX
z*>5wXQb|I3kg3Oyn)zxj0H9p4oZGkVu(59oMr0eqsSy@_lqk&3H5~sk`<mF^eXjl|
zlaor0hD#vaukG>y@N8<Dk<lazKT3T1Tp+SF%(A^G$D5|fVyPPD$eu8-UR3+<-kqRa
zvAjI0BhcA_+&DcxzjPhh8s_GWG`jwKPkb%R5RWH_#}fqC`58`)kWSyJI$Y!P6rkLM
zOJ$3-T|Rnze%UA7*WznoMz%AV4Da9N-6S3&Joi97gnJbPd97%GPLFKUP(Zn2Ib!|)
z20yJ5{vLl*a;1QJBn~H}`%U3K&#|@cn~}FHKtM&lIlRRs;-^(=Y0f_q;3XuJ$+$!a
zES1$qQ7J(DlsKG_IUV5i$y1)<g!9@6eEg7CE=I!-(dYo>isc*|8e(_<c8bL!P_6aL
z_M)tI^);dX7%r79Pjc|c16^x;9id>rF-=qEf73K2Ik2h?5R1hCc>N|T=J4WH3&`cN
zG9BBtjcJ-L!bU}@SS(5rZ{Oz0<+4rBf#)W?fA3+3rfKN9F3AnUz%UF<({w%JI<{h>
zrQ4Qr339nCJNm0`>X!lB;TJXk%ZEJs4-Se5G!@{fa@Wp1ba%svQ^#dtQk7y+BW_$z
z%Q^p90Kkz$2LMQ(8C71Z1jfg!cfVGM+h{}J7o1)q923<=H2?qr07*qoM6N<$f<cyo
AH~;_u

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/helpme.png b/Resources/Textures/Objects/Misc/carvings.rsi/help_me.png
similarity index 100%
rename from Resources/Textures/Objects/Misc/carvings.rsi/helpme.png
rename to Resources/Textures/Objects/Misc/carvings.rsi/help_me.png
diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png b/Resources/Textures/Objects/Misc/carvings.rsi/im_sorry.png
new file mode 100644
index 0000000000000000000000000000000000000000..06e2dd9887636a856109e49e3b1e14df0478425e
GIT binary patch
literal 773
zcmV+g1N!`lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%zez+vR9J=WmrZLEQ51$Bi@0dgMF=xVB@0{Y!ZsAfg<^|~ap>1dTy!JUg}*=q
ze~2!HN@+nTU5KkzB@H6F4TMQ>R~H4_386@4B6N|sh<7?4chZ{(ZtM#olbJjBeeOAj
zb8p~(*QH@!Tz&YUE4x3IP66<G>y6Uf0|Pu+d*mBuH5~xku7$>=Q=^QfQ%Vp60X%>9
zv<uK|IEiCgu7~Tjl_8V?ggHR2koWH&A0CCqH5<-A5SNEBuUD$EG1JCu;8!m~uGhx(
z+I{C9Q2_{=cTPL}IBxi#dDCRxG^tmr)GJj#I<D8oTDAaKSzM47EGR_4FpO@{9KgJ9
z`p>`pDZqKtl)QbWmBoeb?uU=DRP+Tf45Qm>{RE(M+Tq2^R{&%(8BR`4n4Gu@Kwj7Q
zesJK2yI7oI+L)zYsbVc#l=e!bQ=?K3r4(qo9y8BmGQRn>i3#r9yGyY+gSBjh>O?@e
zUR&Bbl#1{?^IRd%@!=88hC{RAkk#~1QHs>bqy!)oGzUWFLRn2GSIAS^D*?T9Xu6&_
zXJQIO{(rU4=tTsCa)mq_>)Y(U|0Hcr!o1-)p~6)HkSQ90sDi7HuDrZo{(FFE1UA;U
z0l0nZrqq1oN__fgPdFD~$(r-8lOmASbTnO$nMd2SOnm`vOkVeQydXqWnyypcFNboj
zDy0+zqYzC4z~<IYVv$7^?S@JKSxxsLL>dHy_}<*wiRC@GYbHs#2$LXW5fSQ~c4#;b
zwp|;p6}z4nI_(IEC2KAgfyZmBK<|7YHm+bTh@)Cmi3bJIh{khy(y0{1;!NmyzwQS3
zD+d_QX|!CAowx5|etl0wQ3xOeB7+dCw(T0@ISnAu{9J%21Rw>8%C>8`o=0Bq0VJ6#
z0SHY^O?H78h)lw~pYgx|Ngy(P{_=I`{~H&&&_CC2x#d!i-(sJ@00000NkvXXu0mjf
DuN_{M

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json
index d7591dcb4e..27b5298363 100644
--- a/Resources/Textures/Objects/Misc/carvings.rsi/meta.json
+++ b/Resources/Textures/Objects/Misc/carvings.rsi/meta.json
@@ -8,7 +8,43 @@
   "copyright": "By Bright",
   "states": [
     {
-      "name": "helpme",
+      "name": "hello",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "help_me",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "thank_you",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "im_sorry",
+      "directions": 1,
+      "delays": [
+        [
+          1
+        ]
+      ]
+    },
+    {
+      "name": "very_good",
       "directions": 1,
       "delays": [
         [
diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png b/Resources/Textures/Objects/Misc/carvings.rsi/thank_you.png
new file mode 100644
index 0000000000000000000000000000000000000000..823004d4fcd27be3f159c81c61e32b14aae38768
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%_en%SR9J=Wmd|SwK@@;LCAA&cLoiv1kcNh`(2#n_VL^+C)%G7Kt?01_5B3kL
zcNG*5>b**kDhfH|U?k#NQnrDHZnoyIFoy=>A)O&h(#?kUX5aD6&b;sa+y|F(DgV1%
zne@WO`dTmQywmwh_oPet^KPuSCj!`5U+blBWUxymt!ub0=Jo3Uy#MeHfW%ZHHbiUy
zWxQZn1X2PZrKIiq*rgId5NL?BY3fJ-ksz@El<{;bMcen8&1R8OYR>~H$(W{w*!{X2
z0*HdR8V3NtE|o&Y^SNBytC2DmKzV;&SzUQJvUno_HrCgA3x(p?$1|o$!*u~L41<M2
zk?u*C#8hJJ-PkFpRIAvf5(mvDLI`b86=d7@38bXudE|3B7K*oGL7WNjY-_8xP$;s$
zw?{ga()x5NMZ<9rLg?bFRIAKpvlv2P2%%x`-n$<v#8GJ&8v)z4HAJOa4HcgXeZjIY
zgc$eKNEw@?N~MBr+W_QqIa;0<I&b?vfNsgU<1m}eUL1gen3<j?lg%Q8;Lg$#EzhIn
zd3q|A%Vhuxi;GApbsD~mc{_3tJ=@yq6)X$y_!yvHe2znAz(XNKXf8BdS5HTPm#<#*
zJ)OG7&c{zf_97z?bUM@>2Y~KrwJYx-+<uj6Ro_#_8?LMW3unoh08bu2>a~sz$$$?3
zpvZxiYq)Oc2c>}i{H|-`qr8s<Xt(=b&P-2}w=5mzhU+2*DqcafJdcBBlc3Y->yHj&
z{fr{paBg;P$n(LR%hR*~+PINShK!Gs*pm<lwV?7G`W>K*4~8A0y^jP)r_CW<#vInw
zYc-5y5+j-9*UulJvp5UMnE<cfyuAX@YBoc9wS++5b7lC~&mW<Rzp#~Tb!E8+aQn_(
zgb;f62b~Uc^YeWF_J!pKt27*k{e%69_Q6;HgAkb;H)$OmhR&8BtWvMlfPUrgd@N72
zXU6{c>E>oHZ&^cnRRhnrw<q4PCjw9qiPIUN`u#k{F9qNq^w^9b#&*Q700000NkvXX
Hu0mjfxvGqZ

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Misc/carvings.rsi/very_good.png b/Resources/Textures/Objects/Misc/carvings.rsi/very_good.png
new file mode 100644
index 0000000000000000000000000000000000000000..cfd614ab6f1ff173e730e2d4af5ac26e4e4bd4df
GIT binary patch
literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&B}qg<R9J=Wmp@1wVHn1LDFH1c0inSIF{p?r6pEoi9J;x55KD{G;ou@zGz5a6
zqf=d+Iux=vh(qmC(;*a69g0JUM4Zw=u%s9dECjqj6_j)c@8`wbpQP<jXrCqb@4M%B
z&-;DvUEsg|b@_f}(9qCu4dBJ|XT071NFp)IS-H%swY9eI=l8l`Z0t!5pi(&}66vQ@
zI>Bmgm9Ed!rluy@+4;cM)@DmE_uNhn4Gq^Sm2<UUDxDCC^mBcEzsbDx?X+QkdwaX~
zTL2O>+&;ZPjE_IW@Bcv}F-sybOD>lOK%QQt>ocAZjsRU<Vb_5R3ops#^0wyIZLcJ3
z>m+rD`qSS9)Aea`xx6xp^!5NS8jS)pfE*SI0FD#X_Ta?C(;9$jR@E^9iN#_K*G^4M
z0$><M(|yj$WdL^f_Q~Zww+=8e602QZT{AGCHJ$73e!$pR9l{#FNS;{ISYLllFc`oz
ztF{oX0HSa>pth6AMGgxEMx#*-!%z?+fe~Y<Cm9R|$YwL`19Wuwxw^Whqodw3R#%to
zhA2rXG)-%O09pfZGY1HTI=Q&GWPX0e7C_VLWfSwcxmf^Gsg3pl1mdm)A{6RuI;ZQ?
zO(1|{30zyTTLO0G09#w{l%Z)>NhTLbr8XQr92=3HIpAt;l}tQIpltv<bGS{wOOk+f
z61D{(3EWk?33#aqAQb8(91f@i1R@$8R_EJEKx8)o!DSL!o6q22pW2os_~y-~Z4$}k
zB5>Og^9M(+piKZ57nj`JnCkTlaD4n#L9DJWVHie(xtPLjBl0qK1Q5xW4>Z1-r43ux
zyO^fa8FgLk@goJ{6hGL^fnqW56GQpE`%0FjC2QVlYMNC{v&!z?zLTdrK&z5YXI1{-
z2wk66>9iu-5(I+*DwT7!j0Ok$i1hYQD133fnQ2y48LSZ5Y{qGbeFE8R#uth7b9(yS
zgTG!5P18uHGYyk5oz4)C$9?g5-1Y0&u>{#{##b!neNJoM?h8o9S%1CcIR}cxywCcL
z|9<C_Z6h+xDyh^4E6dBZR?YvYR+g7r`XBJu=_e<rk>MP|@HhYf002ovPDHLkV1ms+
Bl3xG-

literal 0
HcmV?d00001