Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago

Author: Yuta12342

source/archipelago/APEntryState.hx

@@ -311,7 +311,7 @@ class APEntryState extends MusicBeatState
 
 		var yamlImport = new PsychUIButton(0, 0, "Import YAML", function()
 		{
-			var yamlContent = yutautil.ImprovedFileHandling.loadFile("Import YAML", [new FileFilter('yaml', 'FNF AP YAML File')], Text);
+			var yamlContent = yutautil.ImprovedFileHandling.loadFile("Import YAML", [{ext: "yaml", desc: "FNF AP YAML File"}], Text);
 			if (yamlContent != null) {
 				try {
 					var yaml = new archipelago.APYaml(yamlContent);

source/archipelago/APGameState.hx

@@ -975,6 +975,42 @@ class APGameState
 					archipelago.APItem.createItemByName("Fast Trap").fromTrapLink = true;
 				case "Slow Trap" | "Slowness Trap":
 					archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
+				case "Deisometric Trap":
+					archipelago.APItem.createItemByName("Deisometric Trap").fromTrapLink = true;
+				case "Push Trap":
+					archipelago.APItem.createItemByName('Push Trap').fromTrapLink = true;
+				case "Input Sequence Trap":
+					archipelago.APItem.createItemByName('Input Sequence Trap').fromTrapLink = true;
+				case "Pokemon Trivia Trap":
+					archipelago.APItem.createItemByName('Pokemon Trivia Trap').fromTrapLink = true;
+				case "Thwimp Trap":
+					archipelago.APItem.createItemByName('Thwimp Trap').fromTrapLink = true;
+				case "Tiny Trap":
+					archipelago.APItem.createItemByName('Tiny Trap').fromTrapLink = true;
+				case "Bonk Trap":
+					archipelago.APItem.createItemByName('Bonk Trap').fromTrapLink = true;
+				case "Bald Trap":
+					archipelago.APItem.createItemByName('Bald Trap').fromTrapLink = true;
+				case "Bomb" | "TNT Barrel Trap":
+					archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
+				case "Controller Drift Trap":
+					archipelago.APItem.createItemByName("Controller Drift Trap").fromTrapLink = true;
+				case "Timer Trap":
+					archipelago.APItem.createItemByName("Timer Trap").fromTrapLink = true;
+				case "Jump Trap" | "Spring Trap":
+					archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
+				case "Animal Bonus Trap":
+					archipelago.APItem.createItemByName("Animal Bonus Trap").fromTrapLink = true;
+				case "Hiccup Trap":
+					archipelago.APItem.createItemByName("Hiccup Trap").fromTrapLink = true;
+				case "Gooey Bag":
+					archipelago.APItem.createItemByName("Gooey Bag").fromTrapLink = true;
+				case "Nut Trap":
+					archipelago.APItem.createItemByName("Nut Trap").fromTrapLink = true;
+				case "Pokemon Count Trap":
+					archipelago.APItem.createItemByName("Pokemon Count Trap").fromTrapLink = true;
+				case "Exposition Trap":
+					archipelago.APItem.createItemByName("Exposition Trap").fromTrapLink = true;
 				default:
 					// If it's not a known trap, we can just log it.
 					trace("Unknown trap link received: " + trapName + ".");

source/archipelago/APYaml.hx

@@ -147,6 +147,9 @@ class APYaml {
                     var key = keyValue[0].trim();
                     var value = keyValue[1].trim();
 
+                    trace(key);
+                    trace(value);
+
                     if (key == "game")
                         this.game = new APOption(value);
                     else if (key == "name")