From 4f963c21db4113082102b4e871e508e091193b86 Mon Sep 17 00:00:00 2001
From: Mimerme <androssdragonq.9@gmail.com>
Date: Sun, 25 Jan 2015 11:13:01 -0500
Subject: [PATCH 01/24] Basic Replay Support

Notes
- Only singles supported
- Unstable for other replays
- user cannot choose their own replay to watch
---
 .../app/BattleFieldActivity.java              |   6 +
 .../com/pokemonshowdown/replays/Replay.java   | 199 ++++++++++++++++++
 .../replays/ReplayFragment.java               |  89 ++++++++
 .../replays/ResponseHandler.java              |   5 +
 .../replays/RetrieveReplayTask.java           |  60 ++++++
 app/src/main/res/layout/fragment_replay.xml   |  31 +++
 .../res/layout/fragment_replay_battle.xml     |  10 +
 7 files changed, 400 insertions(+)
 create mode 100644 app/src/main/java/com/pokemonshowdown/replays/Replay.java
 create mode 100644 app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
 create mode 100644 app/src/main/java/com/pokemonshowdown/replays/ResponseHandler.java
 create mode 100644 app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
 create mode 100644 app/src/main/res/layout/fragment_replay.xml
 create mode 100644 app/src/main/res/layout/fragment_replay_battle.xml

diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
index b8ad31c6..3888f77e 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
@@ -27,6 +27,7 @@
 import com.pokemonshowdown.data.CommunityLoungeData;
 import com.pokemonshowdown.data.MyApplication;
 import com.pokemonshowdown.data.Onboarding;
+import com.pokemonshowdown.replays.ReplayFragment;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -230,6 +231,10 @@ private void selectItem(int position) {
                 mPosition = 1;
                 fragment = CommunityLoungeFragment.newInstance();
                 break;
+            case 2:
+                mPosition = 2;
+                fragment = ReplayFragment.newInstance();
+                break;
             case 3:
                 mPosition = 3;
                 fragment = CreditsFragment.newInstance();
@@ -237,6 +242,7 @@ private void selectItem(int position) {
             default:
                 mPosition = 2;
                 fragment = new PlaceHolderFragment();
+                break;
         }
 
         FragmentManager fm = getSupportFragmentManager();
diff --git a/app/src/main/java/com/pokemonshowdown/replays/Replay.java b/app/src/main/java/com/pokemonshowdown/replays/Replay.java
new file mode 100644
index 00000000..cf80b72b
--- /dev/null
+++ b/app/src/main/java/com/pokemonshowdown/replays/Replay.java
@@ -0,0 +1,199 @@
+package com.pokemonshowdown.replays;
+
+import android.os.Handler;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+
+import java.util.ArrayList;
+
+/**
+ * Replay instance
+ * Returns events and such
+ */
+public class Replay {
+    Fragment BattleFragment;
+
+    //Each step is an seprate event in-game
+    //unformated steps for BattleMessage.java
+    ArrayList<String> mFormatedSteps = new ArrayList<String>();
+    //Speed in milliseconds at which each event of the replay will last
+    //if Battle fragment does not handle messages fast enough, possibility of an exception being thrown
+    public long speed;
+
+    private String mPlayer1;
+    private String mPlayer1rank;
+    private String mPlayer2;
+    private String mPlayer2rank;
+    private String mGameType;
+    private String mTier;
+    private boolean mRated;
+
+    public ArrayList<String> rules = new ArrayList<String>();
+    public ArrayList<String> p1Pokemon = new ArrayList<String>();
+    public ArrayList<String> p2Pokemon = new ArrayList<String>();
+    public ArrayList<ArrayList> turns = new ArrayList<ArrayList>();
+
+    private com.pokemonshowdown.app.BattleFragment mReplayBattleFragment;
+    private int mCurrentStep;
+
+    public String getPlayer1(){return mPlayer1;}
+    public String getPlayer2(){return mPlayer2;}
+    public ArrayList<String> getSteps(){return mFormatedSteps;}
+
+    public static ArrayList<String> getSteps(String replayData){
+        String [] unformatedSteps;
+        ArrayList<String> formatedSteps = new ArrayList<String>();
+        unformatedSteps = replayData.split(System.getProperty("line.separator"));
+        for(String str : unformatedSteps){
+            formatedSteps.add(/*str.replaceFirst("\\W", "")*/ str);
+        }
+        return formatedSteps;
+    }
+
+
+    public Replay(String replayData, com.pokemonshowdown.app.BattleFragment replayBattleFragment){
+        mReplayBattleFragment = replayBattleFragment;
+        mFormatedSteps.add("");
+        String[] mReplayData = replayData.split("::");
+        for(String str : mReplayData){
+            mFormatedSteps.add(reformat(str).replaceFirst("\\W", ""));
+        }
+    }
+
+    //Converts the script.log to everything the battle message can understand
+    public static String reformat(String mLine){
+        String args[] = mLine.split("\\|");
+        //Houses temporary splits when string is reformated
+        String temp[];
+
+        String command;
+        if(args.length < 2){
+            return "";
+        }
+            command = args[1];
+    Log.i("Command", command);
+        switch(command){
+            case "player":
+                break;
+            case "poke":
+                break;
+            case "switch":
+                mLine = mLine.replace(",", ", L100,");
+                mLine = mLine.replace("(", "");
+                mLine = mLine.replace(")", "");
+                mLine = mLine.replace("\\", "");
+                //mLine = mLine.replace(" 100/100", "100/100");
+                mLine = fixp1p2(mLine);
+                args = mLine.split("\\|");
+                temp = args[4].split(" ");
+                temp[0] = "";
+                args[4] = temp[1];
+                mLine = rebuildString(args);
+                break;
+            case "-damage":
+                mLine = mLine.replace("(" , "");
+                mLine = mLine.replace(")" , "");
+                mLine = mLine.replace("\\" , "");
+                mLine = fixp1p2(mLine);
+                args = mLine.split("\\|");
+                temp = args[3].split(" ");
+                temp[0] = "";
+                args[3] = temp[1];
+                mLine = rebuildString(args);
+                break;
+            case "-heal":
+                mLine = mLine.replace("(" , "");
+                mLine = mLine.replace(")" , "");
+                mLine = mLine.replace("\\" , "");
+                mLine = fixp1p2(mLine);
+                args = mLine.split("\\|");
+                temp = args[3].split(" ");
+                temp[0] = "";
+                args[3] = temp[1];
+                mLine = rebuildString(args);
+                break;
+            default:
+                mLine = mLine.replace("(" , "");
+                mLine = mLine.replace(")" , "");
+                mLine = mLine.replace("\\" , "");
+                mLine = fixp1p2(mLine);
+                break;
+        }
+        return mLine;
+    }
+
+    static String fixp1p2(String in){
+        in = in.replaceAll("p1", "p1a");
+        in = in.replaceAll("p2", "p2a");
+        return in;
+    }
+
+    private void runClock(){
+        new Handler().postDelayed(new Runnable() {
+
+            @Override
+            public void run() {
+                getStep();
+            }
+        }, speed);
+        Log.i("Replay Next Step #", Integer.toString(mCurrentStep));
+    }
+
+    private void getStep(){
+        if(mFormatedSteps.get(mCurrentStep).equalsIgnoreCase("callback|decision")){
+            speed = 1000;
+            mCurrentStep++;
+            mReplayBattleFragment.processServerMessage(mFormatedSteps.get(mCurrentStep));
+            Log.i("Replay Next Step", mFormatedSteps.get(mCurrentStep));
+            runClock();
+            return;
+        }
+        mReplayBattleFragment.processServerMessage(mFormatedSteps.get(mCurrentStep));
+        mCurrentStep++;
+        Log.i("Replay Next Step", mFormatedSteps.get(mCurrentStep));
+        runClock();
+        return;
+    }
+
+      /* BattleFragment.
+
+        new CountDownTimer(3000, 1000) {
+
+                public void onTick(long millisUntilFinished) {
+                    //Random thing needed
+                }
+
+                public void onFinish() {
+                    Log.i("test", "reached");
+                }
+            }.start();*/
+
+    //Pause the replay
+    public void Pause(){
+
+    }
+    //Skip the turn
+    public void Skip(){
+
+    }
+    //Play the replay
+    public void Play() {
+        /*if (p1Pokemon.isEmpty() || p2Pokemon.isEmpty() || turns.isEmpty()) {
+            Log.e("Replay Error", "Not all replay values have been specified. Are you sure you calle" +
+                    "d the methods in the right order?");
+            return;
+        }*/
+        runClock();
+        return;
+    }
+    public static String rebuildString(String[] s){
+        String v = "";
+        for (String string : s) {
+            v += string;
+            v += "|";
+        }
+        return v;
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java b/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
new file mode 100644
index 00000000..bd4089c0
--- /dev/null
+++ b/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
@@ -0,0 +1,89 @@
+package com.pokemonshowdown.replays;
+
+import android.app.ProgressDialog;
+import android.os.Bundle;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.pokemonshowdown.app.BattleFragment;
+import com.pokemonshowdown.app.R;
+import com.pokemonshowdown.data.BattleFieldData;
+
+public class ReplayFragment extends android.support.v4.app.Fragment implements View.OnClickListener{
+
+    public ProgressDialog mWaitingDialog;
+
+    public static ReplayFragment newInstance() {
+        ReplayFragment fragment = new ReplayFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    public ReplayFragment() {
+        // Required empty public constructor
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        final View v = inflater.inflate(R.layout.fragment_replay, container, false);
+        v.setFocusableInTouchMode(true);
+        Button submit = (Button) v.findViewById(R.id.submit);
+        submit.setOnClickListener(this);
+        return v;
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+    }
+
+    public void showReplay(View view) {
+        EditText mEditText = (EditText) view.findViewById(R.id.replayInput);
+
+        RetrieveReplayTask getReplayTask = new RetrieveReplayTask(){
+            public void OnResponseRecived(Object obj) {
+                String battleLog = (String) obj;
+                //If replay was not retrieved correctly
+                if(battleLog == null){
+                    Toast toast = Toast.makeText(getActivity().getApplicationContext(), "Error fetching replay", Toast.LENGTH_LONG);
+                    toast.show();
+                    return;
+                }
+                setUpReplayBattle(battleLog);
+            }
+        };
+        getReplayTask.execute("http://pokemonshowdown.com/replay/exeggutorboldalakazam");
+    }
+
+    @Override
+    public void onClick(View view) {
+        showReplay(view);
+    }
+
+    private void setUpReplayBattle(String replayString){
+
+        //Create BattleFragment (Basically the same thing as watching replays)
+        BattleFragment replayBattleFragment;
+        replayBattleFragment = BattleFragment.newInstance("replay");
+        Replay currentReplay = new Replay(replayString, replayBattleFragment);
+        BattleFieldData fieldData = BattleFieldData.get(getActivity().getApplicationContext());
+        fieldData.joinRoom("replay",false);
+        FragmentManager fm = getFragmentManager();
+        FragmentTransaction ft = fm.beginTransaction();
+        ft.replace(R.id.fragmentContainer, replayBattleFragment).commit();
+        currentReplay.Play();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/pokemonshowdown/replays/ResponseHandler.java b/app/src/main/java/com/pokemonshowdown/replays/ResponseHandler.java
new file mode 100644
index 00000000..c0c1e284
--- /dev/null
+++ b/app/src/main/java/com/pokemonshowdown/replays/ResponseHandler.java
@@ -0,0 +1,5 @@
+package com.pokemonshowdown.replays;
+
+public interface ResponseHandler {
+    public void OnResponseRecived(Object result);
+}
diff --git a/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java b/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
new file mode 100644
index 00000000..5872e0b2
--- /dev/null
+++ b/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
@@ -0,0 +1,60 @@
+package com.pokemonshowdown.replays;
+
+import android.os.AsyncTask;
+import android.util.Log;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+/**
+ * Battle log of all events are stored in
+ * TODO : Allow cached copies of replays
+ */
+public abstract class RetrieveReplayTask extends AsyncTask<String, Void, String> implements ResponseHandler {
+    String html = "";
+
+    @Override
+    protected String doInBackground(String... url) {
+        Log.i("Getting Replay", url[0]);
+        try {
+            HttpClient client = new DefaultHttpClient();
+            HttpGet request = new HttpGet(url[0]);
+            HttpResponse response = client.execute(request);
+
+            InputStream in = response.getEntity().getContent();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+            StringBuilder str = new StringBuilder();
+            String line = null;
+            while((line = reader.readLine()) != null)
+            {
+                str.append("::" + line);
+            }
+            in.close();
+            html = str.toString();
+            html = html.substring(html.indexOf("<script type=\"text/plain\" class=\"log\">") + 38);
+            html = html.substring(0, html.indexOf("</script>"));
+            Log.i("Sauce",html);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        return html;
+    }
+
+    @Override
+    protected void onPostExecute(String element) {
+        OnResponseRecived(element);
+        return;
+    }
+
+    @Override
+    public abstract void OnResponseRecived(Object result);
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_replay.xml b/app/src/main/res/layout/fragment_replay.xml
new file mode 100644
index 00000000..beec1027
--- /dev/null
+++ b/app/src/main/res/layout/fragment_replay.xml
@@ -0,0 +1,31 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" tools:context="com.pokemonshowdown.replays.ReplayFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Enter Replay ID"
+        android:id="@+id/helperText"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="64dp" />
+
+    <EditText
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/replayInput"
+        android:layout_below="@+id/helperText"
+        android:layout_centerHorizontal="true" />
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Watch Replay"
+        android:id="@+id/submit"
+        android:layout_below="@+id/replayInput"
+        android:layout_centerHorizontal="true"
+        android:onClick="submitClick" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_replay_battle.xml b/app/src/main/res/layout/fragment_replay_battle.xml
new file mode 100644
index 00000000..5e78fff9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_replay_battle.xml
@@ -0,0 +1,10 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.pokemonshowdown.app.ReplayBattleFragment">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView android:layout_width="match_parent" android:layout_height="match_parent"
+        android:text="@string/hello_blank_fragment" />
+
+</FrameLayout>

From 536112c2101f5d7a017583c13a9837872cc2e9a3 Mon Sep 17 00:00:00 2001
From: namThai <nam.thai.cs@gmail.com>
Date: Tue, 6 Jan 2015 00:23:29 -0500
Subject: [PATCH 02/24] Leave all rooms onDetach

---
 .../pokemonshowdown/app/BattleFieldFragment.java    |  8 ++++++++
 .../com/pokemonshowdown/data/BattleFieldData.java   |  9 ++++++++-
 .../com/pokemonshowdown/data/MyApplication.java     | 13 -------------
 .../pokemonshowdown/data/SearchableActivity.java    |  2 +-
 app/src/main/res/values/strings.xml                 |  8 ++++----
 app/src/main/res/xml/searchable.xml                 |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
index 9df21f84..5d9c08b2 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
@@ -12,6 +12,7 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -93,6 +94,13 @@ public void onDetach() {
         super.onDetach();
         getActivity().getActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
         getActivity().getActionBar().removeAllTabs();
+        BattleFieldData.get(getActivity()).leaveAllRooms();
+    }
+
+    @Override
+    public void onStop() {
+        Log.d(BTAG, "onStop");
+        super.onStop();
     }
 
     @Override
diff --git a/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java b/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
index 705a8ca0..466280a6 100644
--- a/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
+++ b/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
@@ -215,7 +215,14 @@ public void leaveRoom(String roomId) {
     }
 
     public void leaveAllRooms() {
-        for (String roomId : mRoomList) {
+        ArrayList<String> holder = new ArrayList<>();
+        ArrayList<String> roomList = getRoomList();
+        for (String roomId : roomList) {
+            if (!roomId.equals("global")) {
+                holder.add(roomId);
+            }
+        }
+        for (String roomId : holder) {
             leaveRoom(roomId);
         }
     }
diff --git a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
index 1217f66a..2768fb19 100644
--- a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
+++ b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
@@ -72,23 +72,10 @@ public void onCreate() {
         mRoomCategoryList = new HashMap<>();
     }
 
-    @Override
-    public void onTerminate() {
-        mOnboarding.signingOut();
-        mBattleFieldData.leaveAllRooms();
-        mCommunityLoungeData.leaveAllRooms();
-        closeActiveConnection();
-        super.onTerminate();
-    }
-
     public static MyApplication getMyApplication() {
         return sMyApplication;
     }
 
-    public void setWebSocketClient(WebSocketClient webSocketClient) {
-        mWebSocketClient = webSocketClient;
-    }
-
     public WebSocketClient getWebSocketClient() {
         ConnectivityManager connectivityManager = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connectivityManager.getActiveNetworkInfo();
diff --git a/app/src/main/java/com/pokemonshowdown/data/SearchableActivity.java b/app/src/main/java/com/pokemonshowdown/data/SearchableActivity.java
index 190449f9..3c93a74f 100644
--- a/app/src/main/java/com/pokemonshowdown/data/SearchableActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/data/SearchableActivity.java
@@ -92,7 +92,7 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
     protected void onNewIntent(Intent intent) {
         setIntent(intent);
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-            String query = intent.getStringExtra(SearchManager.QUERY);
+            String query = MyApplication.toId(intent.getStringExtra(SearchManager.QUERY));
             switch (mSearchType) {
                 case REQUEST_CODE_SEARCH_POKEMON:
                     searchPokemon(query);
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9fad71fb..a41fe9c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,11 +4,11 @@
     <string name="app_name">Showdown!</string>
     <string name="action_settings">Settings</string>
     <string name="hello_world">Hello world!</string>
-    <string name="request_sent">Request sent!</string>
+    <string name="request_sent">Waiting for server responses…</string>
     <string name="forfeit">Left/Forfeited!</string>
     <string name="loading">Loading…</string>
-    <string name="weak_connection">Failed to connect to server… it needs a thing called \'Internet Connection\', brilliant</string>
-    <string name="no_connection">Weak signal, genius.. maybe move your camp trailer to somewhere near civilization?</string>
+    <string name="weak_connection">Failed to connect to server… it needs a thing called \'Internet Connection\'</string>
+    <string name="no_connection">Weak signal… maybe move your camp trailer to somewhere near civilization?</string>
     <string name="still_in_development">TEASER ALERT: feature still in development</string>
     <string name="teaser_alert">Teaser Alert</string>
     <string name="multiple_battle_alert">Focus on the current battle, dude…</string>
@@ -125,8 +125,8 @@
 
     <!-- These are for Search function -->
     <string name="search_title">Search</string>
+    <string name="search_hint">Search Database…</string>
     <string name="search_label_pokemon">Search Pokemon…</string>
-    <string name="search_hint_pokemon">Search Pokemon…</string>
     <string name="search_label_ability">Search Ability…</string>
     <string name="search_label_item">Search Item…</string>
     <string name="search_label_moves">Search Move…</string>
diff --git a/app/src/main/res/xml/searchable.xml b/app/src/main/res/xml/searchable.xml
index e9f756ca..aa1017be 100644
--- a/app/src/main/res/xml/searchable.xml
+++ b/app/src/main/res/xml/searchable.xml
@@ -2,5 +2,5 @@
 
 <searchable xmlns:android="http://schemas.android.com/apk/res/android"
             android:label="@string/search_label_pokemon"
-            android:hint="@string/search_hint_pokemon" >
+            android:hint="@string/search_hint" >
 </searchable>
\ No newline at end of file

From fd430d6ab44b4ad4884864f1063c5719f38b6118 Mon Sep 17 00:00:00 2001
From: namThai <nam.thai.cs@gmail.com>
Date: Tue, 6 Jan 2015 10:50:36 -0500
Subject: [PATCH 03/24] alert for multiple battle

---
 .../pokemonshowdown/app/BattleFieldActivity.java  |  2 +-
 .../pokemonshowdown/app/BattleFieldFragment.java  | 15 ++++++++-------
 .../com/pokemonshowdown/app/BattleFragment.java   | 11 +++++++----
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
index 3888f77e..6479b942 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
@@ -190,7 +190,7 @@ public void run() {
                 return true;
             case R.id.menu_settings:
                 new AlertDialog.Builder(this)
-                        .setMessage(R.string.teaser_alert)
+                        .setMessage(R.string.still_in_development)
                         .create()
                         .show();
                 return true;
diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
index 5d9c08b2..ad1609e3 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
@@ -12,7 +12,6 @@
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -97,12 +96,6 @@ public void onDetach() {
         BattleFieldData.get(getActivity()).leaveAllRooms();
     }
 
-    @Override
-    public void onStop() {
-        Log.d(BTAG, "onStop");
-        super.onStop();
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
@@ -298,6 +291,14 @@ public void processNewRoomRequest(String roomId) {
                 fragment.cancelSearchingButton();
             }
         }
+
+        if (mRoomList.size() > 2) {
+            new AlertDialog.Builder(getActivity())
+                    .setMessage("This app does not handle concurrent battles well =.= " +
+                            "Not just yet =.= Don't close any window, finish all battles and reset the app")
+                    .create()
+                    .show();
+        }
     }
 
     public void generateAvailableWatchBattleDialog() {
diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java b/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
index 765f5909..a02df127 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
@@ -267,6 +267,7 @@ public void onResume() {
     @Override
     public void onPause() {
         super.onPause();
+        Log.d(BTAG, "onPause");
         BattleFieldData.RoomData roomData = BattleFieldData.get(getActivity()).getAnimationInstance(mRoomId);
         if (roomData != null) {
             roomData.setMessageListener(true);
@@ -1248,12 +1249,14 @@ public void displayPokemon(String tag) {
             getView().findViewById(getSpriteId(tag)).setAlpha(1f);
             if (!isBatonPass()) {
                 ((LinearLayout) getView().findViewById(getTempStatusId(tag))).removeAllViews();
-            } else {
-                getView().findViewById(getSpriteId(tag)).setAlpha(0.2f);
             }
             ImageView sub = (ImageView) relativeLayout.findViewWithTag("Substitute");
-            if (sub != null && !isBatonPass()) {
-                relativeLayout.removeView(sub);
+            if (sub != null) {
+                if (!isBatonPass()) {
+                    relativeLayout.removeView(sub);
+                } else {
+                    getView().findViewById(getSpriteId(tag)).setAlpha(0.2f);
+                }
             }
             setBatonPass(false);
         } catch (NullPointerException e) {

From bb9df1ca3164454c6ed610d22dbe9a2d638f88ff Mon Sep 17 00:00:00 2001
From: TeToN <bouvetcl@gmail.com>
Date: Tue, 6 Jan 2015 20:06:22 +0100
Subject: [PATCH 04/24] Saving tiers

---
 .../pokemonshowdown/data/BattleFieldData.java | 11 +++++++
 .../com/pokemonshowdown/data/PokemonTeam.java | 30 ++++++++++++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java b/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
index 466280a6..9aa1434f 100644
--- a/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
+++ b/app/src/main/java/com/pokemonshowdown/data/BattleFieldData.java
@@ -227,6 +227,17 @@ public void leaveAllRooms() {
         }
     }
 
+    public Format getFormatUsingId(String formatNameId) {
+        for (FormatType formatType : mFormatTypes) {
+            for (Format format : formatType.getFormatList()) {
+                if(MyApplication.toId(format.getName()).equals(formatNameId)) {
+                    return format;
+                }
+            }
+        }
+        return null;
+    }
+
     public static class BattleLog {
         private String mRoomId;
         private CharSequence mChatBox;
diff --git a/app/src/main/java/com/pokemonshowdown/data/PokemonTeam.java b/app/src/main/java/com/pokemonshowdown/data/PokemonTeam.java
index 18107c39..4ea0e18f 100644
--- a/app/src/main/java/com/pokemonshowdown/data/PokemonTeam.java
+++ b/app/src/main/java/com/pokemonshowdown/data/PokemonTeam.java
@@ -6,8 +6,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -62,15 +60,29 @@ public static void loadPokemonTeams(Context appContext) {
 
             StringBuffer pokemonTeamBuffer = new StringBuffer("");
             String currentNickname = null;
+            String currentTierId = "";
+
             for (String s : fileContentStringArray) {
                 if (s.startsWith("===") && s.endsWith("===")) {
                     if (pokemonTeamBuffer.length() > 0) {
                         PokemonTeam pt = PokemonTeam.importPokemonTeam(pokemonTeamBuffer.toString(), appContext, true);
                         pt.setNickname(currentNickname);
+                        if (!currentTierId.isEmpty()) {
+                            BattleFieldData.Format currentFormat = BattleFieldData.get(appContext).getFormatUsingId(currentTierId);
+                            if (currentFormat != null) {
+                                pt.setTier(currentFormat.getName());
+                            }
+                        }
                         mPokemonTeamList.add(pt);
                     }
                     pokemonTeamBuffer.setLength(0);
-                    currentNickname = s.replace("=", "").trim();
+                    if (s.contains("[") && s.contains("]")) {
+                        currentTierId = s.substring(s.indexOf("[") + 1, s.indexOf("]"));
+                        currentNickname = s.substring(s.indexOf("]") + 1).replace("=", "").trim();
+                    } else {
+                        currentTierId = "";
+                        currentNickname = s.replace("=", "").trim();
+                    }
                 } else {
                     pokemonTeamBuffer.append(s).append("\n");
                 }
@@ -79,6 +91,12 @@ public static void loadPokemonTeams(Context appContext) {
             if (pokemonTeamBuffer.length() > 0 && currentNickname != null) {
                 PokemonTeam pt = PokemonTeam.importPokemonTeam(pokemonTeamBuffer.toString(), appContext, true);
                 pt.setNickname(currentNickname);
+                if (!currentTierId.isEmpty()) {
+                    BattleFieldData.Format currentFormat = BattleFieldData.get(appContext).getFormatUsingId(currentTierId);
+                    if (currentFormat != null) {
+                        pt.setTier(currentFormat.getName());
+                    }
+                }
                 mPokemonTeamList.add(pt);
             }
 
@@ -94,7 +112,11 @@ public static void savePokemonTeams(Context c) {
             StringBuilder sb = new StringBuilder();
 
             for (PokemonTeam pokemonTeam : mPokemonTeamList) {
-                sb.append("=== ").append(pokemonTeam.getNickname()).append(" ===\n");
+                sb.append("=== ");
+                if (!pokemonTeam.getTier().isEmpty()) {
+                    sb.append("[").append(MyApplication.toId(pokemonTeam.getTier())).append("] ");
+                }
+                sb.append(pokemonTeam.getNickname()).append(" ===\n");
                 sb.append(pokemonTeam.exportPokemonTeam(c));
             }
 

From c902414f863ac923c2511e179440a8edf1ed1e65 Mon Sep 17 00:00:00 2001
From: TeToNN <bouvetcl@gmail.com>
Date: Tue, 6 Jan 2015 20:10:49 +0100
Subject: [PATCH 05/24] Fixing add pokemon button not reappearing when pokemon
 removed

---
 .../java/com/pokemonshowdown/app/TeamBuildingFragment.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java b/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
index 8731fdef..8057fe10 100644
--- a/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
@@ -149,6 +149,11 @@ public boolean onContextItemSelected(MenuItem item) {
                 mPokemonListAdapter.notifyDataSetChanged();
                 // Notify parent activity that the mPokemonTeam changed (so to reprint in the drawer)
                 ((TeamBuildingActivity) getActivity()).updateList();
+                if (mPokemonTeam.isFull()) {
+                    mFooterButton.setVisibility(View.GONE);
+                } else {
+                    mFooterButton.setVisibility(View.VISIBLE);
+                }
                 return true;
 
             case 2:

From cf8ccf3fd493eb358540c3fee88ff89ce5f2bae8 Mon Sep 17 00:00:00 2001
From: TeToNN <bouvetcl@gmail.com>
Date: Tue, 6 Jan 2015 22:39:24 +0100
Subject: [PATCH 06/24] Fixing import with spaces in nicknames

---
 .../com/pokemonshowdown/data/Pokemon.java     | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
index e29c3bc1..7dcb1fc7 100644
--- a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
+++ b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
@@ -96,8 +96,41 @@ public static Pokemon importPokemon(String importString, Context appContext, boo
             pokemonItem = nameItem[1];
             pokemonMainData = nameItem[0];
         }
-        String tmpString = pokemonMainData;
-        String[] tmpSplit = tmpString.trim().split(" ");
+
+        if (pokemonMainData.contains("(") && pokemonMainData.contains(")")) {
+            int countOpen = pokemonMainData.length() - pokemonMainData.replace("(", "").length();
+            int countClosed = pokemonMainData.length() - pokemonMainData.replace(")", "").length();
+
+            if (countOpen == 1 && countClosed == 1) {
+                // either name or gender
+                String genderOrName = pokemonMainData.substring(pokemonMainData.lastIndexOf("(") + 1, pokemonMainData.lastIndexOf(")"));
+
+                if (genderOrName.equals("M") || genderOrName.equals("F") || genderOrName.equals("N")) {
+                    pokemonGender = genderOrName;
+                    pokemonName = pokemonMainData.substring(0, pokemonMainData.lastIndexOf("("));
+                } else {
+                    pokemonName = genderOrName;
+                    pokemonNickname = pokemonMainData.substring(0, pokemonMainData.lastIndexOf("("));
+                }
+            } else {
+                // both name + gender
+                String genderOrName = pokemonMainData.substring(pokemonMainData.lastIndexOf("(") + 1, pokemonMainData.lastIndexOf(")"));
+
+                if (genderOrName.equals("M") || genderOrName.equals("F") || genderOrName.equals("N")) {
+                    pokemonGender = genderOrName;
+                    pokemonMainData = pokemonMainData.substring(0, pokemonMainData.lastIndexOf("("));
+                    pokemonName = pokemonMainData.substring(pokemonMainData.lastIndexOf("(") + 1, pokemonMainData.lastIndexOf(")"));
+                    pokemonNickname = pokemonMainData.substring(0, pokemonMainData.lastIndexOf("("));
+                } else {
+                    // is nickname with ()()() and (name)
+                    pokemonName = genderOrName;
+                    pokemonNickname = pokemonMainData.substring(0, pokemonMainData.lastIndexOf("("));
+                }
+            }
+        } else {
+            pokemonName = pokemonMainData;
+        }
+        /*String[] tmpSplit = tmpString.trim().split(" ");
         switch (tmpSplit.length) {
             case 1:
                 pokemonName = tmpSplit[0].trim();
@@ -131,7 +164,7 @@ public static Pokemon importPokemon(String importString, Context appContext, boo
 
             default:
                 return null;
-        }
+        }*/
 
         // replace for different formes
         pokemonName = MyApplication.toId(pokemonName);

From ec105d5c40e0d146a5bd7d786059edd00c47dcdc Mon Sep 17 00:00:00 2001
From: namThai <nam.thai.cs@gmail.com>
Date: Wed, 7 Jan 2015 11:03:37 -0500
Subject: [PATCH 07/24] Handle uncaught exceptions

---
 .../pokemonshowdown/app/BattleFieldActivity.java | 16 ++++++++++++++++
 .../pokemonshowdown/app/BattleFieldFragment.java |  2 +-
 .../com/pokemonshowdown/data/MyApplication.java  | 13 +++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
index 6479b942..8b9cd3d4 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldActivity.java
@@ -357,6 +357,22 @@ public void run() {
                         mDialog.show();
                     }
                 });
+                return;
+            case MyApplication.EXTRA_UNKNOWN_ERROR:
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mDialog != null && mDialog.isShowing()) {
+                            mDialog.dismiss();
+                        }
+                        mDialog = new AlertDialog.Builder(BattleFieldActivity.this)
+                                .setMessage("An unknown error was caught. " +
+                                        "You can copy current roomId to clipboard; if anything funny happens," +
+                                        " finish the battle in your device's browser.")
+                                .create();
+                        mDialog.show();
+                    }
+                });
         }
     }
 
diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
index ad1609e3..52b31fbc 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFieldFragment.java
@@ -104,7 +104,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
                 .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                     @Override
                     public boolean onMenuItemClick(MenuItem item) {
-                        final String roomId = getCurrentRoomId();
+                        final String roomId = "http://play.pokemonshowdown.com/" + getCurrentRoomId();
                         new AlertDialog.Builder(getActivity())
                                 .setTitle(R.string.bar_room_id)
                                 .setMessage(roomId)
diff --git a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
index 2768fb19..712103bb 100644
--- a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
+++ b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
@@ -35,6 +35,7 @@ public class MyApplication extends Application {
     public final static String EXTRA_SERVER_MESSAGE = "New Server Message";
     public final static String EXTRA_REQUIRE_SIGN_IN = "Require Sign In";
     public final static String EXTRA_ERROR_MESSAGE = "Error Message";
+    public final static String EXTRA_UNKNOWN_ERROR = "Unknown Error";
     public final static String EXTRA_UPDATE_SEARCH = "Search Update";
     public final static String EXTRA_CHANNEL = "Channel";
     public final static String EXTRA_ROOMID = "RoomId";
@@ -70,6 +71,13 @@ public void onCreate() {
         mBattleFieldData = BattleFieldData.get(appContext);
         mCommunityLoungeData = CommunityLoungeData.get(appContext);
         mRoomCategoryList = new HashMap<>();
+
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(Thread thread, Throwable ex) {
+                handleException(thread, ex);
+            }
+        });
     }
 
     public static MyApplication getMyApplication() {
@@ -388,4 +396,9 @@ public static String toId(String name) {
         }
         return name.toLowerCase().replaceAll("[^a-z0-9]", "");
     }
+
+    private void handleException(Thread thread, Throwable ex) {
+        Intent intent = new Intent(ACTION_FROM_MY_APPLICATION).putExtra(EXTRA_DETAILS, EXTRA_UNKNOWN_ERROR);
+        LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
+    }
 }

From dae8a4bbaf50cc27f6f13bb2addc257c86fdf3ae Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Fri, 9 Jan 2015 11:45:17 +0100
Subject: [PATCH 08/24] Refactor listener and lifecycle management. Shedinja
 fix. Stored Power implementation.

---
 .../pokemonshowdown/app/DmgCalcActivity.java  | 69 ++++++++++++++-----
 .../pokemonshowdown/data/FieldFragment.java   | 12 +++-
 2 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 66e70ddb..7aff8ced 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Map;
 
-public class DmgCalcActivity extends FragmentActivity {
+public class DmgCalcActivity extends FragmentActivity implements FieldFragment.FieldConditionsListener {
     public final static String DTAG = DmgCalcActivity.class.getName();
     public final static int REQUEST_CODE_FIND_ATTACKER = 0;
     public final static int REQUEST_CODE_FIND_DEFENDER = 1;
@@ -59,6 +59,8 @@ public class DmgCalcActivity extends FragmentActivity {
     private int mSpikesCount = 0;
     private Weather mActiveWeather = Weather.NO_WEATHER;
 
+    private FieldFragment mFieldFragment;
+
     public enum FieldConditions {
         SINGLES, DOUBLES, STEALTH_ROCK, ZERO_SPIKES, ONE_SPIKES, TWO_SPIKES, THREE_SPIKES, REFLECT, LIGHT_SCREEN, FORESIGHT, HELPING_HAND, NO_WEATHER, SUN, RAIN, SAND, HAIL, GRAVITY;
     }
@@ -78,13 +80,13 @@ public void onCreate(Bundle savedInstanceState) {
         getActionBar().setTitle(R.string.bar_dmg_calc);
         getActionBar().setDisplayHomeAsUpEnabled(true);
 
-        FieldFragment fieldFragment = new DmgCalcFieldXYFragment();
-        fieldFragment.setFieldConditionsListener(new DefaultFieldConditionsListener());
+        mFieldFragment = new DmgCalcFieldXYFragment();
+        mFieldFragment.setFieldConditionsListener(this);
         Bundle fieldBundle = new Bundle();
-        fieldFragment.setArguments(fieldBundle);
+        mFieldFragment.setArguments(fieldBundle);
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragmentManager.beginTransaction()
-                .replace(R.id.dmgcalc_field_container, fieldFragment)
+                .replace(R.id.dmgcalc_field_container, mFieldFragment)
                 .commit();
 
         ImageView switchButton = (ImageView) findViewById(R.id.dmgcalc_switch);
@@ -469,6 +471,9 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
         if ("Status".equals(category)) {
             return 0;
         } else {
+            if("Shedinja".equals(getDefender().getName())) {
+                getDefender().setHP(1);
+            }
             switch (move) {
                 case "dragonrage":
                     return calculateWeaknessModifier(move, type) == 0 ? 0 : 40;
@@ -504,7 +509,7 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
 
     private int applyDamageModifiers(double base, List<Double> modifiers) {
         for (double modifier : modifiers) {
-            base = base % 1 > 0.5 ? Math.ceil(base * modifier) : Math.floor(base *modifier);
+            base = base % 1 > 0.5 ? Math.ceil(base * modifier) : Math.floor(base * modifier);
         }
         return (int) base;
     }
@@ -808,7 +813,10 @@ private double calculateBasePower(String move, String type, double bp) {
                 bp = 150;
                 break;
             case "punishment":
-                bp = Math.min(200, 20 * countDefendersStatStages() + 60);
+                bp = Math.min(200, 20 * countStatStages(getDefender()) + 60);
+                break;
+            case "storedpower":
+                bp = 20 + (20*countStatStages(getAttacker()));
                 break;
             case "fling":
                 bp = 130;
@@ -870,11 +878,11 @@ private double calculateBasePower(String move, String type, double bp) {
         return bp;
     }
 
-    private int countDefendersStatStages() {
+    private int countStatStages(Pokemon pokemon) {
         int count = 0;
-        for(int change : getDefender().getStages()) {
-            if(change > 6) {
-                count += change-6;
+        for (int change : pokemon.getStages()) {
+            if (change > 6) {
+                count += change - 6;
             }
         }
 
@@ -1020,17 +1028,42 @@ public void updateDamage() {
         calculateAllMoves();
     }
 
-    private class DefaultFieldConditionsListener implements FieldConditionsListener {
 
-        @Override
-        public void onFieldConditionChanged(FieldConditions conditions, boolean value) {
-            setConditionStatus(conditions, value);
+    @Override
+    public void onFieldConditionChanged(FieldConditions conditions, boolean value) {
+        setConditionStatus(conditions, value);
+    }
+
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (mFieldFragment != null) {
+            mFieldFragment.removeListener();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        if (mFieldFragment != null) {
+            mFieldFragment.setFieldConditionsListener(this);
         }
+    }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        if (mFieldFragment != null) {
+            mFieldFragment.removeListener();
+        }
     }
 
-    public interface FieldConditionsListener {
-        public void onFieldConditionChanged(FieldConditions conditions, boolean value);
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        if (mFieldFragment != null) {
+            mFieldFragment.setFieldConditionsListener(this);
+        }
     }
 }
-
diff --git a/app/src/main/java/com/pokemonshowdown/data/FieldFragment.java b/app/src/main/java/com/pokemonshowdown/data/FieldFragment.java
index 69fc1384..6008c3bf 100644
--- a/app/src/main/java/com/pokemonshowdown/data/FieldFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/data/FieldFragment.java
@@ -10,15 +10,23 @@
  */
 public class FieldFragment extends Fragment {
 
-    private DmgCalcActivity.FieldConditionsListener mListener;
+    private FieldConditionsListener mListener;
 
-    public void setFieldConditionsListener(@Nullable DmgCalcActivity.FieldConditionsListener listener) {
+    public void setFieldConditionsListener(@Nullable FieldConditionsListener listener) {
         mListener = listener;
     }
 
+    public void removeListener() {
+        mListener = null;
+    }
+
     protected void sendUpdateToListeners(DmgCalcActivity.FieldConditions fieldCondition, boolean value) {
         if(mListener != null)  {
             mListener.onFieldConditionChanged(fieldCondition, value);
         }
     }
+
+    public interface FieldConditionsListener {
+        public void onFieldConditionChanged(DmgCalcActivity.FieldConditions conditions, boolean value);
+    }
 }

From 60c152d46d9b1408168149d0f428cae3095280fc Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Fri, 9 Jan 2015 17:57:25 +0100
Subject: [PATCH 09/24] Modifiable Health

---
 .../pokemonshowdown/app/DmgCalcActivity.java  | 61 +++++++++++++------
 .../pokemonshowdown/app/PokemonFragment.java  | 37 ++++++++++-
 .../pokemonshowdown/data/MyApplication.java   |  1 +
 app/src/main/res/layout/fragment_pokemon.xml  | 22 +++++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 100 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 7aff8ced..6ced5dcb 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -37,7 +37,7 @@ public class DmgCalcActivity extends FragmentActivity implements FieldFragment.F
     public final static int REQUEST_CODE_GET_MOVE_3 = 4;
     public final static int REQUEST_CODE_GET_MOVE_4 = 5;
 
-    private final DecimalFormat DAMAGE_FORMAT = new DecimalFormat("#0.0%");
+    private final static DecimalFormat DAMAGE_FORMAT = new DecimalFormat("#0.0%");
 
     private Pokemon mAttacker;
     private Pokemon mDefender;
@@ -371,8 +371,8 @@ private void calculateDamage(int moveIndex) {
     }
 
     private int calculateDefendersInitialHP() {
-        int baseHP = getDefender().calculateHP();
-        int calculatedHP = baseHP;
+        int baseHP = "Shedinja".equals(getDefender().getName()) ? 1 : getDefender().calculateHP();
+        int calculatedHP = getDefender().getHP();
         List<String> typing = Arrays.asList(getDefender().getType());
 
         if (mStealthRocksActive && !getDefender().getAbility().equals("Magic Guard")) {
@@ -386,6 +386,10 @@ private int calculateDefendersInitialHP() {
         return calculatedHP;
     }
 
+    private double getHPFraction(Pokemon pokemon) {
+        return pokemon.getHP() / (double) pokemon.calculateHP();
+    }
+
     private int calculateDefendersDamagePerRound() {
         int baseHP = getDefender().calculateHP();
         int damagePerRound = 0;
@@ -471,9 +475,6 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
         if ("Status".equals(category)) {
             return 0;
         } else {
-            if("Shedinja".equals(getDefender().getName())) {
-                getDefender().setHP(1);
-            }
             switch (move) {
                 case "dragonrage":
                     return calculateWeaknessModifier(move, type) == 0 ? 0 : 40;
@@ -486,8 +487,8 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
                     boolean usesAttack = "Physical".equals(category);
                     boolean usesDefense = "Physical".equals(category) || "psyshock".equals(move) || "psystrike".equals(move) || "secretsword".equals(move);
 
-                    double attack = "foulplay".equals(move) ? Math.round(getDefender().calculateAtk() * getAtkMultiplier()) : usesAttack ? Math.round(getAttacker().calculateAtk() * getAtkMultiplier()) : getAttacker().calculateSpAtk() * getSpecialAttackMultiplier();
-                    double defense = usesDefense ? getDefender().calculateDef() * getDefenseMultiplier() : getDefender().calculateSpDef() * getSpecialDefenseMultiplier();
+                    double attack = "foulplay".equals(move) ? Math.round(getDefender().calculateAtk() * getAtkMultiplier(getAttacker())) : usesAttack ? Math.round(getAttacker().calculateAtk() * getAtkMultiplier(getAttacker())) : getAttacker().calculateSpAtk() * getSpecialAttackMultiplier(getAttacker());
+                    double defense = usesDefense ? getDefender().calculateDef() * getDefenseMultiplier(getDefender()) : getDefender().calculateSpDef() * getSpecialDefenseMultiplier(getDefender());
                     double base = calculateBasePower(move, type, Double.parseDouble(basePower));
 
                     boolean isStab = Arrays.asList(getAttackerTypingAfterAbilities(type)).contains(type);
@@ -514,50 +515,58 @@ private int applyDamageModifiers(double base, List<Double> modifiers) {
         return (int) base;
     }
 
-    private double getAtkMultiplier() {
+    private double getAtkMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
-        if (getAttacker().getAbility().equals("Huge Power") || getAttacker().getAbility().equals("Pure Power")) {
+        if (pokemon.getAbility().equals("Huge Power") || pokemon.getAbility().equals("Pure Power")) {
             baseMultiplier *= 2.0;
         }
 
-        if (getAttacker().getAbility().equals("Hustle")) {
+        if (pokemon.getAbility().equals("Hustle")) {
             baseMultiplier *= 1.5;
         }
 
-        if (getAttacker().getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
+        if (pokemon.getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
             baseMultiplier *= 1.5;
         }
 
+        if("Defeatist".equals(pokemon.getAbility())) {
+            baseMultiplier *= 0.5;
+        }
+
         return baseMultiplier;
     }
 
-    private double getSpecialDefenseMultiplier() {
+    private double getSpecialDefenseMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
-        if (getAttacker().getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
+        if (pokemon.getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
             baseMultiplier *= 1.5;
         }
 
-        if (Arrays.asList(getDefender().getType()).contains("Rock")) {
+        if (Arrays.asList(pokemon.getType()).contains("Rock")) {
             baseMultiplier *= 1.5;
         }
 
         return baseMultiplier;
     }
 
-    private double getDefenseMultiplier() {
+    private double getDefenseMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
         return baseMultiplier;
     }
 
-    private double getSpecialAttackMultiplier() {
+    private double getSpecialAttackMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
-        if (mActiveWeather == Weather.SUN && getAttacker().getAbility().equals("Solar Power")) {
+        if (mActiveWeather == Weather.SUN && pokemon.getAbility().equals("Solar Power")) {
             baseMultiplier *= 1.5;
         }
 
+        if("Defeatist".equals(pokemon.getAbility())) {
+            baseMultiplier *= 0.5;
+        }
+
         return baseMultiplier;
     }
 
@@ -579,6 +588,10 @@ private void modifyDamageWithAbility(List<Double> modifiers, String move, String
             modifiers.add(1.5);
         }
 
+        if(((attackerAbility.equals("Swarm") && type.equals("Bug")) || (attackerAbility.equals("Blaze") && type.equals("Fire")) || (attackerAbility.equals("Torrent") && type.equals("Water")) || (attackerAbility.equals("Overgrow") && type.equals("Grass"))) && getHPFraction(getAttacker()) <= 1/3.0) {
+            modifiers.add(1.5);
+        }
+
         if (attackerAbility.equals("Iron Fist") && Arrays.asList(new String[]{"bulletpunch", "cometpunch", "dizzypunch", "drainpunch", "dynamicpunch", "firepunch", "focuspunch", "hammerarm", "icepunch",
                 "machpunch", "megapunch", "meteormash", "poweruppunch", "shadowpunch", "skyuppercut", "thunderpunch"}).contains(move)) {
             modifiers.add(1.2);
@@ -828,7 +841,8 @@ private double calculateBasePower(String move, String type, double bp) {
                 break;
             case "reversal":
             case "flail":
-                bp = 200; // TODO: Reimplement if health modifiable
+                int mod = (int) (48 * getHPFraction(getAttacker()));
+                bp = mod <= 1 ? 200 : mod <= 4 ? 150 : mod <= 9 ? 100 : mod <= 16 ? 80 : mod <= 32 ? 40 : 20;
                 break;
             case "heatcrash":
             case "heavyslam":
@@ -837,7 +851,14 @@ private double calculateBasePower(String move, String type, double bp) {
                 break;
             case "crushgrip":
             case "wringout":
-                bp = 121; // TODO: Reimplement once health modifiable
+                bp = 1 + (120 * getHPFraction(getDefender()));
+                break;
+            case "brine":
+                bp = getHPFraction(getDefender()) <= 0.5 ? 130 : 65;
+                break;
+            case "eruption":
+            case "waterspout":
+                bp = Math.max(1, 150 * getHPFraction(getAttacker()));
                 break;
             case "frustration":
             case "return":
diff --git a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
index 4bb5d570..ef661848 100644
--- a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
@@ -14,6 +14,7 @@
 import android.view.Window;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.pokemonshowdown.data.Pokemon;
@@ -83,7 +84,7 @@ public void onClick(View v) {
             addSearchWidget(view);
         }
 
-        TextView pokemonStats = (TextView) view.findViewById(R.id.stats);
+        final TextView pokemonStats = (TextView) view.findViewById(R.id.stats);
         resetStatsString();
         pokemonStats.setBackgroundResource(R.drawable.editable_frame);
         pokemonStats.setOnClickListener(new View.OnClickListener() {
@@ -205,6 +206,33 @@ public void onClick(DialogInterface dialog, int which) {
             }
         });
 
+        int initialHPFraction = (int) (100 * getPokemon().getHP() / (double) getPokemon().calculateHP());
+        final TextView initialHPText = (TextView) view.findViewById(R.id.initial_hp_text);
+        initialHPText.setText(getResources().getString(R.string.initial_hp_dialog, initialHPFraction));
+
+        final SeekBar initialHP = (SeekBar) view.findViewById(R.id.initial_hp);
+        initialHP.setProgress(initialHPFraction);
+        initialHP.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+            @Override
+            public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+                mPokemon.setHP((int) Math.ceil(getPokemon().calculateHP() * (progress / 100.0)));
+                initialHPText.setText(getResources().getString(R.string.initial_hp_dialog, progress));
+                pokemonStats.setText(getStatsString());
+            }
+
+            @Override
+            public void onStartTrackingTouch(SeekBar seekBar) {
+
+            }
+
+            @Override
+            public void onStopTrackingTouch(SeekBar seekBar) {
+
+            }
+        });
+
+        initialHP.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
+        initialHPText.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
     }
 
     private void addSearchWidget(View view) {
@@ -231,7 +259,12 @@ public void setAbilityString(String ability) {
     }
 
     public String getStatsString() {
-        return ("HP " + Integer.toString(getPokemon().getHP()) + " / Atk " + Integer.toString(getPokemon().getAtk()) + " / Def " + Integer.toString(getPokemon().getDef()) + " / SpA " + Integer.toString(getPokemon().getSpAtk()) + " / SpD " + Integer.toString(getPokemon().getSpDef()) + " / Spe " + Integer.toString(getPokemon().getSpd()));
+        if (getArguments().getBoolean(STAGES) && getPokemon().calculateHP() != getPokemon().getHP()) {
+            return ("HP " + Integer.toString(getPokemon().getHP()) + " (" + getPokemon().calculateHP() + ")" + " / Atk " + Integer.toString(getPokemon().getBaseAtk()) + " / Def " + Integer.toString(getPokemon().getBaseDef()) + " / SpA " + Integer.toString(getPokemon().getBaseSpAtk()) + " / SpD " + Integer.toString(getPokemon().getBaseSpDef()) + " / Spe " + Integer.toString(getPokemon().getBaseSpd()));
+        } else {
+            return ("HP " + Integer.toString(getPokemon().getHP()) + " / Atk " + Integer.toString(getPokemon().getAtk()) + " / Def " + Integer.toString(getPokemon().getDef()) + " / SpA " + Integer.toString(getPokemon().getSpAtk()) + " / SpD " + Integer.toString(getPokemon().getSpDef()) + " / Spe " + Integer.toString(getPokemon().getSpd()));
+
+        }
     }
 
     public void resetStatsString() {
diff --git a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
index 712103bb..70fdf2b8 100644
--- a/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
+++ b/app/src/main/java/com/pokemonshowdown/data/MyApplication.java
@@ -398,6 +398,7 @@ public static String toId(String name) {
     }
 
     private void handleException(Thread thread, Throwable ex) {
+        ex.printStackTrace();
         Intent intent = new Intent(ACTION_FROM_MY_APPLICATION).putExtra(EXTRA_DETAILS, EXTRA_UNKNOWN_ERROR);
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
diff --git a/app/src/main/res/layout/fragment_pokemon.xml b/app/src/main/res/layout/fragment_pokemon.xml
index d39bfde6..d4280229 100644
--- a/app/src/main/res/layout/fragment_pokemon.xml
+++ b/app/src/main/res/layout/fragment_pokemon.xml
@@ -127,4 +127,26 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:weightSum="1">
+
+        <SeekBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/initial_hp"
+            android:max="100"
+            android:progress="100"
+            android:layout_weight="0.79" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/initial_hp_text"
+            android:text="@string/initial_hp_dialog"
+            android:layout_gravity="center_horizontal" />
+    </LinearLayout>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a41fe9c6..69a7781a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,6 +97,7 @@
     <string name="dmg_is_same">"%1$s, KO in %2$s round(s)</string>
     <string name="dmg_not_same_same_ko">"%1$s - %2$s\nKO in %3$s round(s)</string>
     <string name="dmg_not_same_not_same_ko">%1$s - %2$s\nKO in %3$s to %4$s rounds</string>
+    <string name="initial_hp_dialog">Initial HP: %d%%</string>
 
     <!-- These are for Pokemon List -->
     <string name="pokemon_list">Pokemon List</string>

From 4db01dae6876a1e40eae448d9c95f63d8cff2849 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Fri, 9 Jan 2015 21:58:23 +0100
Subject: [PATCH 10/24] Items are choosable. Support for Judgement, Multitype,
 Drives, Natural Gift, Fling. Some refactoring.

---
 .../pokemonshowdown/app/DmgCalcActivity.java  | 160 +++++++++++-------
 .../pokemonshowdown/app/PokemonFragment.java  |  42 ++++-
 .../com/pokemonshowdown/data/ItemDex.java     |   2 +-
 app/src/main/res/layout/fragment_pokemon.xml  |  90 ++++++----
 4 files changed, 193 insertions(+), 101 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 6ced5dcb..47eea7a4 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -12,6 +12,7 @@
 import android.widget.TextView;
 
 import com.pokemonshowdown.data.FieldFragment;
+import com.pokemonshowdown.data.ItemDex;
 import com.pokemonshowdown.data.MoveDex;
 import com.pokemonshowdown.data.Pokemon;
 import com.pokemonshowdown.data.SearchableActivity;
@@ -448,24 +449,6 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
             basePower = moveJson.getString("basePower");
             category = moveJson.getString("category");
             targets = moveJson.getString("target");
-
-            if ("weatherball".equals(move)) {
-                switch (mActiveWeather) {
-                    case HAIL:
-                        type = "Ice";
-                        break;
-                    case SAND:
-                        type = "Rock";
-                        break;
-                    case RAIN:
-                        type = "Water";
-                        break;
-                    case SUN:
-                        type = "Fire";
-                        break;
-                }
-            }
-
             hasSecondary = moveJson.optBoolean("secondary", true);
 
         } catch (JSONException | NullPointerException e) {
@@ -491,6 +474,9 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
                     double defense = usesDefense ? getDefender().calculateDef() * getDefenseMultiplier(getDefender()) : getDefender().calculateSpDef() * getSpecialDefenseMultiplier(getDefender());
                     double base = calculateBasePower(move, type, Double.parseDouble(basePower));
 
+                    String originalType = type;
+                    type = modifyAttackType(move, type);
+
                     boolean isStab = Arrays.asList(getAttackerTypingAfterAbilities(type)).contains(type);
 
                     List<Double> modifiers = new ArrayList<>();
@@ -500,7 +486,7 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
                     modifiers.add(calculateCritMultiplier(move, crit));
                     modifiers.add(mHelpingHandActive ? 1.5 : 1.0);
                     modifiers.add(getSpreadMultiplicator(targets));
-                    modifyDamageWithAbility(modifiers, move, type, category, usesDefense, hasSecondary);
+                    modifyDamageWithAbility(modifiers, move, type, originalType, category, usesDefense, hasSecondary);
 
                     base = base == 0.0 ? 0 : Math.floor(((2 * getAttacker().getLevel() / 5 + 2) * attack * base / defense) / 50 + 2);
                     return applyDamageModifiers(base, modifiers);
@@ -508,6 +494,47 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
         }
     }
 
+    private String modifyAttackType(String move, String type) {
+        String attackerAbility = getAttacker().getAbility();
+        if ("naturalgift".equals(move)) {
+            JSONObject itemObject = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+            JSONObject naturalGiftObject = itemObject == null ? null : itemObject.optJSONObject("naturalGift");
+            if (naturalGiftObject != null) {
+                type = naturalGiftObject.optString("type", type);
+            }
+        } else if ("weatherball".equals(move)) {
+            switch (mActiveWeather) {
+                case HAIL:
+                    type = "Ice";
+                    break;
+                case SAND:
+                    type = "Rock";
+                    break;
+                case RAIN:
+                    type = "Water";
+                    break;
+                case SUN:
+                    type = "Fire";
+                    break;
+            }
+        } else if (attackerAbility.equals("Aerilate") && type.equals("Normal")) {
+            type = "Flying";
+        } else if (attackerAbility.equals("Refrigerate") && type.equals("Normal")) {
+            type = "Ice";
+        } else if (attackerAbility.equals("Pixilate") && type.equals("Normal")) {
+            type = "Fairy";
+        } else if (attackerAbility.equals("Normalize")) {
+            type = "Normal";
+        } else if ("technoblast".equals(move)) {
+            JSONObject itemObject = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+            type = itemObject == null ? null : itemObject.optString("onDrive", type);
+        } else if ("judgement".equals(move)) {
+            JSONObject itemObject = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+            type = itemObject == null ? "Normal" : itemObject.optString("onPlate", "Normal");
+        }
+        return type;
+    }
+
     private int applyDamageModifiers(double base, List<Double> modifiers) {
         for (double modifier : modifiers) {
             base = base % 1 > 0.5 ? Math.ceil(base * modifier) : Math.floor(base * modifier);
@@ -529,7 +556,7 @@ private double getAtkMultiplier(Pokemon pokemon) {
             baseMultiplier *= 1.5;
         }
 
-        if("Defeatist".equals(pokemon.getAbility())) {
+        if ("Defeatist".equals(pokemon.getAbility())) {
             baseMultiplier *= 0.5;
         }
 
@@ -563,14 +590,14 @@ private double getSpecialAttackMultiplier(Pokemon pokemon) {
             baseMultiplier *= 1.5;
         }
 
-        if("Defeatist".equals(pokemon.getAbility())) {
+        if ("Defeatist".equals(pokemon.getAbility())) {
             baseMultiplier *= 0.5;
         }
 
         return baseMultiplier;
     }
 
-    private void modifyDamageWithAbility(List<Double> modifiers, String move, String type, String category, boolean usesDefense, boolean hasSecondary) {
+    private void modifyDamageWithAbility(List<Double> modifiers, String move, String type, String originalType, String category, boolean usesDefense, boolean hasSecondary) {
         List<String> attackerTyping = Arrays.asList(getAttackerTypingAfterAbilities(type));
         String attackerAbility = getAttacker().getAbility();
         String defenderAbility = getDefender().getAbility();
@@ -588,7 +615,7 @@ private void modifyDamageWithAbility(List<Double> modifiers, String move, String
             modifiers.add(1.5);
         }
 
-        if(((attackerAbility.equals("Swarm") && type.equals("Bug")) || (attackerAbility.equals("Blaze") && type.equals("Fire")) || (attackerAbility.equals("Torrent") && type.equals("Water")) || (attackerAbility.equals("Overgrow") && type.equals("Grass"))) && getHPFraction(getAttacker()) <= 1/3.0) {
+        if (((attackerAbility.equals("Swarm") && type.equals("Bug")) || (attackerAbility.equals("Blaze") && type.equals("Fire")) || (attackerAbility.equals("Torrent") && type.equals("Water")) || (attackerAbility.equals("Overgrow") && type.equals("Grass"))) && getHPFraction(getAttacker()) <= 1 / 3.0) {
             modifiers.add(1.5);
         }
 
@@ -648,18 +675,18 @@ private void modifyDamageWithAbility(List<Double> modifiers, String move, String
         }
 
         if (attackerAbility.equals("Analytic")) {
-            modifiers.add(1.3);
+            modifiers.add(1.3); //TODO: Reimplement
         }
 
-        if (attackerAbility.equals("Aerilate") && type.equals("Normal")) {
+        if (attackerAbility.equals("Aerilate") && originalType.equals("Normal")) {
             modifiers.add(1.3);
         }
 
-        if (attackerAbility.equals("Refrigerate") && type.equals("Normal")) {
+        if (attackerAbility.equals("Refrigerate") && originalType.equals("Normal")) {
             modifiers.add(1.3);
         }
 
-        if (attackerAbility.equals("Pixilate") && type.equals("Normal")) {
+        if (attackerAbility.equals("Pixilate") && originalType.equals("Normal")) {
             modifiers.add(1.3);
         }
 
@@ -667,7 +694,6 @@ private void modifyDamageWithAbility(List<Double> modifiers, String move, String
             modifiers.add(0.5);
         }
 
-
         if (mActiveWeather == Weather.SAND && attackerAbility.equals("Sand Force") && Arrays.asList(new String[]{"Rock", "Ground", "Steel"}).contains(type)) {
             modifiers.add(1.3);
         }
@@ -717,38 +743,33 @@ private double getSpreadMultiplicator(String targets) {
         return ("allAdjacentFoes".equals(targets) || "allAdjacent".equals(targets) || "all".equals(targets)) && !mIsSingles ? 0.75 : 1;
     }
 
-    private double calculateWeaknessModifier(String move, String type) {
-        double modifier = 1.0;
-
-        String[] defenderTyping = getDefender().getType();
-        String attackerAbility = getAttacker().getAbility();
-        String defenderAbility = getDefender().getAbility();
-
-        if ("Forecast".equals(defenderAbility)) {
+    private String[] getRealTyping(Pokemon pokemon) {
+        String[] typing = pokemon.getType();
+        if ("Forecast".equals(pokemon.getAbility())) {
             switch (mActiveWeather) {
                 case RAIN:
-                    defenderTyping = new String[]{"Water"};
+                    typing = new String[]{"Water"};
                     break;
                 case SUN:
-                    defenderTyping = new String[]{"Fire"};
+                    typing = new String[]{"Fire"};
                     break;
                 case HAIL:
-                    defenderTyping = new String[]{"Ice"};
+                    typing = new String[]{"Ice"};
                     break;
             }
+        } else if("Multitype".equals(pokemon.getAbility()) && pokemon.getName().contains("Arceus")) {
+            JSONObject itemObject = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+            typing = itemObject == null ? new String[]{"Normal"} : new String[]{itemObject.optString("onPlate", "Normal")};
         }
+        return typing;
+    }
 
-        if (!"weatherball".equals(move)) {
-            if (defenderAbility.equals("Aerilate") && type.equals("Normal")) {
-                type = "Flying";
-            } else if (defenderAbility.equals("Refrigerate") && type.equals("Normal")) {
-                type = "Ice";
-            } else if (defenderAbility.equals("Pixilate") && type.equals("Normal")) {
-                type = "Fairy";
-            } else if (defenderAbility.equals("Normalize")) {
-                type = "Normal";
-            }
-        }
+    private double calculateWeaknessModifier(String move, String type) {
+        double modifier = 1.0;
+
+        String[] defenderTyping = getRealTyping(getDefender());
+        String attackerAbility = getAttacker().getAbility();
+        String defenderAbility = getDefender().getAbility();
 
         for (String defType : defenderTyping) {
             if (mEffectivenessImmune.get(defType) != null && mEffectivenessImmune.get(defType).contains(type)) {
@@ -782,7 +803,7 @@ private double calculateWeaknessModifier(String move, String type) {
             type = backupType;
         }
 
-        if ("freezedry".equals(move) && Arrays.asList(getDefender().getType()).contains("Water")) {
+        if ("freezedry".equals(move) && Arrays.asList(defenderTyping).contains("Water")) {
             modifier *= 4; // as it should be resisted once
         }
 
@@ -826,19 +847,31 @@ private double calculateBasePower(String move, String type, double bp) {
                 bp = 150;
                 break;
             case "punishment":
-                bp = Math.min(200, 20 * countStatStages(getDefender()) + 60);
+                bp = Math.min(200, 20 * countStatStages(getDefender(), true) + 60);
                 break;
             case "storedpower":
-                bp = 20 + (20*countStatStages(getAttacker()));
+                bp = 20 + (20 * countStatStages(getAttacker(), true));
+                break;
+            case "knockoff":
+                bp = getDefender().getItem().isEmpty() || getDefender().getItem() == null ? 65 : 97.5;
                 break;
             case "fling":
-                bp = 130;
-                break; // TODO: Reimplement if items are supported
+                JSONObject obj = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+                JSONObject flingObject = obj == null ? null : obj.optJSONObject("fling");
+                if (flingObject != null) {
+                    bp = flingObject.optInt("basePower", 0);
+                } else {
+                    bp = 0;
+                }
+                break;
             case "lowkick":
             case "grassknot":
                 double weight = getDefender().getWeight();
                 bp = weight < 10.0 ? 20 : weight < 25.0 ? 40 : weight < 50.0 ? 60 : weight < 100.0 ? 80 : weight < 200.0 ? 100 : 120;
                 break;
+            case "acrobatics":
+                bp = getDefender().getItem().isEmpty() || getDefender().getItem() == null ? 55 : 110;
+                break;
             case "reversal":
             case "flail":
                 int mod = (int) (48 * getHPFraction(getAttacker()));
@@ -865,7 +898,13 @@ private double calculateBasePower(String move, String type, double bp) {
                 bp = 102;
                 break;
             case "naturalgift":
-                bp = 100;// TODO: Reimplement if items are supported
+                obj = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
+                JSONObject naturalGiftObject = obj == null ? null : obj.optJSONObject("naturalGift");
+                if (naturalGiftObject != null) {
+                    bp = naturalGiftObject.optInt("basePower", 0);
+                } else {
+                    bp = 0;
+                }
                 break;
             case "gyroball":
                 bp = 25.0 * getDefender().calculateSpd() / getAttacker().calculateSpd();
@@ -879,7 +918,6 @@ private double calculateBasePower(String move, String type, double bp) {
                     bp = 100;
                 }
                 break;
-            // TODO: Probably many other moves...
         }
 
         if (getAttacker().getAbility().equals("Technician") && bp <= 60) {
@@ -899,18 +937,16 @@ private double calculateBasePower(String move, String type, double bp) {
         return bp;
     }
 
-    private int countStatStages(Pokemon pokemon) {
+    private int countStatStages(Pokemon pokemon, boolean positiveOnly) {
         int count = 0;
         for (int change : pokemon.getStages()) {
-            if (change > 6) {
+            if (change > 6 || !positiveOnly) {
                 count += change - 6;
             }
         }
-
         return count;
     }
 
-
     private void createIndexOfTypeModifiers() {
         // Normal Type
         mEffectivenessStrong.put("Normal", Arrays.asList(new String[]{"Fighting"}));
@@ -1042,7 +1078,7 @@ private void setConditionStatus(FieldConditions conditions, boolean value) {
     }
 
     private String[] getAttackerTypingAfterAbilities(String moveType) {
-        return getAttacker().getAbility().equals("Protean") ? new String[]{moveType} : getAttacker().getType();
+        return getAttacker().getAbility().equals("Protean") ? new String[]{moveType} : getRealTyping(getAttacker());
     }
 
     public void updateDamage() {
diff --git a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
index ef661848..904ba1fd 100644
--- a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
@@ -1,5 +1,6 @@
 package com.pokemonshowdown.app;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -17,9 +18,12 @@
 import android.widget.SeekBar;
 import android.widget.TextView;
 
+import com.pokemonshowdown.data.ItemDex;
 import com.pokemonshowdown.data.Pokemon;
 import com.pokemonshowdown.data.SearchableActivity;
 
+import org.json.JSONObject;
+
 import java.util.Arrays;
 import java.util.Set;
 
@@ -32,6 +36,8 @@ public class PokemonFragment extends DialogFragment {
     public final static String SEARCH_CODE = "Search Code";
     public final static String STAGES = "Stages";
 
+    private TextView mPokemonItem;
+
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
@@ -231,6 +237,24 @@ public void onStopTrackingTouch(SeekBar seekBar) {
             }
         });
 
+        mPokemonItem = (TextView) view.findViewById(R.id.pokemon_fragment_item);
+        String item = getPokemon().getItem();
+        if (getPokemon().getItem() != null && !getPokemon().getItem().isEmpty()) {
+            mPokemonItem.setText(getPokemon().getItem());
+        } else {
+            mPokemonItem.setText(getResources().getString(R.string.pokemon_nohelditem));
+        }
+
+        mPokemonItem.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(getActivity().getApplicationContext(), SearchableActivity.class);
+                intent.putExtra(SearchableActivity.SEARCH_TYPE, SearchableActivity.REQUEST_CODE_SEARCH_ITEM);
+                startActivityForResult(intent, SearchableActivity.REQUEST_CODE_SEARCH_ITEM);
+            }
+        });
+
+        mPokemonItem.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
         initialHP.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
         initialHPText.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
     }
@@ -290,5 +314,21 @@ private void closeFragment() {
         getActivity().getSupportFragmentManager().beginTransaction().remove(this).commit();
     }
 
-
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (resultCode == Activity.RESULT_OK && requestCode == SearchableActivity.REQUEST_CODE_SEARCH_ITEM) {
+            String item = data.getExtras().getString("Search");
+            getPokemon().setItem(item);
+
+            if (mPokemonItem != null) {
+                JSONObject itemObject = ItemDex.get(getActivity()).getItemJsonObject(item);
+                if(itemObject != null) {
+                    int itemDrawable = ItemDex.getItemIcon(getActivity(), item);
+                    mPokemonItem.setCompoundDrawablesWithIntrinsicBounds(itemDrawable != 0 ? getResources().getDrawable(itemDrawable) : null, null, null, null);
+                    item = itemObject.optString("name", item);
+                }
+                mPokemonItem.setText(item);
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/com/pokemonshowdown/data/ItemDex.java b/app/src/main/java/com/pokemonshowdown/data/ItemDex.java
index f93d8660..50888fa5 100644
--- a/app/src/main/java/com/pokemonshowdown/data/ItemDex.java
+++ b/app/src/main/java/com/pokemonshowdown/data/ItemDex.java
@@ -59,7 +59,7 @@ public JSONObject getItemJsonObject(String name) {
         try {
             String item = mItemDexEntries.get(MyApplication.toId(name));
             return new JSONObject(item);
-        } catch (JSONException e) {
+        } catch (NullPointerException | JSONException e) {
             return null;
         }
     }
diff --git a/app/src/main/res/layout/fragment_pokemon.xml b/app/src/main/res/layout/fragment_pokemon.xml
index d4280229..98aa2e72 100644
--- a/app/src/main/res/layout/fragment_pokemon.xml
+++ b/app/src/main/res/layout/fragment_pokemon.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/pokemon_fragment"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:orientation="vertical">
-    
+
     <RelativeLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        >
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/pokemon_icon"
@@ -22,7 +20,7 @@
             android:contentDescription="@string/pokemon_list">
 
         </ImageView>
-        
+
         <ImageButton
             android:id="@+id/pokemon_fragment_functions"
             android:layout_width="wrap_content"
@@ -31,7 +29,7 @@
             android:adjustViewBounds="true"
             android:scaleType="fitEnd"
             android:background="#00FFFFFF"
-            android:contentDescription="@string/pokemon_fragment_description"/>
+            android:contentDescription="@string/pokemon_fragment_description" />
 
         <TextView
             android:id="@+id/pokemon_name"
@@ -41,8 +39,8 @@
             android:layout_alignBottom="@id/pokemon_fragment_functions"
             android:layout_marginLeft="8dp"
             android:gravity="fill_vertical"
-            android:layout_toRightOf="@id/pokemon_icon"/>
-        
+            android:layout_toRightOf="@id/pokemon_icon" />
+
     </RelativeLayout>
 
     <View style="@style/divider" />
@@ -57,7 +55,7 @@
             android:layout_height="wrap_content"
             android:scaleType="fitXY"
             android:adjustViewBounds="true"
-            android:contentDescription="@string/pokemon_list"/>
+            android:contentDescription="@string/pokemon_list" />
 
         <TextView
             android:id="@+id/stats"
@@ -67,7 +65,7 @@
             android:layout_alignTop="@id/pokemon_view"
             android:layout_margin="4dp"
             android:paddingLeft="4dp"
-            android:paddingRight="4dp"/>
+            android:paddingRight="4dp" />
 
         <TextView
             android:layout_height="wrap_content"
@@ -77,10 +75,48 @@
             android:layout_toRightOf="@id/pokemon_view"
             android:layout_margin="4dp"
             android:layout_below="@id/stats"
-            android:layout_gravity="center"/>
+            android:layout_gravity="center" />
 
     </RelativeLayout>
 
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent">
+        <TextView
+            android:id="@+id/pokemon_fragment_item"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            android:background="@drawable/editable_frame"
+            android:ellipsize="marquee"
+            android:gravity="center"
+            android:lines="1"
+            android:padding="1dp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:weightSum="1">
+
+        <SeekBar
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/initial_hp"
+            android:max="100"
+            android:progress="100"
+            android:layout_weight="0.79" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/initial_hp_text"
+            android:text="@string/initial_hp_dialog"
+            android:layout_gravity="center_horizontal" />
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -93,21 +129,21 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:contentDescription="@string/type_1"/>
+            android:contentDescription="@string/type_1" />
 
         <ImageView
             android:id="@+id/type_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:contentDescription="@string/type_2"/>
+            android:contentDescription="@string/type_2" />
 
         <TextView
             android:id="@+id/level"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp"/>
+            android:layout_marginLeft="8dp" />
 
         <ImageView
             android:id="@+id/gender"
@@ -115,7 +151,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:paddingLeft="8dp"
-            android:contentDescription="@string/gender"/>
+            android:contentDescription="@string/gender" />
 
         <TextView
             android:id="@+id/nature"
@@ -123,30 +159,10 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
-            android:background="@drawable/editable_frame"/>
+            android:background="@drawable/editable_frame" />
 
     </LinearLayout>
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:weightSum="1">
-
-        <SeekBar
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/initial_hp"
-            android:max="100"
-            android:progress="100"
-            android:layout_weight="0.79" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/initial_hp_text"
-            android:text="@string/initial_hp_dialog"
-            android:layout_gravity="center_horizontal" />
-    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

From 597211dec3a592acfd59137152cc5dabb90366f9 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 17:21:00 +0100
Subject: [PATCH 11/24] Life Orb. Acrobatics-Flying gem bug.

---
 .../com/pokemonshowdown/app/DmgCalcActivity.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 47eea7a4..63c79ebc 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -597,6 +597,16 @@ private double getSpecialAttackMultiplier(Pokemon pokemon) {
         return baseMultiplier;
     }
 
+    private void modifyDamageWithItem(List<Double> modifiers, String move, String type, String originalType) {
+        String attackerItem =  getAttacker().getItem();
+
+        if("lifeorb".equals(attackerItem)) {
+            modifiers.add(1.3);
+        }
+
+        // Plates. Shattering procutivity in seconds.
+    }
+
     private void modifyDamageWithAbility(List<Double> modifiers, String move, String type, String originalType, String category, boolean usesDefense, boolean hasSecondary) {
         List<String> attackerTyping = Arrays.asList(getAttackerTypingAfterAbilities(type));
         String attackerAbility = getAttacker().getAbility();
@@ -870,7 +880,7 @@ private double calculateBasePower(String move, String type, double bp) {
                 bp = weight < 10.0 ? 20 : weight < 25.0 ? 40 : weight < 50.0 ? 60 : weight < 100.0 ? 80 : weight < 200.0 ? 100 : 120;
                 break;
             case "acrobatics":
-                bp = getDefender().getItem().isEmpty() || getDefender().getItem() == null ? 55 : 110;
+                bp = getAttacker().getItem() == null || getAttacker().getItem().isEmpty() || "flyinggem".equals(getAttacker().getItem()) ? 55 : 110;
                 break;
             case "reversal":
             case "flail":

From 96797c8100e795fc757cb4f5eb194a22483f4d17 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 17:25:36 +0100
Subject: [PATCH 12/24] Implemented: Plates, Muscle Band, Wise Glasses, Ring
 Target, Air Balloon, Expert Belt, Float Stone, Light Metal Heavy Metal,
 Safety Goggles, Deap Sea *, Light Ball, Soul Dew, time-space-orbs, Life Orb,
 Leftovers. Also typing fixes.

---
 .../pokemonshowdown/app/DmgCalcActivity.java  | 172 ++++++++++++++++--
 1 file changed, 153 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 63c79ebc..3070f81c 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -374,7 +374,7 @@ private void calculateDamage(int moveIndex) {
     private int calculateDefendersInitialHP() {
         int baseHP = "Shedinja".equals(getDefender().getName()) ? 1 : getDefender().calculateHP();
         int calculatedHP = getDefender().getHP();
-        List<String> typing = Arrays.asList(getDefender().getType());
+        List<String> typing = Arrays.asList(getRealTyping(getDefender()));
 
         if (mStealthRocksActive && !getDefender().getAbility().equals("Magic Guard")) {
             calculatedHP -= baseHP * (0.125 * calculateWeaknessModifier("stealthrock", "Rock"));
@@ -395,14 +395,14 @@ private int calculateDefendersDamagePerRound() {
         int baseHP = getDefender().calculateHP();
         int damagePerRound = 0;
         String defenderAbility = getDefender().getAbility();
-        List<String> defenderTypes = Arrays.asList(getDefender().getType());
+        List<String> defenderTypes = Arrays.asList(getRealTyping(getDefender()));
 
         // Weather damage
         if ((defenderAbility.equals("Solar Power") || defenderAbility.equals("Dry Skin")) && mActiveWeather == Weather.SUN) {
             damagePerRound += (baseHP * 0.125);
         }
 
-        if (!defenderAbility.equals("Overcoat") && !defenderAbility.equals("Magic Guard")) {
+        if (!defenderAbility.equals("Overcoat") && !defenderAbility.equals("Magic Guard") && !getDefender().getItem().equals("safetygoggles")) {
             if (mActiveWeather == Weather.SAND && !defenderAbility.equals("Sand Veil") && !defenderAbility.equals("Sand Rush") && !defenderAbility.equals("Sand Force") && !defenderTypes.contains("Rock") && !defenderTypes.contains("Steel") && !defenderTypes.contains("Ground")) {
                 damagePerRound += (baseHP / 16);
             } else if (mActiveWeather == Weather.HAIL && !defenderAbility.equals("Ice Body") && !defenderAbility.equals("Snow Cloak") && !defenderTypes.contains("Ice")) {
@@ -410,6 +410,10 @@ private int calculateDefendersDamagePerRound() {
             }
         }
 
+        if(getDefender().getItem().equals("Leftovers")) {
+            damagePerRound -= (baseHP / 16);
+        }
+
         // Weather Healing
         if (defenderAbility.equals("Dry Skin") && mActiveWeather == Weather.RAIN) {
             damagePerRound -= (baseHP * 0.125);
@@ -470,7 +474,7 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
                     boolean usesAttack = "Physical".equals(category);
                     boolean usesDefense = "Physical".equals(category) || "psyshock".equals(move) || "psystrike".equals(move) || "secretsword".equals(move);
 
-                    double attack = "foulplay".equals(move) ? Math.round(getDefender().calculateAtk() * getAtkMultiplier(getAttacker())) : usesAttack ? Math.round(getAttacker().calculateAtk() * getAtkMultiplier(getAttacker())) : getAttacker().calculateSpAtk() * getSpecialAttackMultiplier(getAttacker());
+                    double attack = "foulplay".equals(move) ? Math.round(getDefender().calculateAtk() * getAttackMultiplier(getAttacker())) : usesAttack ? Math.round(getAttacker().calculateAtk() * getAttackMultiplier(getAttacker())) : getAttacker().calculateSpAtk() * getSpecialAttackMultiplier(getAttacker());
                     double defense = usesDefense ? getDefender().calculateDef() * getDefenseMultiplier(getDefender()) : getDefender().calculateSpDef() * getSpecialDefenseMultiplier(getDefender());
                     double base = calculateBasePower(move, type, Double.parseDouble(basePower));
 
@@ -487,7 +491,7 @@ private int calculateDamageRoutine(int moveIndex, double luck, boolean crit) {
                     modifiers.add(mHelpingHandActive ? 1.5 : 1.0);
                     modifiers.add(getSpreadMultiplicator(targets));
                     modifyDamageWithAbility(modifiers, move, type, originalType, category, usesDefense, hasSecondary);
-
+                    modifyDamageWithItem(modifiers, move, type, originalType, category);
                     base = base == 0.0 ? 0 : Math.floor(((2 * getAttacker().getLevel() / 5 + 2) * attack * base / defense) / 50 + 2);
                     return applyDamageModifiers(base, modifiers);
             }
@@ -542,7 +546,7 @@ private int applyDamageModifiers(double base, List<Double> modifiers) {
         return (int) base;
     }
 
-    private double getAtkMultiplier(Pokemon pokemon) {
+    private double getAttackMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
         if (pokemon.getAbility().equals("Huge Power") || pokemon.getAbility().equals("Pure Power")) {
             baseMultiplier *= 2.0;
@@ -560,17 +564,45 @@ private double getAtkMultiplier(Pokemon pokemon) {
             baseMultiplier *= 0.5;
         }
 
+        if ("choiceband".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
+        if ("Pikachu".equals(pokemon.getName()) && "lightball".equals(pokemon.getItem())) {
+            baseMultiplier *= 2.0;
+        }
+
+        if (("Cubone".equals(pokemon.getName()) || "Marowak".equals(pokemon.getName())) && "thickclub".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
         return baseMultiplier;
     }
 
-    private double getSpecialDefenseMultiplier(Pokemon pokemon) {
+    private double getSpecialAttackMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
-        if (pokemon.getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
+        if (mActiveWeather == Weather.SUN && pokemon.getAbility().equals("Solar Power")) {
             baseMultiplier *= 1.5;
         }
 
-        if (Arrays.asList(pokemon.getType()).contains("Rock")) {
+        if ("Defeatist".equals(pokemon.getAbility())) {
+            baseMultiplier *= 0.5;
+        }
+
+        if ("choicespecs".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
+        if ("Clamperl".equals(pokemon.getName()) && "deepseatooth".equals(pokemon.getItem())) {
+            baseMultiplier *= 2.0;
+        }
+
+        if ("Pikachu".equals(pokemon.getName()) && "lightball".equals(pokemon.getItem())) {
+            baseMultiplier *= 2.0;
+        }
+
+        if (("Latios".equals(pokemon.getName()) || "Latias".equals(pokemon.getName())) && "souldew".equals(pokemon.getItem())) {
             baseMultiplier *= 1.5;
         }
 
@@ -580,30 +612,57 @@ private double getSpecialDefenseMultiplier(Pokemon pokemon) {
     private double getDefenseMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
+        if ("eviolite".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
         return baseMultiplier;
     }
 
-    private double getSpecialAttackMultiplier(Pokemon pokemon) {
+    private double getSpecialDefenseMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
-        if (mActiveWeather == Weather.SUN && pokemon.getAbility().equals("Solar Power")) {
+        if (pokemon.getAbility().equals("Flower Gift") && mActiveWeather == Weather.SUN) {
             baseMultiplier *= 1.5;
         }
 
-        if ("Defeatist".equals(pokemon.getAbility())) {
-            baseMultiplier *= 0.5;
+        if (Arrays.asList(pokemon.getType()).contains("Rock")) {
+            baseMultiplier *= 1.5;
+        }
+
+        if ("assaultvest".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
+        if ("Clamperl".equals(pokemon.getName()) && "deepseascale".equals(pokemon.getItem())) {
+            baseMultiplier *= 2.0;
+        }
+
+        if (("Latios".equals(pokemon.getName()) || "Latias".equals(pokemon.getName())) && "souldew".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
+        }
+
+        if ("eviolite".equals(pokemon.getItem())) {
+            baseMultiplier *= 1.5;
         }
 
         return baseMultiplier;
     }
 
-    private void modifyDamageWithItem(List<Double> modifiers, String move, String type, String originalType) {
-        String attackerItem =  getAttacker().getItem();
+    private void modifyDamageWithItem(List<Double> modifiers, String move, String type, String originalType, String category) {
+        String attackerItem = getAttacker().getItem();
 
-        if("lifeorb".equals(attackerItem)) {
+        if ("lifeorb".equals(attackerItem)) {
             modifiers.add(1.3);
         }
 
+        if ("muscleband".equals(attackerItem) && "Physical".equals(category)) {
+            modifiers.add(1.1);
+        }
+
+        if ("wiseglasses".equals(attackerItem) && "Special".equals(category)) {
+            modifiers.add(1.1);
+        }
         // Plates. Shattering procutivity in seconds.
     }
 
@@ -767,7 +826,7 @@ private String[] getRealTyping(Pokemon pokemon) {
                     typing = new String[]{"Ice"};
                     break;
             }
-        } else if("Multitype".equals(pokemon.getAbility()) && pokemon.getName().contains("Arceus")) {
+        } else if ("Multitype".equals(pokemon.getAbility()) && pokemon.getName().contains("Arceus")) {
             JSONObject itemObject = ItemDex.get(this).getItemJsonObject(getAttacker().getItem());
             typing = itemObject == null ? new String[]{"Normal"} : new String[]{itemObject.optString("onPlate", "Normal")};
         }
@@ -787,6 +846,8 @@ private double calculateWeaknessModifier(String move, String type) {
                     modifier = 1.0;
                 } else if (defType.equals("Flying") && mGravityActive) {
                     modifier = 1.0;
+                } else if ("ringtarget".equals(getDefender().getItem())) {
+                    modifier = 1.0;
                 } else {
                     modifier = 0.0;
                 }
@@ -839,8 +900,14 @@ private double calculateWeaknessModifier(String move, String type) {
             modifier *= 0.5;
         }
 
+        if ("airballoon".equals(getDefender().getItem()) && "Ground".equals(type)) {
+            modifier *= 0;
+        }
+
         if (attackerAbility.equals("Tinted Lens") && modifier < 1.0) {
             modifier *= 2.0;
+        } else if ("expertbelt".equals(getAttacker().getItem()) && modifier > 1.0) {
+            modifier *= 1.2;
         }
 
         return modifier;
@@ -876,7 +943,7 @@ private double calculateBasePower(String move, String type, double bp) {
                 break;
             case "lowkick":
             case "grassknot":
-                double weight = getDefender().getWeight();
+                double weight = calcuateWeight(getDefender());
                 bp = weight < 10.0 ? 20 : weight < 25.0 ? 40 : weight < 50.0 ? 60 : weight < 100.0 ? 80 : weight < 200.0 ? 100 : 120;
                 break;
             case "acrobatics":
@@ -889,7 +956,7 @@ private double calculateBasePower(String move, String type, double bp) {
                 break;
             case "heatcrash":
             case "heavyslam":
-                ratio = getDefender().getWeight() / getAttacker().getWeight();
+                ratio = calcuateWeight(getDefender()) / calcuateWeight(getAttacker());
                 bp = ratio <= 0.2 ? 120 : ratio <= 0.25 ? 100 : ratio <= 1 / 3 ? 80 : ratio <= 0.5 ? 60 : 40;
                 break;
             case "crushgrip":
@@ -944,6 +1011,57 @@ private double calculateBasePower(String move, String type, double bp) {
             bp *= 0.5;
         }
 
+        // Items
+        if (getAttacker().getName().equals("Dialga") && getAttacker().getItem().equals("adamantorb") && (type.equals("Dragon") || type.equals("Steel"))) {
+            bp *= 1.2;
+        } else if (getAttacker().getName().equals("Palkia") && getAttacker().getItem().equals("lustrousorb") && (type.equals("Dragon") || type.equals("Water"))) {
+            bp *= 1.2;
+        } else if ((getAttacker().getName().equals("Giratina") || getAttacker().getName().equals("Giratina-Origin")) && getAttacker().getItem().equals("griseousorb") && (type.equals("Dragon") || type.equals("Ghost"))) {
+            bp *= 1.2;
+        }
+
+        if (Arrays.asList(new String[]{"dracoplate", "dragonfang"}).contains(getAttacker().getItem()) && "Dragon".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"earthplate", "softsand"}).contains(getAttacker().getItem()) && "Ground".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"fistplate", "blackbelt"}).contains(getAttacker().getItem()) && "Fighting".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"flameplate", "charcoal"}).contains(getAttacker().getItem()) && "Fire".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"icicleplate", "nevermeltice"}).contains(getAttacker().getItem()) && "Ice".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"insectplate", "silverpowder"}).contains(getAttacker().getItem()) && "Bug".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"ironplate", "metalcoat"}).contains(getAttacker().getItem()) && "Steel".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"meadowplate", "miracleseed", "roseincense"}).contains(getAttacker().getItem()) && "Grass".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"mindplate", "twistedspoon", "oddincense"}).contains(getAttacker().getItem()) && "Psychic".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"pixieplate"}).contains(getAttacker().getItem()) && "Fairy".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"dreadplate", "blackglasses"}).contains(getAttacker().getItem()) && "Dark".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"skyplate", "sharpbeak"}).contains(getAttacker().getItem()) && "Flying".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"splashplate", "mysticwater", "seaincense", "waveincense"}).contains(getAttacker().getItem()) && "Water".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"spookyplate", "spelltag"}).contains(getAttacker().getItem()) && "Ghost".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"stoneplate", "hardstone", "rockincense"}).contains(getAttacker().getItem()) && "Rock".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"toxicplate", "poisonbarb"}).contains(getAttacker().getItem()) && "Poison".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"zapplate", "magnet"}).contains(getAttacker().getItem()) && "Electric".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"silkscarf"}).contains(getAttacker().getItem()) && "Normal".equals(type)) {
+            bp *= 1.2;
+        } else if (Arrays.asList(new String[]{"polkadotbow"}).contains(getAttacker().getItem()) && "Normal".equals(type)) {
+            bp *= 1.125;
+        } else if (Arrays.asList(new String[]{"pinkbow"}).contains(getAttacker().getItem()) && "Normal".equals(type)) {
+            bp *= 1.1;
+        }
+
         return bp;
     }
 
@@ -957,6 +1075,22 @@ private int countStatStages(Pokemon pokemon, boolean positiveOnly) {
         return count;
     }
 
+    private double calcuateWeight(Pokemon pokemon) {
+        double normalWeight = pokemon.getWeight();
+
+        if ("floatstone".equals(pokemon.getItem())) {
+            normalWeight *= 0.5;
+        }
+
+        if ("Light Metal".equals(pokemon.getAbility())) {
+            normalWeight *= 0.5;
+        } else if ("Heavy Metal".equals(pokemon.getAbility())) {
+            normalWeight *= 2.0;
+        }
+
+        return normalWeight;
+    }
+
     private void createIndexOfTypeModifiers() {
         // Normal Type
         mEffectivenessStrong.put("Normal", Arrays.asList(new String[]{"Fighting"}));

From e6d3abd0f17ca4242c6725b77e7cc67b17ed23e4 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 18:02:09 +0100
Subject: [PATCH 13/24] Layout tweaks, refactoring sticky bard support

---
 .../pokemonshowdown/app/DmgCalcActivity.java  | 14 ++++++----
 .../pokemonshowdown/app/PokemonFragment.java  | 14 +++++++---
 app/src/main/res/layout/fragment_pokemon.xml  | 27 +++++++------------
 app/src/main/res/values/strings.xml           |  1 -
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 3070f81c..e2151b30 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -410,10 +410,6 @@ private int calculateDefendersDamagePerRound() {
             }
         }
 
-        if(getDefender().getItem().equals("Leftovers")) {
-            damagePerRound -= (baseHP / 16);
-        }
-
         // Weather Healing
         if (defenderAbility.equals("Dry Skin") && mActiveWeather == Weather.RAIN) {
             damagePerRound -= (baseHP * 0.125);
@@ -427,6 +423,15 @@ private int calculateDefendersDamagePerRound() {
             damagePerRound -= (baseHP / 16);
         }
 
+        //Items
+        if(getDefender().getItem().equals("Leftovers")) {
+            damagePerRound -= (baseHP / 16);
+        }
+
+        if(getDefender().getItem().equals("stickybarb") && !getDefender().getAbility().equals("Magic Guard")) {
+            damagePerRound += baseHP * (0.125);
+        }
+
         return damagePerRound;
     }
 
@@ -663,7 +668,6 @@ private void modifyDamageWithItem(List<Double> modifiers, String move, String ty
         if ("wiseglasses".equals(attackerItem) && "Special".equals(category)) {
             modifiers.add(1.1);
         }
-        // Plates. Shattering procutivity in seconds.
     }
 
     private void modifyDamageWithAbility(List<Double> modifiers, String move, String type, String originalType, String category, boolean usesDefense, boolean hasSecondary) {
diff --git a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
index 904ba1fd..01341af1 100644
--- a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
@@ -214,7 +214,7 @@ public void onClick(DialogInterface dialog, int which) {
 
         int initialHPFraction = (int) (100 * getPokemon().getHP() / (double) getPokemon().calculateHP());
         final TextView initialHPText = (TextView) view.findViewById(R.id.initial_hp_text);
-        initialHPText.setText(getResources().getString(R.string.initial_hp_dialog, initialHPFraction));
+        initialHPText.setText(Integer.toString(initialHPFraction));
 
         final SeekBar initialHP = (SeekBar) view.findViewById(R.id.initial_hp);
         initialHP.setProgress(initialHPFraction);
@@ -222,7 +222,7 @@ public void onClick(DialogInterface dialog, int which) {
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
                 mPokemon.setHP((int) Math.ceil(getPokemon().calculateHP() * (progress / 100.0)));
-                initialHPText.setText(getResources().getString(R.string.initial_hp_dialog, progress));
+                initialHPText.setText(Integer.toString(progress));
                 pokemonStats.setText(getStatsString());
             }
 
@@ -240,7 +240,13 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         mPokemonItem = (TextView) view.findViewById(R.id.pokemon_fragment_item);
         String item = getPokemon().getItem();
         if (getPokemon().getItem() != null && !getPokemon().getItem().isEmpty()) {
-            mPokemonItem.setText(getPokemon().getItem());
+            JSONObject itemObject = ItemDex.get(getActivity()).getItemJsonObject(item);
+            if (itemObject != null) {
+                int itemDrawable = ItemDex.getItemIcon(getActivity(), item);
+                mPokemonItem.setCompoundDrawablesWithIntrinsicBounds(itemDrawable != 0 ? getResources().getDrawable(itemDrawable) : null, null, null, null);
+                item = itemObject.optString("name", item);
+            }
+            mPokemonItem.setText(item);
         } else {
             mPokemonItem.setText(getResources().getString(R.string.pokemon_nohelditem));
         }
@@ -322,7 +328,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             if (mPokemonItem != null) {
                 JSONObject itemObject = ItemDex.get(getActivity()).getItemJsonObject(item);
-                if(itemObject != null) {
+                if (itemObject != null) {
                     int itemDrawable = ItemDex.getItemIcon(getActivity(), item);
                     mPokemonItem.setCompoundDrawablesWithIntrinsicBounds(itemDrawable != 0 ? getResources().getDrawable(itemDrawable) : null, null, null, null);
                     item = itemObject.optString("name", item);
diff --git a/app/src/main/res/layout/fragment_pokemon.xml b/app/src/main/res/layout/fragment_pokemon.xml
index 98aa2e72..089a4e29 100644
--- a/app/src/main/res/layout/fragment_pokemon.xml
+++ b/app/src/main/res/layout/fragment_pokemon.xml
@@ -80,7 +80,7 @@
     </RelativeLayout>
 
     <LinearLayout
-        android:orientation="vertical"
+        android:orientation="horizontal"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
         <TextView
@@ -92,29 +92,22 @@
             android:ellipsize="marquee"
             android:gravity="center"
             android:lines="1"
-            android:padding="1dp" />
-    </LinearLayout>
+            android:padding="1dp"
+            android:layout_gravity="left"
+            android:text="@string/pokemon_nohelditem"/>
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:weightSum="1">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/initial_hp_text" />
 
         <SeekBar
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:id="@+id/initial_hp"
             android:max="100"
-            android:progress="100"
-            android:layout_weight="0.79" />
+            android:progress="100" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/initial_hp_text"
-            android:text="@string/initial_hp_dialog"
-            android:layout_gravity="center_horizontal" />
     </LinearLayout>
 
     <LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69a7781a..a41fe9c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,7 +97,6 @@
     <string name="dmg_is_same">"%1$s, KO in %2$s round(s)</string>
     <string name="dmg_not_same_same_ko">"%1$s - %2$s\nKO in %3$s round(s)</string>
     <string name="dmg_not_same_not_same_ko">%1$s - %2$s\nKO in %3$s to %4$s rounds</string>
-    <string name="initial_hp_dialog">Initial HP: %d%%</string>
 
     <!-- These are for Pokemon List -->
     <string name="pokemon_list">Pokemon List</string>

From d139626027e2a2a00f0758725bfbad0a25228f38 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 18:07:12 +0100
Subject: [PATCH 14/24] Refactor arguments

---
 .../java/com/pokemonshowdown/app/DmgCalcActivity.java     | 2 ++
 .../java/com/pokemonshowdown/app/PokemonFragment.java     | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index e2151b30..e9cbbffa 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -290,6 +290,8 @@ private void loadPokemon(Pokemon pokemon, int searchCode) {
         bundle.putBoolean(PokemonFragment.SEARCH, true);
         bundle.putInt(PokemonFragment.SEARCH_CODE, searchCode);
         bundle.putBoolean(PokemonFragment.STAGES, true);
+        bundle.putBoolean(PokemonFragment.HEALTH, true);
+        bundle.putBoolean(PokemonFragment.ITEMS, true);
         fragment.setArguments(bundle);
         FragmentManager fragmentManager = getSupportFragmentManager();
         fragment.show(fragmentManager, PokemonFragment.PTAG);
diff --git a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
index 01341af1..3752e2f4 100644
--- a/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/PokemonFragment.java
@@ -35,6 +35,8 @@ public class PokemonFragment extends DialogFragment {
     public final static String SEARCH = "Search";
     public final static String SEARCH_CODE = "Search Code";
     public final static String STAGES = "Stages";
+    public final static String ITEMS = "Items";
+    public final static String HEALTH = "Health";
 
     private TextView mPokemonItem;
 
@@ -260,9 +262,9 @@ public void onClick(View view) {
             }
         });
 
-        mPokemonItem.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
-        initialHP.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
-        initialHPText.setVisibility(getArguments().getBoolean(STAGES) ? View.VISIBLE : View.GONE);
+        mPokemonItem.setVisibility(getArguments().getBoolean(ITEMS) ? View.VISIBLE : View.GONE);
+        initialHP.setVisibility(getArguments().getBoolean(HEALTH) ? View.VISIBLE : View.GONE);
+        initialHPText.setVisibility(getArguments().getBoolean(HEALTH) ? View.VISIBLE : View.GONE);
     }
 
     private void addSearchWidget(View view) {

From 0f35b5a5315425268279d957be7a5e1b96290b4c Mon Sep 17 00:00:00 2001
From: namThai <nam.thai.cs@gmail.com>
Date: Sun, 11 Jan 2015 12:17:53 -0500
Subject: [PATCH 15/24] Rayquaza problem

---
 app/src/main/java/com/pokemonshowdown/app/BattleFragment.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java b/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
index a02df127..a4fee145 100644
--- a/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/BattleFragment.java
@@ -2047,7 +2047,7 @@ public void onAnimationStart(Animator animation) {
                         layoutParams.addRule(RelativeLayout.ALIGN_LEFT, getSpriteId(tag));
                         layoutParams.setMargins((int) (imageView.getWidth() * 0.25f), (int) (imageView.getHeight() * 0.5f), 0, 0);
                         relativeLayout.addView(flyingMessage, layoutParams);
-                    } catch (NullPointerException e) {
+                    } catch (Exception e) {
 
                     }
                 }
@@ -2057,7 +2057,7 @@ public void onAnimationEnd(Animator animation) {
                     try {
                         RelativeLayout relativeLayout = (RelativeLayout) getView().findViewById(getPkmLayoutId(tag));
                         relativeLayout.removeView(flyingMessage);
-                    } catch (NullPointerException e) {
+                    } catch (Exception e) {
 
                     }
                 }

From e80d1a0ccd5d59cded6664814399100286a5a31c Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 18:21:34 +0100
Subject: [PATCH 16/24] Eviolite fix.

---
 .../main/java/com/pokemonshowdown/app/DmgCalcActivity.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index e9cbbffa..0bb7c68f 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -14,6 +14,7 @@
 import com.pokemonshowdown.data.FieldFragment;
 import com.pokemonshowdown.data.ItemDex;
 import com.pokemonshowdown.data.MoveDex;
+import com.pokemonshowdown.data.Pokedex;
 import com.pokemonshowdown.data.Pokemon;
 import com.pokemonshowdown.data.SearchableActivity;
 
@@ -404,7 +405,7 @@ private int calculateDefendersDamagePerRound() {
             damagePerRound += (baseHP * 0.125);
         }
 
-        if (!defenderAbility.equals("Overcoat") && !defenderAbility.equals("Magic Guard") && !getDefender().getItem().equals("safetygoggles")) {
+        if (!defenderAbility.equals("Overcoat") && (!defenderAbility.equals("Magic Guard") || !getDefender().getItem().equals("safetygoggles"))) {
             if (mActiveWeather == Weather.SAND && !defenderAbility.equals("Sand Veil") && !defenderAbility.equals("Sand Rush") && !defenderAbility.equals("Sand Force") && !defenderTypes.contains("Rock") && !defenderTypes.contains("Steel") && !defenderTypes.contains("Ground")) {
                 damagePerRound += (baseHP / 16);
             } else if (mActiveWeather == Weather.HAIL && !defenderAbility.equals("Ice Body") && !defenderAbility.equals("Snow Cloak") && !defenderTypes.contains("Ice")) {
@@ -619,7 +620,7 @@ private double getSpecialAttackMultiplier(Pokemon pokemon) {
     private double getDefenseMultiplier(Pokemon pokemon) {
         double baseMultiplier = 1.0;
 
-        if ("eviolite".equals(pokemon.getItem())) {
+        if ("eviolite".equals(pokemon.getItem()) && Pokedex.get(this).getPokemonJSONObject(pokemon.getName()).has("evos")) {
             baseMultiplier *= 1.5;
         }
 
@@ -649,7 +650,7 @@ private double getSpecialDefenseMultiplier(Pokemon pokemon) {
             baseMultiplier *= 1.5;
         }
 
-        if ("eviolite".equals(pokemon.getItem())) {
+        if ("eviolite".equals(pokemon.getItem()) && Pokedex.get(this).getPokemonJSONObject(pokemon.getName()).has("evos")) {
             baseMultiplier *= 1.5;
         }
 

From 65eb3d2d526bedccdbe0d5b43c3a1a8bf8a54dff Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 18:57:53 +0100
Subject: [PATCH 17/24] No more negative rounds til ko.

---
 .../pokemonshowdown/app/DmgCalcActivity.java    | 17 ++++++++++++-----
 app/src/main/res/values/strings.xml             |  4 +++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 0bb7c68f..8374a3d6 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -347,13 +347,19 @@ private void calculateDamage(int moveIndex) {
         int maxHitsTilKo = minDamage == 0 ? 0 : (int) Math.ceil((double) defenderHP / (minDamage + damagePerRound));
         int minHitsTilKo = maxDamage == 0 ? 0 : (int) Math.ceil((double) defenderHP / (maxDamage + damagePerRound));
 
-        String damageText;
+        String damageText = null;
         if (minDamage == maxDamage && minDamage == 0) {
             damageText = String.format("--");
-        } else if (minDamageText.equals(maxDamageText)) {
+        } else if (minDamageText.equals(maxDamageText) && minHitsTilKo > 0) {
             damageText = getResources().getString(R.string.dmg_is_same, minDamageText, minHitsTilKo);
-        } else if (maxHitsTilKo == minHitsTilKo) {
+        } else if (minDamageText.equals(maxDamageText)) {
+            getResources().getString(R.string.dmg_is_same_outhealed, minDamageText);
+        } else if (maxHitsTilKo == minHitsTilKo && minHitsTilKo > 0) {
             damageText = getResources().getString(R.string.dmg_not_same_same_ko, minDamageText, maxDamageText, minHitsTilKo);
+        } else if (minHitsTilKo > 0 && maxHitsTilKo <= 0) {
+            damageText = getResources().getString(R.string.dmg_not_same_not_same__maybe_outhealed, minDamageText, maxDamageText, minHitsTilKo);
+        } else if (minHitsTilKo <= 0 && maxHitsTilKo <= 0) {
+            damageText = getResources().getString(R.string.dmg_not_same_not_same_outhealed, minDamageText, maxDamageText);
         } else {
             damageText = getResources().getString(R.string.dmg_not_same_not_same_ko, minDamageText, maxDamageText, minHitsTilKo, maxHitsTilKo);
         }
@@ -372,6 +378,7 @@ private void calculateDamage(int moveIndex) {
                 ((TextView) findViewById(R.id.move4_result)).setText(damageText);
                 break;
         }
+
     }
 
     private int calculateDefendersInitialHP() {
@@ -427,11 +434,11 @@ private int calculateDefendersDamagePerRound() {
         }
 
         //Items
-        if(getDefender().getItem().equals("Leftovers")) {
+        if (getDefender().getItem().equals("leftovers")) {
             damagePerRound -= (baseHP / 16);
         }
 
-        if(getDefender().getItem().equals("stickybarb") && !getDefender().getAbility().equals("Magic Guard")) {
+        if (getDefender().getItem().equals("stickybarb") && !getDefender().getAbility().equals("Magic Guard")) {
             damagePerRound += baseHP * (0.125);
         }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a41fe9c6..a629981f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,7 +97,9 @@
     <string name="dmg_is_same">"%1$s, KO in %2$s round(s)</string>
     <string name="dmg_not_same_same_ko">"%1$s - %2$s\nKO in %3$s round(s)</string>
     <string name="dmg_not_same_not_same_ko">%1$s - %2$s\nKO in %3$s to %4$s rounds</string>
-
+    <string name="dmg_is_same_outhealed">"%1$s\nYou\'re getting outhealed.</string>
+    <string name="dmg_not_same_not_same_outhealed">%1$s - %2$s\nYou\'re getting outhealed.</string>
+    <string name="dmg_not_same_not_same__maybe_outhealed">%1$s - %2$s\nKO in min. %3$s with a good chance of getting outhealed.</string>
     <!-- These are for Pokemon List -->
     <string name="pokemon_list">Pokemon List</string>
     <string name="pokemon_fragment_description">Depends on the functionality, can be save, search, or empty</string>

From 591d25de4725d03e65db5a334957653a1ec3a623 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Sun, 11 Jan 2015 19:17:38 +0100
Subject: [PATCH 18/24] derp

---
 app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
index 8374a3d6..5b5fdd70 100644
--- a/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
+++ b/app/src/main/java/com/pokemonshowdown/app/DmgCalcActivity.java
@@ -412,7 +412,7 @@ private int calculateDefendersDamagePerRound() {
             damagePerRound += (baseHP * 0.125);
         }
 
-        if (!defenderAbility.equals("Overcoat") && (!defenderAbility.equals("Magic Guard") || !getDefender().getItem().equals("safetygoggles"))) {
+        if (!defenderAbility.equals("Overcoat") && !defenderAbility.equals("Magic Guard") && !getDefender().getItem().equals("safetygoggles")) {
             if (mActiveWeather == Weather.SAND && !defenderAbility.equals("Sand Veil") && !defenderAbility.equals("Sand Rush") && !defenderAbility.equals("Sand Force") && !defenderTypes.contains("Rock") && !defenderTypes.contains("Steel") && !defenderTypes.contains("Ground")) {
                 damagePerRound += (baseHP / 16);
             } else if (mActiveWeather == Weather.HAIL && !defenderAbility.equals("Ice Body") && !defenderAbility.equals("Snow Cloak") && !defenderTypes.contains("Ice")) {

From f3a2a28c55ca068e863f1679d51ee032c4ec2508 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Wed, 14 Jan 2015 01:29:50 +0100
Subject: [PATCH 19/24] Screen doesn't switch to  standby in BattleFragment

---
 app/src/main/res/layout/fragment_battle.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/fragment_battle.xml b/app/src/main/res/layout/fragment_battle.xml
index 67ea2a31..8fa7961d 100644
--- a/app/src/main/res/layout/fragment_battle.xml
+++ b/app/src/main/res/layout/fragment_battle.xml
@@ -1,7 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/battle_general"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:keepScreenOn="true">
 
     <ImageView
         android:id="@+id/battle_background"

From 03387df0b65827c4b26fc21f76a7ab4884b19867 Mon Sep 17 00:00:00 2001
From: Lennart Frick <lennart.frick@gmail.com>
Date: Thu, 15 Jan 2015 13:41:33 +0100
Subject: [PATCH 20/24] setNatureMultiplier-fix

---
 app/src/main/java/com/pokemonshowdown/data/Pokemon.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
index 7dcb1fc7..ccc92f99 100644
--- a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
+++ b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
@@ -1207,6 +1207,7 @@ public float[] getNatureMultiplier() {
     public void setNatureMultiplier(String nature) {
         mNatureMultiplier = new float[6];
         Arrays.fill(mNatureMultiplier, 1.0f);
+
         if (nature.equals("Adamant")) {
             mNatureMultiplier[1] = 1.1f;
             mNatureMultiplier[3] = 0.9f;
@@ -1224,11 +1225,11 @@ public void setNatureMultiplier(String nature) {
             mNatureMultiplier[1] = 0.9f;
         }
         if (nature.equals("Careful")) {
-            mNatureMultiplier[5] = 1.1f;
+            mNatureMultiplier[4] = 1.1f;
             mNatureMultiplier[3] = 0.9f;
         }
         if (nature.equals("Gentle")) {
-            mNatureMultiplier[5] = 1.1f;
+            mNatureMultiplier[4] = 1.1f;
             mNatureMultiplier[2] = 0.9f;
         }
         if (nature.equals("Hasty")) {
@@ -1265,7 +1266,7 @@ public void setNatureMultiplier(String nature) {
         }
         if (nature.equals("Naughty")) {
             mNatureMultiplier[1] = 1.1f;
-            mNatureMultiplier[5] = 0.9f;
+            mNatureMultiplier[4] = 0.9f;
         }
         if (nature.equals("Quiet")) {
             mNatureMultiplier[3] = 1.1f;
@@ -1273,7 +1274,7 @@ public void setNatureMultiplier(String nature) {
         }
         if (nature.equals("Rash")) {
             mNatureMultiplier[3] = 1.1f;
-            mNatureMultiplier[5] = 0.9f;
+            mNatureMultiplier[4] = 0.9f;
         }
         if (nature.equals("Relaxed")) {
             mNatureMultiplier[2] = 1.1f;

From 35363d1133081d66bd9a96d1faa6580b45828d4a Mon Sep 17 00:00:00 2001
From: TeToNN <bouvetcl@gmail.com>
Date: Sat, 17 Jan 2015 19:56:41 +0100
Subject: [PATCH 21/24] Fixing moves not setting back to empty strings
 sometimes (reported by Knots)

---
 .../com/pokemonshowdown/app/TeamBuildingFragment.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java b/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
index 8057fe10..47be687c 100644
--- a/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/app/TeamBuildingFragment.java
@@ -340,6 +340,8 @@ public void onClick(View view) {
                 move1PpTextView.setText("");
                 ImageView move1TypeImageView = (ImageView) convertView.findViewById(R.id.teambuilder_move1_type);
                 move1TypeImageView.setImageDrawable(null);
+                TextView move1NameTextView = (TextView) convertView.findViewById(R.id.teambuilder_move1_name);
+                move1NameTextView.setText("");
             }
 
             if (!pokemon.getMove2().equals("")) {
@@ -365,6 +367,8 @@ public void onClick(View view) {
                 move2PpTextView.setText("");
                 ImageView move2TypeImageView = (ImageView) convertView.findViewById(R.id.teambuilder_move2_type);
                 move2TypeImageView.setImageDrawable(null);
+                TextView move2NameTextView = (TextView) convertView.findViewById(R.id.teambuilder_move2_name);
+                move2NameTextView.setText("");
             }
 
 
@@ -391,6 +395,8 @@ public void onClick(View view) {
                 move3PpTextView.setText("");
                 ImageView move3TypeImageView = (ImageView) convertView.findViewById(R.id.teambuilder_move3_type);
                 move3TypeImageView.setImageDrawable(null);
+                TextView move3NameTextView = (TextView) convertView.findViewById(R.id.teambuilder_move3_name);
+                move3NameTextView.setText("");
             }
 
             if (!pokemon.getMove4().equals("")) {
@@ -416,6 +422,8 @@ public void onClick(View view) {
                 move4PpTextView.setText("");
                 ImageView move4TypeImageView = (ImageView) convertView.findViewById(R.id.teambuilder_move4_type);
                 move4TypeImageView.setImageDrawable(null);
+                TextView move4NameTextView = (TextView) convertView.findViewById(R.id.teambuilder_move4_name);
+                move4NameTextView.setText("");
             }
 
 

From 1605ede822442c2367639a76cf4136f975784708 Mon Sep 17 00:00:00 2001
From: TeToNN <bouvetcl@gmail.com>
Date: Sun, 18 Jan 2015 07:44:40 +0100
Subject: [PATCH 22/24] Fixing neutral gender in export

---
 app/src/main/java/com/pokemonshowdown/data/Pokemon.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
index ccc92f99..a219441c 100644
--- a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
+++ b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
@@ -544,7 +544,9 @@ public String exportPokemon(Context appContext) {
             } else {
                 sb.append(getName());
             }
-            sb.append(" (").append(getGender().toUpperCase()).append(")");
+            if (!getGender().toUpperCase().equals("N")) {
+                sb.append(" (").append(getGender().toUpperCase()).append(")");
+            }
             if (getItem().length() > 0) {
                 JSONObject itemJSon = ItemDex.get(appContext).getItemJsonObject(getItem());
                 if (itemJSon != null) {

From 99b400f0e527be77333b9eaf5c95198470eb4970 Mon Sep 17 00:00:00 2001
From: TeToNN <bouvetcl@gmail.com>
Date: Sun, 18 Jan 2015 21:51:14 +0100
Subject: [PATCH 23/24] Fixing ivs that cant be 0

---
 .../com/pokemonshowdown/data/Pokemon.java     | 49 +++----------------
 1 file changed, 7 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
index a219441c..8b09692d 100644
--- a/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
+++ b/app/src/main/java/com/pokemonshowdown/data/Pokemon.java
@@ -130,41 +130,6 @@ public static Pokemon importPokemon(String importString, Context appContext, boo
         } else {
             pokemonName = pokemonMainData;
         }
-        /*String[] tmpSplit = tmpString.trim().split(" ");
-        switch (tmpSplit.length) {
-            case 1:
-                pokemonName = tmpSplit[0].trim();
-                break;
-
-            case 2:
-                // name (gender)
-                // nickname (name)
-                if (tmpString.contains("(") && tmpString.contains(")")) {
-                    String gender = tmpString.substring(tmpString.indexOf("(") + 1, tmpString.indexOf(")"));
-                    if (gender.equals("M") || gender.equals("F") || gender.equals("N")) {
-                        pokemonGender = gender;
-                        pokemonName = tmpSplit[0].trim();
-                    } else {
-                        //is pokemon name
-                        pokemonNickname = tmpSplit[0].trim();
-                        pokemonName = gender;
-                    }
-                } else {
-                    Log.w(PTAG, "Invalid pokemon name");
-                    return null;
-                }
-                break;
-
-            case 3:
-                // nickname (name) (gender)
-                pokemonNickname = tmpSplit[0].trim();
-                pokemonName = tmpSplit[1].replace("(", "").replace(")", "").trim();
-                pokemonGender = tmpSplit[2].replace("(", "").replace(")", "").trim();
-                break;
-
-            default:
-                return null;
-        }*/
 
         // replace for different formes
         pokemonName = MyApplication.toId(pokemonName);
@@ -644,7 +609,7 @@ public String exportPokemon(Context appContext) {
         // IVS
         difZero = false;
         for (int i : getIVs()) {
-            if (i != 0) {
+            if (i != 31) {
                 difZero = true;
                 break;
             }
@@ -653,13 +618,13 @@ public String exportPokemon(Context appContext) {
             boolean first = true;
 
             sb.append("IVs: ");
-            if (getHPIV() != 0) {
+            if (getHPIV() != 31) {
                 if (first) {
                     sb.append(getHPIV()).append(" HP ");
                     first = false;
                 }
             }
-            if (getAtkIV() != 0) {
+            if (getAtkIV() != 31) {
                 if (first) {
                     sb.append(getAtkIV()).append(" Atk ");
                     first = false;
@@ -667,7 +632,7 @@ public String exportPokemon(Context appContext) {
                     sb.append("/ ").append(getAtkIV()).append(" Atk ");
                 }
             }
-            if (getDefIV() != 0) {
+            if (getDefIV() != 31) {
                 if (first) {
                     sb.append(getDefIV()).append(" Def ");
                     first = false;
@@ -676,7 +641,7 @@ public String exportPokemon(Context appContext) {
                     sb.append("/ ").append(getDefIV()).append(" Def ");
                 }
             }
-            if (getSpAtkIV() != 0) {
+            if (getSpAtkIV() != 31) {
                 if (first) {
                     sb.append(getSpAtkIV()).append(" SpA ");
                     first = false;
@@ -685,7 +650,7 @@ public String exportPokemon(Context appContext) {
                     sb.append("/ ").append(getSpAtkIV()).append(" SpA ");
                 }
             }
-            if (getSpDefIV() != 0) {
+            if (getSpDefIV() != 31) {
                 if (first) {
                     sb.append(getSpDefIV()).append(" SpD ");
                     first = false;
@@ -694,7 +659,7 @@ public String exportPokemon(Context appContext) {
                     sb.append("/ ").append(getSpDefIV()).append(" SpD ");
                 }
             }
-            if (getSpdIV() != 0) {
+            if (getSpdIV() != 31) {
                 if (first) {
                     sb.append(getSpdIV()).append(" Spe ");
                     first = false;

From 9983fa7da9fc70d1092072066de088a372e47e7d Mon Sep 17 00:00:00 2001
From: Mimerme <androssdragonq.9@gmail.com>
Date: Sun, 25 Jan 2015 18:37:44 -0500
Subject: [PATCH 24/24] Update Coding Standards

- changed some variable names
---
 .../com/pokemonshowdown/replays/Replay.java   | 26 +++++--------------
 .../replays/ReplayFragment.java               |  4 +++
 .../replays/RetrieveReplayTask.java           | 12 ++++-----
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/com/pokemonshowdown/replays/Replay.java b/app/src/main/java/com/pokemonshowdown/replays/Replay.java
index cf80b72b..b34bc0ec 100644
--- a/app/src/main/java/com/pokemonshowdown/replays/Replay.java
+++ b/app/src/main/java/com/pokemonshowdown/replays/Replay.java
@@ -15,29 +15,14 @@ public class Replay {
 
     //Each step is an seprate event in-game
     //unformated steps for BattleMessage.java
-    ArrayList<String> mFormatedSteps = new ArrayList<String>();
+    private ArrayList<String> mFormatedSteps = new ArrayList<String>();
     //Speed in milliseconds at which each event of the replay will last
     //if Battle fragment does not handle messages fast enough, possibility of an exception being thrown
-    public long speed;
-
-    private String mPlayer1;
-    private String mPlayer1rank;
-    private String mPlayer2;
-    private String mPlayer2rank;
-    private String mGameType;
-    private String mTier;
-    private boolean mRated;
-
-    public ArrayList<String> rules = new ArrayList<String>();
-    public ArrayList<String> p1Pokemon = new ArrayList<String>();
-    public ArrayList<String> p2Pokemon = new ArrayList<String>();
-    public ArrayList<ArrayList> turns = new ArrayList<ArrayList>();
+    private long mSpeed;
 
     private com.pokemonshowdown.app.BattleFragment mReplayBattleFragment;
     private int mCurrentStep;
 
-    public String getPlayer1(){return mPlayer1;}
-    public String getPlayer2(){return mPlayer2;}
     public ArrayList<String> getSteps(){return mFormatedSteps;}
 
     public static ArrayList<String> getSteps(String replayData){
@@ -45,7 +30,7 @@ public static ArrayList<String> getSteps(String replayData){
         ArrayList<String> formatedSteps = new ArrayList<String>();
         unformatedSteps = replayData.split(System.getProperty("line.separator"));
         for(String str : unformatedSteps){
-            formatedSteps.add(/*str.replaceFirst("\\W", "")*/ str);
+            formatedSteps.add(str);
         }
         return formatedSteps;
     }
@@ -61,6 +46,7 @@ public Replay(String replayData, com.pokemonshowdown.app.BattleFragment replayBa
     }
 
     //Converts the script.log to everything the battle message can understand
+    //Not fully stable
     public static String reformat(String mLine){
         String args[] = mLine.split("\\|");
         //Houses temporary splits when string is reformated
@@ -135,13 +121,13 @@ private void runClock(){
             public void run() {
                 getStep();
             }
-        }, speed);
+        }, mSpeed);
         Log.i("Replay Next Step #", Integer.toString(mCurrentStep));
     }
 
     private void getStep(){
         if(mFormatedSteps.get(mCurrentStep).equalsIgnoreCase("callback|decision")){
-            speed = 1000;
+            mSpeed = 1500;
             mCurrentStep++;
             mReplayBattleFragment.processServerMessage(mFormatedSteps.get(mCurrentStep));
             Log.i("Replay Next Step", mFormatedSteps.get(mCurrentStep));
diff --git a/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java b/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
index bd4089c0..bbbded45 100644
--- a/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
+++ b/app/src/main/java/com/pokemonshowdown/replays/ReplayFragment.java
@@ -51,7 +51,10 @@ public void onDetach() {
     }
 
     public void showReplay(View view) {
+        //User input not supported
+/*
         EditText mEditText = (EditText) view.findViewById(R.id.replayInput);
+*/
 
         RetrieveReplayTask getReplayTask = new RetrieveReplayTask(){
             public void OnResponseRecived(Object obj) {
@@ -65,6 +68,7 @@ public void OnResponseRecived(Object obj) {
                 setUpReplayBattle(battleLog);
             }
         };
+
         getReplayTask.execute("http://pokemonshowdown.com/replay/exeggutorboldalakazam");
     }
 
diff --git a/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java b/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
index 5872e0b2..8fbf64f2 100644
--- a/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
+++ b/app/src/main/java/com/pokemonshowdown/replays/RetrieveReplayTask.java
@@ -18,7 +18,7 @@
  * TODO : Allow cached copies of replays
  */
 public abstract class RetrieveReplayTask extends AsyncTask<String, Void, String> implements ResponseHandler {
-    String html = "";
+    private String mHtml = "";
 
     @Override
     protected String doInBackground(String... url) {
@@ -37,15 +37,15 @@ protected String doInBackground(String... url) {
                 str.append("::" + line);
             }
             in.close();
-            html = str.toString();
-            html = html.substring(html.indexOf("<script type=\"text/plain\" class=\"log\">") + 38);
-            html = html.substring(0, html.indexOf("</script>"));
-            Log.i("Sauce",html);
+            mHtml = str.toString();
+            mHtml = mHtml.substring(mHtml.indexOf("<script type=\"text/plain\" class=\"log\">") + 38);
+            mHtml = mHtml.substring(0, mHtml.indexOf("</script>"));
+            Log.i("Html Sauce",mHtml);
         } catch (IOException e) {
             e.printStackTrace();
         }
 
-        return html;
+        return mHtml;
     }
 
     @Override