diff options
| -rw-r--r-- | crawl-ref/source/beam.cc | 15 | ||||
| -rw-r--r-- | crawl-ref/source/enum.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/mstuff2.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/spl-cast.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/spl-data.h | 2 |
5 files changed, 24 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index ff2c1ea606..05848498c8 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1282,6 +1282,21 @@ const zap_info zap_data[] = { false, false, false + }, + + { + ZAP_PORKALATOR, + "porkalator", + 100, + NULL, + NULL, + RED, + true, + BEAM_PORKALATOR, + DCHAR_SPACE, + false, + false, + false } }; diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 1638578076..318dd194d9 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -3139,6 +3139,7 @@ enum zap_type ZAP_ENSLAVE_SOUL, ZAP_CHAOS, ZAP_SLIME, + ZAP_PORKALATOR, NUM_ZAPS }; diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index af1b45c53f..408a3e79e8 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -2212,7 +2212,7 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power ) break; case SPELL_PORKALATOR: - beam.name = "0"; + beam.name = "porkalator"; beam.type = 0; beam.flavour = BEAM_PORKALATOR; beam.thrower = KILL_MON_MISSILE; diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index d32187743f..407c4d6232 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1492,6 +1492,12 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) if (!zapping(ZAP_DEGENERATION, powc, beam, true)) return (SPRET_ABORT); break; + + case SPELL_PORKALATOR: + // Wizard mode only. + if (!zapping(ZAP_PORKALATOR, powc, beam, true)) + return (SPRET_ABORT); + break; case SPELL_HELLFIRE: // Should only be available from diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index 155fc7b8c2..0e22a39463 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -2464,7 +2464,7 @@ { SPELL_PORKALATOR, "Porkalator", SPTYP_ENCHANTMENT | SPTYP_TRANSMUTATION, - SPFLAG_DIR_OR_TARGET | SPFLAG_NOT_SELF, + SPFLAG_DIR_OR_TARGET, 5, 200, LOS_RADIUS, LOS_RADIUS, |