diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 04c3ecd9d..2ca8728cf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -71,12 +71,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy; -import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfDetection; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaste; -import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfShadows; -import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfThorns; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; @@ -1084,11 +1081,8 @@ public class Hero extends Char { @Override public int stealth() { - int stealth = super.stealth(); - for (Buff buff : buffs( RingOfShadows.Shadows.class )) { - stealth += ((RingOfShadows.Shadows)buff).level; - } - return stealth; + //no logic here since removal of Ring of Shadows, may do something here in future. + return super.stealth(); } @Override @@ -1236,9 +1230,12 @@ public class Hero extends Char { public boolean search( boolean intentional ) { boolean smthFound = false; - + int positive = 0; int negative = 0; + + //holding onto this code for now as it may be useful in coding the Talisman of Foresight. + /* for (Buff buff : buffs( RingOfDetection.Detection.class )) { int bonus = ((RingOfDetection.Detection)buff).level; if (bonus > positive) { @@ -1247,6 +1244,7 @@ public class Hero extends Char { negative += bonus; } } + */ int distance = 1 + positive + negative; float level = intentional ? (2 * awareness - awareness * awareness) : awareness; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java deleted file mode 100644 index e95545835..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; - -public class RingOfDetection extends Ring { - - { - name = "Ring of Detection"; - } - - @Override - public boolean doEquip( Hero hero ) { - if (super.doEquip( hero )) { - Dungeon.hero.search( false ); - return true; - } else { - return false; - } - } - - @Override - protected RingBuff buff( ) { - return new Detection(); - } - - @Override - public String desc() { - return isKnown() ? - "Wearing this ring will allow the wearer to notice hidden secrets - " + - "traps and secret doors - without taking time to search. Degraded rings of detection " + - "will dull your senses, making it harder to notice secrets even when actively searching for them." : - super.desc(); - } - - public class Detection extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java deleted file mode 100644 index 9cb5d7b7c..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -import com.shatteredpixel.shatteredpixeldungeon.Badges; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.items.Item; - -public class RingOfHaggler extends Ring { - - { - name = "Ring of Haggler"; - } - - @Override - protected RingBuff buff( ) { - return new Haggling(); - } - - @Override - public Item random() { - level = +1; - return this; - } - - @Override - public boolean doPickUp( Hero hero ) { - identify(); - Badges.validateRingOfHaggler(); - Badges.validateItemLevelAquired( this ); - return super.doPickUp(hero); - } - - @Override - public boolean isUpgradable() { - return false; - } - - - @Override - public String desc() { - return isKnown() ? - "In fact this ring doesn't provide any magic effect, but it demonstrates " + - "to shopkeepers and vendors, that the owner of the ring is a member of " + - "The Thieves' Guild. Usually they are glad to give a discount in exchange " + - "for temporary immunity guarantee. Upgrading this ring won't give any additional " + - "bonuses." : - super.desc(); - } - - public class Haggling extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java deleted file mode 100644 index a99431730..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -public class RingOfHerbalism extends Ring { - - { - name = "Ring of Herbalism"; - } - - @Override - protected RingBuff buff( ) { - return new Herbalism(); - } - - @Override - public String desc() { - return isKnown() ? - "This ring increases your chance to gather dew and seeds from trampled grass." : - super.desc(); - } - - public class Herbalism extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java deleted file mode 100644 index 528b865ea..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -public class RingOfMending extends Ring { - - { - name = "Ring of Mending"; - } - - @Override - protected RingBuff buff( ) { - return new Rejuvenation(); - } - - @Override - public String desc() { - return isKnown() ? - "This ring increases the body's regenerative properties, allowing " + - "one to recover lost health at an accelerated rate. Degraded rings will " + - "decrease or even halt one's natural regeneration." : - super.desc(); - } - - public class Rejuvenation extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java deleted file mode 100644 index d03646bc0..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -public class RingOfSatiety extends Ring { - - { - name = "Ring of Satiety"; - } - - @Override - protected RingBuff buff( ) { - return new Satiety(); - } - - @Override - public String desc() { - return isKnown() ? - "Wearing this ring you can go without food longer. Degraded rings of satiety will cause the opposite effect." : - super.desc(); - } - - public class Satiety extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java deleted file mode 100644 index eb642a358..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -public class RingOfShadows extends Ring { - - { - name = "Ring of Shadows"; - } - - @Override - protected RingBuff buff( ) { - return new Shadows(); - } - - @Override - public String desc() { - return isKnown() ? - "Enemies will be less likely to notice you if you wear this ring. Degraded rings " + - "of shadows will alert enemies who might otherwise not have noticed your presence." : - super.desc(); - } - - public class Shadows extends RingBuff { - } -} diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java deleted file mode 100644 index 0f2f27208..000000000 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2014 Oleg Dolya - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ -package com.shatteredpixel.shatteredpixeldungeon.items.rings; - -import com.shatteredpixel.shatteredpixeldungeon.Badges; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.items.Item; - -public class RingOfThorns extends Ring { - - { - name = "Ring of Thorns"; - } - - @Override - protected RingBuff buff( ) { - return new Thorns(); - } - - @Override - public Item random() { - level = +1; - return this; - } - - @Override - public boolean doPickUp( Hero hero ) { - identify(); - Badges.validateRingOfThorns(); - Badges.validateItemLevelAquired( this ); - return super.doPickUp(hero); - } - - @Override - public boolean isUpgradable() { - return false; - } - - - @Override - public String desc() { - return isKnown() ? - "Though this ring doesn't provide real thorns, an enemy that attacks you " + - "will itself be wounded by a fraction of the damage that it inflicts. " + - "Upgrading this ring won't give any additional bonuses." : - super.desc(); - } - - public class Thorns extends RingBuff { - } -}