From 15ea308a42b1208aaf47c60c053d917ed2023cd9 Mon Sep 17 00:00:00 2001
From: Negue <eugen.bolz@gmail.com>
Date: Mon, 3 Oct 2016 22:47:02 +0200
Subject: [PATCH] Apply avatar transformations (if items available) / update
 gradle

---
 Habitica/AndroidManifest.xml                  |   5 ++
 Habitica/assets/migrations/Habitica/28.sql    |   1 +
 Habitica/build.gradle                         |   4 +-
 .../res/layout/activity_skill_members.xml     |  18 ++++
 Habitica/res/layout/skill_list_item.xml       |  34 ++++---
 Habitica/res/values/strings.xml               |   2 +
 .../android/habitica/HabitDatabase.java       |   2 +-
 .../habitica/components/AppComponent.java     |   3 +
 .../events/commands/SelectMemberCommand.java  |   9 ++
 .../ui/activities/SkillMemberActivity.java    |  83 ++++++++++++++++++
 .../ui/adapter/SkillsRecyclerViewAdapter.java |  10 ++-
 .../PartyMemberRecyclerViewAdapter.java       |  17 ++--
 .../ui/fragments/skills/SkillsFragment.java   |  60 ++++++++++++-
 .../social/party/PartyMemberListFragment.java |   2 +-
 .../habitrpgwrapper/lib/models/Buffs.java     |   3 +
 .../habitrpgwrapper/lib/models/Items.java     |  16 ++++
 .../habitrpgwrapper/lib/models/Skill.java     |   4 +-
 .../lib/models/SpecialItems.java              |  61 +++++++++++++
 .../lib/utils/SkillDeserializer.java          |  13 ++-
 gradle/wrapper/gradle-wrapper.jar             | Bin 53636 -> 53324 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +-
 gradlew                                       |  46 +++++-----
 gradlew.bat                                   |   8 +-
 23 files changed, 345 insertions(+), 61 deletions(-)
 create mode 100644 Habitica/assets/migrations/Habitica/28.sql
 create mode 100644 Habitica/res/layout/activity_skill_members.xml
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
 create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
 create mode 100644 Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 5aeda4e9a..d36a69485 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -65,6 +65,11 @@
             android:label="@string/app_name"
             android:screenOrientation="portrait">
         </activity>
+        <activity
+            android:name=".ui.activities.SkillMemberActivity"
+            android:label="@string/app_name"
+            android:screenOrientation="portrait">
+        </activity>
 
         <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
 
diff --git a/Habitica/assets/migrations/Habitica/28.sql b/Habitica/assets/migrations/Habitica/28.sql
new file mode 100644
index 000000000..31235203d
--- /dev/null
+++ b/Habitica/assets/migrations/Habitica/28.sql
@@ -0,0 +1 @@
+ALTER TABLE Items ADD COLUMN 'special_id' INTEGER;
\ No newline at end of file
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 31f6af158..4e4b3c61e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     dependencies {
         classpath 'io.fabric.tools:gradle:1.21.5'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
-        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4'
+        classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
     }
@@ -171,8 +171,6 @@ android {
             debuggable true
             // Disable fabric build ID generation for debug builds
             ext.enableCrashlytics = false
-            multiDexEnabled true
-
             resValue "string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider"
             resValue "string", "app_name", "Habitica Debug"
         }
diff --git a/Habitica/res/layout/activity_skill_members.xml b/Habitica/res/layout/activity_skill_members.xml
new file mode 100644
index 000000000..ae8b57eba
--- /dev/null
+++ b/Habitica/res/layout/activity_skill_members.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbarSize="3dp"
+        android:scrollbarThumbVertical="@color/md_grey_500"
+
+        android:scrollbars="vertical" />
+
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/skill_list_item.xml b/Habitica/res/layout/skill_list_item.xml
index d572528b8..48c43de4b 100644
--- a/Habitica/res/layout/skill_list_item.xml
+++ b/Habitica/res/layout/skill_list_item.xml
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/CardView.Default"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    style="@style/CardView.Default">
+    android:layout_height="wrap_content">
+
     <LinearLayout
+        style="@style/CardContent"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        style="@style/CardContent">
+        android:orientation="horizontal">
 
         <ImageView
+            android:id="@+id/skill_image"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:id="@+id/skill_image"
             android:layout_gravity="center_vertical" />
 
         <LinearLayout
-            android:orientation="vertical"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
+            android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dp"
+            android:layout_weight="1"
             android:gravity="center_vertical"
-            android:layout_gravity="center_vertical">
+            android:orientation="vertical">
 
             <TextView
+                android:id="@+id/skill_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:id="@+id/skill_text" />
+                android:textAppearance="?android:attr/textAppearanceLarge" />
 
             <TextView
                 android:id="@+id/skill_notes"
@@ -37,13 +38,18 @@
         </LinearLayout>
 
         <Button
+            android:id="@+id/price_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/price_button"
-            android:background="@color/brand_100"
-            android:textColor="@android:color/white"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dp" />
+            android:background="@color/brand_100"
+            android:drawableLeft="@drawable/ic_header_magic"
+            android:drawableStart="@drawable/ic_header_magic"
+            android:paddingLeft="16dp"
+            android:paddingStart="16dp"
+            android:paddingRight="24dp"
+            android:paddingEnd="24dp"
+            android:textColor="@android:color/white" />
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 4a66ad065..234899388 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -133,6 +133,7 @@
 
     <string name="mana_price_button" formatted="false">%d MP</string>
     <string name="used_skill" formatted="false">You used %1$s for %2$d mana.</string>
+    <string name="used_skill_without_mana" formatted="false">You used %1$s.</string>
     <string name="new_checklist_item">new checklist item</string>
     <string name="add_checklist_item">Add</string>
 
@@ -413,5 +414,6 @@ To start, which parts of your life do you want to improve?</string>
     <string name="widget_habit_button">Habitica Do Habit</string>
     <string name="widget_dailies">Habitica Dailies</string>
     <string name="widget_add_task">Habitica Add Task</string>
+    <string name="skill_transformation_use">use</string>
 
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
index 83a45a18c..85b321c93 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabitDatabase.java
@@ -7,5 +7,5 @@ public class HabitDatabase {
 
     public static final String NAME = "Habitica";
 
-    public static final int VERSION = 27;
+    public static final int VERSION = 28;
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
index 14faffe08..e15232b84 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
@@ -17,6 +17,7 @@ import com.habitrpg.android.habitica.ui.activities.MaintenanceActivity;
 import com.habitrpg.android.habitica.ui.activities.PartyInviteActivity;
 import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
 import com.habitrpg.android.habitica.ui.activities.SetupActivity;
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
 import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
@@ -90,6 +91,8 @@ public interface AppComponent {
 
     void inject(SkillTasksActivity skillTasksActivity);
 
+    void inject(SkillMemberActivity skillMembersActivity);
+
     void inject(TaskFormActivity taskFormActivity);
 
     void inject(TasksFragment tasksFragment);
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
new file mode 100644
index 000000000..2d25e8488
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/events/commands/SelectMemberCommand.java
@@ -0,0 +1,9 @@
+package com.habitrpg.android.habitica.events.commands;
+
+public class SelectMemberCommand {
+    public String MemberId;
+
+    public SelectMemberCommand(String memberId){
+        MemberId = memberId;
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
new file mode 100644
index 000000000..8c37b3d59
--- /dev/null
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillMemberActivity.java
@@ -0,0 +1,83 @@
+package com.habitrpg.android.habitica.ui.activities;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+
+import com.habitrpg.android.habitica.APIHelper;
+import com.habitrpg.android.habitica.R;
+import com.habitrpg.android.habitica.components.AppComponent;
+import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
+import com.habitrpg.android.habitica.ui.adapter.social.PartyMemberRecyclerViewAdapter;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import javax.inject.Inject;
+
+import butterknife.BindView;
+
+public class SkillMemberActivity extends BaseActivity {
+
+    private PartyMemberRecyclerViewAdapter viewAdapter;
+
+    @BindView(R.id.recyclerView)
+    RecyclerView recyclerView;
+
+    @Inject
+    public APIHelper apiHelper;
+
+    @Override
+    protected int getLayoutResId() {
+        return R.layout.activity_skill_members;
+    }
+
+    @Override
+    protected void injectActivity(AppComponent component) {
+        component.inject(this);
+    }
+
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        EventBus.getDefault().register(this);
+
+        loadMemberList();
+    }
+
+    private void loadMemberList() {
+
+        recyclerView.setLayoutManager(new LinearLayoutManager(this));
+        viewAdapter = new PartyMemberRecyclerViewAdapter();
+        viewAdapter.context = this;
+        recyclerView.setAdapter(viewAdapter);
+
+        apiHelper.apiService.getGroup("party")
+                .compose(this.apiHelper.configureApiCallObserver())
+                .subscribe(group -> {
+                            if (group == null) {
+                                return;
+                            }
+
+                            apiHelper.apiService.getGroupMembers(group.id, true)
+                                    .compose(apiHelper.configureApiCallObserver())
+                                    .subscribe(members -> {
+                                                viewAdapter.setMemberList(members, true);
+                                            },
+                                            throwable -> {
+                                            });
+                        },
+                        throwable -> {
+                        });
+    }
+
+    @Subscribe
+    public void onEvent(SelectMemberCommand evt){
+        Intent resultIntent = new Intent();
+        resultIntent.putExtra("member_id", evt.MemberId);
+        setResult(Activity.RESULT_OK, resultIntent);
+        finish();
+    }
+}
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
index 0113eb9ac..907a5b5b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/SkillsRecyclerViewAdapter.java
@@ -89,7 +89,15 @@ public class SkillsRecyclerViewAdapter extends RecyclerView.Adapter<SkillsRecycl
             this.skill = skill;
             skillNameTextView.setText(skill.text);
             skillNotesTextView.setText(skill.notes);
-            priceButton.setText(String.format(context.getResources().getString(R.string.mana_price_button), skill.mana));
+
+            if(skill.isSpecialItem){
+                priceButton.setText(R.string.skill_transformation_use);
+
+                priceButton.setCompoundDrawables(null, null,null,null);
+            } else  {
+                priceButton.setText(skill.mana+"");
+                priceButton.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_header_magic, 0,0,0);
+            }
             DataBindingUtils.loadImage(skillImageView, "shop_" + skill.key);
 
             if (skill.mana > mana) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
index c2dfff0d6..fbf80b6b1 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java
@@ -3,14 +3,13 @@ package com.habitrpg.android.habitica.ui.adapter.social;
 import com.habitrpg.android.habitica.R;
 import com.habitrpg.android.habitica.databinding.ValueBarBinding;
 import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
+import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
 import com.habitrpg.android.habitica.ui.AvatarView;
 import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
-import com.habitrpg.android.habitica.ui.activities.SetupActivity;
 import com.habitrpg.android.habitica.ui.helpers.ViewHelper;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 
 import android.content.Context;
-import android.content.Intent;
 import android.content.res.Resources;
 import android.databinding.DataBindingUtil;
 import android.support.v4.content.ContextCompat;
@@ -32,9 +31,11 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
     public Context context;
     private List<HabitRPGUser> memberList;
+    private boolean isMemberSelection;
 
-    public void setMemberList(List<HabitRPGUser> memberList) {
+    public void setMemberList(List<HabitRPGUser> memberList, boolean isMemberSelection) {
         this.memberList = memberList;
+        this.isMemberSelection = isMemberSelection;
         this.notifyDataSetChanged();
     }
 
@@ -129,9 +130,15 @@ public class PartyMemberRecyclerViewAdapter extends RecyclerView.Adapter<PartyMe
 
             itemView.setClickable(true);
             itemView.setOnClickListener(view -> {
-                OpenFullProfileCommand cmd = new OpenFullProfileCommand(user.getId());
+                if (isMemberSelection) {
+                    SelectMemberCommand cmd = new SelectMemberCommand(user.getId());
 
-                EventBus.getDefault().post(cmd);
+                    EventBus.getDefault().post(cmd);
+                } else {
+                    OpenFullProfileCommand cmd = new OpenFullProfileCommand(user.getId());
+
+                    EventBus.getDefault().post(cmd);
+                }
             });
         }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
index b55083df3..dcc223116 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
@@ -6,12 +6,14 @@ import com.habitrpg.android.habitica.callbacks.SkillCallback;
 import com.habitrpg.android.habitica.components.AppComponent;
 import com.habitrpg.android.habitica.events.SkillUsedEvent;
 import com.habitrpg.android.habitica.events.commands.UseSkillCommand;
+import com.habitrpg.android.habitica.ui.activities.SkillMemberActivity;
 import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
 import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter;
 import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment;
 import com.habitrpg.android.habitica.ui.helpers.UiUtils;
 import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
 import com.magicmicky.habitrpgwrapper.lib.models.Skill;
+import com.magicmicky.habitrpgwrapper.lib.models.SpecialItems;
 import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse;
 import com.raizlabs.android.dbflow.sql.builder.Condition;
 import com.raizlabs.android.dbflow.sql.language.Select;
@@ -37,6 +39,8 @@ import rx.Observable;
 public class SkillsFragment extends BaseMainFragment {
 
     private final int TASK_SELECTION_ACTIVITY = 10;
+    private final int MEMBER_SELECTION_ACTIVITY = 11;
+
     @BindView(R.id.recyclerView)
     RecyclerView mRecyclerView;
     SkillsRecyclerViewAdapter adapter;
@@ -86,6 +90,42 @@ public class SkillsFragment extends BaseMainFragment {
                 .and(Condition.column("lvl").lessThanOrEq(user.getStats().getLvl()))
                 .queryList();
         adapter.setSkillList(skills);
+
+
+        SpecialItems specialItems = this.user.getItems().getSpecial();
+        if (specialItems != null) {
+            Condition.In specialsWhere = Condition.column("key").in("");
+
+            if (specialItems.getSnowball() > 1) {
+                specialsWhere.and("snowball");
+            }
+
+            if (specialItems.getShinySeed() > 1) {
+                specialsWhere.and("shinySeed");
+            }
+
+            if (specialItems.getSeafoam() > 1) {
+                specialsWhere.and("seafoam");
+            }
+
+            if (specialItems.getSpookySparkles() > 1) {
+                specialsWhere.and("spookySparkles");
+            }
+
+            List<Skill> specials = new Select()
+                    .from(Skill.class)
+                    .where(specialsWhere)
+                    .queryList();
+
+            for (Skill item : specials) {
+                item.isSpecialItem = true;
+                item.target = "party";
+
+                skills.add(item);
+            }
+        }
+
+        adapter.setSkillList(skills);
     }
 
     @Override
@@ -98,7 +138,12 @@ public class SkillsFragment extends BaseMainFragment {
     @Subscribe
     public void onEvent(UseSkillCommand command) {
         Skill skill = command.skill;
-        if (skill.target.equals("task")) {
+
+        if (skill.isSpecialItem) {
+            selectedSkill = skill;
+            Intent intent = new Intent(activity, SkillMemberActivity.class);
+            startActivityForResult(intent, MEMBER_SELECTION_ACTIVITY);
+        } else if (skill.target.equals("task")) {
             selectedSkill = skill;
             Intent intent = new Intent(activity, SkillTasksActivity.class);
             startActivityForResult(intent, TASK_SELECTION_ACTIVITY);
@@ -113,7 +158,12 @@ public class SkillsFragment extends BaseMainFragment {
         Skill skill = event.usedSkill;
         adapter.setMana(event.newMana);
         StringBuilder message = new StringBuilder();
-        message.append(activity.getString(R.string.used_skill, skill.text, skill.mana));
+        if (skill.isSpecialItem) {
+            message.append(activity.getString(R.string.used_skill_without_mana));
+        } else {
+            message.append(activity.getString(R.string.used_skill, skill.text, skill.mana));
+        }
+
         if (event.xp != 0) {
             message.append(" + ").append(round(event.xp, 2)).append(" XP");
         }
@@ -140,6 +190,12 @@ public class SkillsFragment extends BaseMainFragment {
                 }
                 break;
             }
+            case (MEMBER_SELECTION_ACTIVITY): {
+                if (resultCode == Activity.RESULT_OK) {
+                    useSkill(selectedSkill, data.getStringExtra("member_id"));
+                }
+                break;
+            }
         }
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
index 6eaabc2ea..63a973b41 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java
@@ -67,7 +67,7 @@ public class PartyMemberListFragment extends BaseFragment {
 
     public void setMemberList(List<HabitRPGUser> members) {
         this.members = members;
-        viewAdapter.setMemberList(members);
+        viewAdapter.setMemberList(members,  false);
     }
 
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java
index badedd3d1..489a70876 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Buffs.java
@@ -81,5 +81,8 @@ public class Buffs extends BasicStats {
         super.merge(stats);
         this.snowball = stats.snowball != null ? stats.snowball : this.snowball;
         this.streaks = stats.streaks != null ? stats.streaks : this.streaks;
+        this.seafoam = stats.seafoam != null ? stats.seafoam : this.seafoam;
+        this.shinySeed = stats.shinySeed != null ? stats.shinySeed : this.shinySeed;
+        this.spookySparkles = stats.spookySparkles != null ? stats.spookySparkles : this.spookySparkles;
     }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java
index acf9bc44f..e9ae07230 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Items.java
@@ -43,6 +43,12 @@ public class Items extends BaseModel {
             foreignColumnName = "user_id")})
     private Gear gear;
 
+    @Column
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "special_id",
+            columnType = String.class,
+            foreignColumnName = "user_id")})
+    private SpecialItems special;
+
     public Items(String currentMount, String currentPet, int lastDrop_count, Date lastDrop_date) {
         this.currentMount = currentMount;
         this.currentPet = currentPet;
@@ -93,6 +99,14 @@ public class Items extends BaseModel {
         this.gear = gear;
     }
 
+    public SpecialItems getSpecial() {
+        return special;
+    }
+
+    public void setSpecial(SpecialItems specialItems) {
+        this.special = specialItems;
+    }
+
     public String getUser_id() {
         return user_id;
     }
@@ -152,6 +166,8 @@ public class Items extends BaseModel {
     @Override
     public void save() {
         gear.user_id = user_id;
+        special.user_id = user_id;
+
         super.save();
     }
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
index fe115630d..a348195b7 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/Skill.java
@@ -7,7 +7,7 @@ import com.raizlabs.android.dbflow.annotation.Table;
 import com.raizlabs.android.dbflow.structure.BaseModel;
 
 
-@Table(databaseName = HabitDatabase.NAME, allFields = true)
+@Table(databaseName = HabitDatabase.NAME)
 public class Skill extends BaseModel {
 
     @Column
@@ -20,5 +20,5 @@ public class Skill extends BaseModel {
     @Column
     public Integer mana, lvl;
 
-
+    public boolean isSpecialItem;
 }
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java
new file mode 100644
index 000000000..8be17b7e9
--- /dev/null
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/SpecialItems.java
@@ -0,0 +1,61 @@
+package com.magicmicky.habitrpgwrapper.lib.models;
+
+
+import com.habitrpg.android.habitica.HabitDatabase;
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.NotNull;
+import com.raizlabs.android.dbflow.annotation.PrimaryKey;
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.raizlabs.android.dbflow.structure.BaseModel;
+
+@Table(databaseName = HabitDatabase.NAME)
+public class SpecialItems extends BaseModel {
+    @Column
+    @PrimaryKey
+    @NotNull
+    String user_id;
+
+    @Column
+    @NotNull
+    int seafoam, shinySeed, snowball, spookySparkles;
+
+    public String getUser_id() {
+        return user_id;
+    }
+
+    public void setUser_id(String user_id) {
+        this.user_id = user_id;
+    }
+
+    public int getSeafoam() {
+        return seafoam;
+    }
+
+    public void setSeafoam(int seafoam) {
+        this.seafoam = seafoam;
+    }
+
+    public int getShinySeed() {
+        return shinySeed;
+    }
+
+    public void setShinySeed(int shinySeed) {
+        this.shinySeed = shinySeed;
+    }
+
+    public int getSnowball() {
+        return snowball;
+    }
+
+    public void setSnowball(int snowball) {
+        this.snowball = snowball;
+    }
+
+    public int getSpookySparkles() {
+        return spookySparkles;
+    }
+
+    public void setSpookySparkles(int spookySparkles) {
+        this.spookySparkles = spookySparkles;
+    }
+}
diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
index 6b0991465..a8c571949 100644
--- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
+++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/SkillDeserializer.java
@@ -28,9 +28,7 @@ public class SkillDeserializer
         for (Map.Entry<String, JsonElement> classEntry : object.entrySet()) {
             String classname = classEntry.getKey();
             JsonObject classObject = classEntry.getValue().getAsJsonObject();
-            if (classname.equals("special")) {
-                continue;
-            }
+
             for (Map.Entry<String, JsonElement> skillEntry : classObject.entrySet()) {
                 JsonObject skillObject = skillEntry.getValue().getAsJsonObject();
                 Skill skill = new Skill();
@@ -41,7 +39,14 @@ public class SkillDeserializer
                 skill.target = skillObject.get("target").getAsString();
                 skill.habitClass = classname;
                 skill.mana = skillObject.get("mana").getAsInt();
-                skill.lvl = skillObject.get("lvl").getAsInt();
+
+                JsonElement lvlElement = skillObject.get("lvl");
+
+                if(lvlElement != null)
+                {
+                    skill.lvl = lvlElement.getAsInt();
+                }
+
                 skills.add(skill);
             }
         }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 13372aef5e24af05341d49695ee84e5f9b594659..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644
GIT binary patch
delta 5483
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
DmjXp=

delta 5698
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
a`S}6G2=BXz24K7XEFe2bM|!LA#OgoRqI8J>

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e34758aec..ca07d7521 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
-#Mon Sep 12 12:48:06 CEST 2016
+#Thu Sep 29 20:11:45 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
-org.gradle.jvmargs=-Xmx3072M
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
diff --git a/gradlew b/gradlew
index 9d82f7891..27309d923 100755
--- a/gradlew
+++ b/gradlew
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
diff --git a/gradlew.bat b/gradlew.bat
index aec99730b..f6d5974e7 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,7 +46,7 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
 if "%@eval[2+2]" == "4" goto 4NT_args