Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed Equipment #38

Merged
merged 259 commits into from
Nov 1, 2017
Merged
Changes from 1 commit
Commits
Show all changes
259 commits
Select commit Hold shift + click to select a range
a87431e
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 5, 2017
59b3722
+ Changed Character class to PlayerCharacter
Apr 5, 2017
da35948
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 7, 2017
4a3abbc
+ Changed getCoreStatScore to getScore
Apr 7, 2017
83957e3
+ Modified LevelUp and LevelDown to restore the proper scores rather …
Apr 10, 2017
7d1ef55
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 13, 2017
0d2bde8
Removed the EffectiveLevel property from BaseClass
Apr 13, 2017
250c314
+ Added methods for saving throws in PlayerCharacter.java
Apr 16, 2017
904454a
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 16, 2017
ac9ee74
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 18, 2017
e8dc8ed
Merge branch 'master' of https://github.com/JayTSmith/mazes_and_minot…
Apr 18, 2017
86f56e6
+ Added the Equipment functionality to Barbarian
Apr 20, 2017
a2ec89b
+ Added the equipment functionality to the PlayerCharacter
Apr 20, 2017
6683563
+ Fixed more typos
Apr 20, 2017
28fde6c
+ Changed Portfolio to work with the new method of Character Creation
Apr 20, 2017
22d86c8
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 20, 2017
4a2a6d1
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 24, 2017
dcf49f4
+ Changed mWeapon to mCurrentWeapon
Apr 24, 2017
91b9c46
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 25, 2017
786684d
+ Made getHitTotal function properly
Apr 25, 2017
a96a1d7
+ Removed initialization from PlayerCharacter's constructor.
Apr 25, 2017
519e43f
Merge https://github.com/CIS-Extra/mazes_and_minotaurs
Apr 25, 2017
0c01dcb
Merge branch 'master' of https://github.com/JayTSmith/mazes_and_minot…
Apr 25, 2017
09ed5d3
+ Added GSON lib.
May 9, 2017
7b02b97
Merge https://github.com/CIS-Extra/mazes_and_minotaurs into development
May 9, 2017
7cb8a2a
Fixed loading functionality.
May 10, 2017
7d11444
Added javadoc for SaveAndLoadPerformer
May 10, 2017
e772845
Merge https://github.com/CIS-Extra/mazes_and_minotaurs into development
May 10, 2017
e5331b3
Finished commit.
May 10, 2017
d439588
Changed and added methods to the Util class.
May 15, 2017
e5dff23
Finished with Amazon
May 15, 2017
ee3eb67
Created Centaur (should be ready to implement).
May 15, 2017
7646396
Fixed bugged gold for Amazon and Barb.
May 15, 2017
92de2ca
Created and added Noble
May 15, 2017
5487495
Added and Created Spearman class.
May 15, 2017
eec6f59
Added Battle Fortune to Noble.
May 15, 2017
4ec399f
Setup project on new PC.
JayTSmith Sep 8, 2017
f53c723
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 8, 2017
b06443c
Fully implemented Centaur.
JayTSmith Sep 8, 2017
9b39523
Fully implemented Thief.
JayTSmith Sep 11, 2017
3576fdd
Created Hunter and fully implemented!
JayTSmith Sep 11, 2017
f6f3e2c
Moved getSpecialTalent to Specialist.java
JayTSmith Sep 11, 2017
08758d5
Removed getSpecialTalent from the respective classes.
JayTSmith Sep 11, 2017
a194f37
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 11, 2017
2575374
Added new values.
JayTSmith Sep 12, 2017
ce459f6
Renamed the values.
JayTSmith Sep 12, 2017
2676256
Resolved the TODOs in the code.
JayTSmith Sep 12, 2017
b354d92
Fixed a typo.
JayTSmith Sep 12, 2017
ec95ff5
Removed methods that are inside of the Level Interface, and made getL…
JayTSmith Sep 12, 2017
7e1cf79
Fixed issue #2.
JayTSmith Sep 12, 2017
4e2087a
Added functionality to Patron.
JayTSmith Sep 12, 2017
1e85a40
Fixed Specialist lacking the Level Descriptions.
JayTSmith Sep 12, 2017
7293ca1
Added the instance field for possibleStartWeapons to BaseClass
JayTSmith Sep 13, 2017
e800c12
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 13, 2017
7097c18
Merge branch 'master' into exposure
JayTSmith Sep 13, 2017
eff6621
Updated Barbarian to new format.
JayTSmith Sep 13, 2017
7f965aa
Added the instance field mPossibleWeaponsOfChoice to Warrior.
JayTSmith Sep 13, 2017
fdbe7ca
Changed how Amazon would validate starting weapon.
JayTSmith Sep 13, 2017
c83bd08
Changed Warrior so it would still weaponOfChoice even if argument was…
JayTSmith Sep 13, 2017
1299f0c
Changed Amazon and Barbarian to remove their checking of weaponOfChoice.
JayTSmith Sep 13, 2017
4e19561
Centaur has been brought up-to-date.
JayTSmith Sep 13, 2017
741409c
Noble has been brought up-to-date.
JayTSmith Sep 13, 2017
e8db4bb
Spearman has been brought up-to-date.
JayTSmith Sep 13, 2017
b8d0ffa
Added instance field mPossibleWeaponsOfChoice to Specialist.
JayTSmith Sep 13, 2017
9e0ab4c
Hunter has been brought up-to-date.
JayTSmith Sep 13, 2017
85c6349
Thief has been brought up-to-date.
JayTSmith Sep 13, 2017
31bd8a9
Added safe-checking to Specialist's setWeaponOfChoice
JayTSmith Sep 13, 2017
8c0f346
All available Magicans classes have been brought up-to-date.
JayTSmith Sep 13, 2017
f75c8f0
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 14, 2017
d27db45
Fixed bug with App Crash
JayTSmith Sep 14, 2017
0169ee4
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 14, 2017
7499c0b
Fixed EDC issue where it could return the incorrect values.
JayTSmith Sep 14, 2017
c85f73a
Added Patreon instance field to PlayerCharacter
JayTSmith Sep 14, 2017
799f9c2
Created res/dialog_class_selection.xml
JayTSmith Sep 15, 2017
b68b587
Created the layout of dialog_class_selection.xml
JayTSmith Sep 15, 2017
913eab2
Created the layout of dialog_class_selection.xml
JayTSmith Sep 15, 2017
d9baac9
Created DetailFragment class
JayTSmith Sep 15, 2017
4c80358
Have a very rough version of the new dialog working.
JayTSmith Sep 15, 2017
1809e9e
Still a rough version but slightly improved.
JayTSmith Sep 15, 2017
7961e69
Added a blank construcutor for all subclasses of BaseClass.
JayTSmith Sep 18, 2017
3656988
Added values into the Classes Enum
JayTSmith Sep 18, 2017
6bcbeb2
Created a custom adapter.
JayTSmith Sep 19, 2017
5905a15
Created the layout for weapons in a spinner.
JayTSmith Sep 19, 2017
7b06207
Finalized the layout of the spinner items
JayTSmith Sep 19, 2017
b9a8ca5
Added getters
JayTSmith Sep 19, 2017
009b549
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 19, 2017
8db7102
Changed startGold to startMoney.
JayTSmith Sep 19, 2017
bc5e321
Fixed a massive issue regarding scope in the character package.
JayTSmith Sep 19, 2017
3ec3423
Incomplete update for editing attribute values on the character
JayTSmith Sep 20, 2017
c198a02
Added the ability to edit the Might score.
JayTSmith Sep 20, 2017
24a44e5
Added the edit ability to the rest of the attribute scores.
JayTSmith Sep 20, 2017
80c454f
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 20, 2017
057046b
Modified the layout of attribute editing dialog.
JayTSmith Sep 20, 2017
5503a00
Merge branch 'friday-rough-launch'
JayTSmith Sep 20, 2017
0b8cdca
Merge branch 'master' into create-character
JayTSmith Sep 20, 2017
eb22613
Added the proper values for the labels on the CharacterSheet.
JayTSmith Sep 20, 2017
d8145f7
Adding mCurrentHits functionality.
JayTSmith Sep 20, 2017
2ac02f1
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 21, 2017
1446dfd
Merge branch 'master' into friday-fixup
JayTSmith Sep 21, 2017
8d6136c
Rearranged the layout of the Attribute edit dialog to fix issues of c…
JayTSmith Sep 21, 2017
13d7498
Merge branch 'master' into friday-fixup
JayTSmith Sep 21, 2017
99822ee
Added safe-checking when getting a value from the dialog.
JayTSmith Sep 21, 2017
7e79214
Fixed an issue where it would refresh the UI regardless of change.
JayTSmith Sep 21, 2017
74da8a4
Added value checking onto the setCurHits method of PlayerCharacter.
JayTSmith Sep 21, 2017
c1499f4
Moved StatChangeFragment to fragments package.
JayTSmith Sep 21, 2017
159e2e1
Created the HitsChangeFragment class
JayTSmith Sep 21, 2017
76123fc
Fixed an issue where newInstance wasn't exposed.
JayTSmith Sep 21, 2017
52a2afb
Added the ability to edit hits on the character sheet.
JayTSmith Sep 21, 2017
26394d7
The user can change hits now on the character sheet.
JayTSmith Sep 21, 2017
2ba3113
Fixed an issue causing a crash every time the HitsDialog popped up
JayTSmith Sep 21, 2017
0a220d9
Fixed an issue causing a crash every time the HitsDialog's confirm bu…
JayTSmith Sep 21, 2017
4d62633
Fixed setCurHits allowing bad values.
JayTSmith Sep 21, 2017
d95c2f6
Removed debugPrintScores function from PlayerCharacter.
JayTSmith Sep 21, 2017
4080307
Reformatted some code.
JayTSmith Sep 21, 2017
c73d142
PlayerCharacter now updates curHits when initalizeClass is called.
JayTSmith Sep 21, 2017
c84a1df
Removed unused instance fields from Util.
JayTSmith Sep 21, 2017
1558087
Removed a todo.
JayTSmith Sep 21, 2017
76f0f82
Added a getter for the instance field weapons.
JayTSmith Sep 21, 2017
9435986
MID-WORK COMMIT - This is to simply save work.
JayTSmith Sep 21, 2017
417aa62
Weapon of Choice is now checked when making an attack.
JayTSmith Sep 21, 2017
26d7294
Melee bonus is now properly updated in the GUI.
JayTSmith Sep 21, 2017
3918e09
Merge branch 'friday-fixup'
JayTSmith Sep 21, 2017
67570e5
Disabled some stuff to disable crashing.
JayTSmith Sep 21, 2017
d3bed5b
Merge branch 'master' into create-character
JayTSmith Sep 25, 2017
5142359
Changed the textView's id to make it more unique.
JayTSmith Sep 25, 2017
a7a0345
Implemented a working version of the DetailedDialog.
JayTSmith Sep 25, 2017
396b27c
Removed the WeaponArrayAdapter.
JayTSmith Sep 25, 2017
ef92662
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 25, 2017
437bd24
Merge branch 'master' into create-character
JayTSmith Sep 25, 2017
ae368d7
Updated values in strings.xml
JayTSmith Sep 25, 2017
513bec6
Fixed values in layout and strings.xml
JayTSmith Sep 25, 2017
5498106
Changed layout to simple support layout.
JayTSmith Sep 25, 2017
357edcd
Added safe checking to event handlers in DetailDialog.
JayTSmith Sep 26, 2017
7f623ee
Added a default constructor for Priest.
JayTSmith Sep 26, 2017
00e3f38
Rearranged constructor args to be fitting with other code.
JayTSmith Sep 26, 2017
67c909c
Added getAmmo to Util.
JayTSmith Sep 26, 2017
6c8dd98
Removed unused imports.
JayTSmith Sep 26, 2017
2d24c98
Made getAmmo static.
JayTSmith Sep 26, 2017
e1e9a49
Changed constructors that had RangedWeapons involved in startGear.
JayTSmith Sep 26, 2017
699ea11
Made the dialog swap out the starting weapon with chosen starting wea…
JayTSmith Sep 26, 2017
e504b11
Fixed the error where Centaur would start with weaponOfChoice.
JayTSmith Sep 26, 2017
2340649
Made the dialog properly create an instance with filled in values.
JayTSmith Sep 27, 2017
12e5240
Binded a PlayerCharacter to the newly created instance.
JayTSmith Sep 27, 2017
f8e0d66
Modified the listener's interface.
JayTSmith Sep 27, 2017
d20b508
Made BaseClass serializable.
JayTSmith Sep 27, 2017
5b54ed7
Made a rough version of passing character between the dialog and sheet.
JayTSmith Sep 27, 2017
b8e0bfc
Added throwing knife as a weapon
JayTSmith Sep 27, 2017
57c51c6
Removed System.out statements.
JayTSmith Sep 27, 2017
4eb88ae
Added some error handling to the dialog.
JayTSmith Sep 27, 2017
bc1b646
Fixed bug where the class wasn't fully initialized.
JayTSmith Sep 27, 2017
85569b6
Feature complete, able to transfer newly created character to sheet.
JayTSmith Sep 27, 2017
189a4e3
Removed invalid weapon, "mace".
JayTSmith Sep 27, 2017
ce052c4
Added null handling Noble.
JayTSmith Sep 27, 2017
fe207f5
Added a Club Entry.
JayTSmith Sep 27, 2017
707cfc4
Fixed Noble crash potential.
JayTSmith Sep 27, 2017
f947b83
Implemented the new dialog for all of the classes.
JayTSmith Sep 27, 2017
8202a06
Added more error-handling into the code.
JayTSmith Sep 28, 2017
3cabd50
Merge pull request #22 from JayTSmith/create-character
JayTSmith Sep 28, 2017
3728702
Removed outdated variables.
JayTSmith Sep 28, 2017
22be32f
Fixed a bug where the CreateCharacter and CharcterSheetFragment would…
JayTSmith Sep 28, 2017
23a43ec
Moved most of the code to fill in the fragment into a seperate method.
JayTSmith Sep 28, 2017
ce40d72
Removed unused code.
JayTSmith Sep 28, 2017
0143168
Allows the active character to be perserved after the character changes.
JayTSmith Sep 28, 2017
5d88f5b
Merge pull request #23 from JayTSmith/create-character
JayTSmith Sep 28, 2017
35257c9
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 28, 2017
135fd64
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Sep 28, 2017
90ae4f5
Merge remote-tracking branch 'origin/master'
JayTSmith Sep 28, 2017
b6dd52c
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Oct 2, 2017
20cb7a0
Resolved issue with merge.
JayTSmith Oct 2, 2017
092f056
Added value for Priest.
JayTSmith Oct 2, 2017
20babdf
Added handling in case there is no possible starting weapon.
JayTSmith Oct 2, 2017
f661866
Added handling for lack of a weapon
JayTSmith Oct 2, 2017
920af94
Added handling for the dialog for lack of a weapon as well.
JayTSmith Oct 2, 2017
342bb58
fixed issue #24, discovered issue #25, and fixed issue #25
JayTSmith Oct 2, 2017
6eece21
Removed statements related to debuggging.
JayTSmith Oct 3, 2017
14aeb8e
Added helper methods,
JayTSmith Oct 3, 2017
11e2552
Changed the choice weapon spinner to hide if the user selects a Magic…
JayTSmith Oct 4, 2017
bfc710f
Added resIds to Score enum.
JayTSmith Oct 4, 2017
75791ad
Now have a working implentmention of Noble Heritage.
JayTSmith Oct 4, 2017
d417800
Cleaned up some of the code related to Noble creation.
JayTSmith Oct 4, 2017
78e11a9
Added safe checking to doHeritage.
JayTSmith Oct 4, 2017
1417c84
Merge pull request #26 from JayTSmith/create-character
JayTSmith Oct 4, 2017
2dad760
#27 fixed
JayTSmith Oct 4, 2017
21d6b6d
Merge pull request #28 from JayTSmith/create-character
JayTSmith Oct 4, 2017
94faeb7
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Oct 4, 2017
d40e4d2
Merge remote-tracking branch 'origin/master'
JayTSmith Oct 4, 2017
e002dc4
Created DetailedWeaponAdapater
JayTSmith Oct 12, 2017
f39893b
Changed DeteailedWeaponAdapter to subclass BaseAdapter.
JayTSmith Oct 12, 2017
a5e7086
CreatedlLayout for individual spinner items for DetailedWeaponAdapter
JayTSmith Oct 12, 2017
fe1ef7c
Exposed some code to make it easier to implement.
JayTSmith Oct 12, 2017
ce15ab5
Added the ability to change active weapon. Issue #11 fixed.
JayTSmith Oct 12, 2017
ecb3bf5
Added handling for null values.
JayTSmith Oct 12, 2017
a175d94
Fixed #30.
JayTSmith Oct 12, 2017
c18f71d
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Oct 13, 2017
c36a5b6
Simplified SaveAndLoadPerformer
JayTSmith Oct 16, 2017
f7e8a9a
Changed name to fit with conventions.
JayTSmith Oct 16, 2017
ae7ede8
Added layout for character spinner items.
JayTSmith Oct 16, 2017
7875580
Added save icon.
JayTSmith Oct 16, 2017
70ad237
Added action item, "Save Portfolio".
JayTSmith Oct 16, 2017
6235abc
Added methods to serialize Portfolio.
JayTSmith Oct 16, 2017
d739886
Reverted SaveAndLoadPerformer
JayTSmith Oct 17, 2017
1a8ba75
Seperated SaveAndLoadPerformer and CharacterSerializer
JayTSmith Oct 17, 2017
fab7faf
Added RuntimeTypeAdapterFactory.
JayTSmith Oct 17, 2017
1128db7
Fixed with solution located at https://github.com/google/gson/issues/712
JayTSmith Oct 17, 2017
63f1f2f
Serialization should finally work as intended aside from issue #34.
JayTSmith Oct 18, 2017
35f5d35
Added ability to handle failed load.
JayTSmith Oct 18, 2017
d5428f4
Labeled certain methods and classes as deprecated
JayTSmith Oct 18, 2017
b6a6baa
Added the ability to handle polymorphism in Equipment objects.
JayTSmith Oct 18, 2017
5662b12
Replaced multiple gson creations with static one(s).
JayTSmith Oct 18, 2017
64923d5
Created CharacterAdapter
JayTSmith Oct 18, 2017
4c0978d
Added functionality to CharacterAdapter
JayTSmith Oct 18, 2017
89af542
Added a character select screen.
JayTSmith Oct 18, 2017
4202de5
Added a character delete screen.
JayTSmith Oct 19, 2017
f8290a2
The list nows updates when a character is deleted.
JayTSmith Oct 19, 2017
d04a642
Merge pull request #35 from JayTSmith/saving-loading
JayTSmith Oct 19, 2017
9ecb9a7
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Oct 19, 2017
99cc219
Fixed #34
JayTSmith Oct 19, 2017
c71ef76
Merge pull request #37 from JayTSmith/saving-loading
JayTSmith Oct 19, 2017
1666d8c
Fixed improper melee mod value.
JayTSmith Oct 23, 2017
b458a35
Armor is now automatically equipped if a class starts with armor.
JayTSmith Oct 23, 2017
37c01c4
Added functionality to save and load EquipmentDB.
JayTSmith Oct 23, 2017
0cf2f24
EquipmentDB is now saved on startup.
JayTSmith Oct 23, 2017
2a493f3
EquipmentDB is now saveable.
JayTSmith Oct 23, 2017
1c7caa6
Hotfix: Portfolio and EquipmentDB not loaded on startup.
JayTSmith Oct 23, 2017
8c3e77b
Created spinner layout for Equipment.
JayTSmith Oct 23, 2017
ea2afea
Added an inventory screen. (Accessable through the Save Sinet button.)
JayTSmith Oct 23, 2017
6fec360
Moved code related to serialization to its own package.
JayTSmith Oct 24, 2017
4295d53
Moved equipment strings to util.CommonStrings
JayTSmith Oct 25, 2017
a5f655a
Changed the EquipmentDB to use values from util.CommonStrings.
JayTSmith Oct 25, 2017
415d3fb
Fixed classes to work with EquipmentDB's changes.
JayTSmith Oct 25, 2017
10bd56c
Fixed the rest of the code to work with the changes.
JayTSmith Oct 25, 2017
90d0549
Added helper methods for EquipmentDB. (Weapon, Armor, Equipment)
JayTSmith Oct 25, 2017
52b8b9c
Merge pull request #42 from JayTSmith/saving-loading (Fixes #41)
JayTSmith Oct 25, 2017
a5da9e6
Merge branch 'master' of https://github.com/CIS-Extra/mazes_and_minot…
JayTSmith Oct 25, 2017
e752d79
Merge branch 'master' into sheet
JayTSmith Oct 25, 2017
e516780
Fixed InventoryAdapter for Equipment Change
JayTSmith Oct 26, 2017
375c42a
Refactored some code to fix serialization issues. (mWeaponType -> mIs…
JayTSmith Oct 26, 2017
3b16992
Fixed inventory fragment after the weapon change.
JayTSmith Oct 26, 2017
331b429
Added an message for the inventory screen explaining what to do.
JayTSmith Oct 26, 2017
7a60ed8
Added resource values for magician classes' talents.
JayTSmith Oct 26, 2017
d9c228d
Magician's talent will now be displayed. (Fixes #14)
JayTSmith Oct 26, 2017
d1d6d0b
Made getPowerPoints abstract.
JayTSmith Oct 26, 2017
0ddd8d6
Fixed #38
JayTSmith Oct 26, 2017
7ab0ad8
Added a method to reset the data.
JayTSmith Oct 30, 2017
ed63328
Fixed the portfolio reset.
JayTSmith Oct 30, 2017
f21ec8f
Added the function to reset the EquipmentDB. Fixed #44
JayTSmith Oct 30, 2017
a8e7291
Added backstack features.
JayTSmith Oct 30, 2017
4e61b1e
Fixed #40
JayTSmith Oct 31, 2017
fb83b25
Moved clearBackStack to Util class.
JayTSmith Oct 31, 2017
8d3db15
Added the inventory screen. (Fixed #6)
JayTSmith Oct 31, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Conflicts:
	MazesAndMinotaurs/app/src/main/java/com/example/cis/mazeminotaurs/CharacterSheetFragment.java
	MazesAndMinotaurs/app/src/main/res/layout/fragment_character_sheet.xml
JayTSmith committed May 9, 2017
commit 7b02b97484fdb409591bc141dc9544e459466d00
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@

import com.example.cis.mazeminotaurs.character.PlayerCharacter;
import com.example.cis.mazeminotaurs.character.SaveAndLoadDialog;
import com.example.cis.mazeminotaurs.character.classes.Magician;
import com.example.cis.mazeminotaurs.character.stats.Score;
import com.example.cis.mazeminotaurs.util.Util;

@@ -223,6 +224,38 @@ public void onClick(View v) {
onSaveCharacterClick();
}
});
mMagicTitleView = (TextView) rootView.findViewById(R.id.magic_title_view);
mTalentBonusTitleView = (TextView) rootView.findViewById(R.id.talent_bonus_title_view);
mMagicStrengthTitleView = (TextView) rootView.findViewById(R.id.magic_strength_title_view);
mTotalPowerTitleView = (TextView) rootView.findViewById(R.id.total_power_title_view);
mCurrentPowerTitleView = (TextView) rootView.findViewById(R.id.current_power_title_view);

mTalentBonusButton = (Button) rootView.findViewById(R.id.talent_bonus_button);
mTalentBonusButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

}
});
mMagicStrengthButton = (Button) rootView.findViewById(R.id.magic_strength_button);
mTotalPowerButton = (Button) rootView.findViewById(R.id.total_power_button);
mCurrentPowerButton = (Button) rootView.findViewById(R.id.current_power_button);

//this variable for testing only! should normally be set to false!!!
boolean testing = false;
if (mSheetPlayerCharacter.getCharClass() instanceof Magician || testing == true){
mMagicTitleView.setVisibility(View.VISIBLE);
mTalentBonusTitleView.setVisibility(View.VISIBLE);
mMagicStrengthTitleView.setVisibility(View.VISIBLE);
mTotalPowerTitleView.setVisibility(View.VISIBLE);
mCurrentPowerTitleView.setVisibility(View.VISIBLE);

mTalentBonusButton.setVisibility(View.VISIBLE);
mMagicStrengthButton.setVisibility(View.VISIBLE);
mTotalPowerButton.setVisibility(View.VISIBLE);
mCurrentPowerButton.setVisibility(View.VISIBLE);

}

return rootView;
}
Original file line number Diff line number Diff line change
@@ -386,10 +386,6 @@
android:textAlignment="center"
android:textSize="24sp"/>
</TableRow>
<TableRow>
<Button android:id="@+id/save_button"
android:text="SAVE SINET"/>
</TableRow>
</TableLayout>

<TableLayout
@@ -499,7 +495,10 @@
android:textAlignment="center"
android:textSize="24sp"/>
</TableRow>

<TableRow>
<Button android:id="@+id/save_button"
android:text="SAVE SINET"/>
</TableRow>
</TableLayout>

<TextView
You are viewing a condensed version of this merge commit. You can view the full changes here.