18.12.18 하엘적마 업데이트 High Elf & warrior-mage update

알 수 없는 이유로 던전에서 사라진 하이 엘프가 돌아왔습니다! 새롭게 추가된 부여술 주문과 함께 마전사를 다시 한 번 위대하게 만들어봅시다!

+ 하이 엘프가 돌아왔습니다!
+ 새로운 주문 : 적마도사의 방어막 Red Mage's Barrier
5레벨 부여술 주문으로, skald의 시작 책에 수록되어 있습니다. 과거 잠시 존재했던 song of shielding과 같은 효과의 주문으로, 짧은 시간 동안 받는 피해를 체력 대신 마력으로 받습니다.
+ 새로운 주문 : 수은 오라 Quicksilver Aura
6레벨 부여술/주술 주문입니다. 당신의 무기를 수은 오라로 휘감아, 공격한 적의 마법적 효과를 전부 해제하고 저항할 수 없는 8-20 데미지를 줍니다.

The High Elves, who disappeared from the dungeon for unknown reasons, are back! Let's MAKE WARRIOR-MAGE GREAT AGAIN with the newly added charm spells!

+ The High Elf is back!
+ New Spell: Red Mage's Barrier
Level 5 charm. This spell effects like 'a song of shielding' that has been in existence for a while, absorb damage by magic instead of health for a short time.
+ New Spell: Quicksilver Aura
Level 6 charm / hex. Wrapping your weapon with quicksilver aura, dispelling the magical effects of enemy and giving
Irresistible 8-20 damage.

Author: FlowingWriter

crawl-ref/docs/changelog.txt

@@ -1,72 +1,3 @@
-Stone Soup 0.23 (up to 0.23-a0-462-g7c42f869)
----------------------------------------------
-
-Branches, Environment
----------------------
-* New early vaults featuring thematic item shops and monsters guarding
-  manuals.
-* Layouts:
-  - Concentric octagons is enabled for Lair and Snake.
-  - Cave pools (with adjusted parameters) is enabled for the Dungeon.
-
-Character
----------
-* Wanderer starting spell libraries are announced along with equipment.
-* Wanderers that start with exactly one level 1 spell start with it memorized.
-* The player can no longer be put to sleep when paralyzed or petrified.
-
-Gods
-----
-* Monster conversion for Beogh, Gozag's Bribe, and Jiyva is attempted upon
-  sight instead of on the turn after the monster enters LOS.
-* The acid damage from Makhleb's Minor Destruction has been reduced.
-
-Interface
----------
-* The Hepliakqana ancestor reaching full health interrupts resting. The exact
-  behavior of this interrupt can be configured by rest_wait_ancestor.
-* WebTiles users can use a "Forgot Password" link to reset their password
-  via a link sent to their registration email address. This feature is not yet
-  enabled on most official servers.
-
-Items
------
-* Stash search can now search by handedness.
-* Butchering a corpse always leaves a skeleton.
-* Wand charges for wands of digging, enslavement, flame, paralysis, polymorph,
-  and random effects have been reduced.
-* Unrandarts:
-  - The Singing Sword is now vorpal, and its sonic damage effect is stronger
-    and triggers on-hit instead of while wielded.
-  - The Spriggan's Knife loses Dex+4 and MR+ and converts all stabs to
-    sleep-tier stabs.
-  - The robe of Misfortune is now identified, and is +5 {*Contam *Corrode
-    *Drain Harm *Slow and EV+5}.
-  - The sceptre of Torment is now a +7 eveningstar of pain, and its torment
-    does not affect the wielder.
-  - The arc blade's effect now casts static discharge only once, but at very
-    high spellpower. The weapon's enchantment is now +8.
-  - Finisher loses Str+3 and gains a chance to instant-explode the target.
-  - Unrandarts with melee effects that could anger nearby allies give a proper
-    warning.
-
-Monsters
---------
-* Monster weapons, armour, and wands are identified and revealed to the player
-  when the monster is first seen.
-* The shambling mangrove Grasping Roots ability now performs smite-targeted
-  constriction instead of applying a 'Roots' status.
-* Jorgrun gains the Grasping Roots spell and can now spawn in Swamp.
-* Orb run spawns are more frequently near the player and more dangerous.
-* Pandemonium lords' spell sets and attack brands are revealed.
-* Monster summons disappear whenever the summoner changes alignment from being
-  charmed/uncharmed, pacified, or slimified.
-
-Spells
-------
-* Confusing touch works with a weapon wielded
-
-
 Stone Soup 0.22 (20180810)
 --------------------------
 

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

@@ -1479,13 +1479,22 @@ MARKER:   A = feat:<feature_name> or lua:<marker_expr>
           A marker ties a square on the map to a game-trigger of some sort
           (which depends on the marker and what feature it is on).
 
-          Lua markers are used for more complex triggers such as entry to the
-          Slime loot areas when the Royal Jelly dies, fog generators,
-          transporters, etc.
+          The portals to the Hells in the Vestibule of Hell are each annotated
+          with feature markers like this:
 
-          Here's a Lua marker that creates a cloud generator. For a
+          MARKER: D=feat:enter_dis, G=feat:enter_gehenna
+
+          When the horn is sounded, the stone arch at D becomes the portal to
+          Dis, the arch at G becomes the portal to Gehenna. This behaviour
+          applies only to the Vestibule of Hell.
+
+          Lua markers are used for more complex triggers, such as for bazaar
+          and labyrinth gates, rune pickup triggers for the branches of Hell,
+          fog generators, etc.
+
+          Here's a Lua marker that creates a cloud generator (for a
           full explanation of the various parameters, read the header
-          of dat/dlua/lm_fog.lua.
+          of dat/dlua/lm_fog.lua):
 
           MARKER:  A = lua:fog_machine { \
                        pow_max = 15, delay_min = 100, delay_max = 150, \

crawl-ref/docs/options_guide.txt

@@ -47,8 +47,8 @@ The contents of this text are:
                 tc_exclude_circle, runrest_ignore_message,
                 runrest_stop_message, runrest_safe_poison,
                 runrest_ignore_monster, rest_wait_both, rest_wait_percent,
-                rest_wait_ancestor, explore_auto_rest, auto_exclude,
-                wall_jump_move, wall_jump_prompt
+                explore_auto_rest, auto_exclude, wall_jump_move,
+                wall_jump_prompt
 3-g     Command Enhancements.
                 auto_switch, travel_open_doors, easy_unequip, equip_unequip,
                 jewellery_prompt, easy_confirm, simple_targeting,
@@ -926,11 +926,6 @@ rest_wait_both = false
         when both HP and MP are fully restored, not when either one of
         them is restored.
 
-rest_wait_ancestor = false
-        If rest_wait_ancestor is set to true then resting will only stop when
-        the ancestor's health is fully restored in addition to player HP or MP
-        (or both, if rest_wait_both is set).
-
 rest_wait_percent = 100
         When resting, if your HP or MP is below this percentage of being full,
         it will stop resting when this percent of maximum HP or MP is refilled.

crawl-ref/source/aptitudes.h

@@ -50,7 +50,6 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HUMAN,           SK_INVOCATIONS,     1),
     APT(SP_HUMAN,           SK_EVOCATIONS,      0),
 
-#if TAG_MAJOR_VERSION == 34
     // SP_HIGH_ELF
     APT(SP_HIGH_ELF,        SK_FIGHTING,        0),
     APT(SP_HIGH_ELF,        SK_SHORT_BLADES,    2),
@@ -85,7 +84,6 @@ static const species_skill_aptitude species_skill_aptitudes[] =
     APT(SP_HIGH_ELF,        SK_POISON_MAGIC,   -2),
     APT(SP_HIGH_ELF,        SK_INVOCATIONS,     1),
     APT(SP_HIGH_ELF,        SK_EVOCATIONS,      0),
-#endif
 
     // SP_DEEP_ELF
     APT(SP_DEEP_ELF,        SK_FIGHTING,       -2),

crawl-ref/source/book-data.h

@@ -75,6 +75,7 @@ static const vector<spell_type> spellbook_templates[] =
 {   // Book of Enchantments
     SPELL_CAUSE_FEAR,
     SPELL_VIOLENT_UNRAVELLING,
+	SPELL_QUICKSILVER_AURA,
     SPELL_SILENCE,
     SPELL_DEFLECT_MISSILES,
     SPELL_DISCORD,
@@ -232,6 +233,7 @@ static const vector<spell_type> spellbook_templates[] =
     SPELL_SONG_OF_SLAYING,
     SPELL_SPECTRAL_WEAPON,
     SPELL_REGENERATION,
+	SPELL_RED_BARRIER,
 },
 #endif
 
@@ -344,6 +346,14 @@ static const vector<spell_type> spellbook_templates[] =
     SPELL_SUMMON_HYDRA,
 },
 
+{   // Book of Red Mage
+    SPELL_SONG_OF_SLAYING,
+	SPELL_RED_BARRIER,
+	SPELL_QUICKSILVER_AURA,
+    SPELL_DEFLECT_MISSILES,
+	SPELL_RING_OF_FLAMES,
+},
+
 {   // Book of Annihilations
     SPELL_POISON_ARROW,
     SPELL_CHAIN_LIGHTNING,

crawl-ref/source/book-type.h

@@ -55,6 +55,7 @@ enum book_type
     BOOK_DREAMS,
     BOOK_ALCHEMY,
     BOOK_BEASTS,
+	BOOK_RED_MAGE,
 
     BOOK_ANNIHILATIONS,
     BOOK_GRAND_GRIMOIRE,

crawl-ref/source/dat/des/altar/overflow.des

@@ -126,6 +126,8 @@ function species_mock(e)
     e.kmons("1 = insubstantial wisp")
   elseif you.race() == "Halfling" then
     e.kmons("1 = hobgoblin ; mundane hunting sling")
+  elseif you.race() == "High Elf" then
+    e.kmons("1 = glowing orange brain")
   elseif you.race() == "Hill Orc" then
     e.kmons("1 = goblin ; mundane hand axe . mundane ring mail")
   elseif you.race() == "Human" then

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

@@ -238,6 +238,11 @@ book of power
 A book of powerful magic spells, crackling and shuddering with barely-contained
 energies.
 %%%%
+book of red mage
+
+A book of old warrior-mage, who called 'red mage'. Containing charm-based spells
+enhancing your combat.
+%%%%
 book of spatial translocations
 
 A basic spellbook on the magical field of Translocations.

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

@@ -502,7 +502,7 @@ remaining eye is not very good, and she has mistaken you for one.
 Urug, the Eye of Beogh
 
 The most bravest and courageous marksorc. According to the Boogh's will, only Urug was
-empowered to lead a war riding on the blessed warg. Beoge admired her courage
+empowered to lead a war riding on the blessed warg. Beogh admired her courage
 and gave her a sacred eye that would not miss anything.
 %%%%
 Vashnia

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

@@ -63,6 +63,12 @@ Halfling
 Small but hardy, Halflings excel with slings. They have an increased resistance
 to mutagenic effects.
 %%%%
+High Elf
+
+High Elves are adept with blades and with many schools of magic, and have high
+attributes. For unknown reasons, they did not show up in the dungeons for a while,
+but recently they started to explore dungeons again.
+%%%%
 Hill Orc
 
 Orcs are skilled in close combat, and often dabble in offensive magic. Hated by