Skip to content

Commit 6eeb368

Browse files
committed
my the tmeadfs
1 parent 593c54f commit 6eeb368

File tree

6 files changed

+12
-21
lines changed

6 files changed

+12
-21
lines changed
20.3 KB
Loading

source/ChartingState.hx

+3-1
Original file line numberDiff line numberDiff line change
@@ -1132,8 +1132,9 @@ class ChartingState extends MusicBeatState {
11321132
var daSec = FlxMath.maxInt(curSection, sectionNum);
11331133

11341134
var result = getSectionNotes();
1135+
var addTime:Float = sectionStartTime(daSec) - sectionStartTime(daSec - sectionNum);
11351136
for (note in (curNotesLayer == 0 ? _song.notes[daSec - sectionNum].sectionNotes : _song.notes[daSec - sectionNum].notesMoreLayers[curNotesLayer - 1])) {
1136-
var strum = note[0] + Conductor.stepCrochet * (getLengthInSteps(daSec) * sectionNum);
1137+
var strum = note[0] + addTime;
11371138

11381139
var copiedNote:Array<Dynamic> = [strum, note[1], note[2], note[3]];
11391140
_song.notes[daSec].sectionNotes.push(copiedNote);
@@ -1629,6 +1630,7 @@ class ChartingState extends MusicBeatState {
16291630
} else {
16301631
Reflect.deleteField(json.song, "picocharts");
16311632
}
1633+
_song.usedNoteTypes = shrunkNoteTypeArr;
16321634
}
16331635

16341636
var data:String = Json.stringify(json);

source/Main.hx

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import Sys;
1818

1919
class Main extends Sprite
2020
{
21-
public static final gameVersionInt = 2;
22-
public static final gameVersionStr = "v1.1.0 I'm Guitarin'";
21+
public static final gameVersionInt = 3;
22+
public static final gameVersionStr = "v1.1.1 I'm Guitarin' (& icons)";
2323

2424
var gameWidth:Int = 1280; // Width of the game in pixels (might be less / more in actual pixels depending on your zoom).
2525
var gameHeight:Int = 720; // Height of the game in pixels (might be less / more in actual pixels depending on your zoom).

source/PlayState.hx

+3-3
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ class PlayState extends MusicBeatState
900900
var daIconColorPuts:Array<FlxColor> = [boyfriend.healthBarColor, dad.healthBarColor];
901901
for (i in 0...daIconPuts.length) {
902902
if (Std.isOfType(daIconPuts[i], String)) {
903-
daIconPuts[i] = Character.getHealthIcon(daIconPuts[i], modName);
903+
daIconPuts[i] = Character.getHealthIcon(daIconPuts[i], modName, true);
904904
if (Character.lastHealthColorIsValid)
905905
daIconColorPuts[i] = Character.lastHealthColor;
906906
} else {
@@ -1351,7 +1351,7 @@ class PlayState extends MusicBeatState
13511351
SONG.usedNoteTypes.push(t);
13521352
note[3] = SONG.usedNoteTypes.indexOf(t);
13531353
}
1354-
generateNotes(section, section.sectionNotes, -1 - i, funnyNotes);
1354+
generateNotes(section, section.sectionNotes, -2 - i, funnyNotes);
13551355
}
13561356
funnyManias[i] = ManiaInfo.GetManiaInfo(swagshit.maniaStr);
13571357
}
@@ -2820,7 +2820,7 @@ class PlayState extends MusicBeatState
28202820
var char:Character = (note != null && note.charNum != -1) ? Character.activeArray[note.charNum] : (noteTypeData.charNums != null ? Character.activeArray[noteTypeData.charNums[0]] : (isBoyfriend ? boyfriend : dad));
28212821
if (char == null)
28222822
return;
2823-
var color = (note.strumLineNum < 0 ? funnyManias[-1 - note.strumLineNum] : curManiaInfo).arrows[note == null ? noteData : note.noteData];
2823+
var color = (note.strumLineNum < 0 ? funnyManias[-2 - note.strumLineNum] : curManiaInfo).arrows[note == null ? noteData : note.noteData];
28242824
var colorNote = "sing" + color.toUpperCase();
28252825
if (isMiss)
28262826
return char.playAvailableAnim(['${colorNote}miss', 'sing${ManiaInfo.Dir[color]}miss'], true);

version/vman_engine.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
2
2-
1.1.0
1+
3
2+
1.1.1

version/vman_engine_changelog.txt

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
A lot of changes are in this update but here's some highlights
1+
fixed some bugs related to charts i think. also in chart editor. uhhhhhhhhhh
22

3-
Note hit judgements are now based on music time, which is more consistent
4-
Input offset option is now implemented
5-
You can now press Reset key to clear a control, or to reset Input Offset value
6-
You can now press and hold left/right to move the input offset ms faster instead of just pressing many times
7-
Known issue: You can't hit notes in Offset Calibrate. Idk how to fix can we get a more knowledgable programmer on this
8-
Friday Night Funkin weeks now actually show up
9-
Added documentation link to the Tools menu (which is accessable by pressing 7 in the main menu)
10-
Also updated the documentation
11-
Fixed meta txt files for music
12-
Implemented more note type attributes (also added "No Animation" note type)
13-
Additional stuff (check the documentation!)
14-
Let me know if anything shown on the documentation doesn't work
3+
JP translation still not up to date. this is a Hotfix.

0 commit comments

Comments
 (0)