[Feature] Breakable mana shield #3848

ArturKnopik · 2021-12-14T17:58:37Z

New config

useBreakableManaShield: bool
manaShieldBarForAll: bool

New Lua function

player:setManaShieldBar: allows to use mana shield bar as something else (e.g. boss fight timer)

Modified lua script

data/spells/scripts/support/magic_shield.lua: give possibility to use old mana shield and breakable mana shield

I have followed [proper The Forgotten Server code styling][code].
I have read and understood the [contribution guidelines][cont] before making this PR.
I am aware that this PR may be closed if the above-mentioned criteria are not fulfilled.

src/player.cpp

data/spells/scripts/support/magic_shield.lua

omarcopires · 2021-12-15T03:02:49Z

I like the changes, but I would like a global config for the old and new PVP (after balancing), so we could only use one config for all future changes. Another thing is, maybe we could split this request in two, as the magic shield and the rooted condition have no connection. Do not take my comment as negative review, it's just my opinion, thank you very much for bringing the changes!

I ended up finding that you didn't add any spells that break the magic shield, nor did you add the potion system to retrieve it, is this going to be added in the future or has it been forgotten?

EPuncker

excellent! I would love to see the magic shield potion and the shield canceling spell tho

ghost · 2021-12-15T13:53:01Z

locking player in place could be a cool gm feature, having root condition optional to support both old and new clients

…- all relate to config

ArturKnopik · 2021-12-15T20:38:21Z

spells and potion related to config settings
TODO: remove condition root, apply Zbizu changes

…- all relate to config [cleanup]

EPuncker

great! magic shield potion can be added at data/actions/scripts/potions.lua (but please don't move this file to revscriptsys for now 😄) just follow how buff potions where added there

data/scripts/spells/magic_shield.lua

data/scripts/spells/cancel_magic_shield.lua

data/actions/actions.xml

nekiro

I would move the breakable mana values to breakable mana shield condition, it's serialized to database and loaded on login, so you have all the values ready without adding anything to database nor handling these values, same thing with calculcations in game.cpp, you can do them on condition and put whole logic in condition, for example manaCondition->onDamageTaken() and use this inside of game.cpp to reduce mana shield amount and call onConditionEnd inside of it when needed

src/condition.cpp

nekiro · 2021-12-18T00:06:40Z

src/condition.cpp

+	if (!Condition::startCondition(creature)) {
+		return false;
+	}
+	if (auto player = creature->getPlayer()) {


Player* player

nekiro · 2021-12-18T00:06:43Z

src/condition.cpp

+
+void ConditionManaShield::endCondition(Creature* creature)
+{
+	if (auto player = creature->getPlayer()) {


Player* player

nekiro · 2021-12-18T00:06:47Z

src/condition.cpp

+
+void ConditionManaShield::addCondition(Creature* creature, const Condition* addCondition)
+{
+	if (auto player = creature->getPlayer()) {


Player* player

nekiro · 2021-12-18T00:07:28Z

src/condition.cpp

+	bool ret = Condition::setParam(param, value);
+
+	switch (param) {
+	case CONDITION_PARAM_MANASHIELD_BREAKABLE:


missing indendation

nekiro · 2021-12-18T00:08:34Z

src/game.cpp

+						manaShield = 0;
+					}
+				}
+				if (targetPlayer->getMana() == 0 && manaShield > 0) {


nekiro · 2021-12-18T00:09:08Z

src/game.cpp

+					targetPlayer->removeCondition(CONDITION_MANASHIELD_BREAKABLE);
+				}
+			} else {
+			// Old Mana Shield


normal mana shield?

old system that use all mana and cannot be broken when mana reach value 0

I think nekiro means to rename "old mana shield" to "normal mana shield"

src/game.cpp

nekiro · 2021-12-18T00:10:32Z

src/player.h

@@ -1280,6 +1296,8 @@ class Player final : public Creature, public Cylinder
 		uint32_t editListId = 0;
 		uint32_t mana = 0;
 		uint32_t manaMax = 0;
+		uint16_t manaShield = 0;


this should be probably calculated from the condition you added

nekiro · 2021-12-18T00:12:00Z

src/protocolgame.cpp

@@ -1561,7 +1561,7 @@ void ProtocolGame::sendBasicData()
 		msg.addByte(spellId);
 	}

-	msg.addByte(0x00); // is magic shield active (bool)
+	msg.addByte(player->getVocation()->getMagicShield()); // is magic shield active (bool)


again, check if player has condition?

Btw if a player changes vocation where is this updated?

> Specialised Magic Levels: items will be able to receive a magic level modifier for specific elements, e.g. "fire magic level +2", which means only fire damage spells are boosted. Possible elements include Fire, Earth, Energy, Ice, Holy, Death and Healing. https://tibia.fandom.com/wiki/Updates/12.70.10953

This reverts commit 2fa29a1.

actions.xml configmanager.h

EPuncker · 2023-04-04T21:48:28Z

yo guys, lets test this and give feedback, lets merge this!

EPuncker

need to remove the iologindata changes and related changes

omarcopires · 2023-04-04T23:36:55Z

yo guys, lets test this and give feedback, lets merge this!

everything worked great, except the utamo vita spell in revscript, it said "you have the wrong vocation to cast this spell", but once I moved it to XML it worked just fine

krecikondexin · 2023-04-05T07:42:39Z

@EPuncker i forgot revert fix for debug build after master merge, i will revert this changes + fix formatting
@omarcopires i will check it today

This reverts commit 2c4352d.

omarcopires · 2023-04-05T18:30:36Z

Looking at the current code, I noticed that there is compatibility with the old formula being maintained. However, in my opinion, maintaining this compatibility only increases the amount of code and may be unnecessary for those who do not wish to use the old formula. Additionally, several changes have been made to configuration parameters and spells since version 1.3, including cooldowns and item limits. Therefore, I believe it is important to question whether we really need to maintain this compatibility or if it would be better to simplify the code and remove the old formula, allowing us to focus only on the newer versions. What do you think.

ArturKnopik · 2023-04-05T18:30:47Z

@omarcopires string_view issue appear again - fixed
@EPuncker reverted string_view fix

@omarcopires for me old mana shield is viable for EVO and FUN ots, personally i developed 12+ OTS(FUN) with old mana shield

omarcopires · 2023-04-05T18:40:00Z

I performed tests in several scenarios and did not encounter any issues within the game. The shield and icon were added and broken as expected, and the "utamo vita" spell now functions correctly. It is worth noting that the tests were only performed with the "druid" class.

EPuncker · 2023-04-05T21:35:05Z

there are 5 failing checks, can you verify them please?

krecikondexin · 2023-04-06T12:25:14Z

Fails not related to my changes.

add breakable mana shield and condition root

1f2bccd

Zbizu suggested changes Dec 14, 2021

View reviewed changes

src/player.cpp Outdated Show resolved Hide resolved

EPuncker requested a review from a team December 14, 2021 18:41

EPuncker added the feature New feature or functionality label Dec 14, 2021

ArturKnopik commented Dec 14, 2021

View reviewed changes

data/spells/scripts/support/magic_shield.lua Outdated Show resolved Hide resolved

EPuncker reviewed Dec 15, 2021

View reviewed changes

add magic shield potion and cancel magic shield, update magic shield …

c341529

…- all relate to config

add magic shield potion and cancel magic shield, update magic shield …

75bc905

…- all relate to config [cleanup]

EPuncker requested changes Dec 16, 2021

View reviewed changes

data/scripts/spells/magic_shield.lua Outdated Show resolved Hide resolved

data/scripts/spells/cancel_magic_shield.lua Outdated Show resolved Hide resolved

move magic shield potion to potions.lua, remove root condition, cleanup

1f3e71b

ArturKnopik changed the title ~~Feature: Breakable mana shield and condition root~~ Feature: Breakable mana shield Dec 16, 2021

ArturKnopik requested a review from EPuncker December 16, 2021 21:38

EPuncker reviewed Dec 17, 2021

View reviewed changes

data/actions/actions.xml Outdated Show resolved Hide resolved

Update data/actions/actions.xml

380d0d0

EPuncker reviewed Dec 17, 2021

View reviewed changes

data/actions/actions.xml Outdated Show resolved Hide resolved

Update data/actions/actions.xml

cf06dfb

EPuncker previously approved these changes Dec 17, 2021

View reviewed changes

EPuncker requested review from ranisalt, nekiro and DSpeichert December 17, 2021 03:49

nekiro reviewed Dec 18, 2021

View reviewed changes

MillhioreBT and others added 3 commits December 18, 2021 17:49

fix the client crash when you open the missions window (otland#3844)

a3aaa50

remove db dependency, cleanup

d2fd3de

ArturKnopik dismissed EPuncker’s stale review via d2fd3de December 18, 2021 16:49

ArturKnopik added 2 commits December 18, 2021 17:51

remove db dependency, cleanup

47b0d88

Revert "Added specialized magic level (otland#3843)"

c03e6f1

This reverts commit 2fa29a1.

ArturKnopik requested review from nekiro and MillhioreBT and removed request for nekiro November 22, 2022 15:52

AKnopik PC added 3 commits April 4, 2023 17:22

update

2c4352d

conflits in:

0dfe780

actions.xml configmanager.h

fix actions

58b1f88

ArturKnopik changed the title ~~Feature: Breakable mana shield~~ [Feature] Breakable mana shield Apr 4, 2023

ArturKnopik requested review from ramon-bernardo, DSpeichert, nekiro, Zbizu, EPuncker and ranisalt April 4, 2023 16:14

EPuncker requested changes Apr 4, 2023

View reviewed changes

AKnopik PC added 3 commits April 5, 2023 20:03

Revert "update"

05f33ac

This reverts commit 2c4352d.

add new config to config.lua.dist

4c0a667

fix string_view

431290a

omarcopires approved these changes Apr 5, 2023

View reviewed changes

EPuncker approved these changes Apr 6, 2023

View reviewed changes

DSpeichert approved these changes Apr 6, 2023

View reviewed changes

EPuncker merged commit 87ca1d6 into otland:master Apr 6, 2023

ArturKnopik deleted the newManaShield branch April 10, 2023 20:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Feature] Breakable mana shield #3848

[Feature] Breakable mana shield #3848

ArturKnopik commented Dec 14, 2021 •

edited by EPuncker

Loading

omarcopires commented Dec 15, 2021 •

edited

Loading

EPuncker left a comment

ghost commented Dec 15, 2021

ArturKnopik commented Dec 15, 2021 •

edited

Loading

EPuncker left a comment

nekiro left a comment

nekiro Dec 18, 2021

nekiro Dec 18, 2021

nekiro Dec 18, 2021

nekiro Dec 18, 2021

nekiro Dec 18, 2021

nekiro Dec 18, 2021

ArturKnopik Dec 18, 2021

EPuncker Dec 18, 2021

nekiro Dec 18, 2021

nekiro Dec 18, 2021 •

edited

Loading

MillhioreBT Mar 10, 2022

EPuncker commented Apr 4, 2023

EPuncker left a comment

omarcopires commented Apr 4, 2023

krecikondexin commented Apr 5, 2023 •

edited

Loading

omarcopires commented Apr 5, 2023 •

edited

Loading

ArturKnopik commented Apr 5, 2023 •

edited

Loading

omarcopires commented Apr 5, 2023 •

edited

Loading

EPuncker commented Apr 5, 2023

krecikondexin commented Apr 6, 2023

[Feature] Breakable mana shield #3848

[Feature] Breakable mana shield #3848

Conversation

ArturKnopik commented Dec 14, 2021 • edited by EPuncker Loading

omarcopires commented Dec 15, 2021 • edited Loading

EPuncker left a comment

Choose a reason for hiding this comment

ghost commented Dec 15, 2021

ArturKnopik commented Dec 15, 2021 • edited Loading

EPuncker left a comment

Choose a reason for hiding this comment

nekiro left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nekiro Dec 18, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EPuncker commented Apr 4, 2023

EPuncker left a comment

Choose a reason for hiding this comment

omarcopires commented Apr 4, 2023

krecikondexin commented Apr 5, 2023 • edited Loading

omarcopires commented Apr 5, 2023 • edited Loading

ArturKnopik commented Apr 5, 2023 • edited Loading

omarcopires commented Apr 5, 2023 • edited Loading

EPuncker commented Apr 5, 2023

krecikondexin commented Apr 6, 2023

ArturKnopik commented Dec 14, 2021 •

edited by EPuncker

Loading

omarcopires commented Dec 15, 2021 •

edited

Loading

ArturKnopik commented Dec 15, 2021 •

edited

Loading

nekiro Dec 18, 2021 •

edited

Loading

krecikondexin commented Apr 5, 2023 •

edited

Loading

omarcopires commented Apr 5, 2023 •

edited

Loading

ArturKnopik commented Apr 5, 2023 •

edited

Loading

omarcopires commented Apr 5, 2023 •

edited

Loading