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.

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

[6.x] Scripts/Spells: K'ure & Decimatus, SAI + spell scripts. #17343

Merged
merged 5 commits into from Jul 5, 2016
Merged

[6.x] Scripts/Spells: K'ure & Decimatus, SAI + spell scripts. #17343

merged 5 commits into from Jul 5, 2016

Conversation

ghost
Copy link

@ghost ghost commented Jun 11, 2016

Changes proposed:

  • Add Decimatus SAI
  • Add Dark Siphon K'ure spell condition target.
  • Add Decimatus Transformation Sickness spell script.

Target branch(es): 335/6x
6.x
Issues addressed: Fixes #
closes #16175
closes #15433
Tests performed: (Does it build, tested in-game, etc)
SAI and spell condition tested, spell script not tested.
Update:
Spell 169869 and 189491 testing in game, working, you can merge.
Known issues and TODO list:

ID - 169869 Transformation Sickness
=================================================

ToolTip: Decimatus has been temporarily weakened by the premature transformation.
Category = 0, SpellIconID = 6176, activeIconID = 0, SpellVisual = (42387,0)
Family SPELLFAMILY_GENERIC, flag [0] 0x00000000 [1] 0x00000000 [2] 0x00000000 [3] 0x00000000

SpellSchoolMask = 1 (SPELL_SCHOOL_MASK_NORMAL)
DamageClass = 0 (SPELL_DAMAGE_CLASS_NONE)
PreventionType = 0 (SPELL_PREVENTION_TYPE_NONE)
=================================================
Attributes: 0x00000100 (SPELL_ATTR0_HIDE_IN_COMBAT_LOG)
=================================================
Spell Level = 0, base 0, max 0

Category = 0
DispelType = 0 (DISPEL_NONE)
Mechanic = 0 (MECHANIC_NONE)
SpellRange: (Id 1) "Self Only":
    MinRangeNegative = 0, MinRangePositive = 0
    MaxRangeNegative = 0, MaxRangePositive = 0

Cast time (Id 1) = 0,00
Duration: ID (21)  -1, 0, -1
Interrupt Flags: 0x00000000, AuraIF 0x00000000, ChannelIF 0x00000000
Chance = 0, charges - 0
=================================================
Effect 0: Id 6 (SPELL_EFFECT_APPLY_AURA) DIFFICULTY_NONE
BasePoints = 0
Targets (1, 0) (TARGET_UNIT_CASTER, NO_TARGET)
Aura Id 4 (SPELL_AURA_DUMMY), value = 0, misc = 0 (0), miscB = 0, periodic = 0

Effect 1: Id 77 (SPELL_EFFECT_SCRIPT_EFFECT) DIFFICULTY_NONE
BasePoints = 0
Targets (1, 0) (TARGET_UNIT_CASTER, NO_TARGET)

NOTE If your Pull Request is SQL only create a ticket instead

SUGESTION If your Pull Request contains SQL give it one imposible date, for example 9999_99_99_99_database.sql on that way it will be free on merge.

Add Decimatus SAI and Dark Siphon spell condition target.
Decimatus Transformation Sickness.
@Keader
Copy link
Member

Keader commented Jun 12, 2016

Sql name.
Should conflict when merge.

@Aokromes
Copy link
Member

Na, it won't, no one merged db content on 6.x branch that day.

{
if (Unit* caster = GetCaster())
caster->SetHealth(caster->CountPctFromMaxHealth(10));
}
Copy link
Author

@ghost ghost Jun 12, 2016

Choose a reason for hiding this comment

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

void HandleScript(SpellEffIndex /effIndex/)
{
if (Unit* caster = GetCaster())
uint32 hp = caster->CountPctFromMaxHealth(10);
if (hp)
caster->SetHealth(hp);
}
Maybe this better? Also add in database HealthRegen interrupt flag.

Copy link
Contributor

Choose a reason for hiding this comment

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

caster can't be null there, so useless check

Copy link
Author

@ghost ghost Jun 13, 2016

Choose a reason for hiding this comment

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

caster can't be null there, so useless check

Okay, you can suggested new variant? See below.
Variant 1:

        void HandleScript(SpellEffIndex /*effIndex*/)
         {
             GetCaster()->SetHealth(GetCaster()->CountPctFromMaxHealth(10));
         }

Or variant 2:

void HandleScript(SpellEffIndex /*effIndex*/)
        {
            if (Unit* target = GetHitUnit())
               target->SetHealth(target->CountPctFromMaxHealth(10));
        }

Right?

@ghost
Copy link
Author

ghost commented Jun 12, 2016

Sql name.
Should conflict when merge.

Don't worry, I was staring sql date before add file.

And then you never know what comes into head Blizzard.
@ghost ghost changed the title Core/DB/WoD: Add Decimatus SAI, add K'ure Dark Siphon spell condition target, add spell script for Transformation Sickness. Core/DB/WoD: Add Decimatus SAI, add K'ure Dark Siphon spell condition target, add spell script for Transformation Sickness. Add support spell scripts for 189549, 189512 and 189491. Jun 17, 2016
Add support spell scripts for 189549, 189512 and 189491.
@ghost ghost changed the title Core/DB/WoD: Add Decimatus SAI, add K'ure Dark Siphon spell condition target, add spell script for Transformation Sickness. Add support spell scripts for 189549, 189512 and 189491. [6.x] Scripts/Spells: K'ure & Decimatus, SAI + spell scripts. Jun 17, 2016
@Aokromes Aokromes merged commit 48f0f47 into TrinityCore:6.x Jul 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants