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

v0.9.0b: adjusted equip logic to prevent more cases of swap prompt

Browse Source
This commit is contained in:
Evan Debenham 2020-10-13 18:28:19 -04:00
parent 11a684bb1f
commit 840727c674
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/KindofMisc.java
View File

@ -43,12 +43,26 @@ public abstract class KindofMisc extends EquipableItem {
if ( this instanceof Artifact if ( this instanceof Artifact
&& hero.belongings.artifact != null && hero.belongings.artifact != null
&& hero.belongings.misc != null){ && hero.belongings.misc != null){
//see if we can re-arrange items first
if (hero.belongings.misc instanceof Ring && hero.belongings.ring == null){
hero.belongings.ring = (Ring) hero.belongings.misc;
hero.belongings.misc = null;
} else {
equipFull = true; equipFull = true;
}
} else if (this instanceof Ring } else if (this instanceof Ring
&& hero.belongings.misc != null && hero.belongings.misc != null
&& hero.belongings.ring != null){ && hero.belongings.ring != null){
//see if we can re-arrange items first
if (hero.belongings.misc instanceof Artifact && hero.belongings.artifact == null){
hero.belongings.artifact = (Artifact) hero.belongings.misc;
hero.belongings.misc = null;
} else {
equipFull = true; equipFull = true;
} }
}
if (equipFull) { if (equipFull) {