From 8f1a74dcd1b8973a730ef6aeebe1f9f427886843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Aguilera=20Puerto?= Date: Fri, 14 Aug 2020 16:10:19 +0200 Subject: [PATCH] Fix integration tests failing. --- .../Barrels/ServerRangedBarrelComponent.cs | 8 ++--- Resources/Maps/saltern.yml | 35 +++++++++++++++---- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs index 62ba32be5e..b3d6b8e924 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs @@ -112,14 +112,14 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels serializer.DataReadWriteFunction( "angleIncrease", 40 / _fireRate, - angle => _angleIncrease = angle * (float) Math.PI / 180, - () => _angleIncrease / (float) Math.PI / 180); + angle => _angleIncrease = angle * (float) Math.PI / 180f, + () => MathF.Round(_angleIncrease / ((float) Math.PI / 180f), 2)); serializer.DataReadWriteFunction( "angleDecay", 20f, - angle => _angleDecay = angle * (float) Math.PI / 180, - () => _angleDecay / (float) Math.PI / 180); + angle => _angleDecay = angle * (float) Math.PI / 180f, + () => MathF.Round(_angleDecay / ((float) Math.PI / 180f), 2)); serializer.DataField(ref _spreadRatio, "ammoSpreadRatio", 1.0f); diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 33a2d4eb9b..e387f022c3 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -11156,6 +11156,33 @@ entities: ? X: 52 Y: -2 : 0 + ? X: -26 + Y: -17 + : 0 + ? X: -25 + Y: -17 + : 0 + ? X: -24 + Y: -17 + : 0 + ? X: -23 + Y: -17 + : 0 + ? X: -22 + Y: -17 + : 0 + ? X: -21 + Y: -17 + : 0 + ? X: -26 + Y: -16 + : 0 + ? X: -26 + Y: -15 + : 0 + ? X: -26 + Y: -14 + : 0 type: GridAtmosphere - uid: 16 type: Wire @@ -37317,9 +37344,7 @@ entities: pos: -13.672081,21.719378 rot: -1.5707963267948966 rad type: Transform - - angleIncrease: 1.9051974E-08 - angleDecay: 1.4288981E-08 - type: BatteryBarrel + - type: BatteryBarrel - anchored: False type: Collidable - containers: @@ -37346,9 +37371,7 @@ entities: pos: -14.515831,21.735003 rot: -1.5707963267948966 rad type: Transform - - angleIncrease: 1.9051974E-08 - angleDecay: 1.4288981E-08 - type: BatteryBarrel + - type: BatteryBarrel - anchored: False type: Collidable - containers: