mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 04:40:10 +07:00
Code Issues Packages Projects Releases Wiki Activity

Sound.

Browse Source
This commit is contained in:
Anuken 2019-07-29 21:59:59 -04:00
parent c7e4fb8021
commit c65b3f3aca
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/shoot.ogg
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/maps/Map.java
View File

@ -4,6 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.collection.*;
import io.anuke.arc.files.FileHandle;
import io.anuke.arc.graphics.Texture;
import io.anuke.arc.util.*;
import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.*;
import io.anuke.mindustry.io.JsonIO;
@ -71,6 +72,7 @@ public class Map implements Comparable<Map>{
/** Returns the generation filters that this map uses on load.*/
public Array<GenerateFilter> filters(){
Log.info(build);
if(build != -1 && build < 83 && tags.get("genfilters", "").isEmpty()){
return Array.with();
}

3
core/src/io/anuke/mindustry/type/Weapon.java
View File

@ -52,8 +52,6 @@ public class Weapon{
/** whether shooter rotation is ignored when shooting. */
public boolean ignoreRotation = false;
// public Sound sound = Core.audio.newSound(Core.files.internal("sounds/shoot.ogg"));
public TextureRegion region;
protected Weapon(String name){
@ -90,7 +88,6 @@ public class Weapon{
float baseX = shooter.getX(), baseY = shooter.getY();
Weapon weapon = shooter.getWeapon();
//weapon.sound.play(1f);
sequenceNum = 0;
if(weapon.shotDelay > 0.01f){