Merge remote-tracking branch 'origin/master'
This commit is contained in:
Evan Debenham
commit
cbb7d8b130
|
|
@ -705,7 +705,7 @@ public class Badges {
|
|||
}
|
||||
}
|
||||
|
||||
//TODO: Replace this badge
|
||||
//TODO: Replace this badge, Delayed to 0.2.1
|
||||
public static void validateRingOfHaggler() {
|
||||
if (!local.contains( Badge.RING_OF_HAGGLER )/* && new RingOfThorns().isKnown()*/) {
|
||||
Badge badge = Badge.RING_OF_HAGGLER;
|
||||
|
|
@ -714,7 +714,7 @@ public class Badges {
|
|||
}
|
||||
}
|
||||
|
||||
//TODO: Replace this badge
|
||||
//TODO: Replace this badge, Delayed to 0.2.1
|
||||
public static void validateRingOfThorns() {
|
||||
if (!local.contains( Badge.RING_OF_THORNS )/* && new RingOfThorns().isKnown()*/) {
|
||||
Badge badge = Badge.RING_OF_THORNS;
|
||||
|
|
|
|||
|
|
@ -355,6 +355,11 @@ public class Hero extends Char {
|
|||
return 1f;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void spend( float time ) {
|
||||
super.spend( time );
|
||||
};
|
||||
|
||||
public void spendAndNext( float time ) {
|
||||
busy();
|
||||
|
|
|
|||
|
|
@ -84,6 +84,7 @@ public abstract class Mob extends Char {
|
|||
};
|
||||
|
||||
private static final String STATE = "state";
|
||||
private static final String SEEN = "seen";
|
||||
private static final String TARGET = "target";
|
||||
|
||||
@Override
|
||||
|
|
@ -92,6 +93,7 @@ public abstract class Mob extends Char {
|
|||
super.storeInBundle( bundle );
|
||||
|
||||
bundle.put( STATE, state.toString() );
|
||||
bundle.put( SEEN, enemySeen);
|
||||
if (state != State.SLEEPING) {
|
||||
bundle.put( TARGET, target );
|
||||
}
|
||||
|
|
@ -103,6 +105,7 @@ public abstract class Mob extends Char {
|
|||
super.restoreFromBundle( bundle );
|
||||
|
||||
state = State.valueOf( bundle.getString( STATE ) );
|
||||
enemySeen = bundle.getBoolean( SEEN );
|
||||
if (state != State.SLEEPING) {
|
||||
target = bundle.getInt( TARGET );
|
||||
}
|
||||
|
|
@ -388,8 +391,9 @@ public abstract class Mob extends Char {
|
|||
if (penalty != 0)
|
||||
defenseSkill *= Math.pow(0.75, penalty);
|
||||
return defenseSkill;
|
||||
} else
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -128,9 +128,7 @@ public class Ankh extends Item {
|
|||
@Override
|
||||
public void restoreFromBundle( Bundle bundle ) {
|
||||
super.restoreFromBundle( bundle );
|
||||
//TODO: remove when saves from 0.1.1 are invalidated
|
||||
if (bundle.contains( BLESSED ))
|
||||
blessed = bundle.getBoolean( BLESSED );
|
||||
blessed = bundle.getBoolean( BLESSED );
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import java.util.ArrayList;
|
|||
* Created by Evan on 24/08/2014.
|
||||
*/
|
||||
public class Artifact extends KindofMisc {
|
||||
|
||||
//TODO: add artifact transform method and tie it into well of transformation
|
||||
{
|
||||
levelKnown = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import com.watabou.utils.Random;
|
|||
* Created by debenhame on 03/09/2014.
|
||||
*/
|
||||
public class CapeOfThorns extends Artifact {
|
||||
//TODO: add polish, testing
|
||||
//TODO: add polish, testing, numbers tweaking
|
||||
|
||||
{
|
||||
name = "Cape of Thorns";
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import java.util.ArrayList;
|
|||
public class ChaliceOfBlood extends Artifact {
|
||||
//TODO: add polish
|
||||
//TODO: add sprite switching
|
||||
//TODO: decide on max level 8 or 10. balance accordingly.
|
||||
|
||||
private static final String TXT_CHALICE = "Chalice of Blood";
|
||||
private static final String TXT_YES = "Yes, I know what I'm doing";
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import java.util.ArrayList;
|
|||
* Created by debenhame on 25/08/2014.
|
||||
*/
|
||||
public class CloakOfShadows extends Artifact {
|
||||
//TODO: testing, add polish
|
||||
//TODO: final numbers tweaking, add polish
|
||||
|
||||
{
|
||||
name = "Cloak of Shadows";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ import java.util.ArrayList;
|
|||
*/
|
||||
public class HornOfPlenty extends Artifact {
|
||||
|
||||
//TODO: tune numbers, add sprite switching, add polish.
|
||||
//TODO: add sprite switching, add polish.
|
||||
|
||||
{
|
||||
name = "Horn of Plenty";
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import java.util.Collections;
|
|||
* Created by debenhame on 08/09/2014.
|
||||
*/
|
||||
public class SandalsOfNature extends Artifact {
|
||||
//todo: test, add sprite switching, number tweaking.
|
||||
|
||||
{
|
||||
name = "Sandals of Nature";
|
||||
|
|
|
|||
|
|
@ -233,7 +233,6 @@ public class Blandfruit extends Food {
|
|||
if (name.equals("Healthfruit"))
|
||||
cook(new Sungrass.Seed());
|
||||
else if (name.equals("Powerfruit"))
|
||||
//TODO: make sure this doesn't break anything
|
||||
cook(new Wandmaker.Rotberry.Seed());
|
||||
else if (name.equals("Paralyzefruit"))
|
||||
cook(new Earthroot.Seed());
|
||||
|
|
|
|||
|
|
@ -223,8 +223,6 @@ public class Potion extends Item {
|
|||
@Override
|
||||
public void cast( final Hero user, int dst ) {
|
||||
super.cast(user, dst);
|
||||
//if this potion is owned by a fruit, finds it and detaches it.
|
||||
//TODO: add remove code here
|
||||
}
|
||||
|
||||
public boolean isKnown() {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.items.rings;
|
||||
|
||||
public class RingOfAccuracy extends Ring {
|
||||
//TODO: numbers tweaking
|
||||
|
||||
{
|
||||
name = "Ring of Accuracy";
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap;
|
|||
import com.watabou.utils.Random;
|
||||
|
||||
public class RingOfElements extends Ring {
|
||||
//TODO: need to rebalance this
|
||||
|
||||
{
|
||||
name = "Ring of Elements";
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
|
|||
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
|
||||
|
||||
public class RingOfEvasion extends Ring {
|
||||
//todo: testing, numbers tweaking
|
||||
|
||||
{
|
||||
name = "Ring of Evasion";
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.items.rings;
|
||||
|
||||
public class RingOfHaste extends Ring {
|
||||
//TODO: numbers tweaking
|
||||
|
||||
{
|
||||
name = "Ring of Haste";
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
package com.shatteredpixel.shatteredpixeldungeon.items.rings;
|
||||
|
||||
public class RingOfMagic extends Ring {
|
||||
//TODO: evaluate functionality, decide on numbers
|
||||
|
||||
{
|
||||
name = "Ring of Magic";
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ public class Quarterstaff extends MeleeWeapon {
|
|||
|
||||
@Override
|
||||
public String desc() {
|
||||
// TODO Auto-generated method stub
|
||||
return "A staff of hardwood, its ends are shod with iron.";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,10 +150,6 @@ public class Sungrass extends Plant {
|
|||
public void restoreFromBundle( Bundle bundle ) {
|
||||
super.restoreFromBundle( bundle );
|
||||
pos = bundle.getInt( POS );
|
||||
//to support legacy saves from 0.1.0, TODO: remove when saves from V0.1.0 are invalidated
|
||||
if (!bundle.contains( LEVEL )){
|
||||
return;
|
||||
}
|
||||
healCurr = bundle.getInt( HEALCURR );
|
||||
count = bundle.getInt( COUNT );
|
||||
level = bundle.getInt( LEVEL );
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user