Merge pull request #99 from Withoutatrace/master

ORAS Weather

Author: Withoutatrace

src/com/podevs/android/pokemononline/ColorEnums.java

@@ -74,6 +74,8 @@ public TypeForWeatherColor(int weather) {
 			case Rain: color = TypeColor.Water.toString(); break;
 			case SandStorm: color = TypeColor.Rock.toString(); break;
 			case Sunny: color = TypeColor.Fire.toString(); break;
+            case HeavyRain: color = TypeColor.Water.toString(); break;
+            case HeavySun: color = TypeColor.Fire.toString(); break;
 			default: color = TypeColor.Normal.toString(); break;
 			}
 		}

src/com/podevs/android/pokemononline/battle/SpectatingBattle.java

@@ -494,6 +494,8 @@ public void dealWithCommand(BattleCommand bc, byte player, Bais msg) {
 				case SandStorm: message = "The sandstorm subsided!"; break;
 				case Sunny: message = "The sunlight faded!"; break;
 				case Rain: message = "The rain stopped!"; break;
+                case HeavySun: message = "The intense sunlight faded!"; break;
+                case HeavyRain: message = "The heavy downpour stopped!"; break;
 				default: message = "";
 				}
 				writeToHist(Html.fromHtml("<br><font color=" + color + message + "</font>"));
@@ -513,6 +515,8 @@ public void dealWithCommand(BattleCommand bc, byte player, Bais msg) {
 				case SandStorm: message = "The sandstorm rages!"; break;
 				case Sunny: message = "The sunlight is strong!"; break;
 				case Rain: message = "Rain continues to fall!"; break;
+                case HeavySun: message = "The intense sunlight continues to shine!"; break;
+                case HeavyRain: message = "The heavy downpour continues!"; break;
 				default: message = "";
 				}
 				writeToHist(Html.fromHtml("<br><font color=" + color + message + "</font>"));

src/com/podevs/android/pokemononline/poke/PokeEnums.java

@@ -120,7 +120,9 @@ public enum Weather {
 		Hail,
 		Rain,
 		SandStorm,
-		Sunny
+		Sunny,
+        HeavySun,
+        HeavyRain
 	}
 
 	public enum WeatherState {