mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 23:19:41 +00:00
Code Issues Releases Wiki Activity

Rename reflected absorb spells setting and add it to Advanced tab

Browse source
This commit is contained in:
Capostrophic 2018-09-26 21:16:57 +03:00
parent 0e06a25f21
commit ba2fd8b795
5 changed files with 33 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/launcher/advancedpage.cpp
View file

@ -72,6 +72,7 @@ bool Launcher::AdvancedPage::loadSettings()
loadSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game"); loadSettingBool(canLootDuringDeathAnimationCheckBox, "can loot during death animation", "Game");
loadSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game"); loadSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game"); loadSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
loadSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game"); loadSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
loadSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game"); loadSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game");
loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game"); loadSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
@ -131,6 +132,7 @@ void Launcher::AdvancedPage::saveSettings()
saveSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game"); saveSettingBool(followersAttackOnSightCheckBox, "followers attack on sight", "Game");
saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game"); saveSettingBool(preventMerchantEquippingCheckBox, "prevent merchant equipping", "Game");
saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game"); saveSettingBool(rebalanceSoulGemValuesCheckBox, "rebalance soul gem values", "Game");
saveSettingBool(classicReflectedAbsorbSpellsCheckBox, "classic reflected absorb spells behavior", "Game");
saveSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game"); saveSettingBool(chargeForEveryFollowerCheckBox, "charge for every follower travelling", "Game");
saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game"); saveSettingBool(enchantedWeaponsMagicalCheckBox, "enchanted weapons are magical", "Game");
saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game"); saveSettingBool(permanentBarterDispositionChangeCheckBox, "barter disposition change is permanent", "Game");

2
apps/openmw/mwmechanics/spellcasting.cpp
View file

@ -582,7 +582,7 @@ namespace MWMechanics
ActiveSpells::ActiveEffect effect_ = effect; ActiveSpells::ActiveEffect effect_ = effect;
effect_.mMagnitude *= -1; effect_.mMagnitude *= -1;
absorbEffects.push_back(effect_); absorbEffects.push_back(effect_);
if (reflected && Settings::Manager::getBool("classic reflect absorb attribute behavior", "Game")) if (reflected && Settings::Manager::getBool("classic reflected absorb spells behavior", "Game"))
target.getClass().getCreatureStats(target).getActiveSpells().addSpell("", true, target.getClass().getCreatureStats(target).getActiveSpells().addSpell("", true,
absorbEffects, mSourceName, caster.getClass().getCreatureStats(caster).getActorId()); absorbEffects, mSourceName, caster.getClass().getCreatureStats(caster).getActorId());
else else

34
docs/source/reference/modding/settings/game.rst
View file

@ -16,7 +16,7 @@ If the setting is 2, the crosshair is the color of the color crosshair owned set
If the setting is 3, both the tool tip background and the crosshair are colored. If the setting is 3, both the tool tip background and the crosshair are colored.
The crosshair is not visible if crosshair is false. The crosshair is not visible if crosshair is false.
This setting can only be configured by editing the settings configuration file. This setting can be configured in Advanced tab of the launcher.
show projectile damage show projectile damage
---------------------- ----------------------
@ -27,7 +27,7 @@ show projectile damage
If this setting is true, the damage bonus of arrows and bolts will show on their tooltip. If this setting is true, the damage bonus of arrows and bolts will show on their tooltip.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
show melee info show melee info
--------------- ---------------
@ -38,7 +38,7 @@ show melee info
If this setting is true, the reach and speed of weapons will show on their tooltip. If this setting is true, the reach and speed of weapons will show on their tooltip.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
show enchant chance show enchant chance
------------------- -------------------
@ -49,7 +49,7 @@ show enchant chance
Whether or not the chance of success will be displayed in the enchanting menu. Whether or not the chance of success will be displayed in the enchanting menu.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
best attack best attack
----------- -----------
@ -73,13 +73,13 @@ can loot during death animation
If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat. If this setting is true, the player is allowed to loot actors (e.g. summoned creatures) during death animation, if they are not in combat.
However disposing corpses during death animation is not recommended - death counter may not be incremented, and this behaviour can break quests. However disposing corpses during death animation is not recommended - death counter may not be incremented, and this behaviour can break quests.
This is how original Morrowind behaves. This is how Morrowind behaves.
If this setting is false, player has to wait until end of death animation in all cases. If this setting is false, player has to wait until end of death animation in all cases.
This case is more safe, but makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder. This case is more safe, but makes using of summoned creatures exploit (looting summoned Dremoras and Golden Saints for expensive weapons) a lot harder.
Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation. Conflicts with mannequin mods, which use SkipAnim to prevent end of death animation.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
difficulty difficulty
---------- ----------
@ -97,19 +97,19 @@ and values above 500 will result in the player inflicting no damage.
This setting can be controlled in game with the Difficulty slider in the Prefs panel of the Options menu. This setting can be controlled in game with the Difficulty slider in the Prefs panel of the Options menu.
classic reflect absorb attribute behavior classic reflected absorb spells behavior
----------------------------------------- -----------------------------------------
:Type: boolean :Type: boolean
:Range: True/False :Range: True/False
:Default: True :Default: True
If this setting is true, "Absorb Attribute" spells which were reflected by the target are not "mirrored", If this setting is true, effects of Absorb spells which were reflected by the target are not mirrored,
and the caster will absorb their own attribute resulting in no effect on both the caster and the target. and the caster will absorb their own stat resulting in no effect on either the caster and the target.
This makes the gameplay as a mage easier, but these spells become imbalanced. This makes the gameplay as a mage easier, but these spells become imbalanced.
This is how the original Morrowind behaves. This is how Morrowind behaves.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
show effect duration show effect duration
-------------------- --------------------
@ -121,7 +121,7 @@ show effect duration
Show the remaining duration of magic effects and lights if this setting is true. Show the remaining duration of magic effects and lights if this setting is true.
The remaining duration is displayed in the tooltip by hovering over the magical effect. The remaining duration is displayed in the tooltip by hovering over the magical effect.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
enchanted weapons are magical enchanted weapons are magical
----------------------------- -----------------------------
@ -131,9 +131,9 @@ enchanted weapons are magical
:Default: True :Default: True
Make enchanted weapons without Magical flag bypass normal weapons resistance (and weakness) certain creatures have. Make enchanted weapons without Magical flag bypass normal weapons resistance (and weakness) certain creatures have.
This is how original Morrowind behaves. This is how Morrowind behaves.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
prevent merchant equipping prevent merchant equipping
-------------------------- --------------------------
@ -144,7 +144,7 @@ prevent merchant equipping
Prevent merchants from equipping items that are sold to them. Prevent merchants from equipping items that are sold to them.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
followers attack on sight followers attack on sight
------------------------- -------------------------
@ -157,7 +157,7 @@ Make player followers and escorters start combat with enemies who have started c
Otherwise they wait for the enemies or the player to do an attack first. Otherwise they wait for the enemies or the player to do an attack first.
Please note this setting has not been extensively tested and could have side effects with certain quests. Please note this setting has not been extensively tested and could have side effects with certain quests.
This setting can only be configured by editing the settings configuration file. This setting can be toggled in Advanced tab of the launcher.
use additional anim sources use additional anim sources
--------------------------- ---------------------------
@ -182,4 +182,4 @@ barter disposition change is permanent
If this setting is true, disposition change of merchants caused by trading will be permanent and won't be discarded upon exiting dialogue with them. If this setting is true, disposition change of merchants caused by trading will be permanent and won't be discarded upon exiting dialogue with them.
This imitates the option Morrowind Code Patch offers. This imitates the option Morrowind Code Patch offers.
This setting can be toggled with a checkbox in Advanced tab of the launcher. This setting can be toggled in Advanced tab of the launcher.

4
files/settings-default.cfg
View file

@ -200,8 +200,8 @@ best attack = false
# Difficulty. Expressed as damage dealt and received. (e.g. -100 to 100). # Difficulty. Expressed as damage dealt and received. (e.g. -100 to 100).
difficulty = 0 difficulty = 0
# Replicate how reflected "absorb attribute" spells do not have any effect in Morrowind engine. The caster absorbs the attribute from themselves. # Make reflected Absorb spells have no practical effect, like in Morrowind.
classic reflect absorb attribute behavior = true classic reflected absorb spells behavior = true
# Show duration of magic effect and lights in the spells window. # Show duration of magic effect and lights in the spells window.
show effect duration = false show effect duration = false

10
files/ui/advancedpage.ui
View file

@ -86,6 +86,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QCheckBox" name="classicReflectedAbsorbSpellsCheckBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Effects of reflected Absorb spells are not mirrored -- like in Morrowind.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Classic reflected Absorb spells behavior</string>
</property>
</widget>
</item>
<item alignment="Qt::AlignLeft"> <item alignment="Qt::AlignLeft">
<widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true"> <widget class="QWidget" name="unarmedFactorsStrengthGroup" native="true">
<property name="toolTip"> <property name="toolTip">