diff --git a/core/assets/music/boss1.mp3 b/core/assets/music/boss1.mp3 deleted file mode 100644 index 4a54f750c9..0000000000 Binary files a/core/assets/music/boss1.mp3 and /dev/null differ diff --git a/core/assets/music/boss1.ogg b/core/assets/music/boss1.ogg new file mode 100644 index 0000000000..1ed21ad266 Binary files /dev/null and b/core/assets/music/boss1.ogg differ diff --git a/core/assets/music/boss2.mp3 b/core/assets/music/boss2.mp3 deleted file mode 100644 index cd9eaf1b25..0000000000 Binary files a/core/assets/music/boss2.mp3 and /dev/null differ diff --git a/core/assets/music/boss2.ogg b/core/assets/music/boss2.ogg new file mode 100644 index 0000000000..26c0cea224 Binary files /dev/null and b/core/assets/music/boss2.ogg differ diff --git a/core/assets/music/editor.mp3 b/core/assets/music/editor.mp3 deleted file mode 100644 index 0b3a8e6182..0000000000 Binary files a/core/assets/music/editor.mp3 and /dev/null differ diff --git a/core/assets/music/editor.ogg b/core/assets/music/editor.ogg new file mode 100644 index 0000000000..c24a141c3b Binary files /dev/null and b/core/assets/music/editor.ogg differ diff --git a/core/assets/music/game1.mp3 b/core/assets/music/game1.mp3 deleted file mode 100644 index bfb9b3d468..0000000000 Binary files a/core/assets/music/game1.mp3 and /dev/null differ diff --git a/core/assets/music/game1.ogg b/core/assets/music/game1.ogg new file mode 100644 index 0000000000..1688419305 Binary files /dev/null and b/core/assets/music/game1.ogg differ diff --git a/core/assets/music/game2.mp3 b/core/assets/music/game2.mp3 deleted file mode 100644 index baeddf2914..0000000000 Binary files a/core/assets/music/game2.mp3 and /dev/null differ diff --git a/core/assets/music/game2.ogg b/core/assets/music/game2.ogg new file mode 100644 index 0000000000..8d6d36c5b7 Binary files /dev/null and b/core/assets/music/game2.ogg differ diff --git a/core/assets/music/game3.mp3 b/core/assets/music/game3.mp3 deleted file mode 100644 index e7f8e34f75..0000000000 Binary files a/core/assets/music/game3.mp3 and /dev/null differ diff --git a/core/assets/music/game3.ogg b/core/assets/music/game3.ogg new file mode 100644 index 0000000000..9b0ad6179d Binary files /dev/null and b/core/assets/music/game3.ogg differ diff --git a/core/assets/music/game4.mp3 b/core/assets/music/game4.mp3 deleted file mode 100644 index c21cf226f0..0000000000 Binary files a/core/assets/music/game4.mp3 and /dev/null differ diff --git a/core/assets/music/game4.ogg b/core/assets/music/game4.ogg new file mode 100644 index 0000000000..586edefcfc Binary files /dev/null and b/core/assets/music/game4.ogg differ diff --git a/core/assets/music/game5.mp3 b/core/assets/music/game5.mp3 deleted file mode 100644 index 2bcc7e7a94..0000000000 Binary files a/core/assets/music/game5.mp3 and /dev/null differ diff --git a/core/assets/music/game5.ogg b/core/assets/music/game5.ogg new file mode 100644 index 0000000000..d306db44d3 Binary files /dev/null and b/core/assets/music/game5.ogg differ diff --git a/core/assets/music/game6.mp3 b/core/assets/music/game6.mp3 deleted file mode 100644 index 9e0cfc97d6..0000000000 Binary files a/core/assets/music/game6.mp3 and /dev/null differ diff --git a/core/assets/music/game6.ogg b/core/assets/music/game6.ogg new file mode 100644 index 0000000000..86b6e1531a Binary files /dev/null and b/core/assets/music/game6.ogg differ diff --git a/core/assets/music/game7.mp3 b/core/assets/music/game7.mp3 deleted file mode 100644 index 4a8d5187b8..0000000000 Binary files a/core/assets/music/game7.mp3 and /dev/null differ diff --git a/core/assets/music/game7.ogg b/core/assets/music/game7.ogg new file mode 100644 index 0000000000..2d49c70927 Binary files /dev/null and b/core/assets/music/game7.ogg differ diff --git a/core/assets/music/game8.mp3 b/core/assets/music/game8.mp3 deleted file mode 100644 index a2cebbc465..0000000000 Binary files a/core/assets/music/game8.mp3 and /dev/null differ diff --git a/core/assets/music/game8.ogg b/core/assets/music/game8.ogg new file mode 100644 index 0000000000..380fb2ce40 Binary files /dev/null and b/core/assets/music/game8.ogg differ diff --git a/core/assets/music/game9.mp3 b/core/assets/music/game9.mp3 deleted file mode 100644 index a852b4c4c9..0000000000 Binary files a/core/assets/music/game9.mp3 and /dev/null differ diff --git a/core/assets/music/game9.ogg b/core/assets/music/game9.ogg new file mode 100644 index 0000000000..c7d31cce41 Binary files /dev/null and b/core/assets/music/game9.ogg differ diff --git a/core/assets/music/land.mp3 b/core/assets/music/land.mp3 deleted file mode 100644 index 80720c478c..0000000000 Binary files a/core/assets/music/land.mp3 and /dev/null differ diff --git a/core/assets/music/land.ogg b/core/assets/music/land.ogg new file mode 100644 index 0000000000..3f9d0f3458 Binary files /dev/null and b/core/assets/music/land.ogg differ diff --git a/core/assets/music/launch.mp3 b/core/assets/music/launch.mp3 deleted file mode 100644 index 7aeb2a3340..0000000000 Binary files a/core/assets/music/launch.mp3 and /dev/null differ diff --git a/core/assets/music/launch.ogg b/core/assets/music/launch.ogg new file mode 100644 index 0000000000..22e1705652 Binary files /dev/null and b/core/assets/music/launch.ogg differ diff --git a/core/assets/music/menu.mp3 b/core/assets/music/menu.mp3 deleted file mode 100644 index 6423eba4b2..0000000000 Binary files a/core/assets/music/menu.mp3 and /dev/null differ diff --git a/core/assets/music/menu.ogg b/core/assets/music/menu.ogg new file mode 100644 index 0000000000..2768054f01 Binary files /dev/null and b/core/assets/music/menu.ogg differ diff --git a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java index efa75d18fa..8b9c32c81b 100644 --- a/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/SerpuloPlanetGenerator.java @@ -327,7 +327,7 @@ public class SerpuloPlanetGenerator extends PlanetGenerator{ } } - boolean naval = (float)waters / total >= 0.15f; + boolean naval = (float)waters / total >= 0.19f; //create water pathway if the map is flooded if(naval){