From d4cec2529589b43bb4fd70ba79589bc1bb75da98 Mon Sep 17 00:00:00 2001 From: technote24 Date: Wed, 3 Oct 2012 20:45:45 +0000 Subject: =General *Updated a hand full of enum tables and added some place holders in the skill databases. -Tables updated are the Emotions, Map Types, Use Skill Fail Causes, Skills, Units, and Status. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16812 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/skill_db.txt | 18 ++++++++++++++++++ db/pre-re/skill_require_db.txt | 6 ++++++ db/pre-re/skill_unit_db.txt | 2 ++ db/re/skill_db.txt | 20 +++++++++++++++++++- db/re/skill_require_db.txt | 6 ++++++ db/re/skill_unit_db.txt | 2 ++ src/map/clif.h | 28 +++++++++++++++++++++------- src/map/skill.c | 4 ++-- src/map/skill.h | 19 ++++++++++++++++++- src/map/status.h | 34 ++++++++++++++++++++++++++++++++++ 10 files changed, 128 insertions(+), 11 deletions(-) diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 0d34eac04..9cf63a79a 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -644,6 +644,17 @@ 698,0,6,4,0,0x01,0,1,1,no,0,0x2,0,none,0, ALL_WEWISH,Christmas Carol //699,0,0,0,0,0,0,9,0,no,0,0x2,0,none,0, ALL_SONKRAN,ALL_SONKRAN +// New NPC Wide Status AoE Skills And Others +//700,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEHEALTHFEAR,Wide Health Fear +//701,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEBODYBURNNING,Wide Body Burnning +//702,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEFROSTMISTY,Wide Freezing +//703,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDECOLD,Wide Crystalize +//704,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDE_DEEP_SLEEP,Wide Deep Sleep +//705,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDESIREN,Wide Siren's Voice +//706,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_VENOMFOG,Venom Fog +//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MILLENNIUMSHIELD,Millenium Shield 2 +//708,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_COMET,Comet 2 + 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 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0, AS_SONICACCEL,Sonic Acceleration @@ -1006,6 +1017,13 @@ 2535,0,0,4,0,0x1,0,1,0,no,0,0x1,0,none,0, ALL_BUYING_STORE,Open Buying Store 2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall //2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power +//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap +//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2 +//2540,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DISSONANCE,Dissonance 2 +//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2 +//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany +//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection +//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart //**** // Kagerou & Oboro diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt index 9f282933c..eb1cf851b 100644 --- a/db/pre-re/skill_require_db.txt +++ b/db/pre-re/skill_require_db.txt @@ -785,6 +785,12 @@ 2536,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_GUARDIAN_RECALL#Guardian's Recall# //2537,0,0,70: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 //ALL_ODINS_POWER#Odin's Power# +//2538,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 //BEER_BOTTLE_CAP#Beer Bottle Cap# + +//2542,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_TETANY#Tentay# +//2543,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_RAY_OF_PROTECTION#Ray of Protection# +//2544,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 //MC_CARTDECORATE#Cart Decorate# + //**** // Kagerou/Oboro 3001,0,0,10,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 //KO_YAMIKUMO#Yamikumo# diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index 17c61dfa9..557a2c3a1 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -96,6 +96,8 @@ 538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON 670,0xc7, , 1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008 //NPC_EVILLAND +//706,0xfd, , 0, 0,1000,all, 0x000 //NPC_VENOMFOG + 2044,0xca, , 0, 3,1000,all, 0x018 //AB_EPICLESIS 2032,0xe1, , 2, 0,1000,enemy, 0x018 //GC_POISONSMOKE diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 78705eaca..aa8cabdf7 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -1,4 +1,4 @@ -//id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description +//id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description // 01 ID // 02 range (combo skills do not check for range when used, // if range is < 5, the skill is considered melee-range) @@ -644,6 +644,17 @@ 698,0,6,4,0,0x01,0,1,1,no,0,0x2,0,none,0, ALL_WEWISH,Christmas Carol //699,0,0,0,0,0,0,9,0,no,0,0x2,0,none,0, ALL_SONKRAN,ALL_SONKRAN +// New NPC Wide Status AoE Skills And Others +//700,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEHEALTHFEAR,Wide Health Fear +//701,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEBODYBURNNING,Wide Body Burnning +//702,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDEFROSTMISTY,Wide Freezing +//703,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDECOLD,Wide Crystalize +//704,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDE_DEEP_SLEEP,Wide Deep Sleep +//705,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_WIDESIREN,Wide Siren's Voice +//706,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_VENOMFOG,Venom Fog +//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_MILLENNIUMSHIELD,Millenium Shield 2 +//708,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_COMET,Comet 2 + 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 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0, AS_SONICACCEL,Sonic Acceleration @@ -1007,6 +1018,13 @@ 2535,0,0,4,0,0x1,0,1,0,no,0,0x1,0,none,0, ALL_BUYING_STORE,Open Buying Store 2536,0,0,4,0,0x1,0,1,0,no,0,0,0,none,0, ALL_GUARDIAN_RECALL,Guardian's Recall 2537,9,6,16,0,0x1,0,2,1,yes,0,0,0,magic,0, ALL_ODINS_POWER,Odin's Power +//2538,0,0,0,0,0,0,??,0,no,0,0,0,none,0, BEER_BOTTLE_CAP,Beer Bottle Cap +//2539,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_ASSASSINCROSS,Assassin Cross of Sunset 2 +//2540,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_DISSONANCE,Dissonance 2 +//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2 +//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany +//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection +//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart //**** // Kagerou & Oboro diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt index f44cbbea1..14162502c 100644 --- a/db/re/skill_require_db.txt +++ b/db/re/skill_require_db.txt @@ -787,6 +787,12 @@ 2536,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_GUARDIAN_RECALL#Guardian's Recall# //2537,0,0,70: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 //ALL_ODINS_POWER#Odin's Power# +//2538,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 //BEER_BOTTLE_CAP#Beer Bottle Cap# + +//2542,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_TETANY#Tentay# +//2543,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_RAY_OF_PROTECTION#Ray of Protection# +//2544,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 //MC_CARTDECORATE#Cart Decorate# + //**** // Kagerou/Oboro 3001,0,0,10,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 //KO_YAMIKUMO#Yamikumo# diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 82dd43889..511a60f4d 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -98,6 +98,8 @@ 541,0x86, , 0, 3:3:4:4:5, 100,enemy, 0x018 //NJ_RAIGEKISAI 670,0xc7, , 1, 4:7:10:13:16:19:22:25:28:31,1000,all,0x008 //NPC_EVILLAND +//706,0xfd, , 0, 0,1000,all, 0x000 //NPC_VENOMFOG + 2044,0xca, , 0, 3,1000,all, 0x018 //AB_EPICLESIS 2032,0xe1, , 2, 0,1000,enemy, 0x018 //GC_POISONSMOKE diff --git a/src/map/clif.h b/src/map/clif.h index 9039c489c..e92dc4db5 100644 --- a/src/map/clif.h +++ b/src/map/clif.h @@ -166,6 +166,13 @@ typedef enum emotion_type E_ENE, E_PANIC, E_WHISP, // --- 80 + E_YUT1, + E_YUT2, + E_YUT3, + E_YUT4, + E_YUT5, + E_YUT6, + E_YUT7, // E_MAX } emotion_type; @@ -213,6 +220,9 @@ enum map_type MAPTYPE_AGIT_SIEGEV15 = 18, MAPTYPE_BATTLEFIELD = 19, MAPTYPE_PVP_TOURNAMENT = 20, + //Map types 21 - 24 not used. + MAPTYPE_SIEGE_LOWLEVEL = 25, + //Map types 26 - 28 remains opens for future types. MAPTYPE_UNUSED = 29, }; @@ -243,18 +253,18 @@ enum useskill_fail_cause USESKILL_FAIL_DUPLICATE = 22, USESKILL_FAIL_CONDITION = 23, USESKILL_FAIL_PAINTBRUSH = 24, - //XXX_USESKILL_FAIL_II_SURFACE_PAINTS = 25, + USESKILL_FAIL_DRAGON = 25, USESKILL_FAIL_POS = 26, USESKILL_FAIL_HELPER_SP_INSUFFICIENT = 27, - //XXX_USESKILL_FAIL_II_NECK_CANDY = 28, - //XXX_USESKILL_FAIL_II_MISERABLE_TEAR = 29, - //XXX_USESKILL_FAIL_II_PROTECT_NECK_CANDY = 30, + USESKILL_FAIL_NEER_WALL = 28, + USESKILL_FAIL_NEED_EXP_1PERCENT = 29, + USESKILL_FAIL_CHORUS_SP_INSUFFICIENT = 30, USESKILL_FAIL_GC_WEAPONBLOCKING = 31, USESKILL_FAIL_GC_POISONINGWEAPON = 32, USESKILL_FAIL_MADOGEAR = 33, - //XXX_USESKILL_FAIL_II_VULCANBULLET = 34, - //XXX_USESKILL_FAIL_II_FUELGAS = 35, - //XXX_USESKILL_FAIL_II_COLDSLOWERBULLET = 36, + USESKILL_FAIL_NEED_EQUIPMENT_KUNAI = 34, + USESKILL_FAIL_TOTARGET_PLAYER = 35, + USESKILL_FAIL_SIZE = 36, USESKILL_FAIL_CANONBALL = 37, //XXX_USESKILL_FAIL_II_MADOGEAR_ACCELERATION = 38, //XXX_USESKILL_FAIL_II_MADOGEAR_HOVERING_BOOSTER = 39, @@ -298,6 +308,10 @@ enum useskill_fail_cause USESKILL_FAIL_NEED_ROYAL_GUARD_BANDING = 77, USESKILL_FAIL_NEED_EQUIPPED_WEAPON_CLASS = 78, USESKILL_FAIL_EL_SUMMON = 79, + USESKILL_FAIL_RELATIONGRADE = 80, + USESKILL_FAIL_STYLE_CHANGE_FIGHTER = 81, + USESKILL_FAIL_STYLE_CHANGE_GRAPPLER = 82, + USESKILL_FAIL_THERE_ARE_NPC_AROUND = 83, }; int clif_setip(const char* ip); diff --git a/src/map/skill.c b/src/map/skill.c index a0af5fa5c..e56a1de25 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -11602,7 +11602,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns break; case UNT_ZENKAI_WATER: - case UNT_ZENKAI_GROUND: + case UNT_ZENKAI_LAND: case UNT_ZENKAI_FIRE: case UNT_ZENKAI_WIND: if( battle_check_target(&src->bl,bl,BCT_ENEMY) > 0 ){ @@ -11612,7 +11612,7 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns sc_start(bl, SC_FREEZE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); sc_start(bl, SC_FREEZING, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); break; - case UNT_ZENKAI_GROUND: + case UNT_ZENKAI_LAND: sc_start(bl, SC_STONE, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); sc_start(bl, SC_POISON, sg->val1*5, sg->skill_lv, skill_get_time2(sg->skill_id, sg->skill_lv)); break; diff --git a/src/map/skill.h b/src/map/skill.h index c282420fd..509c53bdb 100644 --- a/src/map/skill.h +++ b/src/map/skill.h @@ -1135,6 +1135,15 @@ enum e_skill { ALL_REVERSEORCISH, ALL_WEWISH, ALL_SONKRAN, + NPC_WIDEHEALTHFEAR, + NPC_WIDEBODYBURNNING, + NPC_WIDEFROSTMISTY, + NPC_WIDECOLD, + NPC_WIDE_DEEP_SLEEP, + NPC_WIDESIREN, + NPC_VENOMFOG, + NPC_MILLENNIUMSHIELD, + NPC_COMET, KN_CHARGEATK = 1001, CR_SHRINK, @@ -1465,6 +1474,13 @@ enum e_skill { ALL_BUYING_STORE, ALL_GUARDIAN_RECALL, ALL_ODINS_POWER, + BEER_BOTTLE_CAP, + NPC_ASSASSINCROSS, + NPC_DISSONANCE, + NPC_UGLYDANCE, + ALL_TETANY, + ALL_RAY_OF_PROTECTION, + MC_CARTDECORATE, KO_YAMIKUMO = 3001, KO_RIGHT, @@ -1756,10 +1772,11 @@ enum { UNT_LAVA_SLIDE, UNT_VOLCANIC_ASH, UNT_ZENKAI_WATER, - UNT_ZENKAI_GROUND, + UNT_ZENKAI_LAND, UNT_ZENKAI_FIRE, UNT_ZENKAI_WIND, UNT_MAKIBISHI, + UNT_VENOMFOG, /** * Guild Auras diff --git a/src/map/status.h b/src/map/status.h index 8fa812432..076720c9d 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -1312,6 +1312,40 @@ enum si_type { SI_ON_PUSH_CART = 673, SI_HAT_EFFECT = 674, SI_FLOWER_LEAF = 675, + SI_RAY_OF_PROTECTION = 676, + SI_GLASTHEIM_ATK = 677, + SI_GLASTHEIM_DEF = 678, + SI_GLASTHEIM_HEAL = 679, + SI_GLASTHEIM_HIDDEN = 680, + SI_GLASTHEIM_STATE = 681, + SI_GLASTHEIM_ITEMDEF = 682, + SI_GLASTHEIM_HPSP = 683, + SI_HOMUN_SKILL_POSTDELAY = 684, + SI_ALMIGHTY = 685, + SI_GVG_GIANT = 686, + SI_GVG_GOLEM = 687, + SI_GVG_STUN = 688, + SI_GVG_STONE = 689, + SI_GVG_FREEZ = 690, + SI_GVG_SLEEP = 691, + SI_GVG_CURSE = 692, + SI_GVG_SILENCE = 693, + SI_GVG_BLIND = 694, + SI_CLIENT_ONLY_EQUIP_ARROW = 695, + SI_CLAN_INFO = 696, + SI_JP_EVENT01 = 697, + SI_JP_EVENT02 = 698, + SI_JP_EVENT03 = 699, + SI_JP_EVENT04 = 700, + SI_TELEPORT_FIXEDCASTINGDELAY = 701, + SI_GEFFEN_MAGIC1 = 702, + SI_GEFFEN_MAGIC2 = 703, + SI_GEFFEN_MAGIC3 = 704, + SI_QUEST_BUFF1 = 705, + SI_QUEST_BUFF2 = 706, + SI_QUEST_BUFF3 = 707, + SI_REUSE_LIMIT_RECALL = 708, + SI_SAVEPOSITION = 709, SI_MAX, }; -- cgit v1.2.3-60-g2f50