From 24f549f629152fb988adc24a153abb78bf27c6e5 Mon Sep 17 00:00:00 2001
From: Cathy Fitzpatrick <cathy@cathyjf.com>
Date: Mon, 4 Oct 2010 23:45:25 -0600
Subject: [PATCH] Fixed SolarBeam.

---
 resources/moves.xml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/resources/moves.xml b/resources/moves.xml
index 0b23a1b..74b79c4 100644
--- a/resources/moves.xml
+++ b/resources/moves.xml
@@ -8825,8 +8825,16 @@ makeRecoveryMove(this);
 <init>
 <![CDATA[
 makeChargeMove(this, Text.battle_messages_charge.wrap(0));
-var parent = this.use;
+var parentPrepareSelf = this.prepareSelf;
+var parentUse = this.use;
 var power_ = this.power;
+this.prepareSelf = function(field, user, target) {
+    var flags = getGlobalController(field).getFlags();
+    if (flags[GlobalEffect.SUN]) {
+        return;
+    }
+    parentPrepareSelf.call(this, field, user, target);
+};
 this.use = function(field, user, target, targets) {
     this.power = power_;
     var flags = getGlobalController(field).getFlags();
@@ -8839,7 +8847,7 @@ this.use = function(field, user, target, targets) {
         target.hp -= field.calculate(this, user, target, targets);
         return;
     }
-    parent.call(this, field, user, target, targets);
+    parentUse.call(this, field, user, target, targets);
 };
 ]]>
 </init>