Skip to content

Commit

Permalink
=General
Browse files Browse the repository at this point in the history 
*max_cloth_color changed to 3.
-Turns out while the old original 1st and 2nd jobs has a 4th dye option, the other
-jobs don't. Plus the styling shop info only allows for dyes up to 3 by default.
-They must of decided long ago to only offer 3 dyes.

*Added 2 new skill place holders.

*Updated the "displayskill" command to allow for selecting which skill animation
-packets to send.



=Database
*Fixed some item script errors in item_db.



=Skills
*RK_IGNITIONBREAK
-Fixed a issue where the animation wouldn't appear on 2018-06-20 and newer clients.

*SJ_NOVAEXPLOSING
*SP_SOULEXPLOSION
-Fixed a issue where the damage didn't bypass protection from Devotion.

*SC_ESCAPE
-Added missing item requirement.



=SQL Files
*Fixed some item script errors in item_db.

*Changed the values of monster's stats to smallint.



=Tools
*Updated perl script for the monsters to use smallint for their stats.

git-svn-id: svn://svn.code.sf.net/p/v1-3ceam/code/trunk@864 cad27aaa-dce3-4a30-a00a-e4fd67c11881
  • Loading branch information
rytech16 committed Oct 30, 2018
1 parent e45d269 commit 949c41d
Show file tree
Hide file tree
Showing 13 changed files with 67 additions and 39 deletions.
2 changes: 1 addition & 1 deletion rewrite/conf/battle/client.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ max_hair_style: 31
min_hair_color: 0
max_hair_color: 8
min_cloth_color: 0
max_cloth_color: 4
max_cloth_color: 3
min_body_style: 0
max_body_style: 1

Expand Down
6 changes: 3 additions & 3 deletions rewrite/db/item_db.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5628,8 +5628,8 @@
13303,Huuma_Blaze,Huuma Blaze Shuriken,4,78000,,1500,185,,1,0,0x02000000,7,2,34,4,55,1,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,-2; bonus3 bAutoSpell,"MG_FIREBALL",5,30; },{},{}
13304,Huuma_Calm_Mind,Huuma Calm Mind,4,20,,1550,112,,1,2,0x02000000,7,2,34,3,70,1,22,{ bonus bUnbreakableWeapon,0; bonus2 bSkillAtk,"NJ_HUUMA",30; bonus bNoCastCancel,0; },{},{}
13305,BF_Huuma_Shuriken1,Brave Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
13306,BF_Huuma_Shuriken2,Valorous Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; },{},{}
13307,Krieger_Huuma_Shuriken1,Glorious Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,4,80,1,22,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",10; bonus2 bSkillAtk,\"NJ_ISSEN\",10; }",50,10000; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } },{},{}
13306,BF_Huuma_Shuriken2,Valorous Huuma Front Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,3,80,1,22,{ bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,525,100; bonus2 bSkillAtk,544,100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; },{},{}
13307,Krieger_Huuma_Shuriken1,Glorious Shuriken,4,20,,0,55,,1,0,0x02000000,7,2,34,4,80,1,22,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,525,10; bonus2 bSkillAtk,544,10; }",50,10000; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } },{},{}
13308,Huuma_Blaze_I,Huuma Blaze Shuriken,4,0,,0,230,,1,0,0x02000000,7,2,34,4,0,0,22,{ bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,2; },{},{}
13309,Huuma_Giant_Wheel_C,Huuma Giant Wheel Shuriken,4,0,,0,99,,1,0,0x02000000,7,2,34,4,1,0,22,{},{},{}
13400,Cutlas_,Cutlus,4,20,,900,150,,1,1,0x000654E2,7,2,2,4,40,1,2,{ skill "SM_BASH",5; bonus bStr,2; bonus bDef,1; },{},{}
Expand All @@ -5653,7 +5653,7 @@
13418,Krieger_Onehand_Sword3,Glorious Holy Avenger,4,20,,0,130,,1,0,0x000444A2,7,2,2,4,80,1,2,{ bonus bInt,getrefine()-5; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus bUseSPrate,-10; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"PA_PRESSURE","PR_LEXDIVINA",1,1000; if(getrefine() > 9) bonus bInt,5; },{},{}
13419,Holy_Saber,Holy saber,4,20,,0,160,,1,0,0x000654E2,7,2,2,3,0,0,2,{},{},{}
13420,Honglyun's_Sword,Honglyun's Sword,4,20,,1200,160,,1,1,0x000654E2,7,2,2,4,70,1,2,{ bonus bAtkEle,Ele_Fire; bonus bStr,2; bonus bInt,2; },{},{}
13421,Ruber,Ruber,4,20,,1500,170,,1,1,0x000444A2,2,2,2,3,50,1,2,{ autobonus "{ bonus2 bSkillAtk,\"KN_BOWLINGBASH\",20; bonus2 bSkillAtk,\"SM_BASH\",20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
13421,Ruber,Ruber,4,20,,1500,170,,1,1,0x000444A2,2,2,2,3,50,1,2,{ autobonus "{ bonus2 bSkillAtk,62,20; bonus2 bSkillAtk,5,20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
13422,Flamberge_C,Flamberge,4,0,,0,185,,1,0,0x00004080,7,2,2,3,1,0,2,{ bonus bUnbreakableWeapon,0; },{},{}
13423,P_Sabre1,Eden Sabre I,4,0,,0,147,,1,0,0x000654E2,7,2,2,2,26,0,2,{},{},{}
13424,P_Sabre2,Eden Sabre II,4,0,,0,170,,1,0,0x000654E2,7,2,2,2,40,0,2,{},{},{}
Expand Down
4 changes: 4 additions & 0 deletions rewrite/db/skill_db.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1406,6 +1406,7 @@
//3042,0,6,4,0,0x1,0,2,1,no,0,0,0,none,0, ALL_PRONTERA_RECALL, Return To Prontera//Info shows its max level is 2. Why 2 levels for a recall skill?
//3043,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ALL_GLASTHEIM_RECALL,Return To Glastheim
//3044,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ALL_THANATOS_RECALL,Return To Thanatos
//3045,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0, ALL_LIGHTHALZEN_RECALL,Return To Lighthalzen

// EP 14.3 Part 2 3rd Job Skills
5001,1,8,1,-1,0,0,5,-3,yes,0,0,0,weapon,0, GC_DARKCROW,Dark Claw
Expand Down Expand Up @@ -1470,6 +1471,9 @@
5064,3,6,16,0,0x1,0,1,1,yes,0,0x4,0,none,0, WE_ONEFOREVER,One Forever
5065,0,6,4,0,0x3,3,1,1,yes,0,0x4,0,none,0, WE_CHEERUP,Cheer Up

// Full Throttle jRO Version
5071,0,6,4,0,0x1,0,1,1,yes,0,0x1,0,none,0, EVT_FULL_THROTTLE,Event Full Throttle// Be sure to restrict WoE and PVP use.

// New Arch Bishop Skills
5072,11,6,1,0,0x3,1:1:1:2:2,5,1,yes,0,0,0,none,0, AB_VITUPERATUM,Vituperatum
5073,0,6,4,0,0x1,0,1,1,yes,0,0,0,none,0, AB_CONVENIO,Convenio
Expand Down
6 changes: 6 additions & 0 deletions rewrite/db/skill_renewal_cast_db.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,12 @@
5065,3000,0,0,0,0,60000,0
//==========================================

//===== Full Throttle jRO Version ==========
//-- EVT_FULL_THROTTLE -- Duration 1 is for Full Throttle. Duration 2 is for Rebound.
//Note: Whats the official cooldown for this version? Doing 30 minutes for now.
5071,0,0,500,3000000,0,40000,10000
//==========================================

//===== New Arch Bishop Skills =============
//-- AB_VITUPERATUM
5072,1000,3000:2500:2000:1500:1000,1000,5000,0,0,0
Expand Down
6 changes: 5 additions & 1 deletion rewrite/db/skill_require_db.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,7 @@
//3042,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_PRONTERA_RECALL#Return To Prontera#
//3043,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_GLASTHEIM_RECALL##
//3044,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_THANATOS_RECALL##
//3045,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_LIGHTHALZEN_RECALL##

// EP 14.3 Part 2 3rd Job Skills
5001,0,0,22:34:46:58:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GC_DARKCROW#Dark Claw#
Expand All @@ -1127,7 +1128,7 @@
5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,6144,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WM_FRIGG_SONG#Frigg's Song#
5008,0,0,120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SO_ELEMENTAL_SHIELD#Elemental Shield#
5009,0,0,65,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SR_FLASHCOMBO#Flash Combo#
5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,1065,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SC_ESCAPE#Emergency Escape#
5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //LG_KINGS_GRACE#King's Grace#
Expand Down Expand Up @@ -1177,6 +1178,9 @@
5064,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_ONEFOREVER##
5065,0,0,50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //WE_CHEERUP##

// Full Throttle jRO Version
5071,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //EVT_FULL_THROTTLE#Event Full Throttle#

// New Arch Bishop Skills
5072,0,0,144:120:106:92:78,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_VITUPERATUM##
5073,0,0,70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_CONVENIO##
Expand Down
6 changes: 3 additions & 3 deletions rewrite/sql-files/item_db.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5659,8 +5659,8 @@ REPLACE INTO `item_db` VALUES (13302,'Huuma_Giant_Wheel_','Huuma Giant Wheel Shu
REPLACE INTO `item_db` VALUES (13303,'Huuma_Blaze','Huuma Blaze Shuriken',4,78000,NULL,1500,185,NULL,1,0,0x02000000,7,2,34,4,55,1,22,' bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,-2; bonus3 bAutoSpell,"MG_FIREBALL",5,30; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13304,'Huuma_Calm_Mind','Huuma Calm Mind',4,20,NULL,1550,112,NULL,1,2,0x02000000,7,2,34,3,70,1,22,' bonus bUnbreakableWeapon,0; bonus2 bSkillAtk,"NJ_HUUMA",30; bonus bNoCastCancel,0; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13305,'BF_Huuma_Shuriken1','Brave Huuma Front Shuriken',4,20,NULL,0,55,NULL,1,0,0x02000000,7,2,34,3,80,1,22,' bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13306,'BF_Huuma_Shuriken2','Valorous Huuma Front Shuriken',4,20,NULL,0,55,NULL,1,0,0x02000000,7,2,34,3,80,1,22,' bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",100; bonus2 bSkillAtk,\"NJ_ISSEN\",100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13307,'Krieger_Huuma_Shuriken1','Glorious Shuriken',4,20,NULL,0,55,NULL,1,0,0x02000000,7,2,34,4,80,1,22,' bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,\"NJ_HUUMA\",10; bonus2 bSkillAtk,\"NJ_ISSEN\",10; }",50,10000; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13306,'BF_Huuma_Shuriken2','Valorous Huuma Front Shuriken',4,20,NULL,0,55,NULL,1,0,0x02000000,7,2,34,3,80,1,22,' bonus bStr,2; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,95; autobonus "{ bonus2 bSkillAtk,525,100; bonus2 bSkillAtk,544,100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }"; bonus bUnbreakableWeapon,0; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13307,'Krieger_Huuma_Shuriken1','Glorious Shuriken',4,20,NULL,0,55,NULL,1,0,0x02000000,7,2,34,4,80,1,22,' bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bMatkRate,15; autobonus "{ bonus2 bSkillAtk,525,10; bonus2 bSkillAtk,544,10; }",50,10000; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bAddRace,RC_DemiHuman,(getrefine()-3)*(getrefine()-3); bonus2 bIgnoreDefRate,RC_DemiHuman,5; } if(getrefine() > 8) { bonus5 bAutoSpellOnSkill,"NJ_ISSEN","AL_HEAL",10,1000,1; bonus4 bAutoSpellOnSkill,"NJ_HUUMA","NPC_CRITICALWOUND",2,200; } ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13308,'Huuma_Blaze_I','Huuma Blaze Shuriken',4,0,NULL,0,230,NULL,1,0,0x02000000,7,2,34,4,0,0,22,' bonus bUnbreakableWeapon,0; bonus bAtkEle,Ele_Fire; bonus bDex,2; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13309,'Huuma_Giant_Wheel_C','Huuma Giant Wheel Shuriken',4,0,NULL,0,99,NULL,1,0,0x02000000,7,2,34,4,1,0,22,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (13400,'Cutlas_','Cutlus',4,20,NULL,900,150,NULL,1,1,0x000654E2,7,2,2,4,40,1,2,' skill "SM_BASH",5; bonus bStr,2; bonus bDef,1; ',NULL,NULL);
Expand All @@ -5684,7 +5684,7 @@ REPLACE INTO `item_db` VALUES (13417,'Krieger_Onehand_Sword2','Glorious Rapier',
REPLACE INTO `item_db` VALUES (13418,'Krieger_Onehand_Sword3','Glorious Holy Avenger',4,20,NULL,0,130,NULL,1,0,0x000444A2,7,2,2,4,80,1,2,' bonus bInt,getrefine()-5; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus bUseSPrate,-10; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"PA_PRESSURE","PR_LEXDIVINA",1,1000; if(getrefine() > 9) bonus bInt,5; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13419,'Holy_Saber','Holy saber',4,20,NULL,0,160,NULL,1,0,0x000654E2,7,2,2,3,0,0,2,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (13420,'Honglyun\'s_Sword','Honglyun\'s Sword',4,20,NULL,1200,160,NULL,1,1,0x000654E2,7,2,2,4,70,1,2,' bonus bAtkEle,Ele_Fire; bonus bStr,2; bonus bInt,2; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13421,'Ruber','Ruber',4,20,NULL,1500,170,NULL,1,1,0x000444A2,2,2,2,3,50,1,2,' autobonus "{ bonus2 bSkillAtk,\"KN_BOWLINGBASH\",20; bonus2 bSkillAtk,\"SM_BASH\",20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13421,'Ruber','Ruber',4,20,NULL,1500,170,NULL,1,1,0x000444A2,2,2,2,3,50,1,2,' autobonus "{ bonus2 bSkillAtk,62,20; bonus2 bSkillAtk,5,20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13422,'Flamberge_C','Flamberge',4,0,NULL,0,185,NULL,1,0,0x00004080,7,2,2,3,1,0,2,' bonus bUnbreakableWeapon,0; ',NULL,NULL);
REPLACE INTO `item_db` VALUES (13423,'P_Sabre1','Eden Sabre I',4,0,NULL,0,147,NULL,1,0,0x000654E2,7,2,2,2,26,0,2,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (13424,'P_Sabre2','Eden Sabre II',4,0,NULL,0,170,NULL,1,0,0x000654E2,7,2,2,2,40,0,2,NULL,NULL,NULL);
Expand Down
12 changes: 6 additions & 6 deletions rewrite/sql-files/mob_db.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ CREATE TABLE `mob_db` (
`ATK2` smallint(6) unsigned NOT NULL default '0',
`DEF` smallint(6) unsigned NOT NULL default '0',
`MDEF` smallint(6) unsigned NOT NULL default '0',
`STR` tinyint(4) unsigned NOT NULL default '0',
`AGI` tinyint(4) unsigned NOT NULL default '0',
`VIT` tinyint(4) unsigned NOT NULL default '0',
`INT` tinyint(4) unsigned NOT NULL default '0',
`DEX` tinyint(4) unsigned NOT NULL default '0',
`LUK` tinyint(4) unsigned NOT NULL default '0',
`STR` smallint(6) unsigned NOT NULL default '0',
`AGI` smallint(6) unsigned NOT NULL default '0',
`VIT` smallint(6) unsigned NOT NULL default '0',
`INT` smallint(6) unsigned NOT NULL default '0',
`DEX` smallint(6) unsigned NOT NULL default '0',
`LUK` smallint(6) unsigned NOT NULL default '0',
`Range2` tinyint(4) unsigned NOT NULL default '0',
`Range3` tinyint(4) unsigned NOT NULL default '0',
`Scale` tinyint(4) unsigned NOT NULL default '0',
Expand Down
12 changes: 6 additions & 6 deletions rewrite/sql-files/mob_db_3ceam.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ CREATE TABLE `mob_db_3ceam` (
`ATK2` smallint(6) unsigned NOT NULL default '0',
`DEF` smallint(6) unsigned NOT NULL default '0',
`MDEF` smallint(6) unsigned NOT NULL default '0',
`STR` tinyint(4) unsigned NOT NULL default '0',
`AGI` tinyint(4) unsigned NOT NULL default '0',
`VIT` tinyint(4) unsigned NOT NULL default '0',
`INT` tinyint(4) unsigned NOT NULL default '0',
`DEX` tinyint(4) unsigned NOT NULL default '0',
`LUK` tinyint(4) unsigned NOT NULL default '0',
`STR` smallint(6) unsigned NOT NULL default '0',
`AGI` smallint(6) unsigned NOT NULL default '0',
`VIT` smallint(6) unsigned NOT NULL default '0',
`INT` smallint(6) unsigned NOT NULL default '0',
`DEX` smallint(6) unsigned NOT NULL default '0',
`LUK` smallint(6) unsigned NOT NULL default '0',
`Range2` tinyint(4) unsigned NOT NULL default '0',
`Range3` tinyint(4) unsigned NOT NULL default '0',
`Scale` tinyint(4) unsigned NOT NULL default '0',
Expand Down
12 changes: 6 additions & 6 deletions rewrite/sql-files/mob_db_custom.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ CREATE TABLE `mob_db_custom` (
`ATK2` smallint(6) unsigned NOT NULL default '0',
`DEF` smallint(6) unsigned NOT NULL default '0',
`MDEF` smallint(6) unsigned NOT NULL default '0',
`STR` tinyint(4) unsigned NOT NULL default '0',
`AGI` tinyint(4) unsigned NOT NULL default '0',
`VIT` tinyint(4) unsigned NOT NULL default '0',
`INT` tinyint(4) unsigned NOT NULL default '0',
`DEX` tinyint(4) unsigned NOT NULL default '0',
`LUK` tinyint(4) unsigned NOT NULL default '0',
`STR` smallint(6) unsigned NOT NULL default '0',
`AGI` smallint(6) unsigned NOT NULL default '0',
`VIT` smallint(6) unsigned NOT NULL default '0',
`INT` smallint(6) unsigned NOT NULL default '0',
`DEX` smallint(6) unsigned NOT NULL default '0',
`LUK` smallint(6) unsigned NOT NULL default '0',
`Range2` tinyint(4) unsigned NOT NULL default '0',
`Range3` tinyint(4) unsigned NOT NULL default '0',
`Scale` tinyint(4) unsigned NOT NULL default '0',
Expand Down
15 changes: 10 additions & 5 deletions rewrite/src/map/atcommand.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6366,18 +6366,23 @@ ACMD_FUNC(displayskill)
unsigned int tick;
int skillnum;
int skilllv = 1;
int type = 0;
nullpo_retr(-1, sd);

if (!message || !*message || sscanf(message, "%d %d", &skillnum, &skilllv) < 1)
if (!message || !*message || sscanf(message, "%d %d %d", &skillnum, &skilllv, &type) < 1)
{
clif_displaymessage(fd, "Usage: @displayskill <skillnum> {<skillv>}>");
clif_displaymessage(fd, "Usage: @displayskill <skillnum> {<skillv>} {<type>}>");
clif_displaymessage(fd, "Effect Types: 0: All, 1: Damage, 2: No Damage, 3: Ground");
return -1;
}
status = status_get_status_data(&sd->bl);
tick = gettick();
clif_skill_damage(&sd->bl,&sd->bl, tick, status->amotion, status->dmotion, 1, 1, skillnum, skilllv, 5);
clif_skill_nodamage(&sd->bl, &sd->bl, skillnum, skilllv, 1);
clif_skill_poseffect(&sd->bl, skillnum, skilllv, sd->bl.x, sd->bl.y, tick);
if ( type == 0 || type == 1 )
clif_skill_damage(&sd->bl,&sd->bl, tick, status->amotion, status->dmotion, 1, 1, skillnum, skilllv, 5);
if ( type == 0 || type == 2 )
clif_skill_nodamage(&sd->bl, &sd->bl, skillnum, skilllv, 1);
if ( type == 0 || type == 3 )
clif_skill_poseffect(&sd->bl, skillnum, skilllv, sd->bl.x, sd->bl.y, tick);
return 0;
}

Expand Down
9 changes: 8 additions & 1 deletion rewrite/src/map/skill.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2628,9 +2628,11 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
else // the central target doesn't display an animation
dmg.dmotion = clif_skill_damage(dsrc,bl,tick, dmg.amotion, dmg.dmotion, damage, dmg.div_, skillid, -2, 5); // needs -2(!) as skill level
break;
#if PACKETVER < 20180620
case RK_IGNITIONBREAK:
dmg.dmotion = clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,NV_BASIC,-1,5);
break;
#endif
case WL_HELLINFERNO:
if ( flag&4 )// Show animation for fire damage part.
dmg.dmotion = clif_skill_damage(dsrc,bl,tick,dmg.amotion,dmg.dmotion,damage,dmg.div_,skillid,skilllv,type);
Expand Down Expand Up @@ -3007,7 +3009,7 @@ int skill_attack(int attack_type, struct block_list* src, struct block_list *dsr
if (dmg.amotion)
battle_delay_damage(tick, dmg.amotion,src,bl,dmg.flag,skillid,skilllv,damage,dmg.dmg_lv,dmg.dmotion);

if( sc && sc->data[SC_DEVOTION] && (skillid != PA_PRESSURE || skillid != SJ_NOVAEXPLOSING || skillid != SP_SOULEXPLOSION) )
if( sc && sc->data[SC_DEVOTION] && (skillid != PA_PRESSURE && skillid != SJ_NOVAEXPLOSING && skillid != SP_SOULEXPLOSION) )
{
struct status_change_entry *sce = sc->data[SC_DEVOTION];
struct block_list *d_bl = map_id2bl(sce->val1);
Expand Down Expand Up @@ -6711,6 +6713,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
break;
case ASC_METEORASSAULT:
case GS_SPREADATTACK:
#if PACKETVER >= 20180620
case RK_IGNITIONBREAK:
#endif
case RK_STORMBLAST:
case WL_FROSTMISTY:
case WL_JACKFROST:
Expand Down Expand Up @@ -6747,12 +6752,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
}
break;

#if PACKETVER < 20180620
case RK_IGNITIONBREAK:
skill_area_temp[1] = 0;
clif_skill_damage(src, bl, tick, status_get_amotion(src), 0, -30000, 1, skillid, skilllv, 6);
map_foreachinrange(skill_area_sub, bl, skill_get_splash(skillid, skilllv), splash_target(src),
src, skillid, skilllv, tick, flag|BCT_ENEMY|SD_SPLASH|1, skill_castend_damage_id);
break;
#endif

case NC_EMERGENCYCOOL:
clif_skill_nodamage(src,bl,skillid,skilllv,1);
Expand Down
4 changes: 3 additions & 1 deletion rewrite/src/map/skill.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1680,6 +1680,7 @@ enum e_skill {
ALL_PRONTERA_RECALL,
ALL_GLASTHEIM_RECALL,
ALL_THANATOS_RECALL,
ALL_LIGHTHALZEN_RECALL,

GC_DARKCROW = 5001,
RA_UNLIMIT,
Expand Down Expand Up @@ -1741,7 +1742,8 @@ enum e_skill {
WE_ONEFOREVER,
WE_CHEERUP,

AB_VITUPERATUM = 5072,
EVT_FULL_THROTTLE = 5071,
AB_VITUPERATUM,
AB_CONVENIO,

HLIF_HEAL = 8001,
Expand Down

0 comments on commit 949c41d

Please sign in to comment.