Fully functioning character creation

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/NewCharacter/CreateCharacter.java

@@ -92,7 +92,7 @@ public void afterTextChanged(Editable editable) {
         mWitsButton = (Button) rootView.findViewById(R.id.wits_score_button);
         mWitsButton.setText(Integer.toString(mBaseClass.getCharacter().getScore(Score.WITS).getScore()));
         mLuckButton = (Button) rootView.findViewById(R.id.luck_score_button);
-        mWitsButton.setText(Integer.toString(mBaseClass.getCharacter().getScore(Score.WITS).getScore()));
+        mLuckButton.setText(Integer.toString(mBaseClass.getCharacter().getScore(Score.LUCK).getScore()));
         mWillButton = (Button) rootView.findViewById(R.id.will_score_button);
         mWillButton.setText(Integer.toString(mBaseClass.getCharacter().getScore(Score.WILL).getScore()));
         mGraceButton = (Button) rootView.findViewById(R.id.grace_score_button);

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/NewCharacter/dialogs/DetailDialogFragment.java

@@ -7,7 +7,6 @@
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.AdapterView;
@@ -23,8 +22,10 @@
 import com.example.cis.mazeminotaurs.character.classes.BaseClass;
 import com.example.cis.mazeminotaurs.character.classes.Classes;
 import com.example.cis.mazeminotaurs.character.classes.Magician;
+import com.example.cis.mazeminotaurs.character.classes.Noble;
 import com.example.cis.mazeminotaurs.character.classes.Specialist;
 import com.example.cis.mazeminotaurs.character.classes.Warrior;
+import com.example.cis.mazeminotaurs.character.stats.Score;
 import com.example.cis.mazeminotaurs.util.Util;
 
 /**
@@ -42,6 +43,11 @@ public interface DetailDialogListener {
     Classes mSelectedClass;
     Weapon[] mChoiceWeps;
     Weapon[] mStartWeps;
+
+    // Noble stuff
+    Score mPhysicalHeritage = Score.MIGHT;
+    Score mOtherHeritage = Score.WITS;
+
     // Ints cannot have a null value so this is a replacement for it.
     int mSelectedWeapon = -43762;
     int mSelectedChoiceWep = -43762;
@@ -71,16 +77,53 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
         mChoiceWeps = getChoiceWeapons();
         mStartWeps = getStartWeapons();
 
-        if (mChoiceWeps != null) {
-            System.out.println(mChoiceWeps.toString());
-        }
-        if (mStartWeps != null) {
-            System.out.println(mStartWeps.toString());
+        // Handling class-specific display options
+        if (mSelectedClass == Classes.NOBLE) {
+            Spinner pHeritageSpinner = (Spinner) view.findViewById(R.id.physical_heritage_spinner);
+            Spinner oHeritageSpinner = (Spinner) view.findViewById(R.id.other_heritage_spinner);
+
+            view.findViewById(R.id.physical_heritage_label).setVisibility(View.VISIBLE);
+            view.findViewById(R.id.other_heritage_label).setVisibility(View.VISIBLE);
+            pHeritageSpinner.setVisibility(View.VISIBLE);
+            oHeritageSpinner.setVisibility(View.VISIBLE);
+
+            final ArrayAdapter<Score> pSpinItems = new ArrayAdapter<>(getContext(),
+                    R.layout.support_simple_spinner_dropdown_item);
+            pSpinItems.addAll(Score.getMartialScores());
+            pHeritageSpinner.setAdapter(pSpinItems);
+            pHeritageSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                    mPhysicalHeritage = pSpinItems.getItem(i);
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> adapterView) {
+
+                }
+            });
+
+            final ArrayAdapter<Score> oSpinItems = new ArrayAdapter<>(getContext(),
+                    R.layout.support_simple_spinner_dropdown_item);
+            oSpinItems.addAll(Score.getMentalScores());
+            oHeritageSpinner.setAdapter(oSpinItems);
+            oHeritageSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+                @Override
+                public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
+                    mOtherHeritage = oSpinItems.getItem(i);
+                }
+
+                @Override
+                public void onNothingSelected(AdapterView<?> adapterView) {
+
+                }
+            });
         }
 
         // Populate choice weapons list.
         if (mSelectedClass.getJavaClass().getSuperclass() == Magician.class) {
-            view.findViewById(R.id.choice_weapon_spinner).setEnabled(false);
+            view.findViewById(R.id.choice_weapon_label).setVisibility(View.GONE);
+            view.findViewById(R.id.choice_weapon_spinner).setVisibility(View.GONE);
         } else {
             Spinner choiceSpinner = (Spinner)view.findViewById(R.id.choice_weapon_spinner);
             ArrayAdapter<String> spinItems = new ArrayAdapter<>(getContext(),
@@ -103,13 +146,10 @@ public void onNothingSelected(AdapterView<?> adapterView) {
             } else {
                 spinItems.add(EMPTY_MSG);
                 choiceSpinner.setEnabled(false);
-
-                view.findViewById(R.id.choice_weapon_label).setVisibility(View.GONE);
-                choiceSpinner.setVisibility(View.GONE);
             }
         }
 
-        final Spinner startSpinner = (Spinner) view.findViewById(R.id.start_weapon_spinner);
+        Spinner startSpinner = (Spinner) view.findViewById(R.id.start_weapon_spinner);
         ArrayAdapter<String> spinItems = new ArrayAdapter<>(getContext(),
                 R.layout.support_simple_spinner_dropdown_item);
         startSpinner.setAdapter(spinItems);
@@ -235,7 +275,6 @@ public void onClick(DialogInterface dialogInterface, int i) {
 
                 if (instance != null) {
                     // Safely swaps the default weapon from default constructor
-                    //TODO: Add exception for null values aka Hunter.
                     try {
                         instance.getStartGear().remove(instance.getPossibleStartWeapons()[0]);
                         Equipment oldAmmo = Util.getAmmo(instance.getPossibleStartWeapons()[0]);
@@ -264,6 +303,11 @@ public void onClick(DialogInterface dialogInterface, int i) {
                     instance.setCharacter(new PlayerCharacter());
                     instance.getCharacter().setCharClass(instance);
                     instance.getCharacter().initializeClass();
+
+                    if (instance instanceof Noble) {
+                        ((Noble) instance).doHeritage(mPhysicalHeritage, mOtherHeritage);
+                    }
+
                     mListener.onDialogPositiveClick(instance);
                 }
             }

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/classes/Noble.java

@@ -21,6 +21,10 @@
 public class Noble extends Warrior implements Level {
     private ArrayList<HashMap<Score, Integer>> mScoreLevelChoice = new ArrayList<>();
 
+    private Score mPhysicalHeritage = Score.MIGHT;
+    private Score mOtherHeritage = Score.WITS;
+    private boolean mHasHeritage = false;
+
     public Noble() {
         this(null,null,null,null);
     }
@@ -34,24 +38,11 @@ public Noble(PlayerCharacter playerCharacter, Weapon weaponOfChoice, Score marti
                 EquipmentDB.getInstance().getWeapon(R.string.sword),
         });
 
-        Score martialScore;
-        if (martialHeritage != null && (martialHeritage.equals(Score.MIGHT) || martialHeritage.equals(Score.SKILL))) {
-            martialScore = martialHeritage;
-        } else {
-            martialScore = Score.MIGHT;
-        }
-        // Noble - Heroic Heritage
-        Score mentalScore;
-        if (mentalHeritage != null &&
-                (mentalHeritage.equals(Score.WITS) ||
-                        mentalHeritage.equals(Score.WILL) ||
-                        mentalHeritage.equals(Score.GRACE))) {
-            mentalScore = mentalHeritage;
-        } else {
-            mentalScore = Score.WITS;
-        }
+        // Noble-Specific things
+        mPhysicalHeritage = martialHeritage;
+        mOtherHeritage = mentalHeritage;
 
-        Score[] primAttrs = {martialScore, Score.LUCK};
+        Score[] primAttrs = {mPhysicalHeritage, Score.LUCK};
         ArrayList<Score> primAttributes = new ArrayList<>();
         Collections.addAll(primAttributes, primAttrs);
 
@@ -77,14 +68,8 @@ public Noble(PlayerCharacter playerCharacter, Weapon weaponOfChoice, Score marti
         setStartMoney(rolledGold);
         setStartGear(startGear);
 
-        // TODO find a way to get around this hack-y method.
-        /* Explanation
-            If the Noble is chosen for the new character it will crash due to a lack of
-            Character. However, we still need access to the code of the constructor.
-         */
         if (getCharacter() != null) {
-            getCharacter().getScore(martialScore).setScore(getCharacter().getScore(martialScore).getScore() + 2);
-            getCharacter().getScore(mentalScore).setScore(getCharacter().getScore(mentalScore).getScore() + 2);
+            doHeritage();
         }
     }
 
@@ -162,8 +147,34 @@ public void doLevelDown() {
         }
     }
 
-    public void doHeritage(Score physical, Score mental) {
+    private void doHeritage() {
+        doHeritage(mPhysicalHeritage, mOtherHeritage);
+    }
 
+    public void doHeritage(Score physical, Score other) {
+        if (!hasHeritage()) {
+            Score realPhysical;
+            if (physical != null &&
+                    (physical.equals(Score.MIGHT) || physical.equals(Score.SKILL))) {
+                realPhysical = physical;
+            } else {
+                realPhysical = Score.MIGHT;
+            }
+            AttributeScore pScore = getCharacter().getScore(realPhysical);
+            pScore.setScore(pScore.getScore() + 2);
+            setPhysicalHeritage(physical);
+
+            Score realOther;
+            if (other != null &&
+                    (other.equals(Score.WITS) || other.equals(Score.WILL) || other.equals(Score.GRACE))) {
+                realOther = other;
+            } else {
+                realOther = Score.WITS;
+            }
+            AttributeScore oScore = getCharacter().getScore(realOther);
+            oScore.setScore(oScore.getScore() + 2);
+            setOtherHeritage(other);
+        }
     }
 
     public int getBattleFortuneBonus() {
@@ -177,4 +188,28 @@ public ArrayList<HashMap<Score, Integer>> getScoreLevelChoice() {
     public void setScoreLevelChoice(ArrayList<HashMap<Score, Integer>> scoreLevelChoice) {
         this.mScoreLevelChoice = scoreLevelChoice;
     }
+
+    public Score getPhysicalHeritage() {
+        return mPhysicalHeritage;
+    }
+
+    public void setPhysicalHeritage(Score physicalHeritage) {
+        mPhysicalHeritage = physicalHeritage;
+    }
+
+    public Score getOtherHeritage() {
+        return mOtherHeritage;
+    }
+
+    public void setOtherHeritage(Score otherHeritage) {
+        mOtherHeritage = otherHeritage;
+    }
+
+    public boolean hasHeritage() {
+        return mHasHeritage;
+    }
+
+    public void setHasHeritage(boolean hasHeritage) {
+        mHasHeritage = hasHeritage;
+    }
 }

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/stats/Score.java

@@ -1,14 +1,34 @@
 package com.example.cis.mazeminotaurs.character.stats;
 
+import com.example.cis.mazeminotaurs.R;
+
 /**
  * Created by jusmith on 3/30/17.
  */
 
 public enum Score {
-    MIGHT,
-    GRACE,
-    SKILL,
-    WILL,
-    WITS,
-    LUCK;
+    MIGHT(R.string.might),
+    GRACE(R.string.grace),
+    SKILL(R.string.skill),
+    WILL(R.string.will),
+    WITS(R.string.wits),
+    LUCK(R.string.luck);
+
+    private int mResId;
+
+    Score(int resId) {
+        mResId = resId;
+    }
+
+    public int getResId() {
+        return mResId;
+    }
+
+    public static Score[] getMentalScores() {
+        return new Score[]{WILL, WITS, GRACE};
+    }
+
+    public static Score[] getMartialScores() {
+        return new Score[]{MIGHT, SKILL};
+    }
 }

MazesAndMinotaurs/app/src/main/res/layout/dialog_class_selection.xml

@@ -2,7 +2,8 @@
 <GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+    >
 
     <TextView
         android:id="@+id/fixed_class_label"
@@ -61,4 +62,38 @@
         android:layout_column="1"
         android:layout_row="3"/>
 
+    <TextView
+        android:id="@+id/physical_heritage_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_row="4"
+        android:text="@string/physical_heritage"
+        android:visibility="gone"/>
+
+    <Spinner
+        android:id="@+id/physical_heritage_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_column="1"
+        android:layout_row="4"
+        android:visibility="gone"/>
+
+    <TextView
+        android:id="@+id/other_heritage_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_column="0"
+        android:layout_row="5"
+        android:text="@string/other_heritage"
+        android:visibility="gone"/>
+
+    <Spinner
+        android:id="@+id/other_heritage_spinner"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_column="1"
+        android:layout_row="5"
+        android:visibility="gone"/>
+
 </GridLayout>

MazesAndMinotaurs/app/src/main/res/values/strings.xml

@@ -57,6 +57,8 @@
     <string name="class_word">Class: </string>
     <string name="weapon_of_choice">Weapon of Choice: </string>
     <string name="starting_weapon">Starting Weapon: </string>
+    <string name="physical_heritage">Physical Heritage: </string>
+    <string name="other_heritage">Other Heritage: </string>
 
 
     <!-- Attribute Edit Dialog -->