diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrigidBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrigidBrew.java deleted file mode 100644 index 1a131c547..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrigidBrew.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2019 Evan Debenham - * - * 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.potions.brews; - -import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Freezing; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.StormCloud; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfFrost; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfStormClouds; -import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.noosa.audio.Sample; -import com.watabou.utils.PathFinder; - -public class FrigidBrew extends Brew { - - { - image = ItemSpriteSheet.BREW_FRIGID; - } - - @Override - public void shatter(int cell) { - - if (Dungeon.level.heroFOV[cell]) { - splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); - } - - for (int offset : PathFinder.NEIGHBOURS9){ - if (!Dungeon.level.solid[cell+offset]) { - GameScene.add(Blob.seed(cell + offset, 10, Freezing.class)); - } - } - GameScene.add( Blob.seed( cell, 1000, StormCloud.class ) ); - } - - @Override - public int price() { - //prices of ingredients - return quantity * (30 + 60); - } - - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { - - { - inputs = new Class[]{PotionOfFrost.class, PotionOfStormClouds.class}; - inQuantity = new int[]{1, 1}; - - cost = 2; - - output = FrigidBrew.class; - outQuantity = 1; - } - - } -} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrostfireBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrostfireBrew.java deleted file mode 100644 index 1a03d10cd..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/FrostfireBrew.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2019 Evan Debenham - * - * 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.potions.brews; - -import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; -import com.shatteredpixel.shatteredpixeldungeon.actors.Char; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Freezing; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Roots; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfSnapFreeze; -import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.noosa.audio.Sample; -import com.watabou.utils.PathFinder; - -public class FrostfireBrew extends Brew { - - { - image = ItemSpriteSheet.BREW_FROSTFIRE; - } - - @Override - public void shatter(int cell) { - if (Dungeon.level.heroFOV[cell]) { - setKnown(); - - splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); - } - - Fire fire = (Fire)Dungeon.level.blobs.get( Fire.class ); - - for (int offset : PathFinder.NEIGHBOURS9){ - if (!Dungeon.level.solid[cell+offset]) { - - Freezing.affect( cell + offset, fire ); - - Char ch = Actor.findChar( cell + offset); - if (ch != null){ - Buff.affect(ch, Roots.class, 10f); - } - GameScene.add(Blob.seed(cell + offset, 10, Fire.class)); - - } - } - } - - @Override - public int price() { - //prices of ingredients - return quantity * (50 + 30); - } - - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { - - { - inputs = new Class[]{PotionOfSnapFreeze.class, PotionOfLiquidFlame.class}; - inQuantity = new int[]{1, 1}; - - cost = 8; - - output = FrostfireBrew.class; - outQuantity = 1; - } - - } -} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/WickedBrew.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/WickedBrew.java deleted file mode 100644 index 7631422c3..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/brews/WickedBrew.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2019 Evan Debenham - * - * 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.potions.brews; - -import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ParalyticGas; -import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfParalyticGas; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfToxicGas; -import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.noosa.audio.Sample; - -public class WickedBrew extends Brew { - - { - image = ItemSpriteSheet.BREW_WICKED; - } - - @Override - public void shatter(int cell) { - if (Dungeon.level.heroFOV[cell]) { - splash( cell ); - Sample.INSTANCE.play( Assets.SND_SHATTER ); - } - GameScene.add( Blob.seed( cell, 1000, ToxicGas.class ) ); - GameScene.add( Blob.seed( cell, 1000, ParalyticGas.class ) ); - } - - @Override - public int price() { - //prices of ingredients - return quantity * (30 + 40); - } - - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { - - { - inputs = new Class[]{PotionOfToxicGas.class, PotionOfParalyticGas.class}; - inQuantity = new int[]{1, 1}; - - cost = 1; - - output = WickedBrew.class; - outQuantity = 1; - } - - } -} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfRestoration.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfRestoration.java deleted file mode 100644 index f38a46d8f..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfRestoration.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2019 Evan Debenham - * - * 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.potions.elixirs; - -import com.shatteredpixel.shatteredpixeldungeon.Assets; -import com.shatteredpixel.shatteredpixeldungeon.Dungeon; -import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Healing; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfCleansing; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; -import com.watabou.noosa.audio.Sample; - -public class ElixirOfRestoration extends Elixir { - - { - image = ItemSpriteSheet.ELIXIR_RESTO; - } - - @Override - public void apply(Hero hero) { - Buff.affect( hero, Healing.class ).setHeal((int)(0.8f*hero.HT + 14), 0.25f, 0); - PotionOfCleansing.cleanse(hero); - } - - @Override - public void shatter(int cell) { - if (Actor.findChar(cell) == null){ - super.shatter(cell); - } else { - if (Dungeon.level.heroFOV[cell]) { - Sample.INSTANCE.play(Assets.SND_SHATTER); - splash(cell); - } - - if (Actor.findChar(cell) != null){ - PotionOfCleansing.cleanse(Actor.findChar(cell)); - } - } - } - - @Override - public int price() { - //prices of ingredients - return quantity * (30 + 60); - } - - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { - - { - inputs = new Class[]{PotionOfHealing.class, PotionOfCleansing.class}; - inQuantity = new int[]{1, 1}; - - cost = 1; - - output = ElixirOfRestoration.class; - outQuantity = 1; - } - - } -} diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfVitality.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfVitality.java deleted file mode 100644 index 74c616d80..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfVitality.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2019 Evan Debenham - * - * 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.potions.elixirs; - -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Barrier; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Healing; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; -import com.shatteredpixel.shatteredpixeldungeon.items.potions.exotic.PotionOfShielding; -import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; - -public class ElixirOfVitality extends Elixir { - - { - image = ItemSpriteSheet.ELIXIR_SURGE; - } - - @Override - public void apply(Hero hero) { - Buff.affect( hero, Healing.class ).setHeal((int)(0.8f*hero.HT + 14), 0.25f, 0); - PotionOfHealing.cure(hero); - Buff.affect(hero, Barrier.class).setShield((int)(0.6f*hero.HT + 10)); - } - - @Override - public int price() { - //prices of ingredients - return quantity * (30 + 50); - } - - public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { - - { - inputs = new Class[]{PotionOfHealing.class, PotionOfShielding.class}; - inQuantity = new int[]{1, 1}; - - cost = 2; - - output = ElixirOfVitality.class; - outQuantity = 1; - } - - } - -} diff --git a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 6cc9dd036..cb9685a5f 100644 --- a/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -566,27 +566,18 @@ items.potions.potionoftoxicgas.desc=Uncorking or shattering this pressurized gla ###brews -items.potions.brews.causticbrew.name=caustic brew -items.potions.brews.causticbrew.desc=This brew will spread corrosive ooze in a wide area around the location it shatters in. Anything caught by the ooze will slowly melt if it can't wash it off in water. - items.potions.brews.blizzardbrew.name=blizzard brew items.potions.brews.blizzardbrew.desc=When shattered, this brew will unleash a swirling blizzard which spreads like a gas. items.potions.brews.frigidbrew.name=frigid brew items.potions.brews.frigidbrew.desc=This brew combines the properties of a frost and storm clouds potion. When thrown it will erupt into a cloud which both freezes and spreads water to surrounding terrain. -items.potions.brews.frostfirebrew.name=frostfire brew -items.potions.brews.frostfirebrew.desc=This brew combines the properties of a liquid flame and snap freeze potion. The area around where the vial is thrown will be snap-frozen, then set ablaze for an extended duration. - items.potions.brews.infernalbrew.name=infernal brew items.potions.brews.infernalbrew.desc=When shattered, this brew will unleash a raging inferno which spreads like a gas. items.potions.brews.shockingbrew.name=shocking brew items.potions.brews.shockingbrew.desc=When shattered, this brew will unleash an electrical storm in an area around the location it breaks at. -items.potions.brews.wickedbrew.name=wicked brew -items.potions.brews.wickedbrew.desc=This brew combines the properties of a toxic gas and paralytic gas potion. When exposed to open air the liquid of the brew will erupt into both gasses at once. - ###elixirs @@ -611,12 +602,6 @@ items.potions.elixirs.elixirofmight.desc=This powerful liquid will course throug items.potions.elixirs.elixirofmight$htboost.name=max health boost items.potions.elixirs.elixirofmight$htboost.desc=Your body feels unnaturally strong and healthy.\n\nYour maximum health is boosted for an extended period of time. As you gain levels, the boost will steadily fade.\n\nCurrent boost amount: %d\nLevels remaining: %d -items.potions.elixirs.elixirofrestoration.name=elixir of restoration -items.potions.elixirs.elixirofrestoration.desc=This elixir combines the properties of a healing and cleansing potion. When consumed, the drinker will start to rapidly heal, and will be cleansed of all negative effects. - -items.potions.elixirs.elixirofvitality.name=elixir of vitality -items.potions.elixirs.elixirofvitality.desc=This elixir combines the properties of a healing and shielding potion, granting a massive burst of survivability to whomever drinks it. - items.potions.elixirs.elixiroftoxicessence.name=elixir of toxic essence items.potions.elixirs.elixiroftoxicessence.desc=When consumed, this elixir will imbue the drinker with toxic energy. The drinker will be immune to toxic gas and poison, and will continuously spread toxic gas as they move.