From 2a28e88bcfc6e56633dd1df91eafb249bbbe40f1 Mon Sep 17 00:00:00 2001 From: KayenEQ Date: Sat, 22 Feb 2014 02:23:37 -0500 Subject: [PATCH] not_reflectable -> reflectable --- common/shareddb.cpp | 2 +- common/spdat.h | 2 +- ...{2014_02_20_buff_update.txt => 2014_02_20_buff_update.sql} | 4 +++- zone/mob.cpp | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) rename utils/sql/git/required/{2014_02_20_buff_update.txt => 2014_02_20_buff_update.sql} (92%) diff --git a/common/shareddb.cpp b/common/shareddb.cpp index aa136c41b..a49cec4e8 100644 --- a/common/shareddb.cpp +++ b/common/shareddb.cpp @@ -1710,7 +1710,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) { sp[tempid].descnum = atoi(row[155]); sp[tempid].effectdescnum = atoi(row[157]); - sp[tempid].not_reflectable = atoi(row[161]) != 0; + sp[tempid].reflectable = atoi(row[161]) != 0; sp[tempid].bonushate=atoi(row[162]); sp[tempid].EndurCost=atoi(row[166]); diff --git a/common/spdat.h b/common/spdat.h index 70f4c4b24..d308206e3 100644 --- a/common/spdat.h +++ b/common/spdat.h @@ -688,7 +688,7 @@ struct SPDat_Spell_Struct /* 157 */ int effectdescnum; // eqstr of effect description /* 158 */ //Category Desc ID 3 /* 159 */ //bool npc_no_los; -/* 161 */ bool not_reflectable; +/* 161 */ bool reflectable; /* 162 */ int bonushate; /* 163 */ /* 164 */ // for most spells this appears to mimic ResistDiff diff --git a/utils/sql/git/required/2014_02_20_buff_update.txt b/utils/sql/git/required/2014_02_20_buff_update.sql similarity index 92% rename from utils/sql/git/required/2014_02_20_buff_update.txt rename to utils/sql/git/required/2014_02_20_buff_update.sql index a53930481..636fa0221 100644 --- a/utils/sql/git/required/2014_02_20_buff_update.txt +++ b/utils/sql/git/required/2014_02_20_buff_update.sql @@ -17,4 +17,6 @@ ALTER TABLE `botbuffs` ADD `caston_z` INT(10) NOT NULL DEFAULT '0'; ALTER TABLE `character_buffs` ADD `ExtraDIChance` INT(10) NOT NULL DEFAULT '0'; ALTER TABLE `merc_buffs` ADD `ExtraDIChance` INT(10) NOT NULL DEFAULT '0'; -ALTER TABLE `botbuffs` ADD `ExtraDIChance` INT(10) NOT NULL DEFAULT '0'; \ No newline at end of file +ALTER TABLE `botbuffs` ADD `ExtraDIChance` INT(10) NOT NULL DEFAULT '0'; + +ALTER TABLE `spells_new` CHANGE `not_reflectable` `reflectable` INT(11) NOT NULL DEFAULT '0'; \ No newline at end of file diff --git a/zone/mob.cpp b/zone/mob.cpp index cee9003cc..a77589d63 100644 --- a/zone/mob.cpp +++ b/zone/mob.cpp @@ -4348,7 +4348,7 @@ void Mob::MeleeLifeTap(int32 damage) { bool Mob::TryReflectSpell(uint32 spell_id) { - if (spells[spell_id].not_reflectable) + if (!spells[spell_id].reflectable) return false; int chance = itembonuses.reflect_chance + spellbonuses.reflect_chance + aabonuses.reflect_chance;