Merge branch 'master' into kimchi-1.0-branch

crawl-ref/docs/changelog.txt

@@ -1,4 +1,4 @@
-Stone Soup kimchi-1.1.0 (20200820)
+Stone Soup kimchi-1.1.1 (20200821)
 --------------------------------
 
 Highlights

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

@@ -1074,8 +1074,10 @@ other infusions, makes all targets in your sight are infused by same essences.
 # Imus Thea
 Prismatic Prism ability
 
-Create a prism, blinds nearby enemies and also reflect ranged attacks like you.
+Create a prism, blinds nearby enemies at every turns. Prism's hit dice is depending
+on your piety, and it will be shattered after 3 turns without how much damaged.
 %%%%
 Fragmentation ability
 
-Shatter youself to duplicate yourself.
+Shatter youself to duplicate yourself, costs a half of your present health.
+These 'mirror image' is almost same to you, like spells, equipments.

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

@@ -322,11 +322,11 @@ Imus Thea powers
 
 Followers of Imus Thea can reflect all kinds of upcoming missiles, including
 magical beams. Instead, Imus Thea demands worshippers become mirror, and project
-more wider world. If they accept the aspect of mirror, their bodies become
-fragile and unable to wear heavy armours and any kinds of shields, and lose
-accuracy when swing some heavy weapons. Nevertheless, those who accept these
-will able to blinds enemies with prismatic prism, and able to shatter themselves
-to duplicate themselves.
+more wider world, because those projections make domain of mirror-god more wider.
+If they accept the aspect of mirror, their bodies become fragile and unable to
+wear heavy armours and any kinds of shields, and lose accuracy when using two-handed
+weapons. Nevertheless, those who accept these will able to blinds enemies with
+prismatic prism, and able to shatter themselves to duplicate themselves.
 %%%%
 Jiyva powers
 
@@ -584,7 +584,8 @@ Imus Thea wrath
 
 Imus Thea will punish its old followers from countless parallel realms.
 The betrayer of mirror-god will be encountered with their self from mirror,
-with same equipment and spells as them.
+with same equipment and spells as them, and will be nailed to the point
+where they couldn't run away by overlapping the world around them.
 %%%%
 Wu Jian wrath
 

crawl-ref/source/god-wrath.cc

@@ -2148,23 +2148,24 @@ static bool _imus_retribution()
     const god_type god = GOD_IMUS;
     int count = 0;
 
-    // WIP: use count to define success/failure of summon illusion
-
-    if (count > 0)
+    if (monster *mon =
+        create_monster(_wrath_mon_data(MONS_PLAYER_ILLUSION, god)))
     {
-        switch (random2(2))
-        {
-        case 0:
-            simple_god_message(" says: Do you know who is your worst enemy? Face it!", god);
-            break;
-        case 1:
-            mprf(MSGCH_WARN, "You feel the world around you overlap for a moment!");
-            break;
-        }
+        ghost_demon newstats;
+        newstats.init_player_ghost();
+        mon->set_ghost(newstats);
+        mon->ghost_demon_init();
 
-    } else {
-        simple_god_message( " fails to create your reflection.", god);
+        count++;
     }
+
+    you.increase_duration(DUR_DIMENSION_ANCHOR, 50 + (you.experience_level * 5), 200);
+    mprf(MSGCH_WARN, "You feel the world around you overlap for a moment!");
+
+    if (count <= 0)
+    {
+        simple_god_message( " fails to create your reflection.", god);
+    } else simple_god_message(" says: Do you know who is your worst enemy? Face it!", god);
     return true;
 }
 

crawl-ref/source/rltiles/dc-icons.txt

@@ -58,6 +58,7 @@ bound_soul BOUND_SOUL
 infested INFESTED
 corroded CORRODED
 swift SWIFT
+frozen FROZEN
 pinned PINNED
 vile_clutch VILE_CLUTCH
 possessable POSSESSABLE

crawl-ref/source/spl-summoning.cc

@@ -4123,7 +4123,6 @@ spret fragmentation(int power)
     mon->reset();
 
     const int fragment = max((you.hp/2)-1, 1);
-    //mon->holiness() = you.holiness();
     mon->hit_points = fragment;
     dec_hp(fragment, false);
 

crawl-ref/source/tile-flags.h

@@ -43,12 +43,12 @@ enum tile_flags ENUM_INT64
     TILE_FLAG_BOUND_SOUL   = 0x20000000000000ULL,
     TILE_FLAG_INFESTED     = 0x40000000000000ULL,
     TILE_FLAG_CORRODED     = 0x80000000000000ULL,
-    TILE_FLAG_SWIFT        = 0x100000000000000ULL,
+    TILE_FLAG_SWIFT        = 0x04000000000ULL,
+    TILE_FLAG_FROZEN       = 0x100000000000000ULL,
     TILE_FLAG_PINNED       = 0x200000000000000ULL,
     TILE_FLAG_VILE_CLUTCH  = 0x400000000000000ULL,
     TILE_FLAG_POSSESSABLE  = 0x800000000000000ULL,
     TILE_FLAG_CIGOTUVIS_PLAGUE = 0x02000000000ULL,
-    TILE_FLAG_CUBUS_AURA       = 0x04000000000ULL,
 
     // 4 mutually exclusive flags for threat level.
     TILE_FLAG_THREAT_MASK  = 0xE000000000000000ULL,
@@ -117,6 +117,7 @@ enum tile_flags ENUM_INT64
     TILE_FLAG_STARSPAWN_SE = 0x08000000000ULL,
     TILE_FLAG_STARSPAWN_SW = 0x10000000000ULL,
 #endif
+    //TILE_FLAG_CUBUS_AURA       = 0x04000000000ULL,
 
     //// General
 

crawl-ref/source/tiledgnbuf.cc

@@ -330,10 +330,10 @@ void DungeonCellBuffer::pack_background(int x, int y, const packed_cell &cell)
 
         if (!(bg & TILE_FLAG_UNSEEN))
         {
-            if (cell.fg & TILE_FLAG_CUBUS_AURA)
+            /*if (cell.fg & TILE_FLAG_CUBUS_AURA)
             {
                 m_buf_feat.add(TILE_CUBUS_AURA, x, y);
-            }
+            }*/
 
             if (cell.is_sanctuary)
                 m_buf_feat.add(TILE_SANCTUARY, x, y);
@@ -465,8 +465,8 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
     if (fg & TILE_FLAG_IDEALISED)
         m_buf_icons.add(TILEI_IDEALISED, x, y);
 
-    if (fg & TILE_FLAG_CUBUS_AURA)
-        m_buf_icons.add(TILEI_CUBUS_COLLAR, x, y);
+    /*if (fg & TILE_FLAG_CUBUS_AURA)
+        m_buf_icons.add(TILEI_CUBUS_COLLAR, x, y);*/
 
     int status_shift = 0;
     if (fg & TILE_FLAG_BEH_MASK)
@@ -602,6 +602,11 @@ void DungeonCellBuffer::pack_foreground(int x, int y, const packed_cell &cell)
         m_buf_icons.add(TILEI_SWIFT, x, y, -status_shift, 0);
         status_shift += 6;
     }
+    if (fg & TILE_FLAG_FROZEN)
+    {
+        m_buf_icons.add(TILEI_FROZEN, x, y, -status_shift, 0);
+        status_shift += 6;
+    }
     if (fg & TILE_FLAG_PINNED)
     {
         m_buf_icons.add(TILEI_PINNED, x, y, -status_shift, 0);

crawl-ref/source/tilepick.cc

@@ -1975,6 +1975,8 @@ tileidx_t tileidx_monster(const monster_info& mons)
         ch |= TILE_FLAG_CORRODED;
     if (mons.is(MB_SWIFT))
         ch |= TILE_FLAG_SWIFT;
+    if (mons.is(MB_FROZEN))
+        ch |= TILE_FLAG_FROZEN;
     if (mons.is(MB_PINNED))
         ch |= TILE_FLAG_PINNED;
     if (mons.is(MB_VILE_CLUTCH))
@@ -2022,8 +2024,8 @@ tileidx_t tileidx_monster(const monster_info& mons)
     // Should petrify show the '?' symbol?
     else if (mons.is(MB_DISTRACTED) && !mons.is(MB_PETRIFYING))
         ch |= TILE_FLAG_MAY_STAB;
-    else if (mons.type == MONS_CUBUS)
-        ch |= TILE_FLAG_CUBUS_AURA;
+    //else if (mons.type == MONS_CUBUS)
+    //    ch |= TILE_FLAG_CUBUS_AURA;
     mon_dam_level_type damage_level = mons.dam;
 
     switch (damage_level)