Remove Stoneskin※

It's an extremely generic, non-situational buff that it's wise, but not particularly fun, to keep running at all times. It's not particularly core to EE, so it's getting the axe. (I wouldn't mind EE getting some replacement spell - but that's not critical.) ※It's still around for monsters (though I'm not sure any cast it), and as an effect from the Helm card.
crawl · Feb 5, 2016 · df1107d · df1107d
1 parent 5d26797
commit df1107d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/crawl-ref/source/book-data.h b/crawl-ref/source/book-data.h
@@ -126,7 +126,6 @@ static const vector<spell_type> spellbook_templates[] =
 },
 
 {   // Book of Transfigurations
-    SPELL_STONESKIN,
     SPELL_IRRADIATE,
     SPELL_STATUE_FORM,
     SPELL_HYDRA_FORM,
@@ -245,7 +244,6 @@ static const vector<spell_type> spellbook_templates[] =
 
 {   // Book of Geomancy
     SPELL_SANDBLAST,
-    SPELL_STONESKIN,
     SPELL_PASSWALL,
     SPELL_STONE_ARROW,
     SPELL_PETRIFY,

diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
@@ -1841,9 +1841,6 @@ static spret_type _do_cast(spell_type spell, int powc,
     case SPELL_SWIFTNESS:
         return cast_swiftness(powc, fail);
 
-    case SPELL_STONESKIN:
-        return cast_stoneskin(powc, fail);
-
     case SPELL_CONDENSATION_SHIELD:
         return cast_condensation_shield(powc, fail);
 
@@ -1953,6 +1950,7 @@ static spret_type _do_cast(spell_type spell, int powc,
     case SPELL_TWISTED_RESURRECTION:
     case SPELL_SURE_BLADE:
     case SPELL_FLY:
+    case SPELL_STONESKIN:
         mpr("Sorry, this spell is gone!");
         return SPRET_ABORT;
 #endif

diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h
@@ -1559,7 +1559,7 @@ static const struct spell_desc spelldata[] =
 {
     SPELL_STONESKIN, "Stoneskin",
     SPTYP_EARTH | SPTYP_TRANSMUTATION,
-    SPFLAG_HELPFUL | SPFLAG_UTILITY | SPFLAG_NO_GHOST,
+    SPFLAG_HELPFUL | SPFLAG_UTILITY | SPFLAG_NO_GHOST | SPFLAG_MONSTER,
     2,
     100,
     -1, -1,

diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc
@@ -1116,8 +1116,6 @@ string spell_uselessness_reason(spell_type spell, bool temp, bool prevent,
     {
         if (spell == SPELL_OZOCUBUS_ARMOUR)
             return "your stony body would shatter the ice.";
-        if (spell == SPELL_STONESKIN)
-            return "your skin is already made of stone.";
 
         if (temp && !temperature_effect(LORC_STONESKIN))
         {
@@ -1185,7 +1183,6 @@ string spell_uselessness_reason(spell_type spell, bool temp, bool prevent,
             return "you're already a statue.";
         // fallthrough to other forms
 
-    case SPELL_STONESKIN:
     case SPELL_BEASTLY_APPENDAGE:
     case SPELL_BLADE_HANDS:
     case SPELL_DRAGON_FORM: