diff --git a/assets/items.png b/assets/items.png index d02d98f3f..527218ef1 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index 89fe7df8d..89a613097 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index bd061ade8..a4bb4e4a9 100644 Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index 888fd88cc..96e470197 100644 Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png index e110b80d1..71013365e 100644 Binary files a/res/drawable-xxhdpi/ic_launcher.png and b/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png index 0f1b7cf85..3269935fe 100644 Binary files a/res/drawable-xxxhdpi/ic_launcher.png and b/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index f31c20c3b..270e16e3e 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java @@ -85,7 +85,7 @@ public class ChaliceOfBlood extends Artifact { damage -= Random.IntRange(0, hero.dr()); - //TODO: make sure this look good + //TODO: make sure this looks good if (damage <= 0){ GLog.i("You prick yourself, and your blood drips into the chalice."); } else if (damage < 25){ @@ -95,11 +95,11 @@ public class ChaliceOfBlood extends Artifact { } else if (damage < 100){ GLog.w("Your life essence drains into the chalice."); Sample.INSTANCE.play(Assets.SND_CURSED); - hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 ); + hero.sprite.emitter().burst( ShadowParticle.CURSE, 9 ); } else { GLog.w("The chalice devours your life energy."); Sample.INSTANCE.play(Assets.SND_CURSED); - hero.sprite.emitter().burst( ShadowParticle.CURSE, 6 ); + hero.sprite.emitter().burst( ShadowParticle.CURSE, 12 ); } if (damage > 0) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java index 90cc1a473..f0389932b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/HornOfPlenty.java @@ -26,7 +26,6 @@ import java.util.ArrayList; */ public class HornOfPlenty extends Artifact { - //TODO: final surface testing { name = "Horn of Plenty"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java index f0d075cce..d842364c5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java @@ -26,7 +26,6 @@ import java.util.Collections; * Created by debenhame on 08/09/2014. */ public class SandalsOfNature extends Artifact { - //TODO: tweak the greaves sprite a little, it's too neat/needs to be more messy. { name = "Sandals of Nature"; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java index 32af433ff..000833cc7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java @@ -24,7 +24,6 @@ import java.util.ArrayList; * Created by debenhame on 08/09/2014. */ public class TalismanOfForesight extends Artifact { - //TODO: shade sprite. { name = "Talisman of Foresight";