fiddlerwoaroof/crawl - Change MJWFTUS66PTCNEYXEJA3CUJFXNWXIKDD6H3V24PW7HK64NSVOFSAC

Add gore and splatter to Crawl - in the form of Jarmo's

(strongly modified, I admit) blood patch.

Whenever the player or a monster capable of bleeding suffers damage (currently only in melee) or when you dissect a corpse there's a chance (depending on damage/corpse weight) that the square will turn bloody and be coloured red, with a much lower chance of additionally spattering some of the surrounding squares. These chances are probably still a bit too high for later values of possible damage dealt. Also, ranged and some of the magic attacks (earth-based, mostly) should also be able to send blood flying. :p

For now, this is flavour only, but it shouldn't be too difficult to introduce relations to Necromancy or evil gods.

Also consider dragons to be warm-blooded, like dinosaurs.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3230 c06c8d41-db1a-0410-9941-cceddc491573

Created by j-p-e-g on January 9, 2008

MJWFTUS66PTCNEYXEJA3CUJFXNWXIKDD6H3V24PW7HK64NSVOFSAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 169 [6.13254]
[4.89]
[5.113]
```
bool is_bloodcovered( int x, int y );
```
Replacement in crawl-ref/source/view.cc at line 211 [6.16817]
B:BD[4.178] → [4.178:211]
```
bool is_sanctuary( int x, int y)
```
[4.178]
[4.211]
```
bool is_sanctuary(int x, int y)
```

Replacement in crawl-ref/source/view.cc at line 213 [6.16817]

B:BD[4.213] → [4.213:264]

    return (env.map[x][y].property != FPROP_NONE);

[4.213]

[4.264]

    return (env.map[x][y].property == FPROP_SANCTUARY_1
            || env.map[x][y].property == FPROP_SANCTUARY_2);
}
bool is_bloodcovered(int x, int y)
{
    return (env.map[x][y].property == FPROP_BLOODY);

Insertion in crawl-ref/source/view.cc at line 375 [6.16817]

[7.369]

}
static bool show_bloodcovered(int x, int y)
{
    if (!is_bloodcovered(x,y))
        return (false);
    dungeon_feature_type grid = grd[x][y];
    return (grid_altar_god(grid) == GOD_NO_GOD && !grid_is_trap(grid)
            && !grid_is_portal(grid) && grid != DNGN_ENTER_SHOP);

Insertion in crawl-ref/source/view.cc at line 420 [6.16817]

[4.884]

            }
            else if (object < NUM_REAL_FEATURES && show_bloodcovered(x,y))
            {
                *colour = RED | colmask;

Replacement in crawl-ref/source/view.cc at line 425 [6.16817]

B:BD[4.898] → [4.898:915]

∅:D[4.915] → [8.28:98]

B:BD[8.28] → [8.28:98]

            else
            if (object < NUM_REAL_FEATURES && env.grid_colours[x][y])

[4.898]

[8.98]

            else if (object < NUM_REAL_FEATURES && env.grid_colours[x][y])

Replacement in crawl-ref/source/traps.cc at line 387 [9.5308]

B:BD[9.14410] → [9.14410:14548]

            ouch( (you.your_level * 2) + random2avg(29, 2)
                    - random2(1 + player_AC()), 0, KILLED_BY_TRAP, " blade" );

[9.14410]

[9.14548]

            int damage = (you.your_level * 2) + random2avg(29, 2)
                          - random2(1 + player_AC());
            ouch( damage, 0, KILLED_BY_TRAP, " blade" );
            bleed_onto_floor(you.x_pos, you.y_pos, -1, damage, true);

Replacement in crawl-ref/source/religion.cc at line 3094 [6.804403]
B:BD[10.194366] → [11.651:684]
```
        if ( god != GOD_LUGONU )
```
[10.194366]
[12.3322]
```
        if ( god == GOD_SHINING_ONE )
        {
```

Replacement in crawl-ref/source/religion.cc at line 3097 [6.804403]

B:BD[12.3358] → [12.3358:3359]

[12.3358]

[10.194473]

            // un-bloodify surrounding squares
            for (int i=-3;i<=3;i++)
                for (int j=-3;j<=3;j++)
                {
                     if (is_bloodcovered(you.x_pos+i, you.y_pos+j))
                         env.map[you.x_pos+i][you.y_pos+j].property = FPROP_NONE;
                }
        }

Insertion in crawl-ref/source/mstuff2.cc at line 222 [6.1340842]

[6.1346909]


            bleed_onto_floor(monster->x, monster->y, monster->type,
                             damage_taken, true);

Replacement in crawl-ref/source/mon-data.h at line 482 [6.1826214]
B:BD[6.1837964] → [13.20153:20205]
```
    M_FLIES | M_SPECIAL_ABILITY, //jmf: warm blood?
```
[6.1837964]
[10.496044]
```
    M_FLIES | M_SPECIAL_ABILITY | M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 799 [6.1826214]
B:BD[6.1846123] → [10.499120:499155]
```
    M_NO_FLAGS, //jmf: warm blood?
```
[6.1846123]
[10.499155]
```
    M_WARM_BLOOD,
```
Replacement in crawl-ref/source/mon-data.h at line 1547 [6.1826214]
B:BD[6.1866018] → [13.30264:30293]
```
    M_SPELLCASTER | M_FLIES,
```
[6.1866018]
[10.507430]
```
    M_SPELLCASTER | M_FLIES | M_WARM_BLOOD,
```

Insertion in crawl-ref/source/misc.h at line 74 [6.1928926]

[6.1932235]

void bleed_onto_floor(int x, int y, int mon, int damage, bool spatter = false);

Replacement in crawl-ref/source/misc.cc at line 87 [6.1933596]

B:BD[6.1934998] → [6.1934998:1935037]

    const int mons_class = item.plus;

[6.1934998]

[6.1935037]

    ASSERT( item.base_type == OBJ_CORPSES );
    const int mons_class = item.plus;

Replacement in crawl-ref/source/misc.cc at line 92 [6.1933596]

B:BD[6.1935098] → [6.1935098:1935144]

    ASSERT( item.base_type == OBJ_CORPSES );

[6.1935098]

[6.1935144]

    // only fresh corpses bleed enough to colour the ground
    if (item.special >= 100)
        bleed_onto_floor(you.x_pos, you.y_pos, mons_class, max_chunks, true);

Insertion in crawl-ref/source/misc.cc at line 161 [6.1933596]

[6.1937067]

[10.544399]


// checks whether the player or a monster is capable of bleeding
static bool victim_can_bleed(int montype)
{
    if (montype == -1) // player
    {
        if (you.is_undead && (you.species != SP_VAMPIRE
                              || you.hunger_state >= HS_FULL))
        {
            return (false);
        }
        int tran = you.attribute[ATTR_TRANSFORMATION];
        if (tran == TRAN_STATUE || tran == TRAN_ICE_BEAST
            || tran == TRAN_AIR || tran == TRAN_LICH
            || tran == TRAN_SPIDER) // monster spiders don't bleed either
        {
            return (false);
        }
        return (true);
    }
    
    // now check monsters
    return (mons_class_flag(montype, M_COLD_BLOOD)
            || mons_class_flag(montype, M_WARM_BLOOD));
}
static bool allow_bleeding_on_square(int x, int y)
{
    // no bleeding onto sanctuary ground, please
    // also not necessary if already covered in blood
    if (env.map[x][y].property != FPROP_NONE)
        return (false);
    // no spattering into lava or water
    if (grd[x][y] >= DNGN_LAVA && grd[x][y] < DNGN_FLOOR)
        return (false);
    // the good gods like to keep their altars pristine
    if (is_good_god(grid_altar_god(grd[x][y])))
        return (false);
            
    return (true);
}
static void maybe_bloodify_square(int x, int y, int amount, bool spatter = false)
{
    if (amount < 1)
        return;
    if (!spatter && !allow_bleeding_on_square(x,y))
        return;
    if (amount > random2(20))
    {
#ifdef DEBUG_DIAGNOSTICS
        mprf(MSGCH_DIAGNOSTICS,
             "might bleed now; square: (%d, %d); amount = %d",
             x, y, amount);
#endif
        if (allow_bleeding_on_square(x,y))
            env.map[x][y].property = FPROP_BLOODY;

Insertion in crawl-ref/source/misc.cc at line 224 [6.1933596]

[10.544400]

[14.134]

        if (spatter)
        {
            // smaller chance of spattering surrounding squares
            for (int i=-1;i<=1;i++)
                for (int j=-1;j<=1;j++)
                {
                     if (i == 0 && j == 0) // current square
                         continue;
                         
                     // spattering onto walls etc. less likely
                     if (grd[x+i][y+j] < DNGN_MINMOVE && one_chance_in(3))
                         continue;
                     maybe_bloodify_square(x+i, y+j, amount/10);
                }
        }
    }
}
// currently flavour only: colour ground (and possibly adjacent squares) red
// "damage" depends on damage taken (or hitpoints, if damage higher),
// or, for sacrifices, on the number of chunks possible to get out of a corpse
void bleed_onto_floor(int x, int y, int montype, int damage, bool spatter)
{
    if (!victim_can_bleed(montype))
        return;
    maybe_bloodify_square(x, y, damage, spatter);
}

Insertion in crawl-ref/source/food.cc at line 356 [6.3043806]

[3.1948]

                // ritual sacrifice can also bloodify the ground
                const int mons_class = mitm[corpse_id].plus;
                const int max_chunks = mons_weight( mons_class ) / 150;
                bleed_onto_floor(you.x_pos, you.y_pos, mons_class, max_chunks, true);

Insertion in crawl-ref/source/fight.cc at line 607 [6.3140790]

[15.33912]

[16.1146]


        if (damage_done > 0)
        {
            int blood = damage_done;
            if (blood > defender->stat_hp())
                blood = defender->stat_hp();

Insertion in crawl-ref/source/fight.cc at line 614 [6.3140790]

[16.1147]

[17.5195]

            bleed_onto_floor(where.x, where.y, defender->id(), blood, true);
        }

Insertion in crawl-ref/source/fight.cc at line 2151 [6.3140790]
[18.5748]
[18.5748]
```
            {
```
Insertion in crawl-ref/source/fight.cc at line 2156 [6.3140790]
[18.5968]
[18.5968]
```
            }
```

Insertion in crawl-ref/source/fight.cc at line 2158 [6.3140790]

[18.5969]

            coord_def pos = defender->pos();
            bleed_onto_floor(pos.x, pos.y, defender->id(),
                             def->hit_points, true);

Insertion in crawl-ref/source/fight.cc at line 3538 [6.3140790]

[6.3250307]

[18.8930]

            int type = -1; // player
            if (defender->atype() == ACT_MONSTER)
                type = defender->id();
            int damage = damage_done;
            if (damage > defender->stat_hp())
                damage = defender->stat_hp();
                
            bleed_onto_floor(pos.x, pos.y, type, damage, true);

Insertion in crawl-ref/source/fight.cc at line 3550 [6.3140790]
[18.9048]
[13.79864]
```
            {
```
Replacement in crawl-ref/source/fight.cc at line 3552 [6.3140790]
∅:D[13.79890] → [6.3250589:3250590]
B:BD[6.3250589] → [6.3250589:3250590]
[13.79890]
[13.79891]
```
            }
            
```

Replacement in crawl-ref/source/enum.h at line 1019 [6.3287960]

B:BD[4.17200] → [4.17200:17222]

    FPROP_SANCTUARY_2

[4.17200]

[6.3311270]

    FPROP_SANCTUARY_2,
    FPROP_BLOODY // bloody floor and sanctuary are exclusive, so that's okay

Insertion in crawl-ref/source/effects.cc at line 2684 [6.3382105]

[19.27058]

                                        
                            // clean bloody floor
                            if (is_bloodcovered(cx,cy))
                                env.map[cx][cy].property = FPROP_NONE;
                            // chance of cleaning adjacent squares
                            for (int k=-1; k<=1; k++)
                            {
                                 for (int l=-1; l<=1; l++)
                                      if (is_bloodcovered(cx+k,cy+l)
                                          && one_chance_in(5))
                                      {
                                          env.map[cx+k][cy+l].property = FPROP_NONE;
                                      }
                            }

Insertion in crawl-ref/source/direct.cc at line 2151 [6.3697945]

[20.23033]

[21.11842]

        if (is_bloodcovered(mx, my))
          feature_desc += EOL "It is spattered with blood.";

Insertion in crawl-ref/source/direct.cc at line 2162 [6.3697945]

[22.1892]

[2.930]


        bool bloody = false;
        if (is_bloodcovered(mx, my))
        {
            feature_desc += EOL "It is spattered with blood.";
            bloody = true;
        }

Replacement in crawl-ref/source/direct.cc at line 2172 [6.3697945]

B:BD[2.1037] → [2.1037:1100]

        if ((feat == DNGN_FLOOR || feat == DNGN_FLOOR_SPECIAL)

[2.1037]

[2.1100]

        if ((feat == DNGN_FLOOR || feat == DNGN_FLOOR_SPECIAL) && !bloody

Insertion in crawl-ref/source/beam.cc at line 2672 [6.4128068]

[6.4213132]

            
            // blood does not transfer onto floor
            if (is_bloodcovered(x,y))
                env.map[x][y].property = FPROP_NONE;

Insertion in crawl-ref/source/beam.cc at line 2748 [6.4128068]

[6.4214191]


            // blood does not transfer onto floor
            if (is_bloodcovered(x,y))
                env.map[x][y].property = FPROP_NONE;