From 3d9593f9a469e15f4039668d37d41c8d67cbea88 Mon Sep 17 00:00:00 2001 From: keslik Date: Sat, 30 Nov 2024 17:32:13 +0300 Subject: [PATCH 1/2] Fix: Shinamo grenades aren't trash --- .../Objects/Weapons/Guns/Modules/modules.yml | 3 +++ .../Weapons/Guns/Projectiles/shinanogrenades.yml | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml index 7a25b54b37..762b65951e 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Modules/modules.yml @@ -142,3 +142,6 @@ value: "shinano" module_type: "shutter_module" tag: Grenade + - type: Sprite + sprite: White\Objects\Weapons\modulesOnWeapon.rsi + state: telescopic diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml index f73459d3dd..2eaad64768 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml @@ -1,5 +1,6 @@ - type: entity id: BaseBulletShinanoGranade + parent: BaseBullet abstract: true name: base shinano granade components: @@ -39,11 +40,13 @@ layers: - state: grenade - type: FlashOnTrigger - range: 5 - stunTime: 2 # WD + range: 6 + stunTime: 3 # WD knockdownTime: 10 # WD - type: SpawnOnTrigger proto: GrenadeFlashEffect + - type: ActiveTimerTrigger + timeRemaining: 0.6 - type: DeleteOnTrigger - type: entity @@ -66,6 +69,8 @@ Quantity: 50 - type: SoundOnTrigger sound: /Audio/Items/smoke_grenade_smoke.ogg + - type: ActiveTimerTrigger + timeRemaining: 0.6 - type: DeleteOnTrigger - type: entity @@ -85,6 +90,8 @@ - type: ContainerContainer containers: cluster-payload: !type:Container + - type: ActiveTimerTrigger + timeRemaining: 0.5 - type: entity parent: [BaseBullet, BaseBulletTrail] @@ -99,7 +106,7 @@ - type: Projectile damage: types: - Blunt: 15 + Blunt: 20 - type: StaminaDamageOnCollide ignoreResistances: true - damage: 80 + damage: 100 From e9c4e561e88d2a936da16c59bc875ec7dfb79a3e Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Sat, 30 Nov 2024 20:33:03 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Guns/Launchers/launchers.yml | 4 +++- .../Weapons/Guns/Projectiles/projectiles.yml | 3 +++ .../Objects/Weapons/Guns/Launcher/shinano.yml | 17 ++++++++++++++++- .../Guns/Projectiles/shinanogrenades.yml | 7 +++++-- .../Guns/Launchers/shinano-icons.rsi/meta.json | 5 ++++- .../Launchers/shinano-icons.rsi/shinano.png | Bin 0 -> 229 bytes 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 84e3fa76a8..e126f19cca 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -33,7 +33,7 @@ - type: entity name: china lake - parent: [BaseWeaponLauncher, BaseGunWieldable] + parent: BaseWeaponLauncher # WD removed BaseGunWieldable id: WeaponLauncherChinaLake description: PLOOP components: @@ -57,6 +57,8 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + minAngle: 10 # WD + maxAngle: 10 # WD - type: BallisticAmmoProvider whitelist: tags: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 78cd629006..744100cc95 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -764,6 +764,9 @@ - type: ActiveTimerTrigger timeRemaining: 0.3 - type: DeleteOnTrigger + - type: SoundOnTrigger # WD + sound: + path: "/Audio/Effects/flash_bang.ogg" # This is supposed to spawn shrapnel and stuff so uhh... TODO? - type: entity diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml index f04b4e31ad..b237d00a57 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Launcher/shinano.yml @@ -9,6 +9,9 @@ layers: - state: icon map: ["enum.GunVisualLayers.Base"] + - state: shinano + visible: false + map: [ "enum.ModuleVisualState.ShutterModule" ] - type: Item sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi size: Large @@ -16,6 +19,7 @@ - 0,0,2,1 - type: Clothing sprite: White/Objects/Weapons/Guns/Launchers/shinano-inhands.rsi + quickEquip: false slots: - Back - suitStorage @@ -44,11 +48,22 @@ name: Shutter Module insertSound: /Audio/White/Gun/Modules/insertmodule.ogg ejectSound: /Audio/White/Gun/Modules/ejectmodule.ogg - priority: 1 + priority: 4 whitelist: tags: - BaseShutterModule - type: ContainerContainer containers: shutter_module: !type:ContainerSlot + ballistic-ammo: !type:Container + ents: [] - type: Appearance + - type: EmitSoundOnPickup + sound: + collection: RiflesPickUp + - type: EmitSoundOnDrop + sound: + collection: RiflesDrop + - type: EmitSoundOnLand + sound: + collection: RiflesDrop diff --git a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml index 2eaad64768..716bb8fbe2 100644 --- a/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml +++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/Guns/Projectiles/shinanogrenades.yml @@ -41,13 +41,16 @@ - state: grenade - type: FlashOnTrigger range: 6 - stunTime: 3 # WD - knockdownTime: 10 # WD + stunTime: 3 + knockdownTime: 10 - type: SpawnOnTrigger proto: GrenadeFlashEffect - type: ActiveTimerTrigger timeRemaining: 0.6 - type: DeleteOnTrigger + - type: SoundOnTrigger + sound: + path: "/Audio/Effects/flash_bang.ogg" - type: entity parent: BaseBulletShinanoGranade diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json index 45c099c298..cb8cedb78e 100644 --- a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json +++ b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/meta.json @@ -12,6 +12,9 @@ }, { "name": "bolt-open" + }, + { + "name": "shinano" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png b/Resources/Textures/White/Objects/Weapons/Guns/Launchers/shinano-icons.rsi/shinano.png new file mode 100644 index 0000000000000000000000000000000000000000..64c7f9eaf5c53e21f417540ed4631bc0be3e45a1 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^20*O9!3HEluKbn(Qk(@Ik;M!Q+`=Ht$S`Y;1W<6g zr;B4qMC;pWw%p8$0xri3Hk?fo=6m=5|B-~`tt*wjGd5m+ATZ;4*J&Hch+vlo^D8$n z_b4%%2_+~435la;4xicmUf=%ACsE`7YyN~}TgsbvMtSctE}zBFz@or#