Skip to content

Commit

Permalink
Naga tiles (ontoclasm)
Browse files Browse the repository at this point in the history
  • Loading branch information
snw-0 committed Nov 19, 2015
1 parent 22d93ee commit e53bd43
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 8 deletions.
Binary file modified crawl-ref/source/rltiles/mon/greater_naga.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/naga.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/naga_mage.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/naga_ritualist.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/naga_sharpshooter.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/naga_warrior.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified crawl-ref/source/rltiles/mon/unique/vashnia.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 11 additions & 8 deletions crawl-ref/source/tilemcache.cc
Expand Up @@ -321,7 +321,6 @@ bool mcache_monster::get_weapon_offset(tileidx_t mon_tile,
case TILEP_MONS_KOBOLD:
case TILEP_MONS_OCTOPODE:
case TILEP_MONS_ZOMBIE_OCTOPODE:
case TILEP_MONS_NAGA_RITUALIST:
case TILEP_MONS_ANUBIS_GUARD:
*ofs_x = 0;
*ofs_y = 0;
Expand Down Expand Up @@ -412,15 +411,18 @@ bool mcache_monster::get_weapon_offset(tileidx_t mon_tile,
*ofs_x = 0;
*ofs_y = -3;
break;
// Shift downwards.
case TILEP_MONS_DEEP_ELF_KNIGHT:
case TILEP_MONS_NAGA:
case TILEP_MONS_GREATER_NAGA:
case TILEP_MONS_NAGA_WARRIOR:
case TILEP_MONS_GUARDIAN_SERPENT:
case TILEP_MONS_NAGA_MAGE:
case TILEP_MONS_NAGA_RITUALIST:
case TILEP_MONS_NAGA_SHARPSHOOTER:
case TILEP_MONS_VASHNIA:
*ofs_x = 0;
*ofs_y = -4;
break;
// Shift downwards.
case TILEP_MONS_DEEP_ELF_KNIGHT:
case TILEP_MONS_GUARDIAN_SERPENT:
case TILEP_MONS_THE_ENCHANTRESS:
case TILEP_MONS_DEEP_DWARF:
case TILEP_MONS_RUST_DEVIL:
Expand Down Expand Up @@ -481,6 +483,10 @@ bool mcache_monster::get_weapon_offset(tileidx_t mon_tile,
*ofs_x = -2;
*ofs_y = -4;
break;
case TILEP_MONS_GREATER_NAGA:
*ofs_x = -2;
*ofs_y = -5;
break;
case TILEP_MONS_NIKOLA:
*ofs_x = -4;
*ofs_y = -3;
Expand Down Expand Up @@ -848,9 +854,6 @@ bool mcache_monster::get_shield_offset(tileidx_t mon_tile,
break;

case TILEP_MONS_NAGA:
case TILEP_MONS_NAGA_MAGE:
case TILEP_MONS_NAGA_SHARPSHOOTER:
case TILEP_MONS_VASHNIA:
case TILEP_MONS_NAGA_WARRIOR:
case TILEP_MONS_GREATER_NAGA:
*ofs_x = -3;
Expand Down

0 comments on commit e53bd43

Please sign in to comment.