Merge pull request #182 from shenhuyong/master

* Follow up dedec165eaeb0d291279b1d5b53fac242bcf7b4c

9 files changed, 194 insertions, 87 deletions

diff --git a/db/const.txt b/db/const.txt
index 544638efb..95faefff3 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -197,6 +197,7 @@ EAJ_PRIEST	0x104
 EAJ_BLACKSMITH	0x105
 EAJ_ASSASSIN	0x106
 EAJ_STAR_GLADIATOR	0x107
+EAJ_REBELLION		0x109
 EAJ_KAGEROUOBORO	0x10A
 EAJ_DEATH_KNIGHT	0x10D
 
@@ -697,6 +698,12 @@ SC_BLIND	8
 SC_BLOODING	9
 SC_DPOISON	10
 SC_BURNING	11
+SC_IMPRISON	12
+SC_FEAR	13
+SC_DEEPSLEEP	14
+SC_FROSTMISTY	15
+SC_COLD	16
+SC_NORECOVER	17
 SC_PROVOKE	20
 SC_ENDURE	21
 SC_TWOHANDQUICKEN	22
@@ -2422,6 +2429,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
@@ -3115,6 +3152,62 @@ ACADEMY_MASTER	10006
 PORTAL	10007
 THANATOS_BATTLE	10008
 THANATOS_KEEP	10009
+4_F_LYDIA	10010
+4_LUDE		10011
+4_ALIZA		10012
+4_ALICE		10013
+4_ARCHER_SKEL	10014
+4_JACK		10015
+4_SOLDIER_SKEL	10016
+4_LOLI_RURI	10017
+4_M_SAKRAY_TIED	10018
+4_M_ANTONIO	10019
+4_M_COOKIE	10020
+4_M_BELIEVER01	10021
+4_F_BELIEVER01	10022
+4_M_BELIEVER02	10023
+4_ROPEPILE	10024
+4_BRICKPILE	10025
+4_WOODPILE	10026
+4_M_TAMARIN	10027
+4_M_DEATH	10028
+4_GHOST_STAND	10029
+4_GHOST_COLLAPSE	10030
+4_COOKIEHOUSE	10031
+4_F_SKULL06GIRL	10032
+4_NONMYSTCASE	10033
+4_F_KIMI	10034
+4_M_FROZEN_GC	10035
+4_M_FROZEN_KN	10036
+4_SNAKE_LORD	10037
+4_F_MOCBOY	10038
+4_F_RUNAIN	10039
+4_M_ROEL	10040
+4_F_SHALOSH	10041
+4_ENERGY_RED	10042
+4_ENERGY_BLUE	10043
+4_ENERGY_YELLOW	10044
+4_ENERGY_BLACK	10045
+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
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index 5dcb1a8d3..43d44dc33 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1662,6 +1662,11 @@
 2537,5000,5000,0,60000,0,60000
 //========================================== 
 
+//===== Rebellion ==========================
+//-- RL_B_TRAP
+2555,0,0,0,0,0,10000:11000:12000:13000:14000,0
+//==========================================
+
 //==== Kagerou & Oboro skills ============== 
 //-- KO_YAMIKUMO
 3001,0,0,0,60000,0,0
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index a663e4b57..13417db9a 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -997,7 +997,7 @@
 2489,11,6,1,0,0,0,10,1:2:3:4:5:6:7:8:9:10,no,0,0,0,weapon,0,		GN_FIRE_EXPANSION_ACID,Fire Expansion Acid
 2490,9,6,2,0,0x3,1,5,1,yes,0,0x80,2:3:4:5:6,none,0,	GN_HELLS_PLANT,Hell's Plant
 2491,0,6,1,0,0xC0,0,5,1,no,0,0,0,misc,0,	GN_HELLS_PLANT_ATK,Hell's Plant Attack
-2492,0,6,4,0,0x3,6:7:8:9:10,5,1,yes,0,0,0,none,0,	GN_MANDRAGORA,Howling of Mandragora
+2492,0,6,4,0,0x3,5:6:6:7:7,5,1,yes,0,0,0,none,0,	GN_MANDRAGORA,Howling of Mandragora
 2493,11,6,16,0,0x1,0,1,1,yes,0,0,0,none,0,	GN_SLINGITEM,Sling Item
 2494,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		GN_CHANGEMATERIAL,Change Material
 2495,0,6,4,0,0x1,0,2,1,no,0,0,0,none,0,		GN_MIX_COOKING,Mix Cooking
@@ -1030,29 +1030,29 @@
 
 // Rebellion
 2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_GLITTERING_GREED,Flip The Coin Greed//Not in the skill tree. Why and what does it do? Need real max level.
-2552,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_RICHS_COIN,Rich's Coin
-2553,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_MASS_SPIRAL,Mass Spiral
-2554,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_BANISHING_BUSTER,Banishing Buster
-2555,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_B_TRAP,Bind Trap
-2556,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_FLICKER,Flicker
-2557,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_S_STORM,Shatter Storm
-2558,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_E_CHAIN,Eternal Chain
-2559,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_QD_SHOT,Quick Draw Shot
-2560,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_C_MARKER,Crimson Marker
-2561,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FIREDANCE,Fire Dance
-2562,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_H_MINE,Howling Mine
-2563,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_P_ALTER,Platinum Alter
-2564,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FALLEN_ANGEL,Fallen Angel
-2565,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_R_TRIP,Round Trip
-2566,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_D_TAIL,Dragon Tail
-2567,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FIRE_RAIN,Fire Rain
-2568,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_HEAT_BARREL,Heat Barrel
-2569,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_AM_BLAST,Anti-Material Blast
-2570,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_SLUGSHOT,Slug Shot
-2571,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_HAMMER_OF_GOD,Hammer of God
-2572,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_R_TRIP_PLUSATK,Round Trip Plus Attack
-2573,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_B_FLICKER_ATK,Bind Flicker Attack//Max level guess based on Bind Trap max level.
-2574,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack//Guess on max level is from Flip The Coin Greed
+2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		RL_RICHS_COIN,Rich's Coin
+2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_MASS_SPIRAL,Mass Spiral
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_BANISHING_BUSTER,Banishing Buster
+2555,0,6,4,0,0x1,0,5,1,no,0,0,3,none,0,		RL_B_TRAP,Bind Trap
+2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,	RL_FLICKER,Flicker
+2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_S_STORM,Shatter Storm
+2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,	RL_E_CHAIN,Eternal Chain
+2559,0,6,4,-1,0,0,1,1,no,0,0x200,0,weapon,0,	RL_QD_SHOT,Quick Draw Shot
+2560,11,6,1,0,0x1,0,1,1,no,0,0,3,none,0,	RL_C_MARKER,Crimson Marker
+2561,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_FIREDANCE,Fire Dance
+2562,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_H_MINE,Howling Mine
+2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RL_P_ALTER,Platinum Alter
+2564,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,		RL_FALLEN_ANGEL,Fallen Angel//This skill doesen't deal damage and instead autocasts Desperado right?
+2565,0,6,4,-1,0x2,2:3:4:5:6,5,1,no,0,0,0,weapon,3,	RL_R_TRIP,Round Trip//How much knockback is there? Well put 3 for now.
+2566,0,6,4,-1,0x2,-1,5,1,no,0,0,0,weapon,0,	RL_D_TAIL,Dragon Tail
+2567,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_FIRE_RAIN,Fire Rain
+2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RL_HEAT_BARREL,Heat Barrel
+2569,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_AM_BLAST,Anti-Material Blast
+2570,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,	RL_SLUGSHOT,Slug Shot//Tester found it knocks back and forces sit.
+2571,7:8:9:10:11,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_HAMMER_OF_GOD,Hammer of God//Might be INF 2, but well use INF 1 for now.
+2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,	RL_R_TRIP_PLUSATK,Round Trip Plus Attack
+2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_B_FLICKER_ATK,Bind Flicker Attack//Max level guess based on Bind Trap max level.
+2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,	RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack//Guess on max level is from Flip The Coin Greed
 
 // Kagerou & Oboro
 3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0,		KO_YAMIKUMO,Yamikumo
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index 7f4597f61..21b763dfb 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -795,26 +795,26 @@
 
 // Rebellion
 2551,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	//RL_GLITTERING_GREED#Flip The Coin Greed#
-2552,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	//RL_RICHS_COIN#Rich's Coin#
-2553,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	//RL_MASS_SPIRAL#Mass Spiral#
-2554,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	//RL_BANISHING_BUSTER#Banishing Buster#
-2555,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	//RL_B_TRAP#Bind Trap#
-2556,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	//RL_FLICKER#Flicker#
-2557,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	//RL_S_STORM#Shatter Storm#
-2558,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	//RL_E_CHAIN#Eternal Chain#
-2559,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	//RL_QD_SHOT#Quick Draw Shot#
-2560,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	//RL_C_MARKER#Crimson Marker#
-2561,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	//RL_FIREDANCE#Fire Dance#
-2562,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	//RL_H_MINE#Howling Mine#
-2563,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	//RL_P_ALTER#Platinum Alter#
-2564,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	//RL_FALLEN_ANGEL#Fallen Angel#
-2565,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	//RL_R_TRIP#Round Trip#
-2566,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	//RL_D_TAIL#Dragon Tail#
-2567,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	//RL_FIRE_RAIN#Fire Rain#
-2568,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	//RL_HEAT_BARREL#Heat Barrel#
-2569,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	//RL_AM_BLAST#Anti-Material Blast#
-2570,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	//RL_SLUGSHOT#Slug Shot#
-2571,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	//RL_HAMMER_OF_GOD#Hammer of God#
+2552,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	//RL_RICHS_COIN#Rich's Coin#
+2553,0,0,80:84:88:92:96,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	//RL_MASS_SPIRAL#Mass Spiral#
+2554,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	//RL_BANISHING_BUSTER#Banishing Buster#
+2555,0,0,30:32:34:36:38,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	//RL_B_TRAP#Bind Trap#
+2556,0,0,2,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	//RL_FLICKER#Flicker#
+2557,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	//RL_S_STORM#Shatter Storm#
+2558,0,0,45,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	//RL_E_CHAIN#Eternal Chain#
+2559,0,0,5,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	//RL_QD_SHOT#Quick Draw Shot#
+2560,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	//RL_C_MARKER#Crimson Marker#
+2561,0,0,10:15:20:25:30,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	//RL_FIREDANCE#Fire Dance#
+2562,0,0,45:50:55:60:65,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	//RL_H_MINE#Howling Mine#
+2563,0,0,20:24:28:32:36,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	//RL_P_ALTER#Platinum Alter#
+2564,0,0,90,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	//RL_FALLEN_ANGEL#Fallen Angel#
+2565,0,0,40:45:50:55: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	//RL_R_TRIP#Round Trip#
+2566,0,0,60:70:80:90: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	//RL_D_TAIL#Dragon Tail#
+2567,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	//RL_FIRE_RAIN#Fire Rain#
+2568,0,0,30:40:50:60: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	//RL_HEAT_BARREL#Heat Barrel#
+2569,0,0,80:84:88:92:96,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	//RL_AM_BLAST#Anti-Material Blast#
+2570,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	//RL_SLUGSHOT#Slug Shot#
+2571,0,0,70:80:90:100:110,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	//RL_HAMMER_OF_GOD#Hammer of God#
 2572,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	//RL_R_TRIP_PLUSATK#Round Trip Plus Attack#
 2573,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	//RL_B_FLICKER_ATK#Bind Flicker Attack#
 2574,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	//RL_GLITTERING_GREED_ATK#Flip The Coin Greed Attack#
diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt
index f02c3c231..3333989f0 100644
--- a/db/pre-re/skill_unit_db.txt
+++ b/db/pre-re/skill_unit_db.txt
@@ -152,6 +152,8 @@
 2488,0xe9,    ,  0, 3,1000,enemy, 0x000	//GN_FIRE_EXPANSION_TEAR_GAS
 2490,0xea,    ,  0, 1,1000,enemy, 0x002	//GN_HELLS_PLANT
 
+2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x006	//RL_B_TRAP
+
 3006,0x86,    ,  0, 2, 100,enemy, 0x018	//KO_BAKURETSU
 3008,0x86,    ,  0, 2, 100,enemy, 0x018	//KO_MUCHANAGE
 3009,0x86,    ,  0, 3, 500,enemy, 0x018	//KO_HUUMARANKA
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 63b1267f3..8e5fc8073 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1663,6 +1663,11 @@
 2537,5000,5000,0,60000,0,60000,0
 //==========================================
 
+//===== Rebellion ==========================
+//-- RL_B_TRAP
+2555,0,0,0,0,0,10000:11000:12000:13000:14000,0
+//==========================================
+
 //==== Kagerou & Oboro skills ==============
 //-- KO_YAMIKUMO
 3001,0,0,0,60000,0,0,-1
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 723545f0a..4f7bbdf06 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -1042,29 +1042,29 @@
 
 // Rebellion
 2551,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_GLITTERING_GREED,Flip The Coin Greed//Not in the skill tree. Why and what does it do? Need real max level.
-2552,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_RICHS_COIN,Rich's Coin
-2553,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_MASS_SPIRAL,Mass Spiral
-2554,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_BANISHING_BUSTER,Banishing Buster
-2555,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_B_TRAP,Bind Trap
-2556,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_FLICKER,Flicker
-2557,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_S_STORM,Shatter Storm
-2558,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_E_CHAIN,Eternal Chain
-2559,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_QD_SHOT,Quick Draw Shot
-2560,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		RL_C_MARKER,Crimson Marker
-2561,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FIREDANCE,Fire Dance
-2562,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_H_MINE,Howling Mine
-2563,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_P_ALTER,Platinum Alter
-2564,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FALLEN_ANGEL,Fallen Angel
-2565,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_R_TRIP,Round Trip
-2566,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_D_TAIL,Dragon Tail
-2567,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_FIRE_RAIN,Fire Rain
-2568,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_HEAT_BARREL,Heat Barrel
-2569,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_AM_BLAST,Anti-Material Blast
-2570,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_SLUGSHOT,Slug Shot
-2571,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_HAMMER_OF_GOD,Hammer of God
-2572,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_R_TRIP_PLUSATK,Round Trip Plus Attack
-2573,0,0,0,0,0,0,5,0,no,0,0,0,none,0,		RL_B_FLICKER_ATK,Bind Flicker Attack//Max level guess based on Bind Trap max level.
-2574,0,0,0,0,0,0,10,0,no,0,0,0,none,0,		RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack//Guess on max level is from Flip The Coin Greed
+2552,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		RL_RICHS_COIN,Rich's Coin
+2553,15,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_MASS_SPIRAL,Mass Spiral
+2554,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_BANISHING_BUSTER,Banishing Buster
+2555,0,6,4,0,0x1,0,5,1,no,0,0,3,none,0,		RL_B_TRAP,Bind Trap
+2556,0,6,4,0,0x3,-1,1,1,no,0,0,0,none,0,	RL_FLICKER,Flicker
+2557,9,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_S_STORM,Shatter Storm
+2558,0,6,4,0,0x1,0,10,1,no,0,0,0,none,0,	RL_E_CHAIN,Eternal Chain
+2559,0,6,4,-1,0,0,1,1,no,0,0x200,0,weapon,0,	RL_QD_SHOT,Quick Draw Shot
+2560,11,6,1,0,0x1,0,1,1,no,0,0,3,none,0,	RL_C_MARKER,Crimson Marker
+2561,0,6,4,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_FIREDANCE,Fire Dance
+2562,7:8:9:10:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_H_MINE,Howling Mine
+2563,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RL_P_ALTER,Platinum Alter
+2564,9,6,2,0,0x1,0,5,1,no,0,0,0,none,0,		RL_FALLEN_ANGEL,Fallen Angel//This skill doesen't deal damage and instead autocasts Desperado right?
+2565,0,6,4,-1,0x2,2:3:4:5:6,5,1,no,0,0,0,weapon,3,	RL_R_TRIP,Round Trip//How much knockback is there? Well put 3 for now.
+2566,0,6,4,-1,0x2,-1,5,1,no,0,0,0,weapon,0,	RL_D_TAIL,Dragon Tail
+2567,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_FIRE_RAIN,Fire Rain
+2568,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RL_HEAT_BARREL,Heat Barrel
+2569,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_AM_BLAST,Anti-Material Blast
+2570,9,6,1,-1,0,0,5,1,no,0,0,0,weapon,6,	RL_SLUGSHOT,Slug Shot//Tester found it knocks back and forces sit.
+2571,7:8:9:10:11,6,1,-1,0x2,2,5,1,no,0,0,0,weapon,0,	RL_HAMMER_OF_GOD,Hammer of God//Might be INF 2, but well use INF 1 for now.
+2572,0,6,1,-1,0x40,0,5,1,no,0,0,0,weapon,0,	RL_R_TRIP_PLUSATK,Round Trip Plus Attack
+2573,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	RL_B_FLICKER_ATK,Bind Flicker Attack//Max level guess based on Bind Trap max level.
+2574,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,	RL_GLITTERING_GREED_ATK,Flip The Coin Greed Attack//Guess on max level is from Flip The Coin Greed
 
 // Kagerou & Oboro
 3001,0,6,4,0,0,0,1,1,no,0,0,0,none,0,		KO_YAMIKUMO,Yamikumo
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index c85f45b37..346924254 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -807,26 +807,26 @@
 
 // Rebellion
 2551,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	//RL_GLITTERING_GREED#Flip The Coin Greed#
-2552,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	//RL_RICHS_COIN#Rich's Coin#
-2553,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	//RL_MASS_SPIRAL#Mass Spiral#
-2554,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	//RL_BANISHING_BUSTER#Banishing Buster#
-2555,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	//RL_B_TRAP#Bind Trap#
-2556,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	//RL_FLICKER#Flicker#
-2557,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	//RL_S_STORM#Shatter Storm#
-2558,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	//RL_E_CHAIN#Eternal Chain#
-2559,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	//RL_QD_SHOT#Quick Draw Shot#
-2560,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	//RL_C_MARKER#Crimson Marker#
-2561,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	//RL_FIREDANCE#Fire Dance#
-2562,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	//RL_H_MINE#Howling Mine#
-2563,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	//RL_P_ALTER#Platinum Alter#
-2564,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	//RL_FALLEN_ANGEL#Fallen Angel#
-2565,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	//RL_R_TRIP#Round Trip#
-2566,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	//RL_D_TAIL#Dragon Tail#
-2567,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	//RL_FIRE_RAIN#Fire Rain#
-2568,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	//RL_HEAT_BARREL#Heat Barrel#
-2569,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	//RL_AM_BLAST#Anti-Material Blast#
-2570,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	//RL_SLUGSHOT#Slug Shot#
-2571,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	//RL_HAMMER_OF_GOD#Hammer of God#
+2552,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	//RL_RICHS_COIN#Rich's Coin#
+2553,0,0,80:84:88:92:96,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	//RL_MASS_SPIRAL#Mass Spiral#
+2554,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	//RL_BANISHING_BUSTER#Banishing Buster#
+2555,0,0,30:32:34:36:38,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	//RL_B_TRAP#Bind Trap#
+2556,0,0,2,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	//RL_FLICKER#Flicker#
+2557,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	//RL_S_STORM#Shatter Storm#
+2558,0,0,45,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	//RL_E_CHAIN#Eternal Chain#
+2559,0,0,5,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	//RL_QD_SHOT#Quick Draw Shot#
+2560,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	//RL_C_MARKER#Crimson Marker#
+2561,0,0,10:15:20:25:30,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	//RL_FIREDANCE#Fire Dance#
+2562,0,0,45:50:55:60:65,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	//RL_H_MINE#Howling Mine#
+2563,0,0,20:24:28:32:36,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	//RL_P_ALTER#Platinum Alter#
+2564,0,0,90,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	//RL_FALLEN_ANGEL#Fallen Angel#
+2565,0,0,40:45:50:55: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	//RL_R_TRIP#Round Trip#
+2566,0,0,60:70:80:90: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	//RL_D_TAIL#Dragon Tail#
+2567,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	//RL_FIRE_RAIN#Fire Rain#
+2568,0,0,30:40:50:60: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	//RL_HEAT_BARREL#Heat Barrel#
+2569,0,0,80:84:88:92:96,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	//RL_AM_BLAST#Anti-Material Blast#
+2570,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	//RL_SLUGSHOT#Slug Shot#
+2571,0,0,70:80:90:100:110,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	//RL_HAMMER_OF_GOD#Hammer of God#
 2572,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	//RL_R_TRIP_PLUSATK#Round Trip Plus Attack#
 2573,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	//RL_B_FLICKER_ATK#Bind Flicker Attack#
 2574,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	//RL_GLITTERING_GREED_ATK#Flip The Coin Greed Attack#
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index bece02852..4e2c5b865 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -154,6 +154,8 @@
 2488,0xe9,    ,  0, 3,1000,enemy, 0x000	//GN_FIRE_EXPANSION_TEAR_GAS
 2490,0xea,    ,  0, 1,1000,enemy, 0x002	//GN_HELLS_PLANT
 
+2555,0x104,   ,  0, 1:2:2:3:3,500,enemy,0x006	//RL_B_TRAP
+
 3006,0x86,    ,  0, 2, 100,enemy, 0x018	//KO_BAKURETSU
 3008,0x86,    ,  0, 2, 100,enemy, 0x018	//KO_MUCHANAGE
 3009,0x86,    ,  0, 3, 500,enemy, 0x018	//KO_HUUMARANKA