allow some smite-targeting summon auto spell

Author: kimjoy2002

crawl-ref/source/player.cc

@@ -9667,7 +9667,25 @@ bool player::auto_cast(const coord_def& target, int delay, auto_spell_phase phas
     dec_mp(cost, false);
     if (majin_charge_hp())
         dec_hp(hp_cost, false);
-    spret cast_result = your_spells(cast_spell, 0, false, nullptr, (flags & spflag::selfench) ? you.pos() : target);
+
+    coord_def cast_target = target;
+    if (is_smite_targeting_summon(cast_spell))
+    {
+        vector<coord_def> spots;
+        for (adjacent_iterator ai(target); ai; ++ai)
+        {
+            if (!feat_is_solid(grd(*ai)) && !actor_at(*ai))
+            {
+                spots.push_back(*ai);
+            }
+        }
+        if (spots.size() <= 0)
+            return false;
+
+        cast_target = spots[random2(spots.size())]; //new summon position
+    }
+
+    spret cast_result = your_spells(cast_spell, 0, false, nullptr, (flags & spflag::selfench) ? you.pos() : cast_target);
     if (cast_result == spret::abort)
     {
         inc_mp(cost, true);

crawl-ref/source/spl-util.cc

@@ -1202,7 +1202,6 @@ string spell_uselessness_reason(spell_type spell, bool temp, bool prevent,
         switch (spell)
         {
         case SPELL_CONJURE_FLAME:
-        case SPELL_FULMINANT_PRISM:
         case SPELL_CONFUSING_TOUCH:
         case SPELL_APPORTATION:
         case SPELL_TELEPORT_OTHER:
@@ -1839,6 +1838,20 @@ bool can_auto_cast_spell(spell_type spell, const coord_def& target, auto_spell_p
     if (no_enemy)
         return false;
 
+    if (is_smite_targeting_summon(spell))
+    {
+        vector<coord_def> spots;
+        for (adjacent_iterator ai(target); ai; ++ai)
+        {
+            if (!feat_is_solid(grd(*ai)) && !actor_at(*ai))
+            {
+                spots.push_back(*ai);
+            }
+        }
+        if (spots.size() <= 0)
+            return false;
+    }
+
     switch (spell) {
         //buf spell
     case SPELL_FROZEN_RAMPARTS:
@@ -2431,6 +2444,7 @@ bool is_dangerous_auto_spell(spell_type spell)
     case SPELL_LRD:
     case SPELL_VIOLENT_UNRAVELLING:
     case SPELL_OLGREBS_LAST_MERCY:
+    case SPELL_FULMINANT_PRISM:
         return true;
     default:
         return false;
@@ -2498,6 +2512,19 @@ bool is_castable_null_target(spell_type spell)
             return false;
     }
 }
+bool is_smite_targeting_summon(spell_type spell)
+{
+    switch (spell)
+    {
+    case SPELL_SUMMON_LIGHTNING_SPIRE:
+    case SPELL_SINGULARITY:
+    case SPELL_FULMINANT_PRISM:
+        return true;
+    default:
+        return false;
+    }
+
+}
 
 
 

crawl-ref/source/spl-util.h

@@ -144,5 +144,6 @@ bool can_auto_cast_spell(spell_type spell, const coord_def& target, auto_spell_p
 bool is_currect_phase_auto_spell(spell_type spell, auto_spell_phase phase);
 bool is_dangerous_auto_spell(spell_type spell);
 bool is_castable_null_target(spell_type spell);
+bool is_smite_targeting_summon(spell_type spell);
 
 bool is_can_spectrum(spell_type spell);