diff options
author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-05-26 23:41:01 +0200 |
---|---|---|
committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer> | 2011-05-26 23:42:10 +0200 |
commit | b35aef2d924f03d85eb44a2465be5a745444eafd (patch) | |
tree | 5de5dc327397f9e970ce1bdfacf850a16da02241 /src/resources/monsterdb.cpp | |
parent | b02081c00450d274c23b7198620ee7748756bd72 (diff) | |
download | mana-client-b35aef2d924f03d85eb44a2465be5a745444eafd.tar.gz mana-client-b35aef2d924f03d85eb44a2465be5a745444eafd.tar.bz2 mana-client-b35aef2d924f03d85eb44a2465be5a745444eafd.tar.xz mana-client-b35aef2d924f03d85eb44a2465be5a745444eafd.zip |
Added effects support in monsters attacks.
This is provided through the use of the 'effect-id' property
of the <attack> tag.
Note that the 'particle-effect' support has been removed
as it was redundant, but can be kept for backward compatibility.
Now, on both Manaserv and tA, only the attack id 1 is supported,
i.e:
<monster>
...
<attack id="1" effect-id="11" action="attack" />
</monster>
More to come with re-enabling of the attack type support.
I had to fix a crash in the Being::takeDamage() function
when there were no attacker (in Manaserv), and add rotation
support to the effectManager to achieve this.
Reviwed-by: Jaxad0127.
Diffstat (limited to 'src/resources/monsterdb.cpp')
-rw-r--r-- | src/resources/monsterdb.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp index 6bc64a89..ca9b8e83 100644 --- a/src/resources/monsterdb.cpp +++ b/src/resources/monsterdb.cpp @@ -124,15 +124,14 @@ void MonsterDB::load() else if (xmlStrEqual(spriteNode->name, BAD_CAST "attack")) { const int id = XML::getProperty(spriteNode, "id", 0); - const std::string particleEffect = XML::getProperty( - spriteNode, "particle-effect", ""); + int effectId = XML::getProperty(spriteNode, "effect-id", -1); const std::string spriteAction = XML::getProperty(spriteNode, "action", "attack"); - const std::string missileParticle = XML::getProperty( - spriteNode, "missile-particle", ""); - currentInfo->addAttack(id, spriteAction, - particleEffect, missileParticle); + const std::string missileParticleFilename = + XML::getProperty(spriteNode, "missile-particle", ""); + currentInfo->addAttack(id, spriteAction, effectId, + missileParticleFilename); } else if (xmlStrEqual(spriteNode->name, BAD_CAST "particlefx")) { |