From 1fc61a4c982792d5d8b82568d5b8b93db267bc24 Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 23 Apr 2007 19:08:34 +0000 Subject: - Updated the skill_db, some mob skills seem to be better to a range of -9 than 9. - Corrected the pet_db information for Xmas Goblin and Rice Cake. - Replaced all struct map_session_data to TBL_PC in script.c - Pressure no longer vaporizes plants. - Corrected pc_setregstr to handle a null str argument. - Corrected @reloadbattleconf causing a add_timer_func "already existing function" error. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10326 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 3 +++ db/pet_db.txt | 6 +++--- db/skill_db.txt | 44 ++++++++++++++++++++++---------------------- 3 files changed, 28 insertions(+), 25 deletions(-) (limited to 'db') diff --git a/db/Changelog.txt b/db/Changelog.txt index 2af12f14d..dff1c9307 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -19,6 +19,9 @@ ----- ======================== + +04/24 + * Corrected the pet_db information for Xmas Goblin and Rice Cake. [Skotlex] 04/23 * Added some "refined" headgears [Playtester] * Some more Anubis updates [Playtester] diff --git a/db/pet_db.txt b/db/pet_db.txt index fce9c910e..4c532ade5 100644 --- a/db/pet_db.txt +++ b/db/pet_db.txt @@ -30,7 +30,7 @@ //but only one of each. //NOTE: The max value (100%) of attack_rate, defense_rate & change_target_rate is 10000. -// MobID,Name,JName,LureID,EggID,AcceID,FoodID,Fullness,HungryDelay,R_Hungry,R_Full,Intimate,Die,Capture,Speed,S_Performance,talk_convert_class,attack_rate,defence_attack_rate,change_target_rate,pet_script +// MobID,Name,JName,LureID,EggID,EquipID,FoodID,Fullness,HungryDelay,R_Hungry,R_Full,Intimate,Die,Capture,Speed,S_Performance,talk_convert_class,attack_rate,defence_attack_rate,change_target_rate,pet_script 1002,PORING,Poring,619,9001,10013,531,80,20,50,100,250,20,2000,400,1,0,350,400,800,{ petloot 10; } 1011,CHONCHON,ChonChon,624,9006,10002,537,80,10,30,100,250,20,1500,200,1,0,500,500,250,{ petskillbonus bAgi,4,10,50; } 1014,SPORE,Spore,630,9012,10017,537,80,20,30,100,250,20,1500,200,0,0,350,500,500,{ petrecovery SC_Poison,60; } @@ -57,6 +57,6 @@ 1170,SOHEE,Sohee,638,9020,10016,537,80,20,10,100,250,20,500,300,0,0,100,1000,200,{ petheal 400,60,33,100; } 1188,BON_GUN,Bon Gun,659,9025,10020,537,80,20,10,100,250,20,500,200,1,0,600,200,400,{ petskillattack2 190,555,1,1,1; } 1200,ZHERLTHSH,Zherlthsh,660,9026,0,929,80,20,10,100,250,20,50,200,0,0,1000,100,500,{ petskillattack 136,1,0,3; } -1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,15,20,100,250,20,500,100,0,0,300,300,800,{ petskillattack 10,5,5,5; } +1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,20,50,100,250,20,2000,100,0,0,300,300,800,{ petskillattack 10,5,5,5; } 1275,ALICE,Alice,661,9027,0,504,80,20,10,100,250,20,100,200,0,0,100,1000,200,{ petskillsupport 28,5,60,25,100; } -1815,EVENT_RICECAKE,Rice Cake,0,9028,0,550,80,20,10,100,250,20,2000,150,0,0,500,500,200,{ petskillsupport 257,3,240,50,100; } +1815,EVENT_RICECAKE,Rice Cake,0,9028,0,511,80,20,50,100,250,20,2000,150,1,0,500,500,200,{ petskillsupport 257,3,240,50,100; } diff --git a/db/skill_db.txt b/db/skill_db.txt index 8bdc9f276..5b5e5d59d 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -208,29 +208,29 @@ 167,0,0,4,6,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEHOLY#Holy Attribute Change# 168,0,0,4,7,0x1,0,1,1,no,0,0x2,0,magic,0 //NPC_CHANGEDARKNESS#Shadow 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# -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# +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# +172,-9,6,1,-1,0x40,0,10,1,no,0,0x2,0,weapon,0 //NPC_GUIDEATTACK#On-target Impact Attack# 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# -176,9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_POISON#Poison Attack# -177,9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_BLINDATTACK#Darkness Attack# -178,9,6,1,-1,0,0:0:0:0:0:-1,5,1,no,0,0x2,0,weapon,0 //NPC_SILENCEATTACK#Silence Attack# -179,9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_STUNATTACK#Stun Attack# -180,9,6,1,-1,0,0:0:0:0:0:-1,5,1,no,0,0x2,0,weapon,0 //NPC_PETRIFYATTACK#Petrify Attack# -181,9,6,1,7,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_CURSEATTACK#Cursing Attack # -182,9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_SLEEPATTACK#Sleep attack# -183,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_RANDOMATTACK#Random Attack # -184,9,6,1,1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_WATERATTACK#Water Attribute Attack# -185,9,6,1,2,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_GROUNDATTACK#Earth Attribute Attack# -186,9,6,1,3,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_FIREATTACK#Fire Attribute Attack# -187,9,6,1,4,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_WINDATTACK#Wind Attribute Attack# -188,9,6,1,5,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_POISONATTACK#Poison Attribute Attack# -189,9,6,1,6,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_HOLYATTACK#Holy Attribute Attack# -190,9,6,1,7,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_DARKNESSATTACK#Shadow Attribute Attack# -191,9,6,1,8,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_TELEKINESISATTACK#Sense Attribute Attack# -192,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_MAGICALATTACK#Demon Shock Attack# +176,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_POISON#Poison Attack# +177,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_BLINDATTACK#Darkness Attack# +178,-9,6,1,-1,0,0:0:0:0:0:-1,5,1,no,0,0x2,0,weapon,0 //NPC_SILENCEATTACK#Silence Attack# +179,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_STUNATTACK#Stun Attack# +180,-9,6,1,-1,0,0:0:0:0:0:-1,5,1,no,0,0x2,0,weapon,0 //NPC_PETRIFYATTACK#Petrify Attack# +181,-9,6,1,7,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_CURSEATTACK#Cursing Attack # +182,-9,6,1,-1,0,0,5,1,no,0,0x2,0,weapon,0 //NPC_SLEEPATTACK#Sleep attack# +183,-9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_RANDOMATTACK#Random Attack # +184,-9,6,1,1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_WATERATTACK#Water Attribute Attack# +185,-9,6,1,2,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_GROUNDATTACK#Earth Attribute Attack# +186,-9,6,1,3,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_FIREATTACK#Fire Attribute Attack# +187,-9,6,1,4,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_WINDATTACK#Wind Attribute Attack# +188,-9,6,1,5,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_POISONATTACK#Poison Attribute Attack# +189,-9,6,1,6,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_HOLYATTACK#Holy Attribute Attack# +190,-9,6,1,7,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_DARKNESSATTACK#Shadow Attribute Attack# +191,-9,6,1,8,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_TELEKINESISATTACK#Sense Attribute Attack# +192,-9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_MAGICALATTACK#Demon Shock Attack# 193,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_METAMORPHOSIS#Metamorphosis# 194,0,0,4,0,0x1,0,10,1,no,0,0x2,0,none,0 //NPC_PROVOCATION#Provocation# 195,0,6,4,0,0x50,0,10,1,no,0,0x2,0,misc,0 //NPC_SMOKING#Smoking# @@ -385,7 +385,7 @@ 344,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKARMOR#Break armor# 345,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKHELM#Break helm# 346,9,6,1,-1,0,0,10,1,no,0,0x2,0,weapon,0 //NPC_BREAKSHIELD#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 349,0,6,4,0,0x1,0,10,0,no,0,0x2,0,weapon,0 //NPC_POWERUP 350,0,6,4,0,0x1,0,10,0,no,0,0x2,0,none,0 //NPC_AGIUP -- cgit v1.2.3-60-g2f50