Mumra/fix macos build

.github/workflows/ci.yml

@@ -310,13 +310,39 @@ jobs:
           auth_header="$(git config --local --get http.https://github.com/.extraheader)"
           git submodule sync --recursive
           git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
-      - name: Python install bug workaround # https://github.com/actions/setup-python/issues/577
+      # Some extremely messy interactions between default runner setup and what
+      # brew may or may not do here. Many closed issues around this, here's one
+      # where a github actions contributor more or less says they won't fix it:
+      # https://github.com/actions/runner-images/issues/9471. The issues comes
+      # and goes depending on runner image versions. I believe I originally
+      # found the workaround step below somewhere in:
+      #   https://github.com/actions/setup-python/issues/577
+      # We have the problem because libpng has python as a dep.
+      # * Scenario 1: libpng forces brew to install python in `/usr/local/bin`.
+      #   Then we need to clear out the pre-provided symlinks or brew will fail.
+      #   Further steps use newly installed python.
+      # * Scenario 2: libpng is up-to-date in the current runner. For this case,
+      #   clearing out the links is safe because the runner's default path
+      #   should still include
+      #   `/Library/Frameworks/Python.framework/Versions/Current/bin/python`
+      #   (with a lower priority than `/usr/local/bin`) and pre-installed
+      #   python remains available.
+      # * For both scenarios, we should install pyyaml via pip, not brew, so
+      #   that it is installed for the correct python version. Installing it
+      #   via `brew` doesn't work right in scenario 2.
+      - name: Python install bug workaround
         run: |
           find /usr/local/bin -type l -exec sh -c 'readlink -f "$1" \
           | grep -q ^/Library/Frameworks/Python.framework/Versions/' _ {} \; -exec rm -v {} \;
       - name: Install Dependencies
         run: |
-          brew install pkg-config libpng pyyaml
+          brew install pkg-config libpng
+      - name: Install pyyaml
+        run: pip3 install pyyaml --break-system-packages
+      - name: diagnostic
+        run: |
+          echo $PATH
+          which python
       - name: Setup ccache
         uses: hendrikmuhs/ccache-action@v1.2
         with:

crawl-ref/CREDITS.txt

@@ -271,6 +271,7 @@
     István Markó
     Gabriel Marks
     Jean Martel
+    meckryl
     James 'Eronarn' Meickle
     Jacob Meigs
     mgdelmonte

crawl-ref/docs/changelog.txt

@@ -1,5 +1,5 @@
 Stone Soup 0.31 (20240119)
--------------------------
+--------------------------
 
 Highlights
 ----------

crawl-ref/docs/crawl_manual.rst

@@ -1634,7 +1634,7 @@ Deep Elves (DE)
 Armataurs (At)
   The Armataurs are a large, scaled mammalian species, walking on four feet
   and swinging a powerful tail behind them. Their elephant-back armies
-  terrorize the lands outside the Dungeon.
+  terrorise the lands outside the Dungeon.
 
   Armataurs instinctively roll when moving toward foes, getting a free move and
   regenerating magic. They have great aptitudes with armour and shields, though

crawl-ref/docs/develop/levels/syntax.txt

@@ -1411,7 +1411,7 @@ KMASK:    Z = no_monster_gen
           * "no_wall_fixup": Prevents (rock) walls from being converted to
              the level's default wall type, such as in Vaults.
           * "opaque": Overrides the "transparent" tag for this particular
-             symbol. The symbol is considered impassible for level-building
+             symbol. The symbol is considered impassable for level-building
              purposes. A "transparent" vault with a deliberately disconnected
              region must use this mask on the disconnected part.
 

crawl-ref/docs/develop/spells.txt

@@ -110,8 +110,8 @@ via portals.
 This includes partial or complete movement of the caster's body, usually in
 short distances compared to consumables (Blink, Vhi's Electric Charge); the
 creation of loose or controlled portals (Malign Gateway, Passage of Golubria);
-and moving others entirely, whether short distances (Gell's Gravitas) or far
-(Teleport Other).
+and moving others entirely, whether short distances (Maxwell's Portable
+Piledriver) or far (Teleport Other).
 
 This also includes spells which cause items to be moved from one location to
 another, such as Apportation or Dimensional Bullseye.

crawl-ref/source/Makefile.obj

@@ -146,6 +146,7 @@ message.o \
 misc.o \
 mon-abil.o \
 mon-act.o \
+mon-aura.o \
 mon-behv.o \
 mon-cast.o \
 mon-clone.o \

crawl-ref/source/ability.cc

@@ -3905,9 +3905,8 @@ bool player_has_ability(ability_type abil, bool include_unusable)
                && !you.vampire_alive
                && you.form != transformation::bat;
     case ABIL_BREATHE_FIRE:
-        // red draconian handled before the switch
         return you.form == transformation::dragon
-               && species::dragon_form(you.species) == MONS_FIRE_DRAGON;
+               && !species::is_draconian(you.species);
     case ABIL_BLINKBOLT:
         return you.form == transformation::storm;
     case ABIL_SIPHON_ESSENCE:

crawl-ref/source/actor.cc

@@ -935,33 +935,6 @@ string actor::describe_props() const
     return oss.str();
 }
 
-/**
- * Is the actor currently being slowed by a torpor snail?
- */
-bool actor::torpor_slowed() const
-{
-    if (!props.exists(TORPOR_SLOWED_KEY) || is_sanctuary(pos())
-        || is_stationary()
-        || stasis())
-    {
-        return false;
-    }
-
-    for (monster_near_iterator ri(pos(), LOS_SOLID_SEE); ri; ++ri)
-    {
-        const monster *mons = *ri;
-        if (mons && mons->type == MONS_TORPOR_SNAIL
-            && !is_sanctuary(mons->pos())
-            && !mons_aligned(mons, this)
-            && !mons->props.exists(KIKU_WRETCH_KEY))
-        {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 string actor::resist_margin_phrase(int margin) const
 {
     if (willpower() == WILL_INVULN)

crawl-ref/source/actor.h

@@ -230,9 +230,6 @@ class actor
                        bool temp = true) const = 0;
     int  skill_rdiv(skill_type sk, int mult = 1, int div = 1) const;
 
-#define TORPOR_SLOWED_KEY "torpor_slowed"
-    bool torpor_slowed() const;
-
     virtual int heads() const = 0;
 
     virtual int stat_hp() const = 0;

crawl-ref/source/android-project/jni/src/Android.mk

@@ -166,6 +166,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
     $(CRAWL_PATH)/misc.cc \
     $(CRAWL_PATH)/mon-abil.cc \
     $(CRAWL_PATH)/mon-act.cc \
+    $(CRAWL_PATH)/mon-aura.cc \
     $(CRAWL_PATH)/mon-behv.cc \
     $(CRAWL_PATH)/mon-cast.cc \
     $(CRAWL_PATH)/mon-clone.cc \

crawl-ref/source/areas.cc

@@ -29,11 +29,10 @@
 #include "traps.h"
 #include "travel.h"
 
-/// Bitmasks for area properties
+/// Bitmasks for area properties that center on actors
 enum class areaprop
 {
-    sanctuary_1   = (1 << 0),
-    sanctuary_2   = (1 << 1),
+    // 0 and 1 were sanctuary, now unused
     silence       = (1 << 2),
     halo          = (1 << 3),
     liquified     = (1 << 4),
@@ -42,7 +41,7 @@ enum class areaprop
     umbra         = (1 << 7),
     quad          = (1 << 8),
     disjunction   = (1 << 9),
-    soul_aura     = (1 << 10),
+    // 10 was lost soul aura, now unused
 };
 /// Bit field for the area properties
 DEF_BITFIELD(areaprops, areaprop);
@@ -237,10 +236,6 @@ static void _update_agrid()
 static area_centre_type _get_first_area(const coord_def& f)
 {
     areaprops a = _agrid(f);
-    if (a & areaprop::sanctuary_1)
-        return area_centre_type::sanctuary;
-    if (a & areaprop::sanctuary_2)
-        return area_centre_type::sanctuary;
     if (a & areaprop::silence)
         return area_centre_type::silence;
     if (a & areaprop::halo)

crawl-ref/source/art-data.txt

@@ -1531,7 +1531,7 @@ DBRAND:   Omnireflect: It can block and reflect piercing ranged attacks and
 NAME:     amulet of invisibility
 OBJ:      OBJ_JEWELLERY/AMU_NOTHING
 COLOUR:   WHITE
-TILE:     urand_cekugob
+TILE:     urand_amulet_invisibility
 BOOL:     inv, nogen
 
 ENUM:     THERMIC_ENGINE

crawl-ref/source/artefact.cc

@@ -82,7 +82,10 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
     switch (which_god)
     {
     case GOD_ZIN:
-        // Lawful god: no mutagenics.
+        // Lawful god: no chaos or mutagenics.
+        if (brand == SPWPN_CHAOS)
+            return false;
+
         if (artefact_property(item, ARTP_CONTAM))
             return false;
         break;
@@ -150,6 +153,12 @@ static bool _god_fits_artefact(const god_type which_god, const item_def &item,
             return false;
         break;
 
+    case GOD_IGNIS:
+        // Fire god.
+        if (item.base_type == OBJ_WEAPONS && brand != SPWPN_FLAMING)
+            return false;
+        break;
+
     default:
         break;
     }

crawl-ref/source/beam-type.h

@@ -95,7 +95,8 @@ enum beam_type                  // bolt::flavour
     BEAM_VITRIFYING_GAZE,
     BEAM_WEAKNESS,
     BEAM_CURSE_OF_AGONY,
-    BEAM_LAST_ENCHANTMENT = BEAM_CURSE_OF_AGONY,
+    BEAM_RIMEBLIGHT,
+    BEAM_LAST_ENCHANTMENT = BEAM_RIMEBLIGHT,
 
     BEAM_MEPHITIC,
     BEAM_AIR,

crawl-ref/source/beam.cc

@@ -600,6 +600,12 @@ bool bolt::can_affect_actor(const actor *act) const
     {
         return false;
     }
+    // Xak'krixis' prisms are smart enough not to affect friendlies
+    else if (origin_spell == SPELL_FULMINANT_PRISM && thrower == KILL_MON
+        && act->temp_attitude() == attitude)
+    {
+        return false;
+    }
     auto cnt = hit_count.find(act->mid);
     if (cnt != hit_count.end() && cnt->second >= 2)
     {
@@ -2629,6 +2635,31 @@ void bolt::affect_endpoint()
     }
     break;
 
+    case SPELL_FLASHING_BALESTRA:
+    {
+        coord_def spot;
+        int num_found = 0;
+        for (adjacent_iterator ai(pos()); ai; ++ai)
+        {
+            if (feat_is_solid(env.grid(*ai)) || actor_at(*ai))
+                continue;
+
+            if (one_chance_in(++num_found))
+                spot = *ai;
+        }
+
+        if (!spot.origin())
+        {
+            create_monster(mgen_data(MONS_DANCING_WEAPON,
+                                SAME_ATTITUDE(agent(true)->as_monster()),
+                                spot,
+                                agent(true)->as_monster()->foe,
+                                MG_FORCE_PLACE)
+                        .set_summoned(agent(true), 1, SPELL_FLASHING_BALESTRA, GOD_NO_GOD));
+        }
+    }
+    break;
+
     default:
         break;
     }
@@ -3099,7 +3130,8 @@ bool bolt::harmless_to_player() const
         return true;
 
     if (origin_spell == SPELL_COMBUSTION_BREATH
-        || origin_spell == SPELL_NULLIFYING_BREATH)
+        || origin_spell == SPELL_NULLIFYING_BREATH
+        || origin_spell == SPELL_RIMEBLIGHT)
     {
         return true;
     }
@@ -4302,7 +4334,8 @@ bool bolt::ignores_player() const
         return true;
 
     if (origin_spell == SPELL_COMBUSTION_BREATH
-        || origin_spell == SPELL_NULLIFYING_BREATH)
+        || origin_spell == SPELL_NULLIFYING_BREATH
+        || origin_spell == SPELL_RIMEBLIGHT)
     {
         return true;
     }
@@ -5046,6 +5079,20 @@ void bolt::monster_post_hit(monster* mon, int dmg)
         mon->speed_increment += 10;
         simple_monster_message(*mon, " is empowered.");
     }
+
+    // Give electroferric vorticies a little more life if the player is shooting them
+    if (origin_spell == SPELL_MAGNAVOLT && mon->type == MONS_ELECTROFERRIC_VORTEX)
+        mon->add_ench(mon_enchant(ENCH_SLOWLY_DYING, 0, nullptr, BASELINE_DELAY * 2));
+
+    if (origin_spell == SPELL_RIMEBLIGHT)
+    {
+        if (mon->holiness() & (MH_NATURAL | MH_DEMONIC | MH_HOLY)
+            && !mon->has_ench(ENCH_RIMEBLIGHT)
+            && one_chance_in(2))
+        {
+            apply_rimeblight(*mon, ench_power);
+        }
+    }
 }
 
 static int _knockback_dist(spell_type origin, int pow)
@@ -5540,6 +5587,15 @@ bool bolt::ignores_monster(const monster* mon) const
     if (flavour == BEAM_WATER && mon->type == MONS_WATER_ELEMENTAL)
         return true;
 
+    // Rimeblight explosions won't hurt allies OR the monster that is exploding
+    if (origin_spell == SPELL_RIMEBLIGHT)
+        return mon->friendly() || mon->pos() == source;
+
+    // Casting this destroys the cannon anyway, but this prevents misleading
+    // targeter prompts.
+    if (origin_spell == SPELL_SEISMIC_SHOCKWAVE && mon->type == MONS_SEISMIC_CANNON)
+        return true;
+
     int summon_type = 0;
     mon->is_summoned(nullptr, &summon_type);
     if (flavour == BEAM_QAZLAL && summon_type == MON_SUMM_AID)
@@ -5591,6 +5647,7 @@ bool bolt::has_saving_throw() const
     case BEAM_CONCENTRATE_VENOM:
     case BEAM_ENFEEBLE:
     case BEAM_VITRIFYING_GAZE:
+    case BEAM_RIMEBLIGHT:
         return false;
     case BEAM_VULNERABILITY:
         return !one_chance_in(3);  // Ignores will 1/3 of the time
@@ -5713,6 +5770,11 @@ bool ench_flavour_affects_monster(actor *agent, beam_type flavour,
              || !mons_invuln_will(*mon);
         break;
 
+    case BEAM_RIMEBLIGHT:
+        rc = !mon->has_ench(ENCH_RIMEBLIGHT)
+             && mon->holiness() & (MH_NATURAL | MH_DEMONIC | MH_HOLY);
+        break;
+
     default:
         break;
     }
@@ -6401,6 +6463,15 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon)
             obvious_effect = true;
         return MON_AFFECTED;
 
+    case BEAM_RIMEBLIGHT:
+        if (apply_rimeblight(*mon, ench_power, true))
+        {
+            mprf("A stygian plague fills %s body.",
+                 apostrophise(mon->name(DESC_THE)).c_str());
+            obvious_effect = true;
+        }
+        return MON_AFFECTED;
+
     default:
         break;
     }
@@ -6962,6 +7033,7 @@ bool bolt::nasty_to(const monster* mon) const
         case BEAM_MINDBURST:
         case BEAM_VAMPIRIC_DRAINING:
         case BEAM_ENFEEBLE:
+        case BEAM_RIMEBLIGHT:
             return ench_flavour_affects_monster(agent(), flavour, mon);
         case BEAM_TUKIMAS_DANCE:
             return tukima_affects(*mon); // XXX: move to ench_flavour_affects?
@@ -7257,6 +7329,7 @@ static string _beam_type_name(beam_type type)
     case BEAM_CRYSTALLIZING:         return "crystallizing";
     case BEAM_WARPING:               return "spatial disruption";
     case BEAM_QAZLAL:                return "upheaval targetter";
+    case BEAM_RIMEBLIGHT:            return "rimeblight";
 
     case NUM_BEAMS:                  die("invalid beam type");
     }