From 0ed1c7ace4c2d7ad106136c78591260baecbc565 Mon Sep 17 00:00:00 2001
From: KaiserMaus <kaiser.ratte@gmail.com>
Date: Tue, 7 Jan 2025 13:24:04 +0000
Subject: [PATCH] Tweaks

---
 .../Specific/Mech/Weapons/Gun/combat.yml      |   4 +-
 .../Entities/Objects/Specific/Mech/mechs.yml  |   4 +-
 .../_Sunrise/Catalog/ert_uplink_catalog.yml   |  62 +++++++++---------
 .../Specific/Mech/Weapons/Gun/combat.yml      |  31 ++++++++-
 .../Specific/Mech/mecha_mg.rsi/mecha_mg.png   | Bin 0 -> 1229 bytes
 .../Specific/Mech/mecha_mg.rsi/meta.json      |  14 ++++
 6 files changed, 79 insertions(+), 36 deletions(-)
 create mode 100644 Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/mecha_mg.png
 create mode 100644 Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/meta.json

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index c2053945a74..04ba28a1725 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -55,7 +55,7 @@
     sprite: Objects/Specific/Mech/mecha_equipment.rsi
     state: mecha_antimatrifle
   - type: Gun
-    fireRate: 1.4
+    fireRate: 1.25
     selectedMode: FullAuto
     availableModes:
       - FullAuto
@@ -63,7 +63,7 @@
       path: /Audio/_Sunrise/Weapons/Guns/Snipers/Bauer127/bauer127_shot.ogg
   - type: ProjectileBatteryAmmoProvider
     proto: CartridgeAntiMateriel
-    fireCost: 80
+    fireCost: 120
   - type: Appearance
   - type: AmmoCounter
 
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
index df6a8c9433f..54620d72841 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
@@ -882,8 +882,8 @@
   - type: Mech
     startingEquipment:
       - WeaponMechChainSword
+      - WeaponMechCombatShotgun
       - WeaponMechCombatPulseRifle
-      - WeaponMechCombatHeavyRifle
       - WeaponMechCombatMissileRack8
 
 # Marauder
@@ -961,7 +961,7 @@
   components:
   - type: Mech
     startingEquipment:
-      - WeaponMechChainSword
+      - WeaponMechCombatMG
       - WeaponMechCombatPulseRifle
       - WeaponMechCombatHeavyRifle
       - WeaponMechCombatMissileRack8
diff --git a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
index b6f4017bbe5..1f5fb6e5ac3 100644
--- a/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
+++ b/Resources/Prototypes/_Sunrise/Catalog/ert_uplink_catalog.yml
@@ -161,7 +161,7 @@
   productEntity: WeaponPulseRifle
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-r }
   cost:
-    Bluecrystal: 35
+    Bluecrystal: 30
   categories:
   - NTLasers
   conditions:
@@ -197,19 +197,19 @@
   productEntity: WeaponPulseCarbine
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-c }
   cost:
-    Bluecrystal: 12
+    Bluecrystal: 15
   categories:
     - NTLasers
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 4
+    stock: 6
 
 - type: listing
   id: NTUplinkSunriseWeaponLaserLNT620
   productEntity: WeaponLaserLNT620
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: lnt620 }
   cost:
-    Bluecrystal: 8
+    Bluecrystal: 10
   categories:
   - NTLasers
   conditions:
@@ -221,7 +221,7 @@
   productEntity: WeaponEnergyGunTactical
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: energygun_tac }
   cost:
-    Bluecrystal: 6
+    Bluecrystal: 8
   categories:
   - NTLasers
   conditions:
@@ -259,7 +259,7 @@
   productEntity: WeaponPulsePistol
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: pulse-p }
   cost:
-    Bluecrystal: 4
+    Bluecrystal: 5
   categories:
   - NTPistols
   conditions:
@@ -284,7 +284,7 @@
   productEntity: WeaponPistolN1984
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: n1984 }
   cost:
-    Bluecrystal: 3
+    Bluecrystal: 4
   categories:
   - NTPistols
   conditions:
@@ -309,7 +309,7 @@
   productEntity: BoxMagazinePistolSubMachineGunTopMounted 
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_wt550 }
   cost:
-    Crystallite: 3
+    Crystallite: 2
   categories:
   - NTAmmo
   conditions:
@@ -357,7 +357,7 @@
   productEntity: MagazineBoxMagnumIncendiary
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_magnum_ince }
   cost:
-    Crystallite: 3
+    Crystallite: 2
   categories:
     - NTAmmo
   conditions:
@@ -369,7 +369,7 @@
   productEntity: MagazineBoxMagnumUranium
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_magnum_uran }
   cost:
-    Crystallite: 4
+    Crystallite: 3
   categories:
     - NTAmmo
   conditions:
@@ -381,7 +381,7 @@
   productEntity: MagazineP90
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_p90 }
   cost:
-    Crystallite: 4
+    Crystallite: 3
   categories:
     - NTAmmo
   conditions:
@@ -405,7 +405,7 @@
   productEntity: SMGIncendiaryAmmoKit
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_red }
   cost:
-    Crystallite: 15
+    Crystallite: 14
   categories:
   - NTAmmo
   conditions:
@@ -417,7 +417,7 @@
   productEntity: SMGUraniumAmmoKit
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_smg_uran }
   cost:
-    Crystallite: 25
+    Crystallite: 22
   categories:
   - NTAmmo
   conditions:
@@ -429,7 +429,7 @@
   productEntity: BoxMagazineShotgun
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot }
   cost:
-    Crystallite: 6
+    Crystallite: 4
   categories:
   - NTAmmo
   conditions:
@@ -441,7 +441,7 @@
   productEntity: BoxMagazineShotgunIncendiary
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_red }
   cost:
-    Crystallite: 16
+    Crystallite: 14
   categories:
   - NTAmmo
   conditions:
@@ -453,7 +453,7 @@
   productEntity: BoxMagazineShotgunSlug
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot_slug }
   cost:
-    Crystallite: 9
+    Crystallite: 6
   categories:
   - NTAmmo
   conditions:
@@ -465,7 +465,7 @@
   productEntity: BoxMagazineShotgunBeanbag
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: box_shot }
   cost:
-    Crystallite: 6
+    Crystallite: 3
   categories:
   - NTAmmo
   conditions:
@@ -477,7 +477,7 @@
   productEntity: MagazineBR64
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_br64 }
   cost:
-    Crystallite: 5
+    Crystallite: 4
   categories:
   - NTAmmo
   conditions:
@@ -489,7 +489,7 @@
   productEntity: MagazineMachineGunMG42
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mag_mg342 }
   cost:
-    Crystallite: 5
+    Crystallite: 4
   categories:
   - NTAmmo
   conditions:
@@ -506,7 +506,7 @@
   - NTAmmo
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 5
+    stock: 6
 
 # NTexplosive:
 - type: listing
@@ -726,7 +726,7 @@
   - NTAdditional
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 3
+    stock: 4
 
 - type: listing
   id: NTUplinkSunrisePinpointerUniversal
@@ -793,7 +793,7 @@
   productEntity: DeployableBarrier
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: deploy_barrier }
   cost:
-    Crystallite: 4
+    Crystallite: 3
   categories:
     - NTAdditional
   conditions:
@@ -958,7 +958,7 @@
     - NTEngineering
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 8
+    stock: 12
 
 - type: listing
   id: NTUplinkSunrisePowerCellNanoTrasen
@@ -972,7 +972,7 @@
     - NTEngineering
   conditions:
   - !type:ListingLimitedStockCondition
-    stock: 8
+    stock: 12
 
 # Экипировка:
 - type: listing
@@ -1059,7 +1059,7 @@
   productEntity: JetpackVoidFilled
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: void_jet }
   cost:
-    Crystallite: 8
+    Crystallite: 6
   categories:
     - NTEquipment
   conditions:
@@ -1071,7 +1071,7 @@
   productEntity: ClothingEyesNVD
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nvd }
   cost:
-    Crystallite: 10
+    Crystallite: 8
   categories:
     - NTEquipment
   conditions:
@@ -1083,7 +1083,7 @@
   productEntity: EnergyDomeGeneratorBackpackNT
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_back }
   cost:
-    Crystallite: 14
+    Crystallite: 12
   categories:
     - NTEquipment
   conditions:
@@ -1095,7 +1095,7 @@
   productEntity: EnergyDomeGeneratorPersonalNT
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: nanotrasen_belt }
   cost:
-    Crystallite: 30
+    Crystallite: 25
   categories:
     - NTEquipment
   conditions:
@@ -1122,7 +1122,7 @@
   productEntity: PlayerBorgChassisERTBattery
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: cyborg_ert }
   cost:
-    Bluecrystal: 30
+    Bluecrystal: 35
   categories:
     - NTMechs
   conditions:
@@ -1136,7 +1136,7 @@
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_ntgygax }
   productEntity: CrateCommandNTGygaxBundle
   cost:
-    Bluecrystal: 55
+    Bluecrystal: 60
   categories:
   - NTMechs
   conditions:
@@ -1164,7 +1164,7 @@
   icon: { sprite: _Sunrise/Interface/Misc/nt_icons.rsi, state: mech_seraph }
   productEntity: CrateCommandSeraphBundle
   cost:
-    Bluecrystal: 175
+    Bluecrystal: 160
   categories:
   - NTMechs
   conditions:
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
index 67f329bc92c..cead4a21270 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Mech/Weapons/Gun/combat.yml
@@ -26,7 +26,7 @@
   id: WeaponMechCombatMaxim
   name: Mounted Kardashev-Maxim
   description: An ancient heavy machine gun given new life as a mech-mounted gun
-  suffix: Mech Weapon, Gun, Combat, USSP
+  suffix: Mech Weapon, Combat, USSP
   parent: [ BaseMechWeaponRange, CombatMechEquipment ]
   components:
   - type: Sprite
@@ -47,6 +47,35 @@
   - type: Appearance
   - type: AmmoCounter
 
+- type: entity
+  id: WeaponMechCombatMG
+  name: Mounted MG
+  description: An ancient heavy machine gun given new life as a mech-mounted gun
+  suffix: Mech Weapon, Combat
+  parent: [ BaseMechWeaponRange, CombatMechEquipment ]
+  components:
+  - type: Sprite
+    sprite: _Sunrise/Objects/Specific/Mech/mecha_mg.rsi
+    state: mecha_mg
+  - type: Gun
+    minAngle: -10
+    maxAngle: 18
+    angleIncrease: 3.5
+    angleDecay: 9
+    fireRate: 10
+    shotsPerBurst: 8
+    burstCooldown: 0.5
+    selectedMode: Burst
+    availableModes:
+      - Burst
+    soundGunshot:
+      path: /Audio/_Sunrise/Weapons/Guns/SMGs/mp38/mp38_shot.ogg
+  - type: ProjectileBatteryAmmoProvider
+    proto: CartridgeRifle
+    fireCost: 8
+  - type: Appearance
+  - type: AmmoCounter
+
 - type: entity
   id: WeaponMechCombatPirateCannon
   name: Mounted PirateCannon
diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/mecha_mg.png b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/mecha_mg.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f982f59e8c815cc3e5a5372aa8a79a7c6b3a230
GIT binary patch
literal 1229
zcmV;;1Ty=HP)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px(he<?1RA_<im``sTMHq*lb#@bbYm(M(?C#RkaS)DNwNix}l~nDaSNH%uKrcuf
zP`CgRr-}nYa3WuTz^NCc3M3?iL;<N%N{qmWlD1I-t-DFO#+!PR7!$9vO_oEl+qkY1
z_fH%J{9HV<^ZK26fAbrU*3hCwix#_(>t7xgc6tr}3F@loIF8pI931qmHzi;hU~Fv6
z3lN0eyBS*waO8N(cRlm#>dDh*oa%s8pWrMrI{Krtn*|WJ3Rrbkd?!zxUU}xwF}iyb
zv<U+FS&ib&^y-z-vE5twI=*@Xf*>FW0`|(P4?#o<1bOjLfR|GTshEpZal4ti4!Afp
z<P_$Yq^~E(SMCB!)(Ue46M&A+eN^U~wZ!dZ(<2bxC);0Tei2TdK0`YKKiwz*1!gae
zus0B(@A;GiaIZ4Q^z^i6g+wCZD2n3c$>nnBx{j)<=(>(5-k&xSiFj>I)2LJ`O|{gf
zlU*Dda<tqc=|88)6%FtC*`xiu5LP*N<#(dVV~qdsIjX9nC<?h;4n<K&CX-(L#KZ*Y
zbQ(#Lux*=IEar`E6e^R+Ac`Uj3k#1dLL!lHbX_MD3RP{!R&45k_l6br{}wC?mr9+C
z7z{*KINEcZ=ei?=0s#OH#``I(7w;CG&1S3eWV2Z$Ng@;qk<aJRb=@1&G>vF9y0#cm
zbRFT8%Vi`<^5SgU_Tm6c(<BrMd41PmilUIu=bc8KR9Aq*l@FX^d)T^h;(XT$|2{`L
z&_z(}Akn4LxyMgHYO9*uvMjG~(=@AcnWl+t+r;B>Ow(le^$>l%?Y#E!G9yDiv`LW*
zH=iY)PGcAbkw^qZQMh{bD&=ySKp=pssu+f`X<yScEX#6*bE45GrfE_tmFkMInFFR~
zg*W;E{^@Gx$etqI`;$~yX5nueyW{@uq*AGxFURBY8WFPDY~A9M$t0Of#w$LX%~CFx
zsZ=TeSeCVAUy>x^@i>0JA6?fswjI|UmoHzg5~HpFH#*MuZ|o2DoM1rh#m3>?Z@*uA
z*wzWuTHZ9x8W*^{{mGgGK6}R%;U2GYhYJ&Uh2(NM;_*1eVv$%ZhGkg|^<9yR#iF+^
zw`~{(mSxqfr=fFlBpP+z92lV8?*~aDyngq;_46dDm(KFdr|(zAtE%dqQTJ2Vb^Lxm
zAD)wI9PrV1Yj^6Me5vN#KW=|x`*Dvz6&J2u<CRp3`BI4`QAF^q<($n<HkyJ?+2M=v
zFpR_D1PottN9Kw3tX+q)EVHz<#I5Oq0C*O6d6fQxV-KU@>*7>zud`4tvo{bRBFii+
zFLPVy0^rsknTGNNgFz<}>hOwn(Pj){JrOzrex|0TiS<O#W(-e+?WAD`jNZQe#EU7F
zN<v#(n-lAK(o9c}y6*zp#p2>(m5|zufh@~tGX|Bi<?Vj4v{*02Q>EzwJcxVdWm&Fz
z)+`!60^3D*ILO@kC%{~x)YSQR%mEt<b&KB#cI0J#e@Juy4n&lPj{jxkxNF{P%G!49
r-;BOPVW-{?U9*aB(V|6*|2_W#2$vzh;^olH00000NkvXXu0mjfkVsT~

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/meta.json b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/meta.json
new file mode 100644
index 00000000000..4faab80943c
--- /dev/null
+++ b/Resources/Textures/_Sunrise/Objects/Specific/Mech/mecha_mg.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "license": "CLA",
+  "copyright": "SUNRISE",
+  "size": {
+    "x": 64,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "mecha_mg"
+    }
+  ]
+}
\ No newline at end of file