Add difficulty indicator

NagaseIori · Jun 2, 2022 · 4d2d078 · 4d2d078
1 parent 25095db
commit 4d2d078
Show file tree

Hide file tree

Showing 30 changed files with 525 additions and 5 deletions.
diff --git a/DyNode.yyp b/DyNode.yyp
diff --git a/artassets/Difficulties.psd b/artassets/Difficulties.psd
diff --git a/artassets/casual.png b/artassets/casual.png
diff --git a/artassets/giga.png b/artassets/giga.png
diff --git a/artassets/hard.png b/artassets/hard.png
diff --git a/artassets/mega.png b/artassets/mega.png
diff --git a/artassets/normal.png b/artassets/normal.png
diff --git a/artassets/tera.png b/artassets/tera.png
diff --git a/objects/objmain/Create_0.gml b/objects/objmain/Create_0.gml
@@ -102,7 +102,7 @@
     chartBeatPerMin = 180;
     chartBarPerMin = 180/4;
     chartOffset = 0;
-    chartDifficulty = "CASUAL";
+    chartDifficulty = 0;
     chartSideType = ["MIXER", "MULTI"];
     chartID = "";
     chartMusicFile = "";

diff --git a/objects/objmain/Draw_0.gml b/objects/objmain/Draw_0.gml
@@ -79,7 +79,12 @@ var _nw = global.resolutionW, _nh = global.resolutionH;
     // Draw Title
 
     titleElement
-    .draw(global.resolutionW*0.021, global.resolutionH - targetLineBelow + 34);
+    .draw(resor_to_x(0.021), global.resolutionH - targetLineBelow + 34);
+
+    // Draw Difficulty
+    better_scaling_draw_sprite(global.difficultySprite[chartDifficulty], 0, 
+        resor_to_x(0.019), global.resolutionH - targetLineBelow + 77, 0.2, 0.2, 0, c_white,
+        1, 0);
 
 // Draw targetline
 

diff --git a/objects/objmanager/Create_0.gml b/objects/objmanager/Create_0.gml
@@ -17,6 +17,8 @@ global.fpsAdjust = BASE_FPS / room_speed;
 global.scaleXAdjust = global.resolutionW / BASE_RES_W;
 global.scaleYAdjust = global.resolutionH / BASE_RES_H;
 
+global.difficultyName = ["CASUAL", "NORMAL", "HARD", "MEGA", "GIGA", "TERA"];
+global.difficultySprite = [sprCasual, sprNormal, sprHard, sprMega, sprGiga, sprTera];
 
 // Set GUI Resolution
 

diff --git a/scripts/scrSystem/scrSystem.gml b/scripts/scrSystem/scrSystem.gml
@@ -21,13 +21,40 @@ function map_init() {
         // show_debug_message("ARRAY LENGTH:"+string(array_length(chartNotesArray)));
         // show_debug_message("ARRAY:"+string(chartNotesArray));
         array_sort_f(chartNotesArray, _f);
+
+        // Get the chart's difficulty
+
+        var _diff = "";
+        switch string_char_at(chartID, string_length(chartID)) {
+            case "C":
+                _diff = 0;
+                break;
+            case "N":
+                _diff = 1;
+                break;
+            case "H":
+                _diff = 2;
+                break;
+            case "M":
+                _diff = 3;
+                break;
+            case "G":
+                _diff = 4;
+                break;
+            case "T":
+                _diff = 5;
+                break;
+            default:
+                _diff = 0;
+        }
+        chartDifficulty = _diff;
     }
 
 }
 
 function map_load() {
     var _file = "";
-    _file = get_open_filename_ext("XML Files|*.xml", "example.xml", 
+    _file = get_open_filename_ext("XML Files (*.xml)|*.xml", "example.xml", 
         program_directory, "Load Dynamix Chart File 加载谱面文件");
 
     if(_file == "") return;
@@ -200,11 +227,13 @@ function map_load_xml(_file) {
                 break;
         }
     }
+
+    DerpXmlRead_CloseFile();
 }
 
 function music_load() {
     var _file = "";
-    _file = get_open_filename_ext("Music Files|*.mp3;*.flac;*.wav;*.ogg", "", 
+    _file = get_open_filename_ext("Music Files (*.mp3;*.flac;*.wav;*.ogg;*.aiff;*.mid)|*.mp3;*.flac;*.wav;*.ogg;*.aiff;*.mid", "", 
         program_directory, "Load Music File 加载音乐文件");
 
     if(_file == "") return;
@@ -222,6 +251,9 @@ function music_load() {
         music = FMODGMS_Snd_LoadSound(_file);
         FMODGMS_Snd_PlaySound(music, channel);
         if(!nowPlaying) FMODGMS_Chan_PauseChannel(channel);
+        else {
+            nowTime = _time_to_offset(0);
+        }
         sampleRate = FMODGMS_Chan_Get_Frequency(channel);
         musicLength = FMODGMS_Snd_Get_Length(music);
         musicLength = FMODGMS_Util_SamplesToSeconds(musicLength, sampleRate) * 1000;
@@ -232,7 +264,7 @@ function music_load() {
 
 function image_load() {
     var _file = "";
-    _file = get_open_filename_ext("Image Files|*.jpg;*.png|JPG Files|*.jpg|PNG Files|*.png", "",
+    _file = get_open_filename_ext("Image Files (*.jpg;*.jpeg;*.png)|*.jpg;*.jpeg;*.png|JPG Files (*.jpg)|*.jpg|PNG Files (*.png)|*.png", "",
         program_directory, "Load Background File 加载背景图片");
 
     if(_file == "") return;

diff --git a/sprites/sprcasual/4ab90f15-6ce5-4bca-a2f5-716acf88c0df.png b/sprites/sprcasual/4ab90f15-6ce5-4bca-a2f5-716acf88c0df.png
diff --git a/...s/4ab90f15-6ce5-4bca-a2f5-716acf88c0df/3b59dbad-29b6-4373-88e6-a0503a10e6fe.png b/...s/4ab90f15-6ce5-4bca-a2f5-716acf88c0df/3b59dbad-29b6-4373-88e6-a0503a10e6fe.png
diff --git a/sprites/sprcasual/sprcasual.yy b/sprites/sprcasual/sprcasual.yy
diff --git a/sprites/sprgiga/267e63e7-1a4a-47a1-a4db-5cd919475a43.png b/sprites/sprgiga/267e63e7-1a4a-47a1-a4db-5cd919475a43.png
diff --git a/...s/267e63e7-1a4a-47a1-a4db-5cd919475a43/0a71b0a8-053e-46f6-9c30-31cd6fcec527.png b/...s/267e63e7-1a4a-47a1-a4db-5cd919475a43/0a71b0a8-053e-46f6-9c30-31cd6fcec527.png
diff --git a/sprites/sprgiga/sprgiga.yy b/sprites/sprgiga/sprgiga.yy
diff --git a/sprites/sprhard/eaa6cc87-436c-41af-a246-3f17ec323b34.png b/sprites/sprhard/eaa6cc87-436c-41af-a246-3f17ec323b34.png
diff --git a/...s/eaa6cc87-436c-41af-a246-3f17ec323b34/4135176a-1ac1-452f-8cb6-fcc5c9c27310.png b/...s/eaa6cc87-436c-41af-a246-3f17ec323b34/4135176a-1ac1-452f-8cb6-fcc5c9c27310.png