sharedXP and removeCripplingEffects

Author: wkdgmr

Source/monster.cpp

@@ -1152,7 +1152,7 @@ void MonsterAttackPlayer(Monster &monster, Player &player, int hit, int minDam,
 		}
 		return;
 	}
-	if (monster.type().type == MT_YZOMBIE && &player == MyPlayer) {
+	if (monster.type().type == MT_YZOMBIE && &player == MyPlayer && !*GetOptions().Gameplay.removeCripplingEffects) {
 		if (player._pMaxHP > 64) {
 			if (player._pMaxHPBase > 64) {
 				player._pMaxHP -= 64;
@@ -4792,6 +4792,13 @@ bool Monster::isPossibleToHit() const
 void Monster::tag(const Player &tagger)
 {
 	whoHit |= 1 << tagger.getId();
+	if (*GetOptions().Gameplay.sharedXP) {
+		for (const auto &player : Players) {
+			if (player.plractive && player.plrlevel == tagger.plrlevel) {
+				whoHit |= 1 << player.getId();
+			}
+		}
+	}
 }
 
 bool Monster::tryLiftGargoyle()

Source/objects.cpp

@@ -3193,6 +3193,8 @@ int FindValidShrine()
 			continue;
 		if (!gbIsMultiplayer && shrineavail[rv] == ShrineTypeMulti)
 			continue;
+		if (rv == IsAnyOf(ShrineFascinating, ShrineOrnate, ShrineSacred, ShrineMurphys, ShrineTainted) && *GetOptions().Gameplay.removeCripplingEffects)
+			continue;
 		return rv;
 	}
 }
@@ -3623,13 +3625,16 @@ bool Object::IsDisabled() const
 	if (!*GetOptions().Gameplay.disableCripplingShrines) {
 		return false;
 	}
+	// if gameplay option for Shrines
 	if (IsAnyOf(_otype, _object_id::OBJ_GOATSHRINE, _object_id::OBJ_CAULDRON)) {
 		return true;
 	}
 	if (!IsShrine()) {
 		return false;
 	}
-	return IsAnyOf(static_cast<shrine_type>(_oVar1), shrine_type::ShrineFascinating, shrine_type::ShrineOrnate, shrine_type::ShrineSacred, shrine_type::ShrineMurphys);
+	if (!*GetOptions().Gameplay.removeCripplingEffects) {
+		return IsAnyOf(static_cast<shrine_type>(_oVar1), shrine_type::ShrineFascinating, shrine_type::ShrineOrnate, shrine_type::ShrineSacred, shrine_type::ShrineMurphys);
+	}
 }
 
 Object *FindObjectAtPosition(Point position, bool considerLargeObjects)

Source/options.cpp

@@ -779,6 +779,7 @@ GameplayOptions::GameplayOptions()
     , testBard("Test Bard", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::OnlyHellfire, N_("Test Bard"), N_("Force the Bard character type to appear in the hero selection menu."), false)
     , testBarbarian("Test Barbarian", OptionEntryFlags::CantChangeInGame | OptionEntryFlags::OnlyHellfire, N_("Test Barbarian"), N_("Force the Barbarian character type to appear in the hero selection menu."), false)
     , experienceBar("Experience Bar", OptionEntryFlags::None, N_("Experience Bar"), N_("Experience Bar is added to the UI at the bottom of the screen."), false)
+    , sharedXP("Shared Experience in Multiplayer", OptionEntryFlags::CantChangeInMultiPlayer, N_("Shared Experience in Multiplayer"), N_("Experience is always shared between all players active on the floor a monster is killed."), true)
     , showItemGraphicsInStores("Show Item Graphics in Stores", OptionEntryFlags::None, N_("Show Item Graphics in Stores"), N_("Show item graphics to the left of item descriptions in store menus."), false)
     , showHealthValues("Show health values", OptionEntryFlags::None, N_("Show health values"), N_("Displays current / max health value on health globe."), false)
     , showManaValues("Show mana values", OptionEntryFlags::None, N_("Show mana values"), N_("Displays current / max mana value on mana globe."), false)
@@ -795,9 +796,10 @@ GameplayOptions::GameplayOptions()
     , autoEquipJewelry("Auto Equip Jewelry", OptionEntryFlags::None, N_("Auto Equip Jewelry"), N_("Jewelry will be automatically equipped on pickup or purchase if enabled."), false)
     , randomizeQuests("Randomize Quests", OptionEntryFlags::CantChangeInGame, N_("Randomize Quests"), N_("Randomly selecting available quests for new games."), true)
     , showMonsterType("Show Monster Type", OptionEntryFlags::None, N_("Show Monster Type"), N_("Hovering over a monster will display the type of monster in the description box in the UI."), false)
-    , showItemLabels("Show Item Labels", OptionEntryFlags::None, N_("Show Item Labels"), N_("Show labels for items on the ground when enabled."), false)
-    , disableSearch("Disable Search Spell", OptionEntryFlags::CantChangeInMultiPlayer, N_("Disable Search Spell"), N_("Search spell will not appear on Scrolls, Books, or Staves generated by monsters you kill or objects and vendors you interact with.  Set Monk class skill to Infravision.  Search effect always enabled when using the map."), false)
+    , showItemLabels("Show Item Labels", OptionEntryFlags::None, N_("Show Item Labels"), N_("Show labels for items on the ground when enabled."), true)
+    , disableSearch("Disable Search Spell", OptionEntryFlags::CantChangeInMultiPlayer, N_("Disable Search Spell"), N_("Search spell will not appear on Scrolls, Books, or Staves generated by monsters you kill or objects and vendors you interact with.  Set Monk class skill to Infravision.  Search effect always enabled when using the map."), true)
     , autoRefillBelt("Auto Refill Belt", OptionEntryFlags::None, N_("Auto Refill Belt"), N_("Refill belt from inventory when belt item is consumed."), false)
+	, removeCripplingEffects("Remove Crippling Effects", OptionEntryFlags::CantChangeInMultiPlayer, N_("Remove Crippling Effects"), N_("Fascinating, Ornate, Sacred, Murphy's and Tainted will not spawn and will not be selected for Cauldrons and Goat Shrines.  Black Deaths will not reduce max life."), true)
     , disableCripplingShrines("Disable Crippling Shrines", OptionEntryFlags::None, N_("Disable Crippling Shrines"), N_("When enabled Cauldrons, Fascinating Shrines, Goat Shrines, Ornate Shrines, Sacred Shrines and Murphy's Shrines are not able to be clicked on and labeled as disabled."), false)
     , quickCast("Quick Cast", OptionEntryFlags::None, N_("Quick Cast"), N_("Spell hotkeys instantly cast the spell, rather than switching the readied spell."), false)
     , numHealPotionPickup("Heal Potion Pickup", OptionEntryFlags::None, N_("Heal Potion Pickup"), N_("Number of Healing potions to pick up automatically."), 0, { 0, 1, 2, 4, 8, 16 })
@@ -830,6 +832,7 @@ std::vector<OptionEntryBase *> GameplayOptions::GetEntries()
 		&testBard,
 		&testBarbarian,
 		&experienceBar,
+		&sharedXP,
 		&showItemGraphicsInStores,
 		&showHealthValues,
 		&showManaValues,
@@ -854,6 +857,7 @@ std::vector<OptionEntryBase *> GameplayOptions::GetEntries()
 		&numRejuPotionPickup,
 		&numFullRejuPotionPickup,
 		&autoPickupInTown,
+		&removeCripplingEffects,
 		&disableCripplingShrines,
 		&adriaRefillsMana,
 		&grabInput,

Source/options.h

@@ -610,8 +610,12 @@ struct GameplayOptions : OptionCategoryBase {
 	OptionEntryBoolean showItemLabels;
 	/** @brief Search spell will not appear on Scrolls, Books, or Staves generated by monsters you kill or objects and vendors you interact with.  Set Monk class skill to Infravision.  */
 	OptionEntryBoolean disableSearch;
+	/** @brief Experience is always shared between all players active on the floor a monster is killed. */
+	OptionEntryBoolean sharedXP;
 	/** @brief Refill belt from inventory, or rather, use potions/scrolls from inventory first when belt item is consumed.  */
 	OptionEntryBoolean autoRefillBelt;
+	/** @brief Fascinating, Ornate, Sacred, Murphy's and Tainted will not spawn and will not be selected for Cauldrons and Goat Shrines.  Black Deaths will not reduce max life. */
+	OptionEntryBoolean removeCripplingEffects;
 	/** @brief Locally disable clicking on shrines which permanently cripple character. */
 	OptionEntryBoolean disableCripplingShrines;
 	/** @brief Spell hotkeys instantly cast the spell. */