From 268435d390abb420836ca2a529a818c44b9ec3cc Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Tue, 18 Nov 2014 21:21:23 -0500
Subject: [PATCH] v0.2.3: artifacts can now be transmuted (levels are not
transferred, will decide on this later)
---
.../actors/blobs/WaterOfTransmutation.java | 21 +++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
index e8e886eca..a9a6b5366 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
@@ -22,8 +22,9 @@ import com.shatteredpixel.shatteredpixeldungeon.Journal.Feature;
import com.shatteredpixel.shatteredpixeldungeon.effects.BlobEmitter;
import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.Generator.Category;
+import com.shatteredpixel.shatteredpixeldungeon.items.Item;
+import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.Artifact;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.Potion;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfMight;
import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfStrength;
@@ -70,7 +71,11 @@ public class WaterOfTransmutation extends WellWater {
Journal.remove( Feature.WELL_OF_TRANSMUTATION );
return changeSeed( (Plant.Seed)item );
- } else {
+ } else if (item instanceof Artifact) {
+
+ return changeArtifact( (Artifact)item );
+
+ } else {
return null;
}
}
@@ -161,6 +166,18 @@ public class WaterOfTransmutation extends WellWater {
return n;
}
+
+ private Artifact changeArtifact( Artifact a ) {
+ Artifact n = Generator.randomArtifact();
+
+ if (n != null){
+ n.cursedKnown = a.cursedKnown;
+ n.cursed = a.cursed;
+ Journal.remove( Feature.WELL_OF_TRANSMUTATION );
+ }
+
+ return n;
+ }
private Wand changeWand( Wand w ) {