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

v0.7.2: reverted changes to magical infusion

Browse Source 
The change to magical infusion should happen but now isn't the best time
for itm Catalysts are already enough of a balance change to alchemy.
This commit is contained in:
Evan Debenham 2019-01-25 00:53:33 -05:00
parent a9fa21dd4e
commit 0a7c660f2e
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Recipe.java
View File

@ -179,8 +179,6 @@ public abstract class Recipe {
new Blandfruit.CookFruit(), new Blandfruit.CookFruit(),
new TippedDart.TipDart(), new TippedDart.TipDart(),
new Bomb.EnhanceBomb(), new Bomb.EnhanceBomb(),
new AlchemicalCatalyst.Recipe(),
new ArcaneCatalyst.Recipe(),
new ElixirOfAquaticRejuvenation.Recipe(), new ElixirOfAquaticRejuvenation.Recipe(),
new ElixirOfDragonsBlood.Recipe(), new ElixirOfDragonsBlood.Recipe(),
new ElixirOfIcyTouch.Recipe(), new ElixirOfIcyTouch.Recipe(),
@ -201,6 +199,8 @@ public abstract class Recipe {
new PhaseShift.Recipe(), new PhaseShift.Recipe(),
new ReclaimTrap.Recipe(), new ReclaimTrap.Recipe(),
new Recycle.Recipe(), new Recycle.Recipe(),
new AlchemicalCatalyst.Recipe(),
new ArcaneCatalyst.Recipe(),
new StewedMeat.twoMeat() new StewedMeat.twoMeat()
}; };

20
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/MagicalInfusion.java
View File

@ -27,6 +27,8 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.stones.StoneOfEnchantment;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
@ -36,19 +38,21 @@ import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag;
public class MagicalInfusion extends InventorySpell { public class MagicalInfusion extends InventorySpell {
{ {
mode = WndBag.Mode.UPGRADEABLE; mode = WndBag.Mode.ENCHANTABLE;
image = ItemSpriteSheet.MAGIC_INFUSE; image = ItemSpriteSheet.MAGIC_INFUSE;
} }
@Override @Override
protected void onItemSelected( Item item ) { protected void onItemSelected( Item item ) {
if (item instanceof Weapon && ((Weapon) item).enchantment != null) { if (item instanceof SpiritBow){
if (((SpiritBow) item).enchantment == null){
((Weapon)item).enchant();
}
} else if (item instanceof Weapon) {
((Weapon) item).upgrade(true); ((Weapon) item).upgrade(true);
} else if (item instanceof Armor && ((Armor) item).glyph != null) {
((Armor) item).upgrade(true);
} else { } else {
item.upgrade(); ((Armor) item).upgrade(true);
} }
GLog.p( Messages.get(this, "infuse", item.name()) ); GLog.p( Messages.get(this, "infuse", item.name()) );
@ -62,16 +66,16 @@ public class MagicalInfusion extends InventorySpell {
@Override @Override
public int price() { public int price() {
//prices of ingredients, divided by output quantity //prices of ingredients, divided by output quantity
return Math.round(quantity * ((50 + 40) / 1f)); return Math.round(quantity * ((50 + 30) / 1f));
} }
public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe { public static class Recipe extends com.shatteredpixel.shatteredpixeldungeon.items.Recipe.SimpleRecipe {
{ {
inputs = new Class[]{ScrollOfUpgrade.class, ArcaneCatalyst.class}; inputs = new Class[]{ScrollOfUpgrade.class, StoneOfEnchantment.class};
inQuantity = new int[]{1, 1}; inQuantity = new int[]{1, 1};
cost = 5; cost = 3;
output = MagicalInfusion.class; output = MagicalInfusion.class;
outQuantity = 1; outQuantity = 1;

2
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -969,7 +969,7 @@ items.spells.spell.no_magic=You can't cast spells while magic immune.
items.spells.magicalinfusion.name=magical infusion items.spells.magicalinfusion.name=magical infusion
items.spells.magicalinfusion.inv_title=Infuse an item items.spells.magicalinfusion.inv_title=Infuse an item
items.spells.magicalinfusion.infuse=Your %s is infused with arcane energy! items.spells.magicalinfusion.infuse=Your %s is infused with arcane energy!
items.spells.magicalinfusion.desc=This spell posses the same magical power as a scroll of upgrade, but in a more stable form.\n\nIn addition to upgrading an item, it will also never erase an enchantment on a weapon or glyph on armor. items.spells.magicalinfusion.desc=This spell will infuse a weapon or armor with powerful magical energy.\n\nIn addition to being upgraded, a weapon will gain a magical enchantment, or armor will be imbued with a magical glyph.\n\nIf the item already has an enchantment or glyph, it will not be erased by the upgrade.
items.spells.magicalporter.name=magical porter items.spells.magicalporter.name=magical porter
items.spells.magicalporter.inv_title=Port an item items.spells.magicalporter.inv_title=Port an item