attempt numero uno (#9)

Spatison · Feb 19, 2025 · e5b1b98 · e5b1b98
1 parent 3435aca
commit e5b1b98
Show file tree

Hide file tree

Showing 12 changed files with 88 additions and 12 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -128,6 +128,11 @@
   - type: Tag
     tags:
     - Sidearm
+  - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 80           # wwdp
+    maxBonusAngle: 10             # wwdp
   - type: Clothing
     sprite: Objects/Weapons/Guns/Battery/taser.rsi
     quickEquip: false
@@ -159,6 +164,11 @@
     quickEquip: false
     slots:
     - Belt
+  - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 80           # wwdp
+    maxBonusAngle: 10             # wwdp
   - type: MeleeWeapon
     attackRate: 1.2
     damage:
@@ -587,6 +597,10 @@
         map: ["enum.GunVisualLayers.MagUnshaded"]
         shader: unshaded
   - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 50           # wwdp
+    maxBonusAngle: 10             # wwdp
     selectedMode: FullAuto
     fireRate: 4
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
@@ -9,6 +9,10 @@
   - type: Item
     size: Ginormous
   - type: Gun
+    bonusAngleIncreaseMove: 60    # wwdp
+    bonusAngleIncreaseTurn: 1.5   # wwdp
+    bonusAngleDecay: 30           # wwdp
+    maxBonusAngle: 30             # wwdp
     fireRate: 20
     selectedMode: FullAuto
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml
@@ -20,6 +20,10 @@
     minAngle: -20
     maxAngle: -20
   - type: Gun
+    bonusAngleIncreaseMove: 50    # wwdp
+    bonusAngleIncreaseTurn: 0.5   # wwdp
+    bonusAngleDecay: 30           # wwdp
+    maxBonusAngle: 30             # wwdp
     minAngle: 24
     maxAngle: 45
     angleIncrease: 4

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
@@ -19,6 +19,11 @@
     containers:
       ballistic-ammo: !type:Container
         ents: []
+  - type: Gun
+    bonusAngleIncreaseMove: 60    # wwdp
+    bonusAngleIncreaseTurn: 0.75   # wwdp
+    bonusAngleDecay: 35           # wwdp
+    maxBonusAngle: 30             # wwdp
   - type: MeleeWeapon
     attackRate: 1.5
     damage:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
@@ -26,6 +26,10 @@
     - suitStorage
     - Belt
   - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 80           # wwdp
+    maxBonusAngle: 10             # wwdp
     fireRate: 6
     selectedMode: SemiAuto
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
@@ -23,6 +23,10 @@
     - Belt
   - type: AmmoCounter
   - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 45           # wwdp
+    maxBonusAngle: 10             # wwdp
     selectedMode: SemiAuto
     fireRate: 1.5
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
@@ -17,6 +17,10 @@
   - type: Wieldable
   - type: AmmoCounter
   - type: Gun
+    bonusAngleIncreaseMove: 40    # wwdp
+    bonusAngleIncreaseTurn: 0.25  # wwdp
+    bonusAngleDecay: 40           # wwdp
+    maxBonusAngle: 20             # wwdp
     fireRate: 5
     selectedMode: FullAuto
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
@@ -15,7 +15,11 @@
     - Back
     - suitStorage
   - type: AmmoCounter
-  - type: Gun
+  - type: Gun # if changing also update WeaponDisablerSMG
+    bonusAngleIncreaseMove: 20    # wwdp
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 50           # wwdp
+    maxBonusAngle: 10             # wwdp
     minAngle: 2
     maxAngle: 16
     fireRate: 8

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
@@ -19,7 +19,11 @@
     - Back
     - suitStorage
   - type: AmmoCounter
-  - type: Gun
+  - type: Gun # change WeaponShotgunBulldog too if updating this
+    bonusAngleIncreaseMove: 40    # wwdp 
+    bonusAngleIncreaseTurn: 0.25  # wwdp
+    bonusAngleDecay: 40           # wwdp
+    maxBonusAngle: 20             # wwdp
     fireRate: 2
     selectedMode: SemiAuto
     availableModes:
@@ -65,9 +69,25 @@
     staminaCost: 9.5
   - type: GunRequiresWield # WD EDIT
 
+- type: entity # supposed to be similiar to pistols
+  name: BaseWeaponShotgunSmall
+  parent: BaseWeaponShotgun
+  id: BaseWeaponShotgunSmall
+
+  description: A rootiny tootiny point and shootiny.
+  abstract: true
+  components:
+  - type: Gun # change WeaponFlareGun too if updating this 
+    bonusAngleIncreaseMove: 20    # wwdp 
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 80           # wwdp
+    maxBonusAngle: 10             # wwdp
+    fireRate: 2
+
+
 - type: entity
   name: Bulldog
-  # Don't parent to BaseWeaponShotgun because it differs significantly
+  # Don't parent to BaseWeaponShotgun because it differs significantly # fuck you
   parent: [BaseItem, BaseGunWieldable]
   id: WeaponShotgunBulldog
   description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells.
@@ -90,6 +110,10 @@
   - type: AmmoCounter
   - type: GunRequiresWield #remove when inaccuracy on spreads is fixed
   - type: Gun
+    bonusAngleIncreaseMove: 40    # wwdp
+    bonusAngleIncreaseTurn: 0.25  # wwdp
+    bonusAngleDecay: 40           # wwdp
+    maxBonusAngle: 20             # wwdp
     fireRate: 2
     selectedMode: FullAuto
     availableModes:
@@ -246,7 +270,7 @@
 
 - type: entity
   name: sawn-off shotgun
-  parent: BaseWeaponShotgun
+  parent: BaseWeaponShotgunSmall
   id: WeaponShotgunSawn
   description: Groovy! Uses .50 shotgun shells.
   components:
@@ -290,7 +314,7 @@
 
 - type: entity
   name: handmade pistol
-  parent: BaseWeaponShotgun
+  parent: BaseWeaponShotgunSmall
   id: WeaponShotgunHandmade
   description: Looks unreliable. Uses .50 shotgun shells.
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
@@ -21,6 +21,10 @@
   - type: Wieldable
   - type: GunRequiresWield
   - type: Gun
+    bonusAngleIncreaseMove: 30  # wwdp
+    bonusAngleIncreaseTurn: 0.4 # wwdp
+    bonusAngleDecay: 30         # wwdp
+    maxBonusAngle: 30           # wwdp
     fireRate: 0.75
     selectedMode: SemiAuto
     availableModes:

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
@@ -12,6 +12,16 @@
   - type: Item
     size: Small
     sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
+  - type: Gun
+    bonusAngleIncreaseMove: 20    # wwdp 
+    bonusAngleIncreaseTurn: 0.4   # wwdp
+    bonusAngleDecay: 80           # wwdp
+    maxBonusAngle: 10             # wwdp
+    selectedMode: SemiAuto
+    availableModes:
+      - SemiAuto
+    soundGunshot:
+      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
   - type: ItemSlots
     slots:
       gun_chamber:
@@ -39,13 +49,6 @@
     - Belt
     - suitStorage
   - type: Appearance
-  - type: Gun
-    fireRate: 8
-    selectedMode: SemiAuto
-    availableModes:
-      - SemiAuto
-    soundGunshot:
-      path: /Audio/Weapons/Guns/Gunshots/flaregun.ogg
 
 
 - type: entity

diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
@@ -23,6 +23,8 @@
     - Back
     sprite: _Goobstation/Objects/Weapons/Guns/Battery/erevolver.rsi
   - type: Gun
+    bonusAngleDecay: 60
+    maxBonusAngle: 10
     fireRate: 1.5
     soundGunshot:
       path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg