Minor Fixes

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/AttackResultFragment.java

@@ -50,16 +50,16 @@ public void onCreate(Bundle savedInstanceState){
         mPortfolio = Portfolio.get();
         mCurrentCharacter = mPortfolio.getPlayerCharacter(mCurrentCharacterIndex);
 
-        if(mCurrentCharacter.getWeapon().getWeaponType() == R.string.melee){
+        if(mCurrentCharacter.getCurrentWeapon().getWeaponType() == R.string.melee){
             mMod = mCurrentCharacter.getMeleeMod();
         }
-        else if(mCurrentCharacter.getWeapon().getWeaponType() == R.string.missile){
+        else if(mCurrentCharacter.getCurrentWeapon().getWeaponType() == R.string.missile){
             mMod = mCurrentCharacter.getMissileMod();
         }
         else {//this should never happen
             mMod = -10;
         }
-        mAttackType = getString(mCurrentCharacter.getWeapon().getWeaponType());
+        mAttackType = getString(mCurrentCharacter.getCurrentWeapon().getWeaponType());
         mAttackRoll1 = Util.roll(20);
         mAttackRoll2 = Util.roll(20);
         mDamage1 = Util.roll(6);

MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/CharacterSheetFragment.java

@@ -127,10 +127,10 @@ public void onClick(View v){
         });
 
         mAttackType = (TextView) rootView.findViewById(R.id.attack_title_view);
-        mAttackType.setText(mSheetPlayerCharacter.getWeapon().getWeaponType());
+        mAttackType.setText(mSheetPlayerCharacter.getCurrentWeapon().getWeaponType());
 
         mAttackButton = (Button) rootView.findViewById(R.id.attack_button);
-        if(mSheetPlayerCharacter.getWeapon().getWeaponType() == R.string.melee) {
+        if(mSheetPlayerCharacter.getCurrentWeapon().getWeaponType() == R.string.melee) {
             mAttackButton.setText(Integer.toString(mSheetPlayerCharacter.getMeleeMod()));
         }
         else{
@@ -140,7 +140,7 @@ public void onClick(View v){
             @Override
             public void onClick(View v){
                 //just for testing, replace these with calls to character methods
-                int weaponType = mSheetPlayerCharacter.getWeapon().getWeaponType();
+                int weaponType = mSheetPlayerCharacter.getCurrentWeapon().getWeaponType();
                 boolean woc = true;
                 onAttackClick(weaponType, woc);
             }
@@ -149,7 +149,7 @@ public void onClick(View v){
         mEquippedWeaponButton = (Button) rootView.findViewById(R.id.equipped_weapon_button);
         //Get equipped weapon from character Class
         //int equippedWeaponID = R.string.barb_axe;
-        Weapon equippedWeapon = mSheetPlayerCharacter.getWeapon();
+        Weapon equippedWeapon = mSheetPlayerCharacter.getCurrentWeapon();
         Log.i(TAG, equippedWeapon.toString());
         int equippedWeaponID = equippedWeapon.getResId();
         mEquippedWeaponButton.setText(equippedWeaponID);

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

@@ -79,7 +79,7 @@ public class PlayerCharacter {
     /**
      * The character's equipped weapon.
      */
-    private Weapon mWeapon;
+    private Weapon mCurrentWeapon;
 
     /**
      * The helmet that the character is currently wearing.
@@ -306,26 +306,26 @@ public void setShield(Armor shield) {
         mShield = shield;
     }
 
-    public Weapon getWeapon() {
-        return mWeapon;
+    public Weapon getCurrentWeapon() {
+        return mCurrentWeapon;
     }
 
-    public void setWeapon(Weapon weapon) {
-        mWeapon = weapon;
+    public void setCurrentWeapon(Weapon currentWeapon) {
+        mCurrentWeapon = currentWeapon;
     }
 
     /**
-     * Checks if the current weapon in mWeapon is a weapon of choice.
+     * Checks if the current weapon in mCurrentWeapon is a weapon of choice.
      * @return      true if the weapon is the same as the CharClass's weapon of choice else false
      */
     public boolean isWeaponOfChoiceEquipped(){
         if (!(getCharClass() instanceof Magician)) {
             if (getCharClass() instanceof Warrior) {
                 Warrior warrior = (Warrior) getCharClass();
-                return warrior.getWeaponOfChoice().getResId() == getWeapon().getResId();
+                return warrior.getWeaponOfChoice().getResId() == getCurrentWeapon().getResId();
             } else {
                 Specialist specialist = (Specialist) getCharClass();
-                return specialist.getWeaponOfChoice().getResId() == getWeapon().getResId();
+                return specialist.getWeaponOfChoice().getResId() == getCurrentWeapon().getResId();
             }
         }
         return false;
@@ -398,6 +398,19 @@ public void setCharClass(BaseClass aClass) {
     public void initializeClass(){
         getMoney().put(Money.SILVER, getCharClass().getStartMoney());
         getInventory().addAll(getCharClass().getStartGear());
+        setCurrentWeapon(getWeapons().get(0));
+    }
+
+    public ArrayList<Weapon> getWeapons(){
+        ArrayList<Weapon> weaponsFound = new ArrayList<>();
+
+        for (Equipment equipment: getInventory()) {
+            if (equipment instanceof Weapon) {
+                weaponsFound.add((Weapon) equipment);
+            }
+        }
+
+        return weaponsFound;
     }
 
     public int getAge() {