Fixed Merge Conflicts

Die4Ever · Jul 10, 2023 · 3d2dba4 · 3d2dba4
1 parent abb8038
commit 3d2dba4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/gui/archipelagoWindow.ts b/src/gui/archipelagoWindow.ts
@@ -290,8 +290,11 @@ function archipelagoDebug(){
                 height: 126,
                 text: 'Colbys Debug Button. No Touchy!',
                 onClick: function() {
-                    park.cash = 10000;
-                    var i = "Monorail";
+                    ac_good = true;
+                    ac_onError(true);
+
+                    // park.cash = 10000;
+                    // var i = "Monorail";
                     //console.log(RideType["rollercoaster"]);
                     //console.log(RideType[i]);
                     console.log(scenario.status);
@@ -318,8 +321,8 @@ function archipelagoDebug(){
                     context.getParkStorage().set('RCTRando.ArchipelagoObjectives', archipelago_objectives);
                     ArchipelagoSaveLocations(archipelago_locked_locations, archipelago_unlocked_locations);
                     var BathroomTrap = GetModule("RCTRArchipelago");
-                    //if(BathroomTrap)
-                    //BathroomTrap.ReceiveDeathLink({cause: "Curtis was run over by a train", source: "Curtis"});
+                    // if(BathroomTrap)
+                    // BathroomTrap.ReceiveDeathLink({cause: "Curtis was run over by a train", source: "Curtis"});
                     }
             }]
         )