From ba05b56d514101445da3c691b769522e2d97b595 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 4 May 2024 13:20:21 +0300 Subject: [PATCH] Fence fix + Navy revolver (#130) * Update fence_wood.yml * added revolver navy * Update guns.yml * Update wooden_fence.yml --- .../ru-RU/_CP14/_PROTO/entities/objects.ftl | 3 ++ .../Entities/Structures/Walls/fence_wood.yml | 4 +++ .../Entities/Objects/Weapons/Ranged/guns.yml | 21 +++++++++++ .../Structures/Walls/wooden_fence.yml | 4 +-- .../Ranged/navy_revolver.rsi/bolt-open.png | Bin 0 -> 502 bytes .../navy_revolver.rsi/equipped-BELT1.png | Bin 0 -> 252 bytes .../navy_revolver.rsi/equipped-BELT2.png | Bin 0 -> 253 bytes .../Weapons/Ranged/navy_revolver.rsi/icon.png | Bin 0 -> 488 bytes .../Ranged/navy_revolver.rsi/inhand-left.png | Bin 0 -> 642 bytes .../Ranged/navy_revolver.rsi/inhand-right.png | Bin 0 -> 631 bytes .../Ranged/navy_revolver.rsi/meta.json | 33 ++++++++++++++++++ 11 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.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 c4244626e9..b7d9f1c3a1 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/objects.ftl @@ -29,6 +29,9 @@ ent-CP14BaseLightCrossbow = легкий арбалет ent-CP14Crossbolt = арбалетный болт .desc = Стержень с заостренным концом. Без оперения, это вам не лук. +ent-CP14WeaponRevolverNavy = револьвер "Марин" + .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. + # Coins ent-CP14CopperCoin = медная корона .desc = Минимальная экономическая единица на просторах Эберрона. Является одной десятой серебрянного соверена. diff --git a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml index 2b8dce5f7f..d3c85ad33c 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/fence_wood.yml @@ -242,6 +242,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: @@ -420,6 +422,8 @@ closeTimeTwo: 0 openTimeOne: 0 openTimeTwo: 0 + closedDrawDepth: Mobs + openDrawDepth: Mobs openingAnimationTime: 0 closingAnimationTime: 0 openSound: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml new file mode 100644 index 0000000000..ce3ed1b6f2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/guns.yml @@ -0,0 +1,21 @@ +- type: entity + name: navy revolver + description: A weighty Marin revolver. The Marin revolvers nowadays cost fabulous sums of money, and can be afforded only by successful sailors and merchants. + id: CP14WeaponRevolverNavy + parent: BaseWeaponRevolver + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/navy_revolver.rsi + state: icon + - type: Clothing + sprite: _CP14/Objects/Weapons/Ranged/navy_revolver.rsi + - type: Gun + fireRate: 1 + - type: RevolverAmmoProvider + capacity: 5 + chambers: [ True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null ] + whitelist: + tags: + - SpeedLoaderRifle + proto: CartridgeRifle # TODO custom projectiles \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml index 1dfd06fd4e..ac80259f2f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/wooden_fence.yml @@ -165,7 +165,7 @@ components: - type: Sprite layers: - - state: end + - state: door_closed map: ["enum.DoorVisualLayers.Base"] - type: Fixtures fixtures: @@ -299,7 +299,7 @@ components: - type: Sprite layers: - - state: end_small + - state: door_closed_small map: ["enum.DoorVisualLayers.Base"] - type: Fixtures fixtures: diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/bolt-open.png new file mode 100644 index 0000000000000000000000000000000000000000..34267b4c67459fcc0115f70390a54557c515b5df GIT binary patch literal 502 zcmVPx$ut`KgR9Hvtl}k%PK^TTViEdVqW_dv}QwV7h1x7`-aa}E1wde-~E&E3;TD7Rw zt%8VzA_yW-%rH$VjfyZSPP_v%jOVD+apPvrO3qxK_j|r^j)OYw@l4LAb<=8v|9VBWB9$ne}C7Cr99;y?igFC4Y2ZCiJZ>Nl-3(W9b^_OwFeba)63O3d^>vUgUUl2mr zfm_Z%BluV>!Ky{?kB;|P;NbX_v9rBP#loWqCHGa;0(o2*2o3fap}sB}9qDD-QF-pO zCV=P}{s{=-_5_UO#iY0cuwf>9OXZh>@=%+@Spr~!4Cf0_HUEt;2qACQ4&2fLSm2xT s>h0)kXRd8!?Lb07*qoM6N<$g1*e${Qv*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT1.png new file mode 100644 index 0000000000000000000000000000000000000000..cf8bc1b98a043fcab35fe2dbf3f15eba941f8c03 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wt2cZhE&XX zd&`jPkbwx>gI5Yd8aI?U&cz*As9tbQx}qRlQ2is9)lM&|wHJTX7BkuFub=yG6%$bB zgPmpj_B=iJ!SC@M#-i7z4R_1xv(vj5Zb}ifZCH0(Wa}^f#W$M!^X*%9S;_KW{Jt;t z3tNo-^FWSL)445*pKD^?&ri6##resJW!D+Js%wD;0)fK0tgZiko^vR2T{h*AOVGuI wOE$S&Vw(~&tzxBWm{X)uC4=f7JBI)7_(~PT9=T>OnE}$|>FVdQ&MBb@0QJ^oH~;_u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/equipped-BELT2.png new file mode 100644 index 0000000000000000000000000000000000000000..362612a073217fe22a91d5deedafd45d666ba938 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtKobhE&XX zd&`iE$xxv6;qs%KSXj(CnmVpFZ9O{gKve#NuWOIE-6(szX4|Qrwu%3(4@|IWGpQ5; zY6XH*PtNA8s%;ZGeT#j?S>1*`_g+=)Y`x9&omZl*c!hviT=Tc~$0mLHo|irsme2m3 znHJ-<=R s_)vbs))|6!4B3XtH4H*Wc^Dj4nzv4td1NEEFa)I0)78&qol`;+0NjjXsQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/navy_revolver.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbbbc5f49942a3b3609b791d18f4a68507d2780 GIT binary patch literal 488 zcmVP)Px$qDe$SR9Hu2WEfz;IKcKZj5=U61V%$(Gz3ON0A~o8nmYe~|Nb4rojd0lRa6ZB zgJ|Sp+s`-lKZyVQ#WS$*>C=133QfG4kR1WD9Aq)bQkaF<9EYub0qIjzPzFmKJ8>AU zpP;K@79d*;68rJ%8;U)W;xa_nYtLUkVR-WBCfIJG9PsYLO9n13Ua$p5`eqF0E}mit z_K#$^|KKj%Qfy)%NszBW>R`SHiLKqZoUjAzL^#25e1$=fK}bNH0pti}MNI}P3tO-O zIhiF4&!0VoI{+lc!Nx^YD1br_ZwP=aS5o9=`26V)!|S&{;f@d#6k?E+kYYG;d@qBI zr87JMf^5Be|2kZZlmv+p1?ZMP{P7p;D^>|@xbHwd`1b8Hif=)oLr!i$aR4^U#WZah zK#2wv_nS5^2CJ8mQ~!@GxY4sJG4TO+fIJV|e|ZjO22o*laIk}X{_x8$xP_oN1LXve zBR~#-#UU}4;8TO)0FYv2%VC;9mcrQ7vK%8Df}q11Oarb--u{ ejE2By2mkV6yRaaSW-5 zdpqmAx09p5@$21J7b~3AaDAiXadBz$b-lT-FYVmFu6Vjt`OB;es$7mthqs(C(Kyp` zLn6`fiRACHvU$Audn#`J{5tdfng=;vs(&VXRs8j0=wK4^b8u65$TYz_zzxJ;NnsJv zWB4gLL2!cL2cLv&%eAxTD{tAs+WrIYQvB|^vD+tsCn&gY9=x%+o*(Zo&s9mUKH zjjOLR_cAhYN%XOuQ%(uCxyjM+IA`60ht?cnbGjHB=1!kBd2Q~;B@72FPgEGnTJ$n7 zy!c-2x9vZdL)~JJs!mr;vo|^?RWq0l%A_0Je8O~~Or5Vfi1kPygIOEH0ih>(`dkn0 zIp+LZ#GvE&?%N`Ucd|#G>2u+g@L$Amz4e7n!X$=EvBetmm> zDt9Bx0TrDF#@B}PyU(56&V2c|bH!qokGc1SCo(sr)Yz5JT&j0nVk1L`kzM`VxuyGe zi1BZ{!LUF=HH@LAe^Q{7H0uwk#hLa@4P83o`xi0j&0TaVSj53~TKE0Px%F-b&0RCr$Pn!!r~K@`SE0<)zc%_vP0LXe_Mkk>Aq>(aTuu5*_qU*eeG5EN7O)eeZkRYiYMC+pR`m-?1Oaa6gk{ z0N{AX6W5KQ(QJW-6uFD)x_tlmoe+)M(4x;*Do3)}e6UjhK-lwJWQRXLyOdAQkHQ*2 zE?<)mZv?xRy&o2?V_*-0Ma?wKNQ{9j(|cpw^v4TVl7qx#jRoX%nHDyNwF3yfXdcp#oV@YkWhe1sa(W!u?L_>bT0m; zj|AW(zarJm3q5~xl^m;h4$^7J_*^7a#sFaW&5h;p-1_YclMLR*pDNgdp&_Gm710|5 zfU74kh<;BBSVhua3 zjx~U3#pWqpEGVb|bY);Q=(-L%0M`v;*Jl9OM5)zd1yI`