Bugfix #39
Merged
Bugfix #39
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…than calculated scores. ---WARNING--- Changes made in a sleepy state, they may not be implemented properly or effectively.
Removed the updateLevel method Added an example of getting modifier to CharacterSheet
+getAthleticProwess
+getDangerEvasion
+getMysticFortitude
+getPhysicalVigor
+getCharisma
Conflicts: MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/PlayerCharacter.java MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/classes/Amazon.java
+ Changed some int arguments to use Weapon instead + Added some documentation to PlayerCharacter + Also fixed some typos in method names in PlayerCharacter.
- Weapon Attribute
- Weapon of Choice checking
+ Added weapon of choice to specialist
+ Added the initializeClass method to ease the burden of switching classes at first.
Conflicts: MazesAndMinotaurs/.idea/misc.xml MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/CharacterSheetFragment.java
Conflicts: MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/PlayerCharacter.java MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/classes/Barbarian.java
+ Added getWeapons method to PlayerCharacter + Fixed issue where PlayerCharacter wouldn't have a weapon equipped.
+ Improved documentation on the PlayerCharacter class
+ Added Saving Functionality + Broken Load Functionality at the moment.
Conflicts: MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/CharacterSheetFragment.java MazesAndMinotaurs/app/src/main/res/layout/fragment_character_sheet.xml
Conflicts: MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/CharacterSheetFragment.java MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/SaveAndLoadDialog.java
* Added javadoc to signature roll(int) * Added method roll(int, int) with javadoc Started to add Amazon PlayerCharacter class.
Massive Equipment Change
…aurs # Conflicts: # MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/MainMazes.java # MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/character/SaveAndLoadPerformer.java # MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/util/Util.java # MazesAndMinotaurs/app/src/main/res/menu/main.xml # MazesAndMinotaurs/app/src/main/res/values/strings.xml # MazesAndMinotaurs/instapk.log
JayTSmith
force-pushed
the
master
branch
2 times, most recently
from
6c066a2 to
396b187
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So, there was a bug in the old pull request that I patched. When the back stack would pop, it would up in the background of the new fragment.