Added additional explanation to Resistance tooltip and fixed Revenge …

…in Card Library.
JohnnyBazooka89 · Oct 28, 2018 · 37f82ba · 37f82ba
1 parent 9741325
commit 37f82ba
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>StSMod</groupId>
     <artifactId>StSModTheBlackbeard</artifactId>
-    <version>1.0.7</version>
+    <version>1.0.8</version>
     <packaging>jar</packaging>
     <name>StSModTheBlackbeard</name>
     <description>Adds a new character to Slay the Spire, The Blackbeard.</description>

diff --git a/src/main/java/blackbeard/TheBlackbeardMod.java b/src/main/java/blackbeard/TheBlackbeardMod.java
@@ -245,7 +245,7 @@ public void receiveEditKeywords() {
 
         BaseMod.addKeyword(new String[]{"weapon", "weapons"}, "Whenever you play an Attack card, remove 1 Durability from your rightmost Weapon and deal its Attack damage.");
         BaseMod.addKeyword(new String[]{"cannonball", "cannonballs"}, "Cannonballs are 0 cost attacks that deal 8 (12) damage and exhaust.");
-        BaseMod.addKeyword(new String[]{"resistance"}, "You take less damage from enemy attacks.");
+        BaseMod.addKeyword(new String[]{"resistance"}, "You take less damage from enemy attacks. (Enemy intents always show actual incoming damage, with Resistance taken into account.)");
     }
 
 }
diff --git a/src/main/java/blackbeard/cards/Revenge.java b/src/main/java/blackbeard/cards/Revenge.java
@@ -52,7 +52,9 @@ public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();
             this.upgradeMagicNumber(UPGRADE_PLUS_MAXIMUM_DAMAGE);
-            setBaseDamageAndUpgradeDescription();
+            if (CardCrawlGame.isInARun()) {
+                setBaseDamageAndUpgradeDescription();
+            }
         }
     }
 }
diff --git a/src/main/resources/ModTheSpire.json b/src/main/resources/ModTheSpire.json
@@ -5,7 +5,7 @@
     "JohnnyBazooka89"
   ],
   "description": "Adds The Blackbeard as a new playable character. More info: https://github.com/JohnnyBazooka89/StSModTheBlackbeard",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "dependencies": [
     "basemod"
   ],

diff --git a/src/main/resources/blackbeard/localization/TheBlackbeard-PowerStrings.json b/src/main/resources/blackbeard/localization/TheBlackbeard-PowerStrings.json
@@ -32,7 +32,7 @@
       "You take #b",
       " less",
       " more",
-      " damage from enemy attacks."
+      " damage from enemy attacks. (Enemy intents always show actual incoming damage, with Resistance taken into account.)"
     ]
   },
   "blackbeard:InfiniteBarragePower": {