diff options
author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-08 15:47:26 +0000 |
---|---|---|
committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-08 15:47:26 +0000 |
commit | 26659b5a9d4910fd960174690fe899111dd67ba6 (patch) | |
tree | c612445c42f60ef61e34140b912c8f336f6178ef /src/map | |
parent | 8617fae92c7bf8cef257231ef354187ce9b6cf4a (diff) | |
download | hercules-26659b5a9d4910fd960174690fe899111dd67ba6.tar.gz hercules-26659b5a9d4910fd960174690fe899111dd67ba6.tar.bz2 hercules-26659b5a9d4910fd960174690fe899111dd67ba6.tar.xz hercules-26659b5a9d4910fd960174690fe899111dd67ba6.zip |
- added temp skill db entries and corrected some existing ones (see topic:157041)
- removed txt converters from txt build (they need mysql files so they don't belong there)
- eol-style for newly added file
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10867 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r-- | src/map/skill.c | 24 | ||||
-rw-r--r-- | src/map/skill.h | 8 | ||||
-rw-r--r-- | src/map/status.c | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 5381f1b86..b0ca693b1 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -339,10 +339,10 @@ const struct skill_name_db skill_names[] = { { NPC_BARRIER, "NPC_BARRIER", "NPC_BARRIER" } , { NPC_BLINDATTACK, "NPC_BLINDATTACK", "NPC_BLINDATTACK" } , { NPC_BLOODDRAIN, "NPC_BLOODDRAIN", "NPC_BLOODDRAIN" } , - { NPC_BREAKARMOR, "NPC_BREAKARMOR", "NPC_BREAKARMOR" } , - { NPC_BREAKHELM, "NPC_BREAKHELM", "NPC_BREAKHELM" } , - { NPC_BREAKSHIELD, "NPC_BREAKSHIELD", "NPC_BREAKSHIELD" } , - { NPC_BREAKWEAPON, "NPC_BREAKWEAPON", "NPC_BREAKWEAPON" } , + { NPC_ARMORBRAKE, "NPC_ARMORBRAKE", "Break_Armor" } , + { NPC_HELMBRAKE, "NPC_HELMBRAKE", "Break_Helm" } , + { NPC_SHIELDBRAKE, "NPC_SHIELDBRAKE", "Break_Shield" } , + { NPC_WEAPONBRAKER, "NPC_WEAPONBRAKER", "Break_Weapon" } , { NPC_CALLSLAVE, "NPC_CALLSLAVE", "NPC_CALLSLAVE" } , { NPC_CHANGEDARKNESS, "NPC_CHANGEDARKNESS", "NPC_CHANGEDARKNESS" } , { NPC_CHANGEFIRE, "NPC_CHANGEFIRE", "NPC_CHANGEFIRE" } , @@ -1255,16 +1255,16 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int break; } // Equipment breaking monster skills [Celest] - case NPC_BREAKWEAPON: + case NPC_WEAPONBRAKER: skill_break_equip(bl, EQP_WEAPON, 150*skilllv, BCT_ENEMY); break; - case NPC_BREAKARMOR: + case NPC_ARMORBRAKE: skill_break_equip(bl, EQP_ARMOR, 150*skilllv, BCT_ENEMY); break; - case NPC_BREAKHELM: + case NPC_HELMBRAKE: skill_break_equip(bl, EQP_HELM, 150*skilllv, BCT_ENEMY); break; - case NPC_BREAKSHIELD: + case NPC_SHIELDBRAKE: skill_break_equip(bl, EQP_SHIELD, 150*skilllv, BCT_ENEMY); break; @@ -2762,10 +2762,10 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int case NPC_DARKNESSATTACK: case NPC_TELEKINESISATTACK: case NPC_UNDEADATTACK: - case NPC_BREAKARMOR: - case NPC_BREAKWEAPON: - case NPC_BREAKHELM: - case NPC_BREAKSHIELD: + case NPC_ARMORBRAKE: + case NPC_WEAPONBRAKER: + case NPC_HELMBRAKE: + case NPC_SHIELDBRAKE: case LK_AURABLADE: case LK_SPIRALPIERCE: case LK_HEADCRUSH: diff --git a/src/map/skill.h b/src/map/skill.h index 36006805e..112961b79 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -647,10 +647,10 @@ enum _skill { NPC_DARKSTRIKE, NPC_DARKTHUNDER, NPC_STOP, - NPC_BREAKWEAPON, - NPC_BREAKARMOR, - NPC_BREAKHELM, - NPC_BREAKSHIELD, + NPC_WEAPONBRAKER, + NPC_ARMORBRAKE, + NPC_HELMBRAKE, + NPC_SHIELDBRAKE, NPC_UNDEADATTACK, NPC_CHANGEUNDEAD, NPC_POWERUP, diff --git a/src/map/status.c b/src/map/status.c index dda86240c..9bf6861c9 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -277,8 +277,8 @@ void initChangeTables(void) add_sc(NPC_DARKCROSS, SC_BLIND); add_sc(NPC_GRANDDARKNESS, SC_BLIND); set_sc(NPC_STOP, SC_STOP, SI_STOP, SCB_NONE); - set_sc(NPC_BREAKWEAPON, SC_BROKENWEAPON, SI_BROKENWEAPON, SCB_NONE); - set_sc(NPC_BREAKARMOR, SC_BROKENARMOR, SI_BROKENARMOR, SCB_NONE); + set_sc(NPC_WEAPONBRAKER, SC_BROKENWEAPON, SI_BROKENWEAPON, SCB_NONE); + set_sc(NPC_ARMORBRAKE, SC_BROKENARMOR, SI_BROKENARMOR, SCB_NONE); set_sc(NPC_CHANGEUNDEAD, SC_CHANGEUNDEAD, SI_UNDEAD, SCB_DEF_ELE); set_sc(NPC_POWERUP, SC_INCDEXRATE, SI_BLANK, SCB_DEX); set_sc(NPC_AGIUP, SC_INCFLEERATE, SI_BLANK, SCB_AGI); |