Browse Source

Auto oil pickup (#5159)

* Fixed formatting
pull/5164/head
Yuvraj Tetarwal 4 years ago committed by GitHub
parent
commit
59482b5e9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      Source/options.cpp
  2. 2
      Source/options.h
  3. 14
      Source/qol/autopickup.cpp

2
Source/options.cpp

@ -993,6 +993,7 @@ GameplayOptions::GameplayOptions()
, enemyHealthBar("Enemy Health Bar", OptionEntryFlags::None, N_("Enemy Health Bar"), N_("Enemy Health Bar is displayed at the top of the screen."), false)
, autoGoldPickup("Auto Gold Pickup", OptionEntryFlags::None, N_("Auto Gold Pickup"), N_("Gold is automatically collected when in close proximity to the player."), false)
, autoElixirPickup("Auto Elixir Pickup", OptionEntryFlags::None, N_("Auto Elixir Pickup"), N_("Elixirs are automatically collected when in close proximity to the player."), false)
, autoOilPickup("Auto Oil Pickup", OptionEntryFlags::OnlyHellfire, N_("Auto Oil Pickup"), N_("Oils are automatically collected when in close proximity to the player."), false)
, autoPickupInTown("Auto Pickup in Town", OptionEntryFlags::None, N_("Auto Pickup in Town"), N_("Automatically pickup items in town."), false)
, adriaRefillsMana("Adria Refills Mana", OptionEntryFlags::None, N_("Adria Refills Mana"), N_("Adria will refill your mana when you visit her shop."), false)
, autoEquipWeapons("Auto Equip Weapons", OptionEntryFlags::None, N_("Auto Equip Weapons"), N_("Weapons will be automatically equipped on pickup or purchase if enabled."), true)
@ -1040,6 +1041,7 @@ std::vector<OptionEntryBase *> GameplayOptions::GetEntries()
&autoPickupInTown,
&autoGoldPickup,
&autoElixirPickup,
&autoOilPickup,
&autoEquipWeapons,
&autoEquipArmor,
&autoEquipHelms,

2
Source/options.h

@ -535,6 +535,8 @@ struct GameplayOptions : OptionCategoryBase {
OptionEntryBoolean autoGoldPickup;
/** @brief Auto-pickup elixirs */
OptionEntryBoolean autoElixirPickup;
/** @brief Auto-pickup oils */
OptionEntryBoolean autoOilPickup;
/** @brief Enable or Disable auto-pickup in town */
OptionEntryBoolean autoPickupInTown;
/** @brief Recover mana when talking to Adria. */

14
Source/qol/autopickup.cpp

@ -63,6 +63,20 @@ bool DoPickup(Item item)
case IMISC_ELIXDEX:
case IMISC_ELIXVIT:
return *sgOptions.Gameplay.autoElixirPickup;
case IMISC_OILFIRST:
case IMISC_OILOF:
case IMISC_OILACC:
case IMISC_OILMAST:
case IMISC_OILSHARP:
case IMISC_OILDEATH:
case IMISC_OILSKILL:
case IMISC_OILBSMTH:
case IMISC_OILFORT:
case IMISC_OILPERM:
case IMISC_OILHARD:
case IMISC_OILIMP:
case IMISC_OILLAST:
return *sgOptions.Gameplay.autoOilPickup;
default:
return false;
}

Loading…
Cancel
Save