diff --git a/core/assets/sounds/shootAltLong.ogg b/core/assets/sounds/shootAltLong.ogg index f0936a6683..0ce2dbb719 100644 Binary files a/core/assets/sounds/shootAltLong.ogg and b/core/assets/sounds/shootAltLong.ogg differ diff --git a/core/assets/sounds/shootReign.ogg b/core/assets/sounds/shootReign.ogg new file mode 100644 index 0000000000..46aa4f4db1 Binary files /dev/null and b/core/assets/sounds/shootReign.ogg differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index a8745894a5..0bb01ab6f4 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -280,7 +280,7 @@ public class UnitTypes{ recoil = 5f; shake = 2f; ejectEffect = Fx.casing4; - shootSound = Sounds.bang; + shootSound = Sounds.shootReign; bullet = new BasicBulletType(13f, 80){{ pierce = true; diff --git a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java index 349b2adc8c..2683d35361 100644 --- a/core/src/mindustry/entities/bullet/ShrapnelBulletType.java +++ b/core/src/mindustry/entities/bullet/ShrapnelBulletType.java @@ -62,7 +62,7 @@ public class ShrapnelBulletType extends BulletType{ Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() + 90); Drawf.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, serrationWidth, sl, b.rotation() - 90); } - Drawf.tri(b.x, b.y, width * b.fout(), (realLength + 50), b.rotation()); + Drawf.tri(b.x, b.y, width * b.fout(), (realLength + 4f), b.rotation()); Drawf.tri(b.x, b.y, width * b.fout(), 10f, b.rotation() + 180f); Draw.reset(); diff --git a/core/src/mindustry/world/blocks/power/NuclearReactor.java b/core/src/mindustry/world/blocks/power/NuclearReactor.java index 4b1f038ec6..756f2a8eef 100644 --- a/core/src/mindustry/world/blocks/power/NuclearReactor.java +++ b/core/src/mindustry/world/blocks/power/NuclearReactor.java @@ -34,6 +34,8 @@ public class NuclearReactor extends PowerGenerator{ public float heatOutput = 15f; /** rate at which heat progress increases */ public float heatWarmupRate = 1f; + /** time taken to cool down if no fuel is inputted even if coolant is not present*/ + public float ambientCooldownTime = 60f * 20f; /** threshold at which block starts smoking */ public float smokeThreshold = 0.3f; /** heat threshold at which lights start flashing */ @@ -104,6 +106,7 @@ public class NuclearReactor extends PowerGenerator{ } }else{ productionEfficiency = 0f; + heat = Math.max(0f, heat - Time.delta / ambientCooldownTime); } if(heat > 0){