LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V0.2.0: Cleaned up equip code(pending integration with KindOfMisc super)

Browse Source
This commit is contained in:
Evan Debenham 2014-08-29 13:54:28 -04:00
parent 72be421d93
commit d84ed470cd
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/Artifact.java
View File

@ -47,7 +47,13 @@ public class Artifact extends KindofMisc {
if (hero.belongings.misc1 != null && hero.belongings.misc2 != null) { if (hero.belongings.misc1 != null && hero.belongings.misc2 != null) {
GLog.w("you can only wear 2 rings at a time"); GLog.w("you can only wear 2 misc items at a time");
return false;
} else if (hero.belongings.misc1.getClass() == this.getClass()
|| hero.belongings.misc2.getClass() == this.getClass()){
GLog.w("you cannot wear two of the same artifact");
return false; return false;
} else { } else {
@ -55,7 +61,6 @@ public class Artifact extends KindofMisc {
if (hero.belongings.misc1 == null) { if (hero.belongings.misc1 == null) {
hero.belongings.misc1 = this; hero.belongings.misc1 = this;
} else { } else {
//TODO: decide if I want player to equip two of the same artifact, change logic here accordingly
hero.belongings.misc2 = this; hero.belongings.misc2 = this;
} }

2
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
View File

@ -114,7 +114,7 @@ public class Ring extends KindofMisc {
if (hero.belongings.misc1 != null && hero.belongings.misc2 != null) { if (hero.belongings.misc1 != null && hero.belongings.misc2 != null) {
GLog.w( "you can only wear 2 rings at a time" ); GLog.w( "you can only wear 2 misc items at a time" );
return false; return false;
} else { } else {