From b707123f6936be6b3e387ecc27eb02da070bcf73 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 22 May 2015 12:00:52 -0400 Subject: [PATCH] v0.3.0: buff descriptions round 5, all descriptions added --- .../actors/buffs/MagicalSleep.java | 9 +++++++++ .../actors/buffs/SnipersMark.java | 10 ++++++++++ .../actors/buffs/Venom.java | 10 ++++++++++ .../actors/buffs/Vertigo.java | 10 ++++++++++ .../shatteredpixeldungeon/plants/Sungrass.java | 18 ++++++++++++++++-- 5 files changed, 55 insertions(+), 2 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java index fdf76d624..77d257692 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java @@ -82,4 +82,13 @@ public class MagicalSleep extends Buff { public String toString() { return "Magical Sleep"; } + + @Override + public String desc() { + return "This character has fallen into a deep magical sleep which they will not wake from naturally.\n" + + "\n" + + "Magical sleep is similar to regular sleep, except that only damage will cause the target to wake up. \n" + + "\n" + + "For the hero, magical sleep has some restorative properties, allowing them to rapidly heal while resting."; + } } \ No newline at end of file diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java index f4c9412e5..1c409023e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SnipersMark.java @@ -17,6 +17,8 @@ */ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; +import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; +import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Bundle; @@ -48,4 +50,12 @@ public class SnipersMark extends FlavourBuff { public String toString() { return "Sniper's mark"; } + + @Override + public String desc() { + return "The sniper is honed in on the nearby " + ((Char)Actor.findById(object)).name + ", " + + "gaining increased attack speed and armor penetration while attacking it.\n" + + "\n" + + "The sniper will remain honed in until she switches targets, stops attacking, or the target dies."; + } } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java index 16997a536..93f0d07ee 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Venom.java @@ -32,6 +32,7 @@ public class Venom extends Poison implements Hero.Doom { } @Override + //TODO: new icon? public int icon() { return BuffIndicator.POISON; } @@ -41,6 +42,15 @@ public class Venom extends Poison implements Hero.Doom { return "Venomed"; } + @Override + public String desc() { + return "Venom is a extremely caustic and dangerous poison.\n" + + "\n" + + "Unlike poison, whose damage lowers over time, venom does increasing damage the longer it stays on a target.\n" + + "\n" + + "This venom will last for " + dispTurns(left) + ", and is currently dealing " + damage + " damage."; + } + @Override public boolean act() { if (target.isAlive()) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java index 1d13f2208..e0eb3db66 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java @@ -38,6 +38,16 @@ public class Vertigo extends FlavourBuff { return "Vertigo"; } + @Override + public String desc() { + return "Walking in a straight line can be difficult when the whole world is spinning.\n" + + "\n" + + "While under the effects of vertigo, characters who attempt to move will go in a random direction, " + + "instead of the one they intended to go in. \n" + + "\n" + + "This Vertigo effect with last for " + dispTurns() + "."; + } + public static float duration( Char ch ) { Resistance r = ch.buff( Resistance.class ); return r != null ? r.durationFactor() * DURATION : DURATION; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java index af6459702..80f8c85db 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java @@ -83,6 +83,10 @@ public class Sungrass extends Plant { private int healCurr = 1; private int count = 0; private int level; + + { + type = buffType.POSITIVE; + } @Override public boolean attachTo( Char target ) { @@ -135,9 +139,19 @@ public class Sungrass extends Plant { @Override public String toString() { - return Utils.format( "Herbal Healing (%d)", level); + return "Herbal Healing"; } - + + @Override + public String desc() { + return "Sungrass possesses excellent healing properties, though its not as fast as a potion of healing.\n" + + "\n" + + "You are current slowly regenerating health from the sungrass plant. " + + "Taking damage while healing will reduce the healing effectiveness, and moving off the plant will break the healing effect.\n" + + "\n" + + "You can heal for " + level + " more health, or until your health is full."; + } + private static final String POS = "pos"; private static final String HEALCURR = "healCurr"; private static final String COUNT = "count";