juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix integration tests failing.

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-08-14 16:10:19 +02:00
parent 9ffc134f75
commit 8f1a74dcd1
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerRangedBarrelComponent.cs
View File

@@ -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);

35
Resources/Maps/saltern.yml
View File

@@ -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: