Corrected Rebellion cast times (#3928)

* Fixes #3858. * Corrected cast times and duration for several Rebellion skills. Thanks to @siriousb!
rathena · Mar 23, 2019 · 972a14e · 972a14e
1 parent 9500c06
commit 972a14e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 33 deletions.
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
@@ -1631,32 +1631,28 @@
 //==========================================
 
 //===== Rebellion Skills ===================
-//-- RL_GLITTERING_GREED
-//2551,0,0,0,0,0,0
 //-- RL_RICHS_COIN
 2552,0,1000,0,600000,0,3000
 //-- RL_MASS_SPIRAL
-2553,2000,1000,0,0,30000,2000
+2553,1000,1000,0,120000,0,2000
 //-- RL_BANISHING_BUSTER
-2554,3000:2500:2000:1500:1000,2000,0,0,0,10000
+2554,3000:2500:2000:1500:1000,0,0,0,0,2000
 //-- RL_B_TRAP
-2555,0,2500:2000:1500:1000:500,0,10000,9000:14000:19000:24000:29000,10000
-//-- RL_FLICKER
-2556,0,0,0,0,0,10000
+2555,2000:1600:1200:800:400,2500:2000:1500:1000:500,0,10000,10000:11000:12000:13000:14000,10000
 //-- RL_S_STORM
-2557,3000:2500:2000:1500:1000,2000,0,0,0,2000
+2557,3000:2500:2000:1500:1000,0,0,0,0,2000
 //-- RL_E_CHAIN
 2558,1000,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,0
 //-- RL_QD_SHOT
 2559,0,0,0,1500,0,0
 //-- RL_C_MARKER
 2560,0,0,0,30000,0,1000
 //-- RL_FIREDANCE
-2561,0,500,0,0,0,5000
+2561,0,500,0,0,0,0
 //-- RL_H_MINE
 2562,1000,1000,0,50000,15000,5000:4500:4000:3500:3000
 //-- RL_P_ALTER
-2563,0,0,0,30000:45000:60000:75000:90000,0,0
+2563,2000,0,0,42000:54000:66000:78000:90000,0,0
 //-- RL_FALLEN_ANGEL
 2564,0,0,0,2000,0,0
 //-- RL_R_TRIP
@@ -1673,12 +1669,6 @@
 2570,5000:6000:7000:8000:9000,1000,0,0,2000,5000
 //-- RL_HAMMER_OF_GOD
 2571,0,2000,0,0,3000:3000:4000:4000:5000,30000
-//-- RL_R_TRIP_PLUSATK
-//2572,0,0,0,0,0,0
-//-- RL_B_FLICKER_ATK
-//2573,0,0,0,0,0,0
-//-- RL_GLITTERING_GREED_ATK
-//2574,0,0,0,0,0,0
 //==========================================
 
 //==== Kagerou & Oboro Skills ==============

diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
@@ -1659,32 +1659,28 @@
 //==========================================
 
 //===== Rebellion Skills ===================
-//-- RL_GLITTERING_GREED
-//2551,0,0,0,0,0,0,-1
 //-- RL_RICHS_COIN
 2552,0,1000,0,600000,0,3000,-1
 //-- RL_MASS_SPIRAL
-2553,2000,1000,0,0,30000,2000,1000
+2553,1000,1000,0,120000,0,2000,2000
 //-- RL_BANISHING_BUSTER
-2554,3000:2500:2000:1500:1000,2000,0,0,0,10000,-1
+2554,3000:2500:2000:1500:1000,0,0,0,0,2000,1000
 //-- RL_B_TRAP
-2555,0,2500:2000:1500:1000:500,0,10000,9000:14000:19000:24000:29000,10000,-1
-//-- RL_FLICKER
-2556,0,0,0,0,0,10000,-1
+2555,2000:1600:1200:800:400,2500:2000:1500:1000:500,0,10000,10000:11000:12000:13000:14000,10000,-1
 //-- RL_S_STORM
-2557,3000:2500:2000:1500:1000,2000,0,0,0,2000,1000
+2557,3000:2500:2000:1500:1000,0,0,0,0,2000,1000
 //-- RL_E_CHAIN
 2558,1000,1000,0,45000:60000:75000:90000:105000:120000:135000:150000:165000:180000,0,0,-1
 //-- RL_QD_SHOT
 2559,0,0,0,1500,0,0,-1
 //-- RL_C_MARKER
 2560,0,0,0,30000,0,1000,-1
 //-- RL_FIREDANCE
-2561,0,500,0,0,0,5000,-1
+2561,0,500,0,0,0,0,-1
 //-- RL_H_MINE
 2562,1000,1000,0,50000,15000,5000:4500:4000:3500:3000,-1
 //-- RL_P_ALTER
-2563,0,0,0,30000:45000:60000:75000:90000,0,0,-1
+2563,2000,0,0,42000:54000:66000:78000:90000,0,0,-1
 //-- RL_FALLEN_ANGEL
 2564,0,0,0,2000,0,0,-1
 //-- RL_R_TRIP
@@ -1701,12 +1697,6 @@
 2570,5000:6000:7000:8000:9000,1000,0,0,2000,5000,1000
 //-- RL_HAMMER_OF_GOD
 2571,0,2000,0,0,3000:3000:4000:4000:5000,30000,-1
-//-- RL_R_TRIP_PLUSATK
-//2572,0,0,0,0,0,0,-1
-//-- RL_B_FLICKER_ATK
-//2573,0,0,0,0,0,0,-1
-//-- RL_GLITTERING_GREED_ATK
-//2574,0,0,0,0,0,0,-1
 //==========================================
 
 //==== Kagerou & Oboro Skills ==============

diff --git a/src/map/skill.cpp b/src/map/skill.cpp
@@ -1834,7 +1834,7 @@ int skill_additional_effect(struct block_list* src, struct block_list *bl, uint1
 		break;
 
 	case RL_MASS_SPIRAL:
-		sc_start2(src,bl,SC_BLEEDING,30 + 10 * skill_lv,skill_lv,src->id,skill_get_time2(skill_id,skill_lv));
+		sc_start2(src,bl,SC_BLEEDING,30 + 10 * skill_lv,skill_lv,src->id,skill_get_time(skill_id,skill_lv));
 		break;
 	case RL_SLUGSHOT:
 		sc_start(src,bl,SC_STUN,100,skill_lv,skill_get_time2(skill_id,skill_lv));