Skip to content

Commit ab19cdc

Browse files
committed
fun stuff
1 parent c805fe2 commit ab19cdc

File tree

6 files changed

+41
-5
lines changed

6 files changed

+41
-5
lines changed

.flight/icons/z11.png

5.79 KB
Loading

.flight/logo.png

72 KB
Loading

.flight/metadata.json

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
2+
{
3+
"metadata_version": 1,
4+
"name": "Mixtape Engine",
5+
"version": "4.8.0",
6+
"description": "It's about time we mix things a bit!\nAn engine that aims to be a one-stop shop for all mods, while keeping the simplicity of Psych Engine.\n\nA Work-in-Progress, but we'll get there!\n\nAlso supports Archipelago!",
7+
"logo_position": "middle",
8+
"contributors": [
9+
{
10+
"group": "Mixtape Team",
11+
"members": [
12+
{
13+
"name": "Z11Gaming",
14+
"icon": "icons/z11.webp",
15+
"role": "Main Creater of the engine"
16+
},
17+
{
18+
"name": "Yutamon",
19+
"icon": "icons/yuta.webp",
20+
"role": "Co-Creater of the engine"
21+
}
22+
]
23+
}
24+
],
25+
"engine": {
26+
"engine_type": "psych",
27+
"engine_name": "Mixtape Engine",
28+
"engine_icon": "",
29+
"mods_folder": true,
30+
"mods_folder_path": "mods"
31+
}
32+
}

Project.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<define name="CRASH_HANDLER" if="desktop" />
8080

8181
<!-- Assets -->
82+
<assets path=".flight" />
8283
<assets path="assets/fonts" />
8384
<assets path="assets/shared" exclude="*.ogg" if="web"/>
8485
<assets path="assets/shared" exclude="*.mp3" unless="web"/>

source/states/PlayState.hx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1793,6 +1793,9 @@ class PlayState extends MusicBeatState
17931793
modManager.registerDefaultModifiers();
17941794

17951795
if (ClientPrefs.data.middleScroll) {
1796+
altNoteMove = true;
1797+
//strumOffsetspacebcauseitsstupid = 0;
1798+
//strumOffsetbcauseitsstupid = 0;
17961799
var off:Float = Math.min(FlxG.width, 1280) / 4;
17971800
var opp:Int = opponentmode ? 0 : 1;
17981801

@@ -4314,7 +4317,7 @@ class PlayState extends MusicBeatState
43144317

43154318
public var initY:Float;
43164319
var lastHealth:Float = -1;
4317-
public var manualDisable:Bool = false; // for modcharts that need the variables otherwise lol
4320+
public var enableBaseMovement:Bool = false; // for modcharts that need the variables otherwise lol
43184321
override public function update(elapsed:Float)
43194322
{
43204323
if(!inCutscene && !paused && !freezeCamera) {
@@ -4365,7 +4368,7 @@ class PlayState extends MusicBeatState
43654368
modManager.update(elapsed, curDecBeat, curDecStep);
43664369

43674370
//Band-Aid patch but HEY IT WORKS SO I AM NOT COMPLAINING LMAO
4368-
if (!startingSong && !manualDisable)
4371+
if (!startingSong && enableBaseMovement)
43694372
modchartSync(false);
43704373

43714374
// TODO: Figure this out
@@ -7977,7 +7980,7 @@ class PlayState extends MusicBeatState
79777980
} else {
79787981
// Sync X position
79797982
var offsetX = strumNote.x - field.baseXPositions[i];
7980-
modManager.setValue('transform${i}X', (altNoteMove ? offsetX : strumNote.x) - (strumOffsetspacebcauseitsstupid * i) - strumOffsetbcauseitsstupid, field.playerId);
7983+
modManager.setValue('transform${i}X-a', (altNoteMove ? offsetX : strumNote.x) - (strumOffsetspacebcauseitsstupid * i) - strumOffsetbcauseitsstupid, field.playerId);
79817984
//strumNote.x = strumNote.x;
79827985

79837986
// Sync Y position

source/substates/RankingSubstate.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ class RankingSubstate extends MusicBeatSubstate
198198
TransitionState.transitionState(states.StoryMenuState, {transitionType: "stickers"});
199199
case "Freeplay":
200200
trace('WENT BACK TO FREEPLAY??');
201-
//TransitionState.transitionState(FreeplayManager.getFreeplayState(), {transitionType: "stickers"});
202-
MusicManager.playMenuMusic();
201+
TransitionState.transitionState(FreeplayManager.getFreeplayState(), {transitionType: "stickers"});
202+
//MusicManager.playMenuMusic();
203203
case "APFreeplay":
204204
trace('WENT BACK TO ARCHIPELAGO FREEPLAY??');
205205
//MusicManager.playMenuMusic();

0 commit comments

Comments
 (0)