Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- added temp skill db entries and corrected some existing ones (see topic:157041)

Browse Source 
- 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://svn.code.sf.net/p/rathena/svn/trunk@10867 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2007-07-08 15:47:26 +00:00
parent 2d637e910b
commit 3f722ba896
6 changed files with 1150 additions and 1124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
db/skill_db.txt
View File

@ -210,7 +210,7 @@
169,0,0,4,8,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGETELEKINESIS#Sense Attribute Change# 169,0,0,4,8,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGETELEKINESIS#Sense Attribute Change#
170,-9,6,1,-1,0x20,0,10,1,no,0,0x2,0,weapon,0 //NPC_CRITICALSLASH#Defense disregard attack# 170,-9,6,1,-1,0x20,0,10,1,no,0,0x2,0,weapon,0 //NPC_CRITICALSLASH#Defense disregard attack#
171,-9,8,1,-1,0,0,10,2:3:4:5:6:7:8:9:10:11,no,0,0x2,0,weapon,0 //NPC_COMBOATTACK#Multi-stage Attack# 171,-9,8,1,-1,0,0,10,2:3:4:5:6:7:8:9:10:11,no,0,0x2,0,weapon,0 //NPC_COMBOATTACK#Multi-stage Attack#
172,-9,6,1,-1,0x40,0,10,1,no,0,0x2,0,weapon,0 //NPC_GUIDEATTACK#On-target Impact Attack# 172,-9,6,1,-1,0x40,0,10,1,no,0,0x2,0,weapon,0 //NPC_GUIDEDATTACK#On-target Impact Attack#
173,5,6,4,3,0xD2,5,10,1,no,0,0x2,0,misc,3 //NPC_SELFDESTRUCTION#Suicide bombing# 173,5,6,4,3,0xD2,5,10,1,no,0,0x2,0,misc,3 //NPC_SELFDESTRUCTION#Suicide bombing#
174,-9,6,1,-1,0x2,3,1,1,no,0,0x2,0,weapon,0 //NPC_SPLASHATTACK#Splash attack# 174,-9,6,1,-1,0x2,3,1,1,no,0,0x2,0,weapon,0 //NPC_SPLASHATTACK#Splash attack#
175,0,0,4,0,0x41,0,10,1,no,0,0x2,0,misc,0 //NPC_SUICIDE#Suicide# 175,0,0,4,0,0x41,0,10,1,no,0,0x2,0,misc,0 //NPC_SUICIDE#Suicide#
@ -381,10 +381,10 @@
340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0 //NPC_DARKSTRIKE#Soul Strike of Darkness# 340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0 //NPC_DARKSTRIKE#Soul Strike of Darkness#
341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7 //NPC_DARKTHUNDER#Darkness Jupiter# 341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7 //NPC_DARKTHUNDER#Darkness Jupiter#
342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0 //NPC_STOP 342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0 //NPC_STOP
343,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKWEAPON#Break weapon# 343,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_WEAPONBRAKER#Break weapon#
344,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKARMOR#Break armor# 344,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_ARMORBRAKE#Break armor#
345,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKHELM#Break helm# 345,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_HELMBRAKE#Break helm#
346,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKSHIELD#Break shield# 346,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_SHIELDBRAKE#Break shield#
347,-9,6,1,9,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_UNDEADATTACK 347,-9,6,1,9,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_UNDEADATTACK
348,9,0,1,9,0x1,0,5,1,no,0,0x2,0,magic,0 //NPC_CHANGEUNDEAD 348,9,0,1,9,0x1,0,5,1,no,0,0x2,0,magic,0 //NPC_CHANGEUNDEAD
349,0,6,4,0,0x1,0,10,0,no,0,0x2,0,weapon,0 //NPC_POWERUP 349,0,6,4,0,0x1,0,10,0,no,0,0x2,0,weapon,0 //NPC_POWERUP
@ -584,6 +584,36 @@
543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0 //NJ_NEN#NJ_NEN# 543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0 //NJ_NEN#NJ_NEN#
544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0 //NJ_ISSEN#NJ_ISSEN# 544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0 //NJ_ISSEN#NJ_ISSEN#
// new NPC skills (not yet implemented, dummy data)
653,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_EARTHQUAKE
654,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_FIREBREATH
655,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_ICEBREATH
656,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_THUNDERBREATH
657,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_ACIDBREATH
658,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_DARKNESSBREATH
659,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_DRAGONFEAR
660,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_BLEEDING
661,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_PULSESTRIKE
662,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_HELLJUDGEMENT
663,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESILENCE
664,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDEFREEZE
665,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDEBLEEDING
666,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESTONE
667,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDECONFUSE
668,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESLEEP
669,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESIGHT
670,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_EVILLAND
671,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_MAGICMIRROR
672,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_SLOWCAST
673,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_CRITICALWOUND
674,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_EXPULSION
675,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_STONESKIN
676,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_ANTIMAGIC
677,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDECURSE
678,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESTUN
679,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_VAMPIRE_GIFT
680,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_WIDESOULDRAIN
1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0 //KN_CHARGEATK#Charge Attack# 1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0 //KN_CHARGEATK#Charge Attack#
1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2 //CR_SHRINK#Shrink# 1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2 //CR_SHRINK#Shrink#
1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0 //AS_SONICACCEL#Sonic Acceleration# 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0 //AS_SONICACCEL#Sonic Acceleration#

4
eAthena-8.sln
View File

@ -117,19 +117,15 @@ Global
{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Debug|Win32.Build.0 = Debug|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.ActiveCfg = Release|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Release|Win32.Build.0 = Release|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-E9E9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
{D356871D-58E1-450B-967A-E9E9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.Build.0 = Debug|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Debug|Win32.Build.0 = Debug|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Debug-sql|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Debug-txt|Win32.ActiveCfg = Debug|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.ActiveCfg = Release|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.Build.0 = Release|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Release|Win32.Build.0 = Release|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32 {D356871D-58E1-450B-967A-EAE9646175AF}.Release-sql|Win32.ActiveCfg = Release|Win32
{D356871D-58E1-450B-967A-EAE9646175AF}.Release-txt|Win32.ActiveCfg = Release|Win32
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

2194
npc/quests/doomed_swords_quest.txt
View File

File diff suppressed because it is too large Load Diff

24
src/map/skill.c
View File

@ -339,10 +339,10 @@ const struct skill_name_db skill_names[] = {
{ NPC_BARRIER, "NPC_BARRIER", "NPC_BARRIER" } , { NPC_BARRIER, "NPC_BARRIER", "NPC_BARRIER" } ,
{ NPC_BLINDATTACK, "NPC_BLINDATTACK", "NPC_BLINDATTACK" } , { NPC_BLINDATTACK, "NPC_BLINDATTACK", "NPC_BLINDATTACK" } ,
{ NPC_BLOODDRAIN, "NPC_BLOODDRAIN", "NPC_BLOODDRAIN" } , { NPC_BLOODDRAIN, "NPC_BLOODDRAIN", "NPC_BLOODDRAIN" } ,
{ NPC_BREAKARMOR, "NPC_BREAKARMOR", "NPC_BREAKARMOR" } , { NPC_ARMORBRAKE, "NPC_ARMORBRAKE", "Break_Armor" } ,
{ NPC_BREAKHELM, "NPC_BREAKHELM", "NPC_BREAKHELM" } , { NPC_HELMBRAKE, "NPC_HELMBRAKE", "Break_Helm" } ,
{ NPC_BREAKSHIELD, "NPC_BREAKSHIELD", "NPC_BREAKSHIELD" } , { NPC_SHIELDBRAKE, "NPC_SHIELDBRAKE", "Break_Shield" } ,
{ NPC_BREAKWEAPON, "NPC_BREAKWEAPON", "NPC_BREAKWEAPON" } , { NPC_WEAPONBRAKER, "NPC_WEAPONBRAKER", "Break_Weapon" } ,
{ NPC_CALLSLAVE, "NPC_CALLSLAVE", "NPC_CALLSLAVE" } , { NPC_CALLSLAVE, "NPC_CALLSLAVE", "NPC_CALLSLAVE" } ,
{ NPC_CHANGEDARKNESS, "NPC_CHANGEDARKNESS", "NPC_CHANGEDARKNESS" } , { NPC_CHANGEDARKNESS, "NPC_CHANGEDARKNESS", "NPC_CHANGEDARKNESS" } ,
{ NPC_CHANGEFIRE, "NPC_CHANGEFIRE", "NPC_CHANGEFIRE" } , { NPC_CHANGEFIRE, "NPC_CHANGEFIRE", "NPC_CHANGEFIRE" } ,
@ -1255,16 +1255,16 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int
break; break;
} }
// Equipment breaking monster skills [Celest] // Equipment breaking monster skills [Celest]
case NPC_BREAKWEAPON: case NPC_WEAPONBRAKER:
skill_break_equip(bl, EQP_WEAPON, 150*skilllv, BCT_ENEMY); skill_break_equip(bl, EQP_WEAPON, 150*skilllv, BCT_ENEMY);
break; break;
case NPC_BREAKARMOR: case NPC_ARMORBRAKE:
skill_break_equip(bl, EQP_ARMOR, 150*skilllv, BCT_ENEMY); skill_break_equip(bl, EQP_ARMOR, 150*skilllv, BCT_ENEMY);
break; break;
case NPC_BREAKHELM: case NPC_HELMBRAKE:
skill_break_equip(bl, EQP_HELM, 150*skilllv, BCT_ENEMY); skill_break_equip(bl, EQP_HELM, 150*skilllv, BCT_ENEMY);
break; break;
case NPC_BREAKSHIELD: case NPC_SHIELDBRAKE:
skill_break_equip(bl, EQP_SHIELD, 150*skilllv, BCT_ENEMY); skill_break_equip(bl, EQP_SHIELD, 150*skilllv, BCT_ENEMY);
break; break;
@ -2762,10 +2762,10 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int
case NPC_DARKNESSATTACK: case NPC_DARKNESSATTACK:
case NPC_TELEKINESISATTACK: case NPC_TELEKINESISATTACK:
case NPC_UNDEADATTACK: case NPC_UNDEADATTACK:
case NPC_BREAKARMOR: case NPC_ARMORBRAKE:
case NPC_BREAKWEAPON: case NPC_WEAPONBRAKER:
case NPC_BREAKHELM: case NPC_HELMBRAKE:
case NPC_BREAKSHIELD: case NPC_SHIELDBRAKE:
case LK_AURABLADE: case LK_AURABLADE:
case LK_SPIRALPIERCE: case LK_SPIRALPIERCE:
case LK_HEADCRUSH: case LK_HEADCRUSH:

8
src/map/skill.h
View File

@ -647,10 +647,10 @@ enum _skill {
NPC_DARKSTRIKE, NPC_DARKSTRIKE,
NPC_DARKTHUNDER, NPC_DARKTHUNDER,
NPC_STOP, NPC_STOP,
NPC_BREAKWEAPON, NPC_WEAPONBRAKER,
NPC_BREAKARMOR, NPC_ARMORBRAKE,
NPC_BREAKHELM, NPC_HELMBRAKE,
NPC_BREAKSHIELD, NPC_SHIELDBRAKE,
NPC_UNDEADATTACK, NPC_UNDEADATTACK,
NPC_CHANGEUNDEAD, NPC_CHANGEUNDEAD,
NPC_POWERUP, NPC_POWERUP,

4
src/map/status.c
View File

@ -277,8 +277,8 @@ void initChangeTables(void)
add_sc(NPC_DARKCROSS, SC_BLIND); add_sc(NPC_DARKCROSS, SC_BLIND);
add_sc(NPC_GRANDDARKNESS, SC_BLIND); add_sc(NPC_GRANDDARKNESS, SC_BLIND);
set_sc(NPC_STOP, SC_STOP, SI_STOP, SCB_NONE); set_sc(NPC_STOP, SC_STOP, SI_STOP, SCB_NONE);
set_sc(NPC_BREAKWEAPON, SC_BROKENWEAPON, SI_BROKENWEAPON, SCB_NONE); set_sc(NPC_WEAPONBRAKER, SC_BROKENWEAPON, SI_BROKENWEAPON, SCB_NONE);
set_sc(NPC_BREAKARMOR, SC_BROKENARMOR, SI_BROKENARMOR, 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_CHANGEUNDEAD, SC_CHANGEUNDEAD, SI_UNDEAD, SCB_DEF_ELE);
set_sc(NPC_POWERUP, SC_INCDEXRATE, SI_BLANK, SCB_DEX); set_sc(NPC_POWERUP, SC_INCDEXRATE, SI_BLANK, SCB_DEX);
set_sc(NPC_AGIUP, SC_INCFLEERATE, SI_BLANK, SCB_AGI); set_sc(NPC_AGIUP, SC_INCFLEERATE, SI_BLANK, SCB_AGI);