Fixed sacrifice moves.

cathyjf · Oct 5, 2010 · 007366f · 007366f
1 parent 2c954c3
commit 007366f
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/resources/moves.js b/resources/moves.js
@@ -35,20 +35,12 @@ function makeSacrificeMove(move, func) {
         }
         user.faint();
         var slot = user.position;
-        while (true) {
-            user.switchOut();
-            field.sendMessage("informReplacePokemon", user);
-            selection.sendOut(slot);
-            if (!selection.fainted)
-                break;
-            user = selection;
-            selection = field.requestInactivePokemon(user);
-            if (!selection) {
-                // The user has lost.
-                return;
-            }
+        user.switchOut();
+        field.sendMessage("informReplacePokemon", user);
+        selection.sendOut(slot);
+        if (!selection.fainted) {
+            func(field, selection);
         }
-        func(field, selection);
     };
 }