From: <j-...@us...> - 2007-08-31 08:57:13
|
Revision: 2038 http://crawl-ref.svn.sourceforge.net/crawl-ref/?rev=2038&view=rev Author: j-p-e-g Date: 2007-08-31 01:57:00 -0700 (Fri, 31 Aug 2007) Log Message: ----------- Added shields as potentially unwearable/restricted in you_can_wear. Mummies shouldn't autopickup known =sustenance. Modified Paths: -------------- trunk/crawl-ref/source/command.cc trunk/crawl-ref/source/lua/pickup.lua trunk/crawl-ref/source/output.cc trunk/crawl-ref/source/player.cc Modified: trunk/crawl-ref/source/command.cc =================================================================== --- trunk/crawl-ref/source/command.cc 2007-08-30 19:34:53 UTC (rev 2037) +++ trunk/crawl-ref/source/command.cc 2007-08-31 08:57:00 UTC (rev 2038) @@ -379,7 +379,7 @@ else if (!you_tran_can_wear(i)) estr << " (currently unavailable)"; else if (!you_can_wear(i)) - estr << " (ill-fitting)"; + estr << " (restricted)"; else estr << " none"; Modified: trunk/crawl-ref/source/lua/pickup.lua =================================================================== --- trunk/crawl-ref/source/lua/pickup.lua 2007-08-30 19:34:53 UTC (rev 2037) +++ trunk/crawl-ref/source/lua/pickup.lua 2007-08-31 08:57:00 UTC (rev 2038) @@ -111,7 +111,9 @@ end if you_undead() and (item.subtype(it) == "regeneration" - or item.subtype(it) == "rage") then + or item.subtype(it) == "rage" + or item.subtype(it) == "sustenance" + and you.race() == "Mummy") then return false end end Modified: trunk/crawl-ref/source/output.cc =================================================================== --- trunk/crawl-ref/source/output.cc 2007-08-30 19:34:53 UTC (rev 2037) +++ trunk/crawl-ref/source/output.cc 2007-08-31 08:57:00 UTC (rev 2038) @@ -1287,7 +1287,7 @@ else if (!you_can_wear(e_order[i])) { snprintf(buf, sizeof buf, - "%-7s: <lightgray>(ill-fitting)</lightgray>", + "%-7s: <lightgray>(restricted)</lightgray>", slot); } else Modified: trunk/crawl-ref/source/player.cc =================================================================== --- trunk/crawl-ref/source/player.cc 2007-08-30 19:34:53 UTC (rev 2037) +++ trunk/crawl-ref/source/player.cc 2007-08-31 08:57:00 UTC (rev 2038) @@ -441,7 +441,7 @@ { // these can be used by all if (eq == EQ_LEFT_RING || eq == EQ_RIGHT_RING || eq == EQ_AMULET - || eq == EQ_WEAPON || eq == EQ_SHIELD || eq == EQ_CLOAK) + || eq == EQ_WEAPON || eq == EQ_CLOAK) { return true; } @@ -453,9 +453,12 @@ if (you.is_undead) return true; - // anyone can wear caps/hats and robes - if (special_armour && (eq == EQ_HELMET || eq == EQ_BODY_ARMOUR)) + // anyone can wear caps/hats and robes and at least one of buckler/shield + if (special_armour + && (eq == EQ_HELMET || eq == EQ_BODY_ARMOUR || eq == EQ_SHIELD)) + { return true; + } if (eq == EQ_BOOTS && (you.species == SP_NAGA || you.species == SP_CENTAUR)) return (special_armour); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |