[Bug] Clicking Right from Lock Rarities moves to transfer or check team (#2177)

* Clicking Right from Lock Rarities moves to transfer or check team

* make cursor left movement more natural

---------

Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>

src/data/ability.ts

@@ -4243,7 +4243,7 @@ export class FormBlockDamageAbAttr extends ReceivedMoveDamageMultiplierAbAttr {
         (args[0] as Utils.NumberHolder).value = this.multiplier;
         pokemon.removeTag(this.tagType);
         if (this.recoilDamageFunc) {
-          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER);
+          pokemon.damageAndUpdate(this.recoilDamageFunc(pokemon), HitResult.OTHER, false, false, true, true);
         }
       }
       return true;

src/test/abilities/disguise.test.ts

@@ -207,4 +207,18 @@ describe("Abilities - Disguise", () => {
 
     expect(mimikyu1.formIndex).toBe(disguisedForm);
   }, TIMEOUT);
+
+  it("doesn't faint twice when fainting due to Disguise break damage, nor prevent faint from Disguise break damage if using Endure", async () => {
+    game.override.enemyMoveset(Array(4).fill(Moves.ENDURE));
+    await game.startBattle();
+
+    const mimikyu = game.scene.getEnemyPokemon()!;
+    mimikyu.hp = 1;
+
+    game.move.select(Moves.SHADOW_SNEAK);
+    await game.toNextWave();
+
+    expect(game.scene.getCurrentPhase()?.constructor.name).toBe("CommandPhase");
+    expect(game.scene.currentBattle.waveIndex).toBe(2);
+  }, TIMEOUT);
 });

src/ui/modifier-select-ui-handler.ts

@@ -334,7 +334,11 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
             success = false;
             break;
           case 1:
-            success = this.rerollButtonContainer.visible && this.setCursor(0);
+            if (this.transferButtonContainer.visible) {
+              success = this.setCursor(3);
+            } else {
+              success = this.rerollButtonContainer.visible && this.setCursor(0);
+            }
             break;
           case 2:
             if (this.transferButtonContainer.visible) {
@@ -368,6 +372,13 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
           case 2:
             success = false;
             break;
+          case 3:
+            if (this.transferButtonContainer.visible) {
+              success = this.setCursor(1);
+            } else {
+              success = this.setCursor(2);
+            }
+            break;
           }
         } else if (this.cursor < this.getRowItems(this.rowCursor) - 1) {
           success = this.setCursor(this.cursor + 1);