summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/docs/crawl_manual.txt2
-rw-r--r--crawl-ref/source/item_use.cc6
-rw-r--r--crawl-ref/source/misc.cc19
-rw-r--r--crawl-ref/source/mutation.cc37
-rw-r--r--crawl-ref/source/transfor.cc105
-rw-r--r--crawl-ref/source/transfor.h5
6 files changed, 75 insertions, 99 deletions
diff --git a/crawl-ref/docs/crawl_manual.txt b/crawl-ref/docs/crawl_manual.txt
index 01ec580638..1ad65b8c00 100644
--- a/crawl-ref/docs/crawl_manual.txt
+++ b/crawl-ref/docs/crawl_manual.txt
@@ -1469,7 +1469,7 @@ on the part of the player.
Grey Draconians have no particular weaknesses or strengths when it
comes to learning, and they get no breath weapon. Their scales,
however, become particularly hard over time, they gain more HP
- than other draconians, nd they grow a spiked tail, making them
+ than other draconians, and they grow a spiked tail, making them
particularly fit for battle.
Black Draconians command lightning bolts and are naturally insulated.
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 19a2d3b747..34ee576593 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -726,7 +726,7 @@ bool do_wear_armour( int item, bool quiet )
return (false);
}
- const int base_type = you.inv[item].base_type;
+ const object_class_type base_type = you.inv[item].base_type;
if (base_type != OBJ_ARMOUR)
{
if (!quiet)
@@ -884,8 +884,8 @@ bool do_wear_armour( int item, bool quiet )
if (slot == EQ_BODY_ARMOUR
&& you.equip[EQ_CLOAK] != -1 && !cloak_is_being_removed())
{
- if ( you.equip[EQ_BODY_ARMOUR] &&
- item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) )
+ if (you.equip[EQ_BODY_ARMOUR] != -1 &&
+ item_cursed(you.inv[you.equip[EQ_BODY_ARMOUR]]) )
{
if ( !quiet )
mprf("%s is stuck to your body!",
diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc
index 2756efc18f..a78614471c 100644
--- a/crawl-ref/source/misc.cc
+++ b/crawl-ref/source/misc.cc
@@ -513,30 +513,17 @@ void curare_hits_player(int agent, int degree)
void merfolk_start_swimming(void)
{
- FixedVector < char, 8 > removed;
-
if (you.attribute[ATTR_TRANSFORMATION] != TRAN_NONE)
untransform();
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- {
- removed[i] = 0;
- }
-
- if (you.equip[EQ_BOOTS] != -1)
- removed[EQ_BOOTS] = 1;
+ std::set<equipment_type> removed;
+ removed.insert(EQ_BOOTS);
// Perhaps a bit to easy for the player, but we allow merfolk
// to slide out of heavy body armour freely when entering water,
// rather than handling emcumbered swimming. -- bwr
if (!player_light_armour())
- {
- // Can't slide out of just the body armour, cloak comes off -- bwr
- if (you.equip[EQ_CLOAK])
- removed[EQ_CLOAK] = 1;
-
- removed[EQ_BODY_ARMOUR] = 1;
- }
+ removed.insert(EQ_BODY_ARMOUR);
remove_equipment(removed);
you.redraw_evasion = true;
diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc
index ce1c580ea3..5288b28fe0 100644
--- a/crawl-ref/source/mutation.cc
+++ b/crawl-ref/source/mutation.cc
@@ -1546,18 +1546,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
case MUT_HOOVES: //jmf: like horns
mpr(gain_mutation[mutat][you.mutation[mutat]], MSGCH_MUTATION);
- if (you.equip[EQ_BOOTS] != -1)
- {
- FixedVector < char, 8 > removed;
-
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- {
- removed[i] = 0;
- }
-
- removed[EQ_BOOTS] = 1;
- remove_equipment(removed);
- }
+ remove_one_equip(EQ_BOOTS);
break;
case MUT_CLAWS:
@@ -1567,18 +1556,8 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
MSGCH_MUTATION);
// gloves aren't prevented until level three
- if (you.mutation[ mutat ] >= 3 && you.equip[ EQ_GLOVES ] != -1)
- {
- FixedVector < char, 8 > removed;
-
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- {
- removed[i] = 0;
- }
-
- removed[ EQ_GLOVES ] = 1;
- remove_equipment( removed );
- }
+ if (you.mutation[ mutat ] >= 3)
+ remove_one_equip(EQ_GLOVES);
break;
case MUT_HORNS: // horns force your helmet off
@@ -1592,15 +1571,7 @@ bool mutate(mutation_type which_mutation, bool failMsg, bool force_mutation,
break; // horns don't push caps/wizard hats off
}
- FixedVector < char, 8 > removed;
-
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- {
- removed[i] = 0;
- }
-
- removed[EQ_HELMET] = 1;
- remove_equipment(removed);
+ remove_one_equip(EQ_HELMET);
}
break;
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc
index fd97820d64..ebbfc8a621 100644
--- a/crawl-ref/source/transfor.cc
+++ b/crawl-ref/source/transfor.cc
@@ -32,17 +32,21 @@
void drop_everything(void);
void extra_hp(int amount_extra);
-bool remove_equipment(FixedVector < char, 8 > &remove_stuff)
+bool remove_equipment(std::set<equipment_type> removed)
{
// if we're removing body armour, the cloak will come off as well -- bwr
- if (remove_stuff[EQ_BODY_ARMOUR] == 1 && you.equip[EQ_BODY_ARMOUR] != -1)
- remove_stuff[EQ_CLOAK] = 1;
+ if ( removed.find(EQ_BODY_ARMOUR) != removed.end() &&
+ you.equip[EQ_BODY_ARMOUR] != -1 )
+ removed.insert(EQ_CLOAK);
// if we're removing gloves, the weapon will come off as well -- bwr
- if (remove_stuff[EQ_GLOVES] == 1 && you.equip[EQ_GLOVES] != -1)
- remove_stuff[EQ_WEAPON] = 1;
+ // but this makes Statue Form odd -- haranp
+ if ( removed.find(EQ_GLOVES) != removed.end() &&
+ you.equip[EQ_GLOVES] != -1 )
+ removed.insert(EQ_WEAPON);
- if (remove_stuff[EQ_WEAPON] == 1 && you.equip[EQ_WEAPON] != -1)
+ if ( removed.find(EQ_WEAPON) != removed.end() &&
+ you.equip[EQ_WEAPON] != -1)
{
unwield_item(you.equip[EQ_WEAPON]);
you.equip[EQ_WEAPON] = -1;
@@ -50,31 +54,43 @@ bool remove_equipment(FixedVector < char, 8 > &remove_stuff)
you.wield_change = true;
}
- for (int i = EQ_CLOAK; i < EQ_LEFT_RING; i++)
+ // Remove items in order (std::set is a sorted container)
+ std::set<equipment_type>::const_iterator iter;
+ for ( iter = removed.begin(); iter != removed.end(); ++iter )
{
- if (remove_stuff[i] == 0 || you.equip[i] == -1)
+ const equipment_type e = *iter;
+ if ( e == EQ_WEAPON || you.equip[e] == -1 )
continue;
mprf("%s falls away.",
- you.inv[you.equip[i]].name(DESC_CAP_YOUR).c_str());
+ you.inv[you.equip[e]].name(DESC_CAP_YOUR).c_str());
- unwear_armour( you.equip[i] );
- you.equip[i] = -1;
+ unwear_armour( you.equip[e] );
+ you.equip[e] = -1;
}
return true;
} // end remove_equipment()
+bool remove_one_equip(equipment_type eq)
+{
+ std::set<equipment_type> r;
+ r.insert(eq);
+ return remove_equipment(r);
+}
+
// Returns true if any piece of equipment that has to be removed is cursed.
// Useful for keeping low level transformations from being too useful.
-static bool check_for_cursed_equipment( FixedVector < char, 8 > &remove_stuff )
+static bool check_for_cursed_equipment(const std::set<equipment_type> &remove)
{
- for (int i = EQ_WEAPON; i < EQ_LEFT_RING; i++)
+ std::set<equipment_type>::const_iterator iter;
+ for (iter = remove.begin(); iter != remove.end(); ++iter )
{
- if (remove_stuff[i] == 0 || you.equip[i] == -1)
+ equipment_type e = *iter;
+ if ( you.equip[e] == -1 )
continue;
- if (item_cursed( you.inv[ you.equip[i] ] ))
+ if (item_cursed( you.inv[ you.equip[e] ] ))
{
mpr( "Your cursed equipment won't allow you to complete the "
"transformation." );
@@ -158,13 +174,17 @@ bool transform(int pow, transformation_type which_trans)
//jmf: silently discard this enchantment
you.duration[DUR_STONESKIN] = 0;
- FixedVector < char, 8 > rem_stuff;
+ // We drop everything except jewellery by default
+ equipment_type default_rem[] = {
+ EQ_WEAPON, EQ_CLOAK, EQ_HELMET, EQ_GLOVES, EQ_BOOTS,
+ EQ_SHIELD, EQ_BODY_ARMOUR
+ };
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- rem_stuff[i] = 1;
+ std::set<equipment_type> rem_stuff(default_rem,
+ default_rem + ARRAYSIZE(default_rem));
- you.redraw_evasion = 1;
- you.redraw_armour_class = 1;
+ you.redraw_evasion = true;
+ you.redraw_armour_class = true;
you.wield_change = true;
/* Remember, it can still fail in the switch below... */
@@ -175,7 +195,7 @@ bool transform(int pow, transformation_type which_trans)
return (false);
mpr("You turn into a venomous arachnid creature.");
- remove_equipment( rem_stuff );
+ remove_equipment(rem_stuff);
you.attribute[ATTR_TRANSFORMATION] = TRAN_SPIDER;
you.duration[DUR_TRANSFORMATION] = 10 + random2(pow) + random2(pow);
@@ -192,7 +212,7 @@ bool transform(int pow, transformation_type which_trans)
case TRAN_ICE_BEAST: // also AC +3, cold +3, fire -1, pois +1
mpr( "You turn into a creature of crystalline ice." );
- rem_stuff[ EQ_CLOAK ] = 0;
+ rem_stuff.erase(EQ_CLOAK);
remove_equipment( rem_stuff );
@@ -212,10 +232,10 @@ bool transform(int pow, transformation_type which_trans)
return (true);
case TRAN_BLADE_HANDS:
- rem_stuff[EQ_CLOAK] = 0;
- rem_stuff[EQ_HELMET] = 0;
- rem_stuff[EQ_BOOTS] = 0;
- rem_stuff[EQ_BODY_ARMOUR] = 0;
+ rem_stuff.erase(EQ_CLOAK);
+ rem_stuff.erase(EQ_HELMET);
+ rem_stuff.erase(EQ_BOOTS);
+ rem_stuff.erase(EQ_BODY_ARMOUR);
if (check_for_cursed_equipment( rem_stuff ))
return (false);
@@ -238,10 +258,11 @@ bool transform(int pow, transformation_type which_trans)
else
mpr( "You turn into a living statue of rough stone." );
- rem_stuff[ EQ_WEAPON ] = 0; /* can still hold a weapon */
- rem_stuff[ EQ_CLOAK ] = 0;
- rem_stuff[ EQ_HELMET ] = 0;
- rem_stuff[ EQ_BOOTS ] = 0;
+ rem_stuff.erase(EQ_WEAPON); // can still hold a weapon
+ rem_stuff.erase(EQ_CLOAK);
+ rem_stuff.erase(EQ_HELMET);
+ rem_stuff.erase(EQ_BOOTS);
+
// too stiff to make use of shields, gloves, or armour -- bwr
remove_equipment( rem_stuff );
@@ -265,7 +286,8 @@ bool transform(int pow, transformation_type which_trans)
case TRAN_DRAGON: // also AC +10, ev -3, cold -1, fire +2, pois +1, flight
if (you.species == SP_MERFOLK && player_is_swimming())
- mpr("You fly out of the water as you turn into a fearsome dragon!");
+ mpr("You fly out of the water as you turn into "
+ "a fearsome dragon!");
else
mpr("You turn into a fearsome dragon!");
@@ -375,13 +397,8 @@ bool transform_can_butcher_barehanded(transformation_type tt)
void untransform(void)
{
- FixedVector < char, 8 > rem_stuff;
-
- for (int i = EQ_WEAPON; i < EQ_RIGHT_RING; i++)
- rem_stuff[i] = 0;
-
- you.redraw_evasion = 1;
- you.redraw_armour_class = 1;
+ you.redraw_evasion = true;
+ you.redraw_armour_class = true;
you.wield_change = true;
you.symbol = '@';
@@ -475,13 +492,11 @@ void untransform(void)
// If nagas wear boots while transformed, they fall off again afterwards:
// I don't believe this is currently possible, and if it is we
// probably need something better to cover all possibilities. -bwr
- if ((you.species == SP_NAGA || you.species == SP_CENTAUR)
- && you.equip[ EQ_BOOTS ] != -1
- && you.inv[ you.equip[EQ_BOOTS] ].sub_type != ARM_NAGA_BARDING)
- {
- rem_stuff[EQ_BOOTS] = 1;
- remove_equipment(rem_stuff);
- }
+
+ // Removed barding check, no transformed creatures can wear barding
+ // anyway.
+ if (you.species == SP_NAGA || you.species == SP_CENTAUR)
+ remove_one_equip(EQ_BOOTS);
calc_hp();
if (hp_downscale != 10)
diff --git a/crawl-ref/source/transfor.h b/crawl-ref/source/transfor.h
index 45d0904bad..5d5480c026 100644
--- a/crawl-ref/source/transfor.h
+++ b/crawl-ref/source/transfor.h
@@ -14,6 +14,8 @@
#ifndef TRANSFOR_H
#define TRANSFOR_H
+#include <set>
+
#include "FixVec.h"
#include "enum.h"
@@ -44,7 +46,8 @@ bool transform(int pow, transformation_type which_trans);
/* ***********************************************************************
* called from: mutation - transfor
* *********************************************************************** */
-bool remove_equipment( FixedVector<char, 8>& remove_stuff );
+bool remove_equipment( std::set<equipment_type> remove_stuff );
+bool remove_one_equip(equipment_type eq);
bool transform_changed_physiology( bool phys_scales = false );
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-23 18:56:51 +0000