Stuff.

Author: Yuta12342

source/archipelago/APItem.hx

@@ -246,8 +246,12 @@ class APItem {
                 }, true, true);
             case "SvC Effect":
                 return new APTrap(name, ConditionHelper.PlayState(), function() {
-                    popup('Effect: ${APPlayState.instance.effectArray[APPlayState.instance.curEffect]}', "APItem: SvC Effect", true);
-                    APPlayState.instance.doEffect(APPlayState.instance.effectArray[APPlayState.instance.curEffect]);
+                    // Pick a random effect from the effectArray
+                    var effects = APPlayState.instance.effectArray;
+                    var randomIndex = FlxG.random.int(0, effects.length - 1);
+                    var effect = effects[randomIndex];
+                    popup('Effect: $effect', "APItem: SvC Effect", true);
+                    APPlayState.instance.doEffect(effect);
                 }, true, false).funcAndReturn(function(t:APItem) {
                     // Set it as a trap.
                     t.isTrap = true;

source/archipelago/substates/InfoPanelSubstate.hx

@@ -173,12 +173,6 @@ class InfoPanelSubstate extends MusicBeatSubstate {
         infoText.setFormat(Paths.font("vcr.ttf"), 14, FlxColor.WHITE, LEFT, OUTLINE, FlxColor.BLACK);
         infoText.borderSize = 1;
         add(infoText);
-
-        // Calculate max scroll offset
-        var tempText = new FlxText(0, 0, panelWidth - 60, getCurrentPageContent(), 14);
-        tempText.setFormat(Paths.font("vcr.ttf"), 14);
-        maxScrollOffset = Math.max(0, tempText.textField.textHeight - contentHeight);
-        tempText.destroy();
     }
 
     function setupNavigationButtons():Void {
@@ -258,6 +252,12 @@ class InfoPanelSubstate extends MusicBeatSubstate {
         infoText.text = getCurrentPageContent();
         infoText.y = panel.y + 60 - currentScrollOffset;
 
+        // Recalculate max scroll offset for current page content
+        var tempText = new FlxText(0, 0, panelWidth - 60, getCurrentPageContent(), 14);
+        tempText.setFormat(Paths.font("vcr.ttf"), 14);
+        maxScrollOffset = Math.max(0, tempText.textField.textHeight - maxContentHeight);
+        tempText.destroy();
+
         // Update page info
         if (contentPages.length > 1) {
             pageInfo.text = '${currentPage + 1}/${contentPages.length}';