Skip to content
Permalink
Browse files
* Follow up f056629 
-- Updated item_db.txt, makes Rebellion can use Gunslinger weapons and ammos
-- Updated item_db.sql and item_db_re.sql
-- 3CeAM 2.0 merger: r13
-- idAthena merger: r1057, r1077
* Follow up 3f6d4b6
-- Update the const.txt for SC_MOONSTAR and SC_SUPER_STAR. SC_EXTREMITYFIST2 should be always on the end of SC number
* Hercules merger: 1375af7d00

Signed-off-by: Cahyadi Ramadhan Togihon <house.bad@gmail.com>
  • Loading branch information
@cydh
cydh committed Oct 28, 2013
1 parent 3f6d4b6 commit f058c4de1cf66097bdfb319994617e7539f73169
Showing with 394 additions and 251 deletions.
  1. +51 −3 db/const.txt
  2. +1 −1 db/packet_db.txt
  3. +55 −55 db/pre-re/item_db.txt
  4. +23 −0 db/pre-re/skill_db.txt
  5. +4 −0 db/pre-re/skill_require_db.txt
  6. +64 −64 db/re/item_db.txt
  7. +11 −0 db/re/skill_db.txt
  8. +4 −0 db/re/skill_require_db.txt
  9. +1 −0 doc/item_db.txt
  10. +55 −55 sql-files/item_db.sql
  11. +66 −66 sql-files/item_db_re.sql
  12. +1 −1 src/common/mmo.h
  13. +1 −2 src/common/timer.h
  14. +1 −0 src/map/clif.h
  15. +11 −0 src/map/skill.h
  16. +45 −4 src/map/status.h
54 db/const.txt
View file
@@ -199,6 +199,7 @@ EAJ_PRIEST 0x104
EAJ_BLACKSMITH 0x105
EAJ_ASSASSIN 0x106
EAJ_STAR_GLADIATOR 0x107
EAJ_REBELLION 0x109
EAJ_KAGEROUOBORO 0x10A
EAJ_DEATH_KNIGHT 0x10E

@@ -1328,9 +1329,9 @@ SC_MONSTER_TRANSFORM 566
SC_ANGEL_PROTECT 567
SC_ILLUSIONDOPING 568
SC_FLASHCOMBO 569
SC_EXTREMITYFIST2 570
SC_MOONSTAR 571
SC_SUPER_STAR 572
SC_MOONSTAR 570
SC_SUPER_STAR 571
SC_EXTREMITYFIST2 572

e_gasp 0
e_what 1
@@ -2532,6 +2533,36 @@ EF_MIRESULT_MAKE_FAIL 1018
EF_ALL_RAY_OF_PROTECTION 1019
EF_VENOMFOG 1020
EF_DUSTSTORM 1021
//1022 - 1039 Unknown
EF_GC_DARKCROW 1040
EF_RK_DRAGONBREATH_WATER 1041
EF_ALL_FULL_THROTTLE 1042
EF_SR_FLASHCOMBO 1043
EF_RK_LUXANIMA 1044
//1045 Unknown
EF_SO_ELEMENTAL_SHIELD 1046
EF_AB_OFFERTORIUM 1047
EF_WL_TELEKINESIS_INTENSE 1048
EF_GN_ILLUSIONDOPING 1049
EF_NC_MAGMA_ERUPTION 1050
EF_LG_KINGS_GRACE 1051
EF_BLOODDRAIN2 1052
EF_NPC_WIDEWEB 1053
EF_NPC_BURNT 1054
EF_NPC_CHILL 1055
EF_RA_UNLIMIT 1056
EF_AB_OFFERTORIUM_RING 1057
EF_SC_ESCAPE 1058
EF_WM_FRIGG_SONG 1059
EF_C_MAKER 1060
//1061 Unknown
EF_HAMMER_OF_GOD 1062
//1063 - 1065 Unknown
EF_BANISHING_BUSTER 1066
EF_SLUGSHOT 1067
EF_D_TAIL 1068
//1069 - 1077 Unknown
EF_S_STORM 1078

WARPNPC 45
1_ETC_01 46
@@ -3265,6 +3296,23 @@ THANATOS_KEEP 10009
4_ENERGY_WHITE 10046
4_F_PERE01 10047
4_JITTERBUG 10048
4_SEA_OTTER 10049
4_GALAPAGO 10050
4_DESERTWOLF_B 10051
4_BB_PORING 10052
4_F_CHARLESTON01 10053
4_F_CHARLESTON02 10054
4_F_CHARLESTON03 10055
4_M_IAN 10056
4_M_OLDSCHOLAR 10057
4_F_LAPERM 10058
4_M_DEBON 10059
4_M_BIRMAN 10060
4_F_SHAM 10061
4_M_REBELLION 10062
4_F_REBELLION 10063
4_CHN_SHAOTH 10064
4_SHOAL 10065

HAVEQUEST 0
PLAYTIME 1
2 db/packet_db.txt
View file
@@ -2028,7 +2028,7 @@ packet_ver: 39
0x093A,5,hommenu,2:4
0x0964,36,storagepassword,2:4:20

//2013-06-18 Ragexe (Shaktoh)
//2013-06-18 Ragexe (Shakto)
packet_ver: 40
0x0889,7,actionrequest,2:6
0x0951,10,useskilltoid,2:4:6
110 db/pre-re/item_db.txt
View file

Large diffs are not rendered by default.

23 db/pre-re/skill_db.txt
View file
@@ -836,6 +836,25 @@
//706,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_VENOMFOG,Venom Fog
//707,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_MILLENNIUMSHIELD,Millenium Shield 2
//708,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_COMET,Comet 2
//709,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_ICEMINE,Ice Mine
//710,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_ICEEXPLO,Ice Explosion
//711,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_FLAMECROSS,Flame Cross
//712,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_PULSESTRIKE2,Pulse Strike 2
//713,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DANCINGBLADE,Dancing Blade
//714,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DANCINGBLADE_ATK,Dancing Blade Attack
//715,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DARKPIERCING,Dark Piercing
//716,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_MAXPAIN,Max Pain
//717,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_MAXPAIN_ATK,Max Pain Attack
//718,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_DEATHSUMMON,Death Summon
//719,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_HELLBURNING,Hell Burning
//720,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_JACKFROST,Jack Frost 2
//721,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDEWEB,Wide Web
//722,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_WIDESUCK,Wide Suck
//723,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_STORMGUST2,Storm Gust 2
//724,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_FIRESTORM,Fire Storm
//725,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_REVERBERATION,Reverberation 2
//726,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_REVERBERATION_ATK,Reverberation Attack
//727,0,0,0,0,0,0,??,0,no,0,0,0,none,0,0x0, NPC_LEX_AETERNA,Lex Aeterna 2

//****
// 2nd Quest Skills
@@ -1265,6 +1284,10 @@
3028,1,6,4,0,0x2,3,1,1,no,0,0,0,weapon,0,0x0, OB_OBOROGENSOU_TRANSITION_ATK,
3029,7,6,1,0,0x1,0,5,0,no,0,0,0,none,0,0x0, OB_AKAITSUKI,Akaitsuki

// Copied Bard / Dancer Skills
//3036,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, BA_POEMBRAGI2,Poem of Bragi 2
//3037,0,0,0,0,0,0,10,0,no,0,0,0,none,0,0x0, DC_FORTUNEKISS2,Fortune Kiss 2

//****
// Homunculus S
8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,0x0, HLIF_HEAL,Healing Touch
4 db/pre-re/skill_require_db.txt
View file
@@ -850,6 +850,10 @@
3027,0,0,55:60:65:70:75 ,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,0,0 //OB_OBOROGENSOU#Oboro Gensou#
3029,0,0,20:30:40:50:60,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,0,0 //OB_AKAITSUKI#Akaitsuki#

// Copied Bard / Dancer Skills
//3036,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,0,0 //BA_POEMBRAGI2#Poem of Bragi 2#
//3037,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,0,0 //DC_FORTUNEKISS2#Fortune Kiss 2#

8001,0,0,13:16:19:22:25,0,0,0,99,0,0,none,0,0,545,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HLIF_HEAL
8002,0,0,20:25:30:35:40,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,0,0 //HLIF_AVOID
8004,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,0,0 //HLIF_CHANGE

0 comments on commit f058c4d

Please sign in to comment.