Reworked Runic Octahedron

twanvl · Oct 31, 2018 · 0c2aa9e · 0c2aa9e
1 parent 7a9c730
commit 0c2aa9e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ### v1.5.0
-* Added relics: Spicy Sausage, Treasure Map, Bottled Yo-Yo
+* Added relics: Spicy Sausage, Treasure Map, Bottled Yo-Yo, Runic Octahedron
 * Fix: Water orb shouldn't be affected by focus
 * Fix: Necrotic Wound should not play at end of turn when you have Runic Pyramid
 * Fix: Purge shouldn't remove Necronomicurse, Ascender's Bane, and other souldbound cards (interacts with StsLib)

diff --git a/src/main/java/conspire/relics/RunicOctahedron.java b/src/main/java/conspire/relics/RunicOctahedron.java
@@ -8,15 +8,21 @@
 
 public class RunicOctahedron extends AbstractConspireRelic {
     public static final String ID = "conspire:RunicOctahedron";
-    public static final int DRAW_LOSS = 2;
+    public static final int DRAW_LOSS = 1;
+    public static final int NUM_CARDS = 2;
 
     public RunicOctahedron() {
-        super(ID, AbstractRelic.RelicTier.SPECIAL, AbstractRelic.LandingSound.CLINK);
+        super(ID, AbstractRelic.RelicTier.BOSS, AbstractRelic.LandingSound.CLINK);
     }
 
     @Override
     public String getUpdatedDescription() {
-        return DESCRIPTIONS[0] + DRAW_LOSS + DESCRIPTIONS[1];
+        return DESCRIPTIONS[0] + DRAW_LOSS + DESCRIPTIONS[1] + NUM_CARDS + DESCRIPTIONS[2];
+    }
+
+    @Override
+    public void atTurnStart() {
+        this.counter = 0;
     }
 
     @Override
@@ -31,8 +37,12 @@ public void onUnequip() {
 
     @Override
     public void onPlayCard(AbstractCard c, AbstractMonster m) {
-        AbstractDungeon.actionManager.addToBottom(new DrawCardAction(AbstractDungeon.player, 1));
-        this.flash();
+        ++this.counter;
+        if (this.counter % NUM_CARDS == 0) {
+            this.counter = 0;
+            AbstractDungeon.actionManager.addToBottom(new DrawCardAction(AbstractDungeon.player, 1));
+            this.flash();
+        }
     }
 
     @Override

diff --git a/src/main/resources/conspire/localization/eng/conspire-relics.json b/src/main/resources/conspire/localization/eng/conspire-relics.json
@@ -85,7 +85,7 @@
     "NAME": "Runic Octahedron",
     "FLAVOR": "The runes are indecipherable.",
     "DESCRIPTIONS": [
-      "Draw #b"," fewer cards each turn. Whenever you play a card, draw a card."
+      "Draw #b"," fewer card each turn. Every time you play #b"," cards in a single turn, draw a card."
     ]
   },
   "conspire:SeveredTorchhead": {