Menu
▾
▴
[crawl-ref-commits] greathelmet branch updated: 0.34-a0-391-g61fba5b580
|
From: <gi...@cr...> - 2025-07-14 23:40:13
|
via 61fba5b580746a8baa9ea45682673bbc21220b15 (commit)
via b8fd483c09a62f682253259a53d06affcfa77431 (commit)
via 62605002da157668d967554a0d3b14ee27669b7d (commit)
from bc61345c7189d402f1b0917fbf7399209dc6bdda (commit)
-----------------------------------------------------------------------
commit 61fba5b580746a8baa9ea45682673bbc21220b15
Author: hellmonk <nld...@gm...>
Date: Mon Jul 14 18:35:51 2025 -0500
rename revparry
commit b8fd483c09a62f682253259a53d06affcfa77431
Author: hellmonk <nld...@gm...>
Date: Mon Jul 14 18:25:38 2025 -0500
rename deflection ego to parrying
commit 62605002da157668d967554a0d3b14ee27669b7d
Author: hellmonk <nld...@gm...>
Date: Mon Jul 14 17:45:48 2025 -0500
Revert "Rings of conjuration"
Moved conj enhancer into orb slot earlier.
This reverts commit 70ffe06879018ce7d965db1513c7ba975b12bad7.
-----------------------------------------------------------------------
Summary of changes:
crawl-ref/source/artefact.cc | 1 -
crawl-ref/source/dat/descript/items.txt | 4 ----
crawl-ref/source/describe.cc | 2 +-
crawl-ref/source/duration-data.h | 6 +++---
crawl-ref/source/duration-type.h | 2 +-
crawl-ref/source/fight.cc | 2 +-
crawl-ref/source/item-name.cc | 10 +++-------
crawl-ref/source/item-prop-enum.h | 3 +--
crawl-ref/source/item-prop.cc | 2 +-
crawl-ref/source/makeitem.cc | 2 +-
crawl-ref/source/mapdef.cc | 2 +-
crawl-ref/source/output.cc | 2 +-
crawl-ref/source/player-equip.cc | 4 ++--
crawl-ref/source/player-equip.h | 2 +-
crawl-ref/source/player.cc | 17 ++++++++---------
crawl-ref/source/player.h | 4 ++--
crawl-ref/source/rltiles/dc-item.txt | 10 ++++++----
.../armour/brands/{i-deflection.png => i-parrying.png} | Bin
crawl-ref/source/rltiles/item/ring/i-conjuration.png | Bin 185 -> 0 bytes
crawl-ref/source/shopping.cc | 3 +--
crawl-ref/source/tileweb.cc | 6 +++---
crawl-ref/source/wiz-dump.cc | 2 --
22 files changed, 37 insertions(+), 49 deletions(-)
rename crawl-ref/source/rltiles/item/armour/brands/{i-deflection.png => i-parrying.png} (100%)
delete mode 100644 crawl-ref/source/rltiles/item/ring/i-conjuration.png
diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc
index eaf456ca26..6b717e5bf5 100644
--- a/crawl-ref/source/artefact.cc
+++ b/crawl-ref/source/artefact.cc
@@ -393,7 +393,6 @@ static map<jewellery_type, vector<artp_value>> jewellery_artps = {
{ RING_POSITIVE_ENERGY, { { ARTP_NEGATIVE_ENERGY, 1 } } },
{ RING_WILLPOWER, { { ARTP_WILLPOWER, 1 } } },
{ RING_RESIST_CORROSION, { { ARTP_RCORR, 1 } } },
- { RING_CONJURATION, { { ARTP_ENHANCE_CONJ, 1 } } },
{ RING_STRENGTH, { { ARTP_STRENGTH, 0 } } },
{ RING_INTELLIGENCE, { { ARTP_INTELLIGENCE, 0 } } },
diff --git a/crawl-ref/source/dat/descript/items.txt b/crawl-ref/source/dat/descript/items.txt
index 3ba739f4c3..c638835cbc 100644
--- a/crawl-ref/source/dat/descript/items.txt
+++ b/crawl-ref/source/dat/descript/items.txt
@@ -1219,10 +1219,6 @@ ring mail
A light leather suit reinforced with a covering of metal rings. It is
protective in combat, but slightly uncomfortable due to the added weight.
%%%%
-ring of conjuration
-
-A ring that enhances its wearer's conjuration spells.
-%%%%
ring of dexterity
A ring that increases the dexterity of its wearer.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
index ce782dff38..f17c2a0ae8 100644
--- a/crawl-ref/source/describe.cc
+++ b/crawl-ref/source/describe.cc
@@ -2384,7 +2384,7 @@ static const char* _item_ego_desc(special_armour_type ego)
return "it improves the success rate of the wearer's forgecraft spells "
" and enhances their melee attacks proportionally to forgecraft "
" skill";
- case SPARM_DEFLECTION:
+ case SPARM_PARRYING:
return "It shields the wearer if their last action was a melee attack. "
"The shielding is half as effective if the wielder's offhand is "
"occupied by an item other than their weapon.";
diff --git a/crawl-ref/source/duration-data.h b/crawl-ref/source/duration-data.h
index a974162551..80a4a8a72f 100644
--- a/crawl-ref/source/duration-data.h
+++ b/crawl-ref/source/duration-data.h
@@ -748,9 +748,9 @@ static const duration_def duration_data[] =
"Your melee attacks are strengthened by primal bloodlust.", D_EXPIRES,
{{ "Your bloodlust subsides." },
{ "You feel your bloodlust ebbing." }}, 6},
- { DUR_DEFLECTION, 0, "",
- "deflection", "deflecting",
- "You are deflecting attacks and have increased SH.", D_NO_FLAGS,
+ { DUR_PARRYING, 0, "",
+ "parry", "parrying",
+ "You are parrying attacks and have increased SH.", D_NO_FLAGS,
{{ "", []() {
you.redraw_armour_class = true;
}}}},
diff --git a/crawl-ref/source/duration-type.h b/crawl-ref/source/duration-type.h
index 04f4bc2d7e..fada471a03 100644
--- a/crawl-ref/source/duration-type.h
+++ b/crawl-ref/source/duration-type.h
@@ -293,6 +293,6 @@ enum duration_type
DUR_MEDUSA_COOLDOWN,
DUR_DIMINISHED_SPELLS,
DUR_DAZED,
- DUR_DEFLECTION,
+ DUR_PARRYING,
NUM_DURATIONS
};
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 6ae3263f19..5b643ede29 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -638,7 +638,7 @@ void do_player_post_attack(actor *defender, bool was_firewood, bool simu)
_do_medusa_stinger();
if (!was_firewood)
- update_deflection_status();
+ update_parrying_status();
}
/**
diff --git a/crawl-ref/source/item-name.cc b/crawl-ref/source/item-name.cc
index bf83824d6c..faa5b6a4d2 100644
--- a/crawl-ref/source/item-name.cc
+++ b/crawl-ref/source/item-name.cc
@@ -580,7 +580,7 @@ const char* special_armour_type_name(special_armour_type ego, bool terse)
case SPARM_COMMAND: return "command";
case SPARM_DEATH: return "death";
case SPARM_RESONANCE: return "resonance";
- case SPARM_DEFLECTION: return "deflection";
+ case SPARM_PARRYING: return "parrying";
case SPARM_CONJURING: return "conjuring";
case SPARM_GLASS: return "glass";
default: return "bugginess";
@@ -639,7 +639,7 @@ const char* special_armour_type_name(special_armour_type ego, bool terse)
case SPARM_COMMAND: return "command";
case SPARM_DEATH: return "death";
case SPARM_RESONANCE: return "resonance";
- case SPARM_DEFLECTION: return "deflection";
+ case SPARM_PARRYING: return "parrying";
case SPARM_CONJURING: return "conjuring";
case SPARM_GLASS: return "glass";
default: return "buggy";
@@ -803,7 +803,6 @@ const char* jewellery_effect_name(int jeweltype, bool terse)
case RING_TELEPORTATION: return "teleportation";
case RING_TELEPORT_CONTROL: return "teleport control";
#endif
- case RING_CONJURATION: return "conjuration";
case AMU_MANA_REGENERATION: return "magic regeneration";
case AMU_ACROBAT: return "the acrobat";
#if TAG_MAJOR_VERSION == 34
@@ -856,7 +855,6 @@ const char* jewellery_effect_name(int jeweltype, bool terse)
case RING_FIRE: return "obsoleteness";
case RING_ICE: return "obsoleteness";
#endif
- case RING_CONJURATION: return "Conj";
case AMU_REGENERATION: return "Regen";
case AMU_MANA_REGENERATION: return "RegenMP";
#if TAG_MAJOR_VERSION == 34
@@ -1043,7 +1041,7 @@ const char* gizmo_effect_name(int type)
{
case SPGIZMO_SPELLMOTOR: return "SpellMotor";
case SPGIZMO_GADGETEER: return "Gadgeteer";
- case SPGIZMO_PARRYREV: return "RevParry";
+ case SPGIZMO_PARRYREV: return "RevArmour";
case SPGIZMO_AUTODAZZLE: return "AutoDazzle";
default:
@@ -3462,8 +3460,6 @@ bool is_useless_item(const item_def &item, bool temp, bool ident)
return player_res_poison(false, temp, false) > 0;
case RING_WIZARDRY:
- case RING_CONJURATION:
- case AMU_ALCHEMY:
return you_worship(GOD_TROG);
case RING_FLIGHT:
diff --git a/crawl-ref/source/item-prop-enum.h b/crawl-ref/source/item-prop-enum.h
index a232d33ae3..3e0727a4d9 100644
--- a/crawl-ref/source/item-prop-enum.h
+++ b/crawl-ref/source/item-prop-enum.h
@@ -233,7 +233,6 @@ enum jewellery_type
RING_ICE,
RING_TELEPORT_CONTROL,
#endif
- RING_CONJURATION,
NUM_RINGS, // keep as last ring; should not overlap
// with amulets!
// RINGS after num_rings are for unique types for artefacts
@@ -532,7 +531,7 @@ enum special_armour_type
SPARM_COMMAND,
SPARM_DEATH,
SPARM_RESONANCE,
- SPARM_DEFLECTION,
+ SPARM_PARRYING,
SPARM_CONJURING,
SPARM_GLASS,
NUM_REAL_SPECIAL_ARMOURS,
diff --git a/crawl-ref/source/item-prop.cc b/crawl-ref/source/item-prop.cc
index 08d39c972d..66afea0fbb 100644
--- a/crawl-ref/source/item-prop.cc
+++ b/crawl-ref/source/item-prop.cc
@@ -195,7 +195,7 @@ static const armour_def Armour_prop[] =
SLOT_GLOVES, SIZE_SMALL, SIZE_MEDIUM, true, 0, {
{ SPARM_DEXTERITY, 1 },
{ SPARM_STRENGTH, 1 },
- { SPARM_DEFLECTION,1 },
+ { SPARM_PARRYING, 1 },
{ SPARM_HURLING, 1 },
{ SPARM_STEALTH, 1 },
{ SPARM_INFUSION, 1 },
diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
index 692ce401c6..30c057792c 100644
--- a/crawl-ref/source/makeitem.cc
+++ b/crawl-ref/source/makeitem.cc
@@ -830,7 +830,7 @@ bool is_armour_brand_ok(int type, int brand, bool strict)
// deliberate fall-through
case SPARM_HURLING:
case SPARM_FIRE:
- case SPARM_DEFLECTION:
+ case SPARM_PARRYING:
return slot == SLOT_GLOVES;
case SPARM_SEE_INVISIBLE:
diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
index a55160f213..cc2fb1468c 100644
--- a/crawl-ref/source/mapdef.cc
+++ b/crawl-ref/source/mapdef.cc
@@ -5000,7 +5000,7 @@ int str_to_ego(object_class_type item_type, string ego_str)
"command",
"death",
"resonance",
- "deflection",
+ "parrying",
"conjuring",
"glass",
nullptr
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index 55a8e3562f..5af7dee30b 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -638,7 +638,7 @@ static bool _boosted_sh()
&& you.duration[DUR_EPHEMERAL_SHIELD])
|| (you.get_mutation_level(MUT_CONDENSATION_SHIELD)
&& !you.duration[DUR_ICEMAIL_DEPLETED])
- || you.duration[DUR_DEFLECTION];
+ || you.duration[DUR_PARRYING];
}
#ifdef DGL_SIMPLE_MESSAGING
diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index 272ac341cc..f422628708 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -2470,9 +2470,9 @@ bool acrobat_boost_active()
&& (!you.is_constricted());
}
-bool deflection_boost_active()
+bool parrying_boost_active()
{
- return player_deflection() && you.duration[DUR_DEFLECTION];
+ return player_parrying() && you.duration[DUR_PARRYING];
}
static void _equip_amulet_of_reflection()
diff --git a/crawl-ref/source/player-equip.h b/crawl-ref/source/player-equip.h
index ebab6cffd8..c2b962d55d 100644
--- a/crawl-ref/source/player-equip.h
+++ b/crawl-ref/source/player-equip.h
@@ -145,6 +145,6 @@ void equip_artefact_effect(item_def &item, bool *show_msgs, bool unmeld);
void unequip_artefact_effect(item_def &item, bool *show_msgs, bool meld);
bool acrobat_boost_active();
-bool deflection_boost_active();
+bool parrying_boost_active();
void unwield_distortion(bool brand = false);
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index e33417372d..0a46075565 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -1618,7 +1618,6 @@ int player_spec_conj()
int sc = 0;
sc += you.wearing(OBJ_STAVES, STAFF_CONJURATION);
- sc += you.wearing_jewellery(RING_CONJURATION);
sc += you.wearing_ego(OBJ_ARMOUR, SPARM_CONJURING);
sc += you.scan_artefacts(ARTP_ENHANCE_CONJ);
@@ -1854,9 +1853,9 @@ void update_acrobat_status()
you.redraw_evasion = true;
}
-int player_deflection()
+int player_parrying()
{
- int sh = 8 * you.wearing_ego(OBJ_ARMOUR, SPARM_DEFLECTION);
+ int sh = 8 * you.wearing_ego(OBJ_ARMOUR, SPARM_PARRYING);
if (you.get_mutation_level(MUT_MISSING_HAND))
sh /= 2;
else
@@ -1869,12 +1868,12 @@ int player_deflection()
return sh;
}
-void update_deflection_status()
+void update_parrying_status()
{
- if (player_deflection() <= 0)
+ if (player_parrying() <= 0)
return;
- you.duration[DUR_DEFLECTION] = you.time_taken+1;
+ you.duration[DUR_PARRYING] = you.time_taken+1;
you.redraw_armour_class = true;
}
@@ -2185,8 +2184,8 @@ int player_shield_class(int scale, bool random, bool ignore_temporary)
shield += you.wearing_jewellery(AMU_REFLECTION) * AMU_REFLECT_SH * 100;
shield += you.scan_artefacts(ARTP_SHIELDING) * 200;
- if (you.duration[DUR_DEFLECTION])
- shield += player_deflection() * 200;
+ if (you.duration[DUR_PARRYING])
+ shield += player_parrying() * 200;
return random ? div_rand_round(shield * scale, 100) : ((shield * scale) / 100);
}
@@ -5947,7 +5946,7 @@ bool player::shielded() const
return shield()
|| duration[DUR_DIVINE_SHIELD]
|| duration[DUR_EPHEMERAL_SHIELD]
- || duration[DUR_DEFLECTION]
+ || duration[DUR_PARRYING]
|| get_mutation_level(MUT_LARGE_BONE_PLATES) > 0
|| qazlal_sh_boost() > 0
|| you.wearing_jewellery(AMU_REFLECTION)
diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index 92f76c4119..a820e75c2e 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -1029,8 +1029,8 @@ bool player_can_hear(const coord_def& p, int hear_distance = 999);
void update_acrobat_status();
bool player_acrobatic();
-int player_deflection();
-void update_deflection_status();
+int player_parrying();
+void update_parrying_status();
bool is_effectively_light_armour(const item_def *item);
bool player_effectively_in_light_armour();
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index ec2595bf5d..4aa4ad8bcc 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -596,7 +596,7 @@ i-archery BRAND_ARM_ARCHERY
i-command BRAND_ARM_COMMAND
i-death BRAND_ARM_DEATH
i-resonance BRAND_ARM_RESONANCE
-i-deflection BRAND_ARM_DEFLECTION
+i-parrying BRAND_ARM_PARRYING
i-conjuring BRAND_ARM_CONJURING
i-glass BRAND_ARM_GLASS BRAND_ARM_LAST
%rim 1
@@ -857,13 +857,15 @@ i-wizardry RING_WIZARDRY
i-magical-power RING_MAGICAL_POWER
i-flight RING_FLIGHT
i-positive-energy RING_POSITIVE_ENERGY
-i-willpower RING_WILLPOWER
# start TAG_MAJOR_VERSION == 34
+i-willpower RING_WILLPOWER
i-fire RING_FIRE
i-ice RING_ICE
-i-c-teleport RING_TELEPORT_CONTROL
+i-c-teleport RING_TELEPORT_CONTROL RING_ID_LAST
+# end TAG_MAJOR_VERSION
+# start TAG_MAJOR_VERSION == 35
+# i-willpower RING_WILLPOWER RING_ID_LAST
# end TAG_MAJOR_VERSION
-i-conjuration RING_CONJURATION RING_ID_LAST
############amulets
%sdir item/amulet
diff --git a/crawl-ref/source/rltiles/item/armour/brands/i-deflection.png b/crawl-ref/source/rltiles/item/armour/brands/i-parrying.png
similarity index 100%
rename from crawl-ref/source/rltiles/item/armour/brands/i-deflection.png
rename to crawl-ref/source/rltiles/item/armour/brands/i-parrying.png
diff --git a/crawl-ref/source/rltiles/item/ring/i-conjuration.png b/crawl-ref/source/rltiles/item/ring/i-conjuration.png
deleted file mode 100644
index 74d5a0f0e8..0000000000
Binary files a/crawl-ref/source/rltiles/item/ring/i-conjuration.png and /dev/null differ
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
index 04548449c8..9d9ee0a504 100644
--- a/crawl-ref/source/shopping.cc
+++ b/crawl-ref/source/shopping.cc
@@ -390,7 +390,7 @@ unsigned int item_value(item_def item, bool ident)
case SPARM_INFUSION:
case SPARM_LIGHT:
case SPARM_ENERGY:
- case SPARM_DEFLECTION:
+ case SPARM_PARRYING:
case SPARM_CONJURING:
case SPARM_GLASS:
valued += 50;
@@ -619,7 +619,6 @@ unsigned int item_value(item_def item, bool ident)
break;
case RING_WIZARDRY:
- case RING_CONJURATION:
case AMU_REGENERATION:
case AMU_GUARDIAN_SPIRIT:
case AMU_MANA_REGENERATION:
diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc
index d31306a5bf..817a4b0036 100644
--- a/crawl-ref/source/tileweb.cc
+++ b/crawl-ref/source/tileweb.cc
@@ -1006,12 +1006,12 @@ static bool _update_statuses(player_info& c)
continue;
inf.short_text = "acrobatic";
}
- else if (status == DUR_DEFLECTION)
+ else if (status == DUR_PARRYING)
{
inf = status_info();
- if (!deflection_boost_active())
+ if (!parrying_boost_active())
continue;
- inf.short_text = "deflecting";
+ inf.short_text = "parrying";
}
else if (!fill_status_info(status, inf)) // this will reset inf itself
continue;
diff --git a/crawl-ref/source/wiz-dump.cc b/crawl-ref/source/wiz-dump.cc
index c0cd07017e..eeac7f5289 100644
--- a/crawl-ref/source/wiz-dump.cc
+++ b/crawl-ref/source/wiz-dump.cc
@@ -110,8 +110,6 @@ static uint8_t _jewellery_type_from_artefact_prop(const string &s
return RING_FLIGHT;
if (s == "rPois")
return RING_POISON_RESISTANCE;
- if (s == "Conj")
- return RING_CONJURATION;
if (s.substr(0, 2) == "AC")
return RING_PROTECTION;
--
Dungeon Crawl Stone Soup
|
