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

V0.2.0: Deleted all seven unused rings (each one is replaced by an artifact)

Browse Source
This commit is contained in:
Evan Debenham 2014-09-10 15:01:08 -04:00
parent 5684fe2367
commit 2667f1bbf5
8 changed files with 7 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
View File

@ -71,12 +71,9 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey;
import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey; import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfAccuracy; 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.RingOfElements;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEvasion;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfHaste; 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.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRecharging;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
@ -1084,11 +1081,8 @@ public class Hero extends Char {
@Override @Override
public int stealth() { public int stealth() {
int stealth = super.stealth(); //no logic here since removal of Ring of Shadows, may do something here in future.
for (Buff buff : buffs( RingOfShadows.Shadows.class )) { return super.stealth();
stealth += ((RingOfShadows.Shadows)buff).level;
}
return stealth;
} }
@Override @Override
@ -1236,9 +1230,12 @@ public class Hero extends Char {
public boolean search( boolean intentional ) { public boolean search( boolean intentional ) {
boolean smthFound = false; boolean smthFound = false;
int positive = 0; int positive = 0;
int negative = 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 )) { for (Buff buff : buffs( RingOfDetection.Detection.class )) {
int bonus = ((RingOfDetection.Detection)buff).level; int bonus = ((RingOfDetection.Detection)buff).level;
if (bonus > positive) { if (bonus > positive) {
@ -1247,6 +1244,7 @@ public class Hero extends Char {
negative += bonus; negative += bonus;
} }
} }
*/
int distance = 1 + positive + negative; int distance = 1 + positive + negative;
float level = intentional ? (2 * awareness - awareness * awareness) : awareness; float level = intentional ? (2 * awareness - awareness * awareness) : awareness;

55
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfDetection.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

68
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHaggler.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

40
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfHerbalism.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

42
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfMending.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

40
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfSatiety.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

41
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfShadows.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}

66
src/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfThorns.java
View File

@ -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 <http://www.gnu.org/licenses/>
*/
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 {
}
}