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

Author: Yuta12342

assets/shared/sounds/traplink/BUZZER.ogg

@@ -4,14 +4,14 @@ cd ..
 @echo on
 echo Installing dependencies...
 echo This might take a few moments depending on your internet speed.
-haxelib install lime 8.1.2
-haxelib install openfl 9.3.3
-haxelib install flixel 5.6.1
+haxelib install lime 8.2.2
+haxelib install openfl 9.4.1
+haxelib install flixel 5.6.2
 haxelib install flixel-addons 3.3.2
 haxelib install flixel-tools 1.5.1
 haxelib install hscript-iris 1.1.3
 haxelib install tjson 1.4.0
-haxelib install hxdiscord_rpc 1.2.4
+haxelib install hxdiscord_rpc 1.3.0
 haxelib install hxvlc 2.0.1 --skip-dependencies
 haxelib install helder.set 0.3.1
 haxelib install yaml 2.0.1
@@ -20,9 +20,9 @@ haxelib install haxe-concurrent 5.1.3
 haxelib install actuate 1.9.0
 haxelib install flixel-ui 2.6.1
 haxelib install hscript 2.5.0
-haxelib install noisehx
-haxelib set lime 8.1.2
-haxelib set openfl 9.3.3
+haxelib install noisehx 0.0.1
+haxelib set lime 8.2.2
+haxelib set openfl 9.4.1
 haxelib git linc_dialogs https://github.com/snowkit/linc_dialogs.git
 haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate 768740a56b26aa0c072720e0d1236b94afe68e3e
 haxelib git linc_luajit https://github.com/superpowers04/linc_luajit 1906c4a96f6bb6df66562b3f24c62f4c5bba14a7

assets/shared/sounds/traplink/CORRECT.ogg

@@ -4,6 +4,7 @@ import backend.window.PlatformUtil;
 import haxe.ds.StringMap;
 import cutscenes.DialogueBoxPsych;
 import flixel.util.FlxDestroyUtil;
+import archipelago.TrapLinkFunctions;
 
 typedef Condition = {
     var checkFn:APItem->Bool;
@@ -496,19 +497,27 @@ class APItem {
                     t.isTrap = true;
                 });
 
-            //TODO: Add the raymarching shader
+            //TODO: Test if this works
             case "Deisometric Trap":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
                     popup('Can you tilt your screen? I can\'t see...', "TrapLink: Deisometric Trap");
+                    for (cam in FlxG.cameras.list) {
+                        if (!cam.filters.contains(shaders.ShadersHandler.perspective))
+                            cam.filters.push(shaders.ShadersHandler.perspective);
+                    }
+                    flixel.tweens.FlxTween.num(shaders.ShadersHandler.perspective.shader.data.zrot.value[0], 0, 15, function(value:Float) {
+                        shaders.ShadersHandler.perspective.shader.data.zrot.value = [value];
+                    }); 
                 }, true, true).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;
                 });
 
-            //TODO: add the car crash script stuff here
+            //TODO: Test if this works
             case "Push Trap":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
                     popup('You go bye bye now :)', "TrapLink: Push Trap");
+                    TrapLinkFunctions.doCarCrash(true);
                 }, true, true).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;
@@ -523,19 +532,20 @@ class APItem {
                     t.isTrap = true;
                 });
 
-            //TODO: Grab the bushwack pumpkin mechanic
+            //TODO: Test if this works
             case "Input Sequence Trap":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
                     popup('Imma hit you with a QTE just cause.', "TrapLink: Input Sequence Trap");
+                    TrapLinkFunctions.doBushwakThings();
                 }, true, true).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;
                 });
 
-            //TODO: Grab the Hypno's Lullaby Typing Mechanic
             case "Pokemon Trivia Trap":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
                     popup('What is the following word:', "TrapLink: Pokemon Trivia Trap");
+                    TrapLinkFunctions.startUnown();
                 }, true, true).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;
@@ -621,10 +631,12 @@ class APItem {
                     t.isTrap = true;
                 });
 
-            //TODO: grab the Trampoline Script
+            //TODO: Test this
             case "Jump Trap" | "Spring Trap":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
-                    popup('Don\'t fall off...', 'TrapLink: $name');
+                    popup('Don\'t break your neck...', 'TrapLink: $name');
+                    var tramp:Trampoline = new Trampoline();
+                    if (APPlayState.instance != null) APPlayState.instance.addBehindBF(tramp);
                 }, true, true).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;