Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct BlackSkull spells limitations #2333

Merged
merged 5 commits into from Dec 17, 2017
Merged

Correct BlackSkull spells limitations #2333

merged 5 commits into from Dec 17, 2017

Conversation

nekiro
Copy link
Member

@nekiro nekiro commented Sep 10, 2017 •
edited

This pull request should fix #2329

According to http://tibia.wikia.com/wiki/Skull_System

When a player has a black skull they will no longer be able to attack an unmarked player - that is any player without a skull. In addition to this, a black-skulled player may not use area attack spells and runes (i.e. Hell's Core, Explosion, etc.), as well as Burst Arrows to prevent black skulls from killing unmarked players indirectly. They also cannot summon or convince creatures, or use Undead Legion or strike spells (i.e. Energy Strike) which are not aimed at a target.

wgrr
wgrr reviewed Sep 10, 2017
View reviewed changes
Copy link
Contributor

@wgrr wgrr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since tfs is not a vanilla replica, this behavior should be configurable, or even better, could be completely done in lua when #2102 be merged.

data/spells/scripts/support/summon_creature.lua Outdated
@@ -1,4 +1,9 @@
function onCastSpell(creature, variant)
if player:getSkull() == SKULL_BLACK then
Copy link
Contributor

@wgrr wgrr Sep 10, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

player is nil value here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

ranisalt
ranisalt reviewed Sep 13, 2017
View reviewed changes
data/spells/scripts/support/summon_creature.lua Outdated
@@ -7,7 +12,7 @@ function onCastSpell(creature, variant)
creature:getPosition():sendMagicEffect(CONST_ME_POFF)
return false
end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing whitespace

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still missing

ranisalt
ranisalt reviewed Sep 13, 2017
View reviewed changes
data/weapons/scripts/burst_arrow.lua Outdated
if player:getSkull() == SKULL_BLACK then
return false
end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing whitespace

ranisalt
ranisalt reviewed Sep 13, 2017
View reviewed changes
src/monster.cpp Outdated
if (player->getSkull() == SKULL_BLACK) {
return false;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

ranisalt
ranisalt reviewed Sep 13, 2017
View reviewed changes
src/spells.cpp Outdated
player->sendCancelMessage(RETURNVALUE_NOTPOSSIBLE);
return false;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same

ranisalt
ranisalt requested changes Sep 14, 2017
View reviewed changes
data/spells/scripts/support/summon_creature.lua Outdated
@@ -7,7 +12,7 @@ function onCastSpell(creature, variant)
creature:getPosition():sendMagicEffect(CONST_ME_POFF)
return false
end

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still missing

ranisalt
ranisalt approved these changes Sep 14, 2017
View reviewed changes
Copy link
Member

@ranisalt ranisalt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@WibbenZ
Copy link
Member

WibbenZ commented Dec 15, 2017

@nekiro Can you resolve the conflicts?

@DSpeichert DSpeichert merged commit ee5156a into otland:master Dec 17, 2017
@nekiro nekiro deleted the black-skull-fix branch December 18, 2017 17:04
@WibbenZ WibbenZ added this to the 1.3 milestone Dec 27, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wgrr wgrr wgrr left review comments

@ranisalt ranisalt ranisalt approved these changes

@WibbenZ WibbenZ WibbenZ approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
1.4
Development

Successfully merging this pull request may close these issues.

No BlackSkull spells limitations
5 participants
@nekiro @WibbenZ @ranisalt @wgrr @DSpeichert