From 93902876c8ea6b2f67a09668ef3472ebf115eb68 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Thu, 19 Jun 2025 21:52:31 +0100 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=BB=D0=B0=D0=BD=D1=81=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D0=94=D1=80=D0=BE=D0=B1=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D0=BA=D0=BE=D0=B2=20(#2422)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Guns/Shotguns/shotguns.yml | 4 + .../Weapons/Guns/Shotguns/shotguns.yml | 95 ++++++++++++++++-- .../spas_12_2/big.rsi/inhand-left.png | Bin 0 -> 619 bytes .../spas_12_2/big.rsi/inhand-right.png | Bin 0 -> 671 bytes .../Guns/Shotguns/spas_12_2/big.rsi/meta.json | 27 +++++ .../spas_12_2/big.rsi/wielded-inhand-left.png | Bin 0 -> 1147 bytes .../big.rsi/wielded-inhand-right.png | Bin 0 -> 1088 bytes .../spas_12_2/tiny.rsi/equipped-BACKPACK.png | Bin 0 -> 1617 bytes .../tiny.rsi/equipped-SUITSTORAGE.png | Bin 0 -> 1617 bytes .../Guns/Shotguns/spas_12_2/tiny.rsi/icon.png | Bin 0 -> 556 bytes .../Shotguns/spas_12_2/tiny.rsi/meta.json | 22 ++++ 11 files changed, 137 insertions(+), 11 deletions(-) create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/meta.json create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png create mode 100644 Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 22e81c09d9..3005e42992 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -130,6 +130,8 @@ fireRate: 3 soundGunshot: collection: m3 # Sunrise-Edit + - type: GunSpreadModifier # Sunrise-add #Port WZ #37731 + spread: 0.6 # Sunrise-add - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -220,6 +222,8 @@ fireRate: 3 soundGunshot: collection: m3 # Sunrise-Edit + - type: GunSpreadModifier # Sunrise-add #Port WZ #37731 + spread: 1.4 # Sunrise-add - type: BallisticAmmoProvider capacity: 2 - type: Construction diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 980986bbc0..8270c11974 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -1,6 +1,33 @@ +- type: entity + name: BaseWeaponShotgun + parent: BaseWeaponShotgun + id: BaseWeaponShotgunSunrise + description: A rooty tooty point and shooty. + abstract: true + components: + - type: Gun + fireRate: 2 + useKey: true + selectedMode: SemiAuto + - type: MeleeWeapon + angle: 60 + range: 1.1 + damage: + types: + Blunt: 12 + Structural: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 0.85 + autoAttack: false + - type: AltFireMelee + attackType: Heavy + - type: SpeedModifiedOnWield + walkModifier: 0.9 + sprintModifier: 0.9 + - type: entity name: XM1014 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponXM1014 components: - type: Sprite @@ -38,36 +65,39 @@ - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/paladin-12/tiny.rsi - type: BallisticAmmoProvider - capacity: 5 + capacity: 6 soundRack: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/pump.ogg soundInsert: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/insert.ogg - type: Wieldable - type: UseDelay - delay: 0.5 + delay: 0.25 - type: GunRequiresWield - type: Gun - fireRate: 2.25 + fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/paladin_12/paladin12_shot.ogg params: volume: 1 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity name: Spas-12 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponShotgunSPAS12 components: - type: Sprite - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/big.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi - type: Item size: Large shape: - 0,0,4,1 - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi - type: Clothing - sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12/tiny.rsi + sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi - type: BallisticAmmoProvider capacity: 8 - type: Wieldable @@ -78,10 +108,13 @@ fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/spas_12/spas12_shot.ogg + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: entity name: Trenchgun L-4034 - parent: BaseWeaponShotgun + parent: BaseWeaponShotgunSunrise id: WeaponShotgunTrenchgun4034 components: - type: Sprite @@ -107,7 +140,9 @@ delay: 0.5 - type: GunRequiresWield - type: Gun - fireRate: 1.25 + fireRate: 1 + - type: GunSpreadModifier + spread: 0.6 - type: Construction graph: ShotgunTrenchgun4034Sawn node: start @@ -120,6 +155,23 @@ components: - type: Sprite sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/big.rsi + - type: Gun + fireRate: 1 + useKey: true + selectedMode: SemiAuto + - type: GunSpreadModifier + spread: 1.4 + - type: MeleeWeapon + angle: 60 + range: 1 + damage: + types: + Blunt: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 1 + autoAttack: false + - type: AltFireMelee + attackType: Light - type: Item size: Normal shape: @@ -128,7 +180,12 @@ - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Shotguns/trenchgun_l_4034_sawn/tiny.rsi - type: BallisticAmmoProvider - capacity: 4 + capacity: 5 + - type: UseDelay + delay: 0.25 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 - type: Construction graph: ShotgunTrenchgun4034Sawn node: shotgun4034sawn @@ -169,3 +226,19 @@ - type: GunRequiresWield - type: Gun fireRate: 2 + - type: GunSpreadModifier + spread: 1.2 + - type: SpeedModifiedOnWield + walkModifier: 0.95 + sprintModifier: 0.95 + - type: MeleeWeapon + angle: 60 + range: 1 + damage: + types: + Blunt: 8 + bluntStaminaDamageFactor: 2.0 + attackRate: 1 + autoAttack: false + - type: AltFireMelee + attackType: Light diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b1ad4af65a0edd2813a89646049bb15160534d GIT binary patch literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U{dvTaSW-L z^Y-q+tlJI(3>Q3K1U9LNH0xF8R*R~AnbUuH`H$jHg1cCJJeXeARu@dk>zQq~R@n1f zwR$qoyt^~!ith4Z0h);ntgnPle!c2s@^M28S?h*e&8?Gf&Z%9!T5W#3$;YR!x6kkr ztdRnWcOQ*(*<$&~Ov%pue*F9%*~@l3C*yU_CGD;2_}s0gq-6hZhh%B(EkT`OH6>qFo)~u6?^5r z+Z8HjR;cG1aO`&J>gO}|$H&>#+fV&ne`(t3)#9!bf=&hNHyNE%eE0OzE6tCZ%crRP z_iy7}wOZ}HR@27E)o0f|nf_YRdf&~LyRLrb)LP%XQtS4=qROw2xE{z)?Uc7Vbi?p% z(6--}s`X<23-?F;-*TTjr|YwslG3kz^K<4P2L>8jX1(PZj%TuGbEAG#|2ScJc)9#n z_xkLO7Tr^B-T8i9y*-9yy|0V?{*1or8zq+dKLolL#N0N>-w_giwy=NZ{L3ePY}c9` z@8^F1>+HoL;l6UqTFxh?{E5y{udmK^uYKkH^rXcSC5d-`5`AYo`R{xkwsYOA=E&!9 zQ(O&7S~e#Cir+m+{^67V*Pb1bIab}M_)~Cplbl^K%czopr0Ml&|PXGV_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..344dac096003f100e958a21f032f72d760ad7dd0 GIT binary patch literal 671 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>V2bo~aSW-L z^Y*T9mXf0g!vmu;L5`{%dsn_aljC}5jcqUc3CWnVj73cSlbye~O_;zksrKw5&D>;; z$@916ey$bZ(2Y1>wLU&{triQ=WMuH~@`Cs!j{7}wduj{UG$zg2_KDg5E>LLx{<`*y zJ2-Mh4)&|<-{bWwmgAw3kJ{mYX}*2eY@6#Qx;<9PG3!q>l6-dj<;%*u)?qxor416x zSL)feI>c}Xk$s;lC@%e}jP z`)Acf&Tr2)9yPeH&My7fM0fgXk;f*buh_RFT+rWE{N?$pEbH*fe@-t>$gT1!^ZEMZ zeA?&B{C`+NTm^!A3|j>b<(T>Z)(^D#EB)eg!SBg8niAHBNuZNWWRUJ^SzUg;r6_ z$l-&=E}gsM*VMF*B8t0W1PEF>M!%FllE74PtotQym9#N zuLn0%jCg+f-TAEDv|9k^HL>dtpFPXJeQ?jK4Au`{_Ppx_294E>=`BYeSsk(PeICv- zT~WQ>NV4v<>Ia9O%O)?xZ}0z;vomIC@hzRJxBums+22%MAi9%d)so{Tv(E_v1gs*G&Gr;-#2WWqRk@LSMdrg3Fpi^KTHWg(>db-HjRU3YA1E&oK3kzp-G7ot&JKEM3iso%GD#*Dy#VRZ*Cpj!(-IZf`R3Gz){U z1*o7y$ei~(L({mj8AZbW-j$8S*?i6B{)++SqgM04ZlNfPnV?jZjW0LUimH~JjxiHT zN9rnVXzRTw*J|zPo+_4rd=7BbxV6;R*Lx{8F8CQm0a=F{b^1z#BV9%@MBF8jJU$8f z5?Tor+=d6uA@g^sVADRQrtQ{aUnYh=5wxZL!WM8_T{thoG6i1Vo_;@F`IL} ztK-`lV$MbSNO^fW5RQ{k|ccZrKMpN2|StJY09Xi+gxg=c)GOVEt`a>P_S*K zk~M(w3Y6L~LmaM{+)Dg)kd)7Ww{XdMzAR&Be>>Pps*9WMmZ}F) gFH?s;!18eI)Z&kCEiXm;mmIwUm(c+n|L@5E16(RK>i_@% literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/big.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..7261d8a55b7c73ff94e491a4e432560766fc41a6 GIT binary patch literal 1088 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 P00000NkvXXu0mjf8*33W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..1b80e188665c8408a02ba09f0b0c7a0602fdf76f GIT binary patch literal 1617 zcmV-X2Cn&uP)3c0|+tUv?!N>n1!JDYw_2p8TZq(-_F~buIeAt)7#5-C7rISu6pl%->IqNupKloKYy%0J+(i+EZ&{A@wnCjf9TM`7~X>izeKB#?j=y4NNS$Sf!PCn9xWVw zJ-&N}HNLysy%T+VYk5e{iJ>0TA@Ebv&qj|{e~nh|uLQ@Nsg0?gIB_a5+|t#n8{}H^ zgo&UB0C;lOQ&F$ii%`N=D}bMydo$t!Jb=0OJhwltgD0o}2+SXSBgTyq4!?XP(Pqrb)-JwSudnspoX+xs)SpR~=f)}?5H z*Ikz9RY%Md>-+Z2M6bMh#4ArO1$bw#Klt*!x5jFD@jrd>+60Q`!m5DNCGd>>`KNmc zc-p-FNPg7alG^DG3bmKcp6vhm`)c%e@4x8eXG3 zv4B@7jLNG}4)6);_G>M!_;sI`Z3EnbXW@gw%hF?B2M_Z1MQ<_)9Qy+GTS{-b@8R2!bp=V377rF2tbDXKaO0_U?T;Rzx1&nF}F+|J%DC z(}F>_dm#_q+Q+Q#`Nanze*EE1ZvL4b0427_Ibm_-%7v)Z=3;JfMjMEX80q1|KjICM zJk&B3!15D<5Y{o1JcKuUjD9X>$&smmyo9nC)%l#fmG^5=Pyr-A2<6SFb%G4>B5&cX zdE^czK?rOWw`b4dqpxoc?HPs?#j~IS>|_!k`G8|G-`!qr)TcD=j3f=BZwDSF}R9skrEwefcJJhGYxSg;B zI0a)-vJA$UU}aMOGGg%jd~S@ z1#nbWiy?@i2pB0J)Ct^zalzYX$cPf~jOFF*A4S0su)nLV7g&aM*VDGZInk=T#Q6b? zM2M2Zzz~wrs{kfK074Md!2}rT2yKXPozFNGst~Yz?RjC_Z|hzKFer@xjMDlo(You_ z11#^*&a%b@b3hsad4RsXiO^=6UH^AV?noFz+ zZRAC6<%D&a;yjSHn>-W(#J-XrM7X4gCIC#60WY|I{bu}jI&_23ifY8W@WP{s+y{*(_I+BJ}_O01jnXNoGw=04e|g00;m8000000Mb*F P00000NkvXXu0mjf8*33W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png b/Resources/Textures/_Sunrise/Objects/Weapons/Guns/Shotguns/spas_12_2/tiny.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..cf5bc097b35fa4e1d32ca0cd9a259109880bc05f GIT binary patch literal 556 zcmV+{0@MA8P)Px$=1D|BR9J=Wld+D|KoEvMqbFrMW6i3WIEkz3dWJ@)fyVoHz+5gpLCL&8&B3=l^Fs11(y#Xz{-zIOK@q zxH|Uma%Jgu1OQS>mdoYAT*q){A8{PV)nGWHEX!b@9Sld@zjqgR)>{7wH&E+K#7e0fRpEqu{q~)1MG1zV;J_p--|KeoOW@Az;%o uhu!~sTLJ>0veqJmxOEXNTC`~KPjLm+Zyol3HsQAb0000