Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-11-17 11:23:54 -05:00
parent 78ae6dde4f 2071bad22d
commit 40ae2e64c8
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/contributors
View File

@@ -96,6 +96,7 @@ YellOw139
PetrGasparik PetrGasparik
LeoDog896 LeoDog896
Summet Summet
MEEP of Faith
jalastram (freesound.org) jalastram (freesound.org)
newlocknew (freesound.org) newlocknew (freesound.org)
dsmolenaers (freesound.org) dsmolenaers (freesound.org)

2
core/src/mindustry/content/UnitTypes.java
View File

@@ -431,7 +431,7 @@ public class UnitTypes implements ContentList{
firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f; firstShotDelay = Fx.greenLaserChargeSmall.lifetime - 1f;
reload = 320f; reload = 160f;
recoil = 0f; recoil = 0f;
chargeSound = Sounds.lasercharge2; chargeSound = Sounds.lasercharge2;
shootSound = Sounds.beam; shootSound = Sounds.beam;

1
core/src/mindustry/entities/comp/WeaponsComp.java
View File

@@ -117,6 +117,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc, Velc, Statusc{
}else{ }else{
mount.bullet.rotation(weaponRotation + 90); mount.bullet.rotation(weaponRotation + 90);
mount.bullet.set(shootX, shootY); mount.bullet.set(shootX, shootY);
mount.reload = weapon.reload;
vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil)); vel.add(Tmp.v1.trns(rotation + 180f, mount.bullet.type.recoil));
if(weapon.shootSound != Sounds.none && !headless){ if(weapon.shootSound != Sounds.none && !headless){
if(mount.sound == null) mount.sound = new SoundLoop(weapon.shootSound, 1f); if(mount.sound == null) mount.sound = new SoundLoop(weapon.shootSound, 1f);