Skip to content

Commit 4aee6d1

Browse files
Yuta12342Yuta12342
committed
NO TRAP LINK LOOPS.
1 parent 0dace3f commit 4aee6d1

File tree

2 files changed

+96
-95
lines changed

2 files changed

+96
-95
lines changed

‎source/archipelago/APGameState.hx‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,7 @@ class APGameState
12031203
}
12041204
else
12051205
{
1206-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1206+
archipelago.APItem.createItemByName(trapName, true);
12071207
}
12081208
trace("TrapLink processed: " + trapName);
12091209
}
@@ -1240,97 +1240,97 @@ class APGameState
12401240
};
12411241
waitForPlayState();
12421242
case "Instant Death Trap":
1243-
archipelago.APItem.createItemByName("Blue Balls Curse").fromTrapLink = true;
1243+
archipelago.APItem.createItemByName("Blue Balls Curse", true);
12441244
backend.COD.COD.COD = "Killed by Blue Balls Curse.\n(Instant Death TrapLink)";
12451245
case "Ghost":
1246-
archipelago.APItem.createItemByName("Ghost").fromTrapLink = true;
1246+
archipelago.APItem.createItemByName("Ghost", true);
12471247
case "My Turn! Trap":
1248-
archipelago.APItem.createItemByName("My Turn! Trap").fromTrapLink = true;
1248+
archipelago.APItem.createItemByName("My Turn! Trap", true);
12491249
case "Paralyze Trap":
1250-
archipelago.APItem.createItemByName("Paralyze Trap").fromTrapLink = true;
1250+
archipelago.APItem.createItemByName("Paralyze Trap", true);
12511251
case "Phone Trap" | "Literature Trap":
1252-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1252+
archipelago.APItem.createItemByName(trapName, true);
12531253
case "Home Trap":
1254-
archipelago.APItem.createItemByName("Tutorial Trap").fromTrapLink = true;
1254+
archipelago.APItem.createItemByName("Tutorial Trap", true);
12551255
case "Ice Trap":
1256-
archipelago.APItem.createItemByName("Ice Trap").fromTrapLink = true;
1256+
archipelago.APItem.createItemByName("Ice Trap", true);
12571257
case "Freeze Trap" | "Frozen Trap" | "Bubble Trap":
1258-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1258+
archipelago.APItem.createItemByName(trapName, true);
12591259
case "Army Trap" | "Police Trap" | "Buyon Trap" | "OmoTrap":
1260-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1260+
archipelago.APItem.createItemByName(trapName, true);
12611261
case "Damage Trap":
1262-
archipelago.APItem.createItemByName('Damage Trap').fromTrapLink = true;
1262+
archipelago.APItem.createItemByName('Damage Trap', true);
12631263
case "Chaos Control Trap":
1264-
archipelago.APItem.createItemByName("Chaos Control Trap").fromTrapLink = true;
1264+
archipelago.APItem.createItemByName("Chaos Control Trap", true);
12651265
case "Confuse Trap":
1266-
archipelago.APItem.createItemByName("Confuse Trap").fromTrapLink = true;
1266+
archipelago.APItem.createItemByName("Confuse Trap", true);
12671267
case "Eject Ability":
1268-
archipelago.APItem.createItemByName("Eject Ability").fromTrapLink = true;
1268+
archipelago.APItem.createItemByName("Eject Ability", true);
12691269
case "Whoops! Trap":
1270-
archipelago.APItem.createItemByName("Whoops! Trap").fromTrapLink = true;
1270+
archipelago.APItem.createItemByName("Whoops! Trap", true);
12711271
case "Zoom Trap":
1272-
archipelago.APItem.createItemByName("Zoom Trap").fromTrapLink = true;
1272+
archipelago.APItem.createItemByName("Zoom Trap", true);
12731273
case "Posession Trap":
1274-
archipelago.APItem.createItemByName("Posession Trap").fromTrapLink = true;
1274+
archipelago.APItem.createItemByName("Posession Trap", true);
12751275
case "Poison Trap" | "Poison Mushroom":
1276-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1276+
archipelago.APItem.createItemByName(trapName, true);
12771277
case "Confound Trap":
1278-
archipelago.APItem.createItemByName("Confound Trap").fromTrapLink = true;
1278+
archipelago.APItem.createItemByName("Confound Trap", true);
12791279
case "Fast Trap":
1280-
archipelago.APItem.createItemByName("Fast Trap").fromTrapLink = true;
1280+
archipelago.APItem.createItemByName("Fast Trap", true);
12811281
case "Slow Trap" | "Slowness Trap":
1282-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1282+
archipelago.APItem.createItemByName(trapName, true);
12831283
case "Deisometric Trap" | "Camera Rotate Trap":
1284-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1284+
archipelago.APItem.createItemByName(trapName, true);
12851285
case "Push Trap":
1286-
archipelago.APItem.createItemByName('Push Trap').fromTrapLink = true;
1286+
archipelago.APItem.createItemByName('Push Trap', true);
12871287
case "Input Sequence Trap":
1288-
archipelago.APItem.createItemByName('Input Sequence Trap').fromTrapLink = true;
1288+
archipelago.APItem.createItemByName('Input Sequence Trap', true);
12891289
case "Pokemon Trivia Trap":
1290-
archipelago.APItem.createItemByName('Pokemon Trivia Trap').fromTrapLink = true;
1290+
archipelago.APItem.createItemByName('Pokemon Trivia Trap', true);
12911291
case "Thwimp Trap":
1292-
archipelago.APItem.createItemByName('Thwimp Trap').fromTrapLink = true;
1292+
archipelago.APItem.createItemByName('Thwimp Trap', true);
12931293
case "Tiny Trap":
1294-
archipelago.APItem.createItemByName('Tiny Trap').fromTrapLink = true;
1294+
archipelago.APItem.createItemByName('Tiny Trap', true);
12951295
case "Bonk Trap":
1296-
archipelago.APItem.createItemByName('Bonk Trap').fromTrapLink = true;
1296+
archipelago.APItem.createItemByName('Bonk Trap', true);
12971297
case "Bald Trap":
1298-
archipelago.APItem.createItemByName('Bald Trap').fromTrapLink = true;
1298+
archipelago.APItem.createItemByName('Bald Trap', true);
12991299
case "Bomb" | "TNT Barrel Trap":
1300-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1300+
archipelago.APItem.createItemByName(trapName, true);
13011301
case "Controller Drift Trap":
1302-
archipelago.APItem.createItemByName("Controller Drift Trap").fromTrapLink = true;
1302+
archipelago.APItem.createItemByName("Controller Drift Trap", true);
13031303
case "Timer Trap":
1304-
archipelago.APItem.createItemByName("Timer Trap").fromTrapLink = true;
1304+
archipelago.APItem.createItemByName("Timer Trap", true);
13051305
case "Jump Trap" | "Spring Trap":
1306-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1306+
archipelago.APItem.createItemByName(trapName, true);
13071307
case "Animal Bonus Trap":
1308-
archipelago.APItem.createItemByName("Animal Bonus Trap").fromTrapLink = true;
1308+
archipelago.APItem.createItemByName("Animal Bonus Trap", true);
13091309
case "Hiccup Trap":
1310-
archipelago.APItem.createItemByName("Hiccup Trap").fromTrapLink = true;
1310+
archipelago.APItem.createItemByName("Hiccup Trap", true);
13111311
case "Gooey Bag":
1312-
archipelago.APItem.createItemByName("Gooey Bag").fromTrapLink = true;
1312+
archipelago.APItem.createItemByName("Gooey Bag", true);
13131313
case "Nut Trap":
1314-
archipelago.APItem.createItemByName("Nut Trap").fromTrapLink = true;
1314+
archipelago.APItem.createItemByName("Nut Trap", true);
13151315
case "Pokemon Count Trap":
1316-
archipelago.APItem.createItemByName("Pokemon Count Trap").fromTrapLink = true;
1316+
archipelago.APItem.createItemByName("Pokemon Count Trap", true);
13171317
case "Exposition Trap":
1318-
archipelago.APItem.createItemByName("Exposition Trap").fromTrapLink = true;
1318+
archipelago.APItem.createItemByName("Exposition Trap", true);
13191319
case "Double Damage":
1320-
archipelago.APItem.createItemByName("Double Damage").fromTrapLink = true;
1320+
archipelago.APItem.createItemByName("Double Damage", true);
13211321
case "Instant Crystal Trap" | "One Hit KO":
1322-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1322+
archipelago.APItem.createItemByName(trapName, true);
13231323
case "Mirror Trap":
1324-
archipelago.APItem.createItemByName("Mirror Trap").fromTrapLink = true;
1324+
archipelago.APItem.createItemByName("Mirror Trap", true);
13251325
case "Pixellation Trap":
1326-
archipelago.APItem.createItemByName("Pixellation Trap").fromTrapLink = true;
1326+
archipelago.APItem.createItemByName("Pixellation Trap", true);
13271327
case "Swap Trap":
1328-
archipelago.APItem.createItemByName("Swap Trap").fromTrapLink = true;
1328+
archipelago.APItem.createItemByName("Swap Trap", true);
13291329
case "Cutscene Trap":
1330-
archipelago.APItem.createItemByName("Cutscene Trap").fromTrapLink = true;
1330+
archipelago.APItem.createItemByName("Cutscene Trap", true);
13311331
default:
13321332
try {
1333-
archipelago.APItem.createItemByName(trapName).fromTrapLink = true;
1333+
archipelago.APItem.createItemByName(trapName, true);
13341334
trace("TrapLink processed by fallback: " + trapName);
13351335
} catch (e:Dynamic) {
13361336
// If it's not a known trap, we can just log it.

0 commit comments

Comments
 (0)