Remove Rolling Charge

This ability still seems quite fun, but it seems like it'll work better
as a spell (where it can combine with many different species in interesting
ways) than as a species (where it only combines with a few backgrounds in
distinctive ways). Let's move it out for now.

Also remove Armataurs' innate sinv, since that only existed for Rolling Charge
UI reasons.

Author: PleasingFungus

crawl-ref/source/ability-type.h

@@ -54,9 +54,11 @@ enum ability_type
     ABIL_SHAFT_SELF,
     // Barachim
     ABIL_HOP,
+#if TAG_MAJOR_VERSION == 34
     // Armataurs
     ABIL_ROLLING_CHARGE,
-    // Air Walk
+#endif
+    // Storm Form
     ABIL_BLINKBOLT,
     ABIL_MAX_INTRINSIC = ABIL_BLINKBOLT,
 

crawl-ref/source/ability.cc

@@ -330,8 +330,6 @@ static vector<ability_def> &_get_ability_list()
             0, 0, 0, -1, {}, abflag::delay },
         { ABIL_HOP, "Hop",
             0, 0, 0, -1, {}, abflag::none }, // range special-cased
-        { ABIL_ROLLING_CHARGE, "Rolling Charge",
-            0, 0, 0, -1, {}, abflag::none }, // range special-cased
         { ABIL_BLINKBOLT, "Blinkbolt",
             0, 0, 0, LOS_MAX_RANGE, {}, abflag::none },
 #if TAG_MAJOR_VERSION == 34
@@ -705,9 +703,6 @@ int ability_range(ability_type abil)
         case ABIL_HOP:
             range = frog_hop_range();
             break;
-        case ABIL_ROLLING_CHARGE:
-            range = armataur_charge_range();
-            break;
         case ABIL_DITHMENOS_SHADOW_STEP:
             range = you.umbra_radius();
             break;
@@ -1884,10 +1879,6 @@ static bool _check_ability_possible(const ability_def& abil, bool quiet = false)
     case ABIL_HOP:
         return _can_hop(quiet);
 
-    case ABIL_ROLLING_CHARGE:
-        return _can_movement_ability(quiet) &&
-                                armataur_charge_possible(quiet, true);
-
     case ABIL_WORD_OF_CHAOS:
         if (you.duration[DUR_WORD_OF_CHAOS_COOLDOWN])
         {
@@ -2537,12 +2528,6 @@ static spret _do_ability(const ability_def& abil, bool fail, dist *target,
         else
             return spret::abort;
 
-    case ABIL_ROLLING_CHARGE:
-        if (_can_movement_ability(false))
-            return armataur_charge(fail, target);
-        else
-            return spret::abort;
-
 
     case ABIL_BLINKBOLT:
         {
@@ -3679,8 +3664,6 @@ bool player_has_ability(ability_type abil, bool include_unusable)
                && (form_keeps_mutations() || include_unusable);
     case ABIL_HOP:
         return you.get_mutation_level(MUT_HOP);
-    case ABIL_ROLLING_CHARGE:
-        return you.get_mutation_level(MUT_ROLL);
     case ABIL_BREATHE_POISON:
         return you.get_mutation_level(MUT_SPIT_POISON) >= 2;
     case ABIL_SPIT_POISON:
@@ -3758,7 +3741,6 @@ vector<talent> your_talents(bool check_confused, bool include_unusable, bool ign
             ABIL_DIG,
             ABIL_SHAFT_SELF,
             ABIL_HOP,
-            ABIL_ROLLING_CHARGE,
             ABIL_SPIT_POISON,
             ABIL_BREATHE_FIRE,
             ABIL_BREATHE_FROST,

crawl-ref/source/dat/descript/ability.txt

@@ -106,14 +106,6 @@ Shaft Self ability
 Sends you to a random position one to three floors down, as if you jumped into
 a shaft trap. It takes some time to dig the shaft.
 %%%%
-Rolling Charge ability
-
-Rolls at a foe with a clatter of scales, then uncurls and strikes them in melee
-with increased accuracy. The greater the distance of the roll, the more
-momentum will be added to the force of your strike. You roll with sufficient
-speed to dodge traps and harmful terrain along the way, but not at your
-destination.
-%%%%
 Evoke Blink ability
 
 Randomly translocates the user a short distance. Translocating in this way

crawl-ref/source/dat/descript/mutations.txt

@@ -609,12 +609,6 @@ You have big, strong legs, allowing you to hop about with
 land. The second level of this mutation allows you to hop farther. Each time
 you hop, you need to rest for a bit before you can hop again.
 %%%%
-roll mutation
-
-You can roll at nearby foes to attack with <input>$cmd[CMD_USE_ABILITY]</input>.
-Each level of this mutation increases the distance you can roll, though not the
-damage dealt.
-%%%%
 reflexive curl mutation
 
 You curl up when struck, giving you protection against further attacks until

crawl-ref/source/dat/species/armataur.yaml

@@ -47,9 +47,7 @@ mutations:
   1:
     MUT_RUGGED_BROWN_SCALES: 3
     MUT_ARMOURED_TAIL: 1
-    MUT_ACUTE_VISION: 1
     MUT_DEFORMED: 1
-    MUT_ROLL: 1
   7:
     MUT_CURL: 1
 recommended_jobs:

crawl-ref/source/melee-attack.cc

@@ -69,7 +69,7 @@ melee_attack::melee_attack(actor *attk, actor *defn,
     ::attack(attk, defn),
 
     attack_number(attack_num), effective_attack_number(effective_attack_num),
-    cleaving(is_cleaving), is_riposte(false), is_projected(false), roll_dist(0),
+    cleaving(is_cleaving), is_riposte(false), is_projected(false),
     wu_jian_attack(WU_JIAN_ATTACK_NONE),
     wu_jian_number_of_targets(1)
 {
@@ -1449,14 +1449,6 @@ int melee_attack::player_apply_final_multipliers(int damage, bool aux)
     // martial damage modifier (wu jian)
     damage = martial_damage_mod(damage);
 
-    // Armataur rolling charge bonus
-    if (roll_dist > 0)
-    {
-        // + 1/3rd base per distance rolled, up to double at dist 3.
-        const int extra_dam = damage * roll_dist / 3;
-        damage += extra_dam > damage ? damage : extra_dam;
-    }
-
     // not additive, statues are supposed to be bad with tiny toothpicks but
     // deal crushing blows with big weapons
     if (you.form == transformation::statue)
@@ -2211,10 +2203,6 @@ int melee_attack::post_roll_to_hit_modifiers(int mhit, bool random, bool aux)
     if (you.duration[DUR_CONFUSING_TOUCH] && !aux)
         modifiers += maybe_random_div(you.dex(), 2, random);
 
-    // Rolling charges feel bad when they miss, so make them miss less often.
-    if (roll_dist > 0)
-        modifiers += 5; // matching UC form to-hit bonuses
-
     if (attacker->is_player() && !weapon && get_form()->unarmed_hit_bonus)
     {
         // TODO: Review this later (transformations getting extra hit

crawl-ref/source/melee-attack.h

@@ -38,7 +38,6 @@ class melee_attack : public attack
     bool         cleaving;        // additional attack from cleaving
     bool         is_riposte;      // long blade retaliation attack
     bool         is_projected;    // projected weapon spell attack
-    int          roll_dist;       // armataur rolling charge distance
     wu_jian_attack_type wu_jian_attack;
     int wu_jian_number_of_targets;
     coord_def attack_position;

crawl-ref/source/mutation-data.h

@@ -939,6 +939,7 @@ static const mutation_def mut_data[] =
 
   {"", "", ""},
 },
+#if TAG_MAJOR_VERSION == 34
 
 // Armataur only
 { MUT_ROLL, 8, 3, mutflag::good, true,
@@ -956,6 +957,7 @@ static const mutation_def mut_data[] =
    "You can no longer roll as far.",
    "You can no longer roll as far."},
 },
+#endif
 
 { MUT_ARMOURED_TAIL, 0, 1, mutflag::good, true,
   "armoured tail",

crawl-ref/source/mutation-type.h

@@ -238,8 +238,8 @@ enum mutation_type
     MUT_STRONG_NOSE,
 #if TAG_MAJOR_VERSION == 34
     MUT_ACID_RESISTANCE,
-#endif
     MUT_ROLL,
+#endif
     MUT_ARMOURED_TAIL,
 #if TAG_MAJOR_VERSION == 34
     MUT_BIG_BRAIN,

crawl-ref/source/mutation.cc

@@ -1769,10 +1769,6 @@ bool physiology_mutation_conflict(mutation_type mutat)
     if (!you.has_innate_mutation(MUT_SPIT_POISON) && mutat == MUT_SPIT_POISON)
         return true;
 
-    // Only Armataur can go on a roll.
-    if (!you.has_innate_mutation(MUT_ROLL) && mutat == MUT_ROLL)
-        return true;
-
     // Only Draconians (and gargoyles) can get wings.
     if (!species::is_draconian(you.species) && you.species != SP_GARGOYLE
         && mutat == MUT_BIG_WINGS)