Skip to content

Commit 5c2e29a

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents 9295cd4 + a192fec commit 5c2e29a

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

source/Main.hx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,8 +931,9 @@ class CommandPrompt
931931
}
932932

933933
case "testTrapLink":
934+
@:privateAccess
934935
if (archipelago.APEntryState.inArchipelagoMode)
935-
if (args.length < 1)
936+
if (args.length > 0)
936937
archipelago.APGameState.instance?.doTrapLink({
937938
source: "apTest",
938939
trap_name: args.join(" "),

source/archipelago/APYaml.hx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,11 @@ class APYaml {
147147
var key = keyValue[0].trim();
148148
var value = keyValue[1].trim();
149149

150-
trace(key);
151-
trace(value);
152-
150+
153151
if (key == "game")
154152
this.game = new APOption(value);
155153
else if (key == "name")
156-
this.name = new APOtion(value);
154+
this.name = new APOption(value);
157155
else if (key == "description")
158156
this.description = new APOption(value);
159157

source/objects/NotePool.hx

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1031,6 +1031,11 @@ abstract AbstractNoteArray(Array<NoteTemplate>) from Array<NoteTemplate> to Arra
10311031
{
10321032
return this.iterator();
10331033
}
1034+
1035+
public inline function splice():Iterator<NoteTemplate>
1036+
{
1037+
return this.iterator();
1038+
}
10341039
}
10351040

10361041
// AbstractNoteArray that acts like an Array<Note>, but creates Notes on demand from NoteTemplates.
@@ -1116,6 +1121,18 @@ abstract NoteArray(AbstractNoteArray) from AbstractNoteArray to AbstractNoteArra
11161121
}
11171122
return notes;
11181123
}
1124+
1125+
public function remove(note:NoteTemplate) {
1126+
return this.remove(note);
1127+
}
1128+
1129+
public function indexOf(note:NoteTemplate) {
1130+
return this.indexOf(note);
1131+
}
1132+
1133+
public function splice(note:NoteTemplate, index:Int) {
1134+
return this.splice(note, index);
1135+
}
11191136
}
11201137

11211138
/**

0 commit comments

Comments
 (0)