From 0a8ff569b4cfed4c582fb5a3ce7ceb182b461497 Mon Sep 17 00:00:00 2001 From: Yoshman29 <81191621+YoshiCrafter29@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:20:34 +0100 Subject: [PATCH] sfx --- assets/sounds/{GF_1.mp3 => dialogue/gf/normal1.mp3} | Bin assets/sounds/{GF_4.ogg => dialogue/gf/normal1.ogg} | Bin assets/sounds/{GF_2.mp3 => dialogue/gf/normal2.mp3} | Bin assets/sounds/{GF_1.ogg => dialogue/gf/normal2.ogg} | Bin assets/sounds/{GF_3.mp3 => dialogue/gf/normal3.mp3} | Bin assets/sounds/{GF_2.ogg => dialogue/gf/normal3.ogg} | Bin assets/sounds/{GF_4.mp3 => dialogue/gf/normal4.mp3} | Bin assets/sounds/{GF_3.ogg => dialogue/gf/normal4.ogg} | Bin assets/sounds/{cancelMenu.mp3 => menu/cancel.mp3} | Bin assets/sounds/{cancelMenu.ogg => menu/cancel.ogg} | Bin assets/sounds/{confirmMenu.mp3 => menu/confirm.mp3} | Bin assets/sounds/{confirmMenu.ogg => menu/confirm.ogg} | Bin assets/sounds/{scrollMenu.mp3 => menu/scroll.mp3} | Bin assets/sounds/{scrollMenu.ogg => menu/scroll.ogg} | Bin buildnumber.txt | 2 +- source/funkin/menus/StoryMenuState.hx | 11 +---------- source/funkin/system/CoolUtil.hx | 6 +++--- 17 files changed, 5 insertions(+), 14 deletions(-) rename assets/sounds/{GF_1.mp3 => dialogue/gf/normal1.mp3} (100%) rename assets/sounds/{GF_4.ogg => dialogue/gf/normal1.ogg} (100%) rename assets/sounds/{GF_2.mp3 => dialogue/gf/normal2.mp3} (100%) rename assets/sounds/{GF_1.ogg => dialogue/gf/normal2.ogg} (100%) rename assets/sounds/{GF_3.mp3 => dialogue/gf/normal3.mp3} (100%) rename assets/sounds/{GF_2.ogg => dialogue/gf/normal3.ogg} (100%) rename assets/sounds/{GF_4.mp3 => dialogue/gf/normal4.mp3} (100%) rename assets/sounds/{GF_3.ogg => dialogue/gf/normal4.ogg} (100%) rename assets/sounds/{cancelMenu.mp3 => menu/cancel.mp3} (100%) rename assets/sounds/{cancelMenu.ogg => menu/cancel.ogg} (100%) rename assets/sounds/{confirmMenu.mp3 => menu/confirm.mp3} (100%) rename assets/sounds/{confirmMenu.ogg => menu/confirm.ogg} (100%) rename assets/sounds/{scrollMenu.mp3 => menu/scroll.mp3} (100%) rename assets/sounds/{scrollMenu.ogg => menu/scroll.ogg} (100%) diff --git a/assets/sounds/GF_1.mp3 b/assets/sounds/dialogue/gf/normal1.mp3 similarity index 100% rename from assets/sounds/GF_1.mp3 rename to assets/sounds/dialogue/gf/normal1.mp3 diff --git a/assets/sounds/GF_4.ogg b/assets/sounds/dialogue/gf/normal1.ogg similarity index 100% rename from assets/sounds/GF_4.ogg rename to assets/sounds/dialogue/gf/normal1.ogg diff --git a/assets/sounds/GF_2.mp3 b/assets/sounds/dialogue/gf/normal2.mp3 similarity index 100% rename from assets/sounds/GF_2.mp3 rename to assets/sounds/dialogue/gf/normal2.mp3 diff --git a/assets/sounds/GF_1.ogg b/assets/sounds/dialogue/gf/normal2.ogg similarity index 100% rename from assets/sounds/GF_1.ogg rename to assets/sounds/dialogue/gf/normal2.ogg diff --git a/assets/sounds/GF_3.mp3 b/assets/sounds/dialogue/gf/normal3.mp3 similarity index 100% rename from assets/sounds/GF_3.mp3 rename to assets/sounds/dialogue/gf/normal3.mp3 diff --git a/assets/sounds/GF_2.ogg b/assets/sounds/dialogue/gf/normal3.ogg similarity index 100% rename from assets/sounds/GF_2.ogg rename to assets/sounds/dialogue/gf/normal3.ogg diff --git a/assets/sounds/GF_4.mp3 b/assets/sounds/dialogue/gf/normal4.mp3 similarity index 100% rename from assets/sounds/GF_4.mp3 rename to assets/sounds/dialogue/gf/normal4.mp3 diff --git a/assets/sounds/GF_3.ogg b/assets/sounds/dialogue/gf/normal4.ogg similarity index 100% rename from assets/sounds/GF_3.ogg rename to assets/sounds/dialogue/gf/normal4.ogg diff --git a/assets/sounds/cancelMenu.mp3 b/assets/sounds/menu/cancel.mp3 similarity index 100% rename from assets/sounds/cancelMenu.mp3 rename to assets/sounds/menu/cancel.mp3 diff --git a/assets/sounds/cancelMenu.ogg b/assets/sounds/menu/cancel.ogg similarity index 100% rename from assets/sounds/cancelMenu.ogg rename to assets/sounds/menu/cancel.ogg diff --git a/assets/sounds/confirmMenu.mp3 b/assets/sounds/menu/confirm.mp3 similarity index 100% rename from assets/sounds/confirmMenu.mp3 rename to assets/sounds/menu/confirm.mp3 diff --git a/assets/sounds/confirmMenu.ogg b/assets/sounds/menu/confirm.ogg similarity index 100% rename from assets/sounds/confirmMenu.ogg rename to assets/sounds/menu/confirm.ogg diff --git a/assets/sounds/scrollMenu.mp3 b/assets/sounds/menu/scroll.mp3 similarity index 100% rename from assets/sounds/scrollMenu.mp3 rename to assets/sounds/menu/scroll.mp3 diff --git a/assets/sounds/scrollMenu.ogg b/assets/sounds/menu/scroll.ogg similarity index 100% rename from assets/sounds/scrollMenu.ogg rename to assets/sounds/menu/scroll.ogg diff --git a/buildnumber.txt b/buildnumber.txt index db8b6957..397787a8 100644 --- a/buildnumber.txt +++ b/buildnumber.txt @@ -1 +1 @@ -948 \ No newline at end of file +949 \ No newline at end of file diff --git a/source/funkin/menus/StoryMenuState.hx b/source/funkin/menus/StoryMenuState.hx index 3e49a798..dcae2f84 100644 --- a/source/funkin/menus/StoryMenuState.hx +++ b/source/funkin/menus/StoryMenuState.hx @@ -76,9 +76,6 @@ class StoryMenuState extends MusicBeatState override function create() { - transIn = FlxTransitionableState.defaultTransIn; - transOut = FlxTransitionableState.defaultTransOut; - if (FlxG.sound.music != null) { if (!FlxG.sound.music.playing) @@ -94,12 +91,6 @@ class StoryMenuState extends MusicBeatState txtWeekTitle.setFormat("VCR OSD Mono", 32, FlxColor.WHITE, RIGHT); txtWeekTitle.alpha = 0.7; - var rankText:FlxText = new FlxText(0, 10); - rankText.text = 'RANK: GREAT'; - rankText.setFormat(Paths.font("vcr.ttf"), 32); - rankText.size = scoreText.size; - rankText.screenCenter(X); - var ui_tex = Paths.getSparrowAtlas('menus/storymenu/assets'); var yellowBG:FlxSprite = new FlxSprite(0, 56).makeGraphic(FlxG.width, 400, 0xFFF9CF51); @@ -203,7 +194,7 @@ class StoryMenuState extends MusicBeatState txtTracklist = new FlxText(FlxG.width * 0.05, yellowBG.x + yellowBG.height + 100, 0, "Tracks", 32); txtTracklist.alignment = CENTER; - txtTracklist.font = rankText.font; + txtTracklist.font = Paths.font("vcr.ttf"); txtTracklist.color = 0xFFe55777; add(txtTracklist); // add(rankText); diff --git a/source/funkin/system/CoolUtil.hx b/source/funkin/system/CoolUtil.hx index c5de6690..e2933c0a 100644 --- a/source/funkin/system/CoolUtil.hx +++ b/source/funkin/system/CoolUtil.hx @@ -111,9 +111,9 @@ class CoolUtil */ public static function playMenuSFX(menuSFX:Int = 0, volume:Float = 1) { FlxG.sound.play(Paths.sound(switch(menuSFX) { - case 1: 'confirmMenu'; - case 2: 'cancelMenu'; - default: 'scrollMenu'; + case 1: 'menu/confirm'; + case 2: 'menu/cancel'; + default: 'menu/scroll'; }), volume); }