Merge pull request TempusMUD#496 from origintempus/manually-revert-42…

…1-and-407 Manually revert 421 and 407
dlowe-net · Jan 8, 2015 · 66aad1b · 66aad1b
2 parents 136b48e + c90dfd6
commit 66aad1b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 39 deletions.
diff --git a/sample_lib/etc/spells.xml b/sample_lib/etc/spells.xml
@@ -1064,16 +1064,6 @@ To answer the mysteries one's life can bring.</lyrics>
   <skill id="668" name="drag">
     <granted class="barbarian" level="40"/>
   </skill>
-  <spell id="162" name="dragons breath">
-    <manacost initial="0" level_dec="0" minimum="0"/>
-    <position minimum="fighting"/>
-    <target type="creature" scope="room"/>
-    <target type="creature" scope="fighting"/>
-    <flag value="violent"/>
-    <flag value="damage"/>
-    <flag value="nowater"/>
-    <flag value="magic"/>
-  </spell>
   <spell id="365" name="drifters ditty">
     <granted class="bard" level="4"/>
     <manacost initial="30" level_dec="2" minimum="15"/>

diff --git a/sample_lib/misc/messages b/sample_lib/misc/messages
@@ -472,22 +472,6 @@ Thorns pop out of $n's skin effortlessly.
 #
 $n chuckles as thorns effortlessly pop out of $s skin.
 
-* Dragons Breath
-M
- 162
-You blast $N's body into ash with your fiery breath!
-Your body is blasted to ash by the fiery breath of $n!
-$n blasts $N to ash with $s fiery breath!
-$N dodges your jet of fiery breath!
-$n breathes fire at you, but you leap aside!
-$N dodges a jet of fiery breath from $n!
-You blast $N with a jet of fiery breath.
-$n blasts you full force with $s fiery breath!
-$N staggers under a blast of flame as $n breathes on $M!
-$N sneers at your offensive breath.
-$n warms you with a breath of fire.
-$n warms $N with $s fiery breath.
-
 * Psychic Surge
 M
  224

diff --git a/src/combat/combat_utils.c b/src/combat/combat_utils.c
@@ -845,7 +845,6 @@ make_corpse(struct creature *ch, struct creature *killer, int attacktype)
     case SPELL_LIGHTNING_BOLT:
     case SPELL_MICROWAVE:
     case SPELL_FIRE_BREATH:
-    case SPELL_DRAGONS_BREATH:
     case SPELL_LIGHTNING_BREATH:
     case SPELL_FIRE_ELEMENTAL:
     case TYPE_ABLAZE:

diff --git a/src/combat/fight.c b/src/combat/fight.c
@@ -1647,7 +1647,6 @@ damage(struct creature *ch, struct creature *victim,
     case SPELL_FLAME_STRIKE:
     case SPELL_FIRE_ELEMENTAL:
     case SPELL_FIRE_BREATH:
-    case SPELL_DRAGONS_BREATH:
     case TYPE_ABLAZE:
     case SPELL_FIRE_SHIELD:
     case TYPE_FLAMETHROWER:
@@ -1936,7 +1935,6 @@ damage(struct creature *ch, struct creature *victim,
         if (!AFF2_FLAGGED(victim, AFF2_ABLAZE) &&
             (attacktype == SPELL_FIREBALL ||
                 attacktype == SPELL_FIRE_BREATH ||
-                attacktype == SPELL_DRAGONS_BREATH ||
                 attacktype == SPELL_HELL_FIRE ||
                 attacktype == SPELL_FLAME_STRIKE ||
                 attacktype == SPELL_METEOR_STORM ||

diff --git a/src/include/spells.h b/src/include/spells.h
@@ -290,7 +290,6 @@ enum spell {
     SPELL_FROST_BREATHING = 159,
     SPELL_FLAME_OF_FAITH = 160,
     SPELL_ABLAZE = 161, // Only here to allow an ablaze affect
-    SPELL_DRAGONS_BREATH = 162,
 
   /************************** Psionic Triggers ***************/
     SPELL_POWER = 201,	/* Strength                */

diff --git a/src/magic/magic.c b/src/magic/magic.c
@@ -761,10 +761,6 @@ mag_damage(int level, struct creature *ch, struct creature *victim,
         audible = true;
         dam = dice(level, 15) + level;
         break;
-    case SPELL_DRAGONS_BREATH:
-        audible = true;
-        dam = dice(level, 8) + (level / 2);
-        break;
     case SPELL_FROST_BREATH:
         audible = true;
         dam = dice(level, 7) + level;

diff --git a/src/mobiles/mobact.c b/src/mobiles/mobact.c
@@ -4213,19 +4213,23 @@ ACMD(do_breathe)
 
     if (IS_PC(ch)) {
         if (fire != NULL) {
-            if (GET_SKILL(ch, SPELL_DRAGONS_BREATH) < GET_SKILL(ch, SPELL_FIRE_BREATHING))
-                SET_SKILL(ch, SPELL_DRAGONS_BREATH, GET_SKILL(ch, SPELL_FIRE_BREATHING));
-            call_magic(ch, vict, NULL, NULL, SPELL_DRAGONS_BREATH, GET_LEVEL(ch),
+            call_magic(ch, vict, NULL, NULL, SPELL_FIRE_BREATH, GET_LEVEL(ch),
                 CAST_BREATH);
             fire = affected_by_spell(ch, SPELL_FIRE_BREATHING);
             if (fire) {
                 fire->duration -= 5;
                 if (fire->duration <= 0)
                     affect_remove(ch, fire);
             }
-            WAIT_STATE(ch, 1 RL_SEC);
         } else if (frost != NULL) {
-            send_to_char(ch, "ERROR: Frost breath not found.\r\n");
+            call_magic(ch, vict, NULL, NULL, SPELL_FROST_BREATH, GET_LEVEL(ch),
+                CAST_BREATH);
+            frost = affected_by_spell(ch, SPELL_FROST_BREATH);
+            if (frost) {
+                frost->duration -= 5;
+                if (frost->duration <= 0)
+                    affect_remove(ch, frost);
+            }
         } else {
             send_to_char(ch, "ERROR: No breath type found.\r\n");
         }