reverted mpeg's work

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8522 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 51 insertions, 48 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index acc4830f4..ea97887dd 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,9 +19,6 @@
 	-----

 

 =========================

-08/28

- 	* Applied Mpeg's work on GS [Toms]

-	  ( http://gpegon.free.fr/ea/gunslinger_08-28-06_mpeg.txt )

 08/26

 	* Reduced weapon range of all guns by 1 [Playtester]

 08/25

diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 19060f8c5..78da5124d 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -843,35 +843,41 @@
 //-- GS_GLITTERING

 500,0,0,0,600000,0

 //-- GS_FLING

-501,0,0,0,30000,0

+501,0,1000,0,30000,0

+//-- GS_TRIPLEACTION

+502,0,1000,0,0,0

+//-- GS_BULLSEYE

+503,0,1000,0,0,0

 //-- GS_MADNESSCANCEL

-504,0,0,0,15000,0

-//-- GS_ADJUSTMENT // Duration1 unknown

-505,0,0,0,30000,0

+504,0,1000,0,15000,0

+//-- GS_ADJUSTMENT

+505,0,1000,0,30000,0

 //-- GS_INCREASING

-506,0,0,0,60000,0

-//-- GS_CRACKER // No clue for duration2 (stun time)

-508,0,0,0,0,5000

-//-- GS_TRACKING // Delay unknown

+506,0,1000,0,60000,0

+//-- GS_MAGICALBULLET

+507,0,1000,0,0,0

+//-- GS_CRACKER

+508,0,1000,0,0,5000

+//-- GS_TRACKING

 512,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,0,0

-//-- GS_DISARM // Cast&Delay unknown (temp values). No clue for Duration1 (Strip time)...

-513,1000,0,0,30000,0

-//-- GS_PIERCINGSHOT // Cast&Delay unknown (temp values). No clue for Duration2 (Bleeding time)

-514,1000,0,0,0,120000

-//-- GS_RAPIDSHOWER // Delay must be checked (maybe 0(ASPD)...)

+//-- GS_DISARM

+513,0,1000,0,30000,0

+//-- GS_PIERCINGSHOT

+514,0,1000,0,0,120000

+//-- GS_RAPIDSHOWER

 515,0,1000,0,0,0

-//-- GS_DESPERADO // Delay must be checked (very likely to be 1s though)

+//-- GS_DESPERADO

 516,0,1000,1000,1000,0

 //-- GS_GATLINGFEVER

 517,0,1000,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:165000,0

-//-- GS_DUST // Delay must be checked (very long with low agi, still long with full agi, so it must be correct...)

-518,1000,0,0,0,0

+//-- GS_DUST

+518,1000,1000,0,0,0

 //-- GS_FULLBUSTER

 519,1000,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,10000

-//-- GS_SPREADATTACK // Delay unknown (if there is one, other that aspd)

-520,1000,0,0,0,0

-//-- GS_GROUNDDRIFT // Delay unknown (if there is one, other that aspd)

-521,1000,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,10000

+//-- GS_SPREADATTACK

+520,0,1000,0,0,0

+//-- GS_GROUNDDRIFT

+521,0,1000,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,0

 //==========================================

 

 

diff --git a/db/skill_db.txt b/db/skill_db.txt
index 87d7c3ea5..39d9ce965 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -524,28 +524,28 @@
 498,0,6,4,0,1,0,1,0,no,0,8,0,none,0	//AM_TWILIGHT3#Twilight Alchemy 3#

 499,-9,8,4,-1,0,0,1,2,no,0,520,0,weapon,0	//HT_POWER#Beast Strafing#

 //Temp Plugs(using bash as base)

-500,0,6,4,0,0,0,5,1,no,0,0,0,misc,0	//GS_GLITTERING#Flip the Coin#

-501,0,6,1,-1,0,0,1,1,no,0,0,0,misc,0	//GS_FLING#Fling#

-502,0,8,1,-1,0,0,1,3,no,0,0,0,weapon,0	//GS_TRIPLEACTION#Triple Action#

-503,0,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_BULLSEYE#Bulls Eye#

-504,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0	//GS_MADNESSCANCEL#Madness Canceler#

-505,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0	//GS_ADJUSTMENT#AdJustment#

-506,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0	//GS_INCREASING#Increasing Accuracy#

-507,0,6,1,8,0,0,1,1,no,0,0,0,weapon,0	//GS_MAGICALBULLET#Magical Bullet#

-508,0,6,1,-1,1,0,1,1,no,0,0,0,weapon,0	//GS_CRACKER#Cracker#

-509,0,0,0,0,0,0,10,0,no,0,0,0,none,0	//GS_SINGLEACTION#Single Action#

+500,0,6,4,0,0,0,5,1,no,0,0,0,none,0	//GS_GLITTERING#Flip the Coin#

+501,-3,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_FLING#Fling#

+502,-3,8,1,-1,0,0,1,3,no,0,0,0,weapon,0	//GS_TRIPLEACTION#Triple Action#

+503,-3,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_BULLSEYE#Bulls Eye#

+504,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0	//GS_MADNESSCANCEL#Madness Canceler#

+505,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0	//GS_ADJUSTMENT#AdJustment#

+506,0,6,4,0,1,0,5,1,no,0,0,0,weapon,0	//GS_INCREASING#Increasing Accuracy#

+507,-3,6,1,8,0,0,1,1,no,0,0,0,weapon,0	//GS_MAGICALBULLET#Magical Bullet#

+508,-3,6,1,-1,0,0,1,1,no,0,0,0,weapon,0	//GS_CRACKER#Cracker#

+509,-3,0,0,0,0,0,10,0,no,0,0,0,none,0	//GS_SINGLEACTION#Single Action#

 510,0,0,0,0,0,0,10,0,no,0,0,0,none,0	//GS_SNAKEEYE#Snake Eye#

-511,0,8,0,-1,0,0,10,2,no,0,0,0,weapon,0	//GS_CHAINACTION#Chain Action#

-512,0,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#Tracking#

-513,0,6,1,-1,1,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#

-514,0,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#Piercing Shot#

-515,0,8,1,-1,0,0,10,5,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#Rapid Shower#

+511,-3,8,0,0,0,0,10,2,no,0,0,0,weapon,0	//GS_CHAINACTION#Chain Action#

+512,3,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_TRACKING#Tracking#

+513,7,6,1,-1,1,0,5,1,no,0,0,0,weapon,0	//GS_DISARM#Disarm#

+514,3,6,1,-1,0,0,5,1,no,0,0,0,weapon,0	//GS_PIERCINGSHOT#Piercing Shot#

+515,3,8,1,-1,0,0,10,5,no,0,0,0,weapon,0	//GS_RAPIDSHOWER#Rapid Shower#

 516,0,8,4,-1,2,3,10,1,no,0,0,0,weapon,0	//GS_DESPERADO#Desperado#

 517,0,6,4,-1,1,0,10,1,no,0,0,0,weapon,0	//GS_GATLINGFEVER#Gatling Fever#

 518,3,6,1,-1,0,0,10,1,no,0,0,0,weapon,5	//GS_DUST#Dust#

-519,0,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0	//GS_FULLBUSTER#Full Buster#

-520,0,6,1,-1,2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0,0,weapon,0	//GS_SPREADATTACK#Spread Attack#

-521,0,6,2,-1,0,0,10,1,no,0,0,0,weapon,0	//GS_GROUNDDRIFT#Ground Drift#

+519,3,6,1,-1,0,0,10,1,yes,0,0,0,weapon,0	//GS_FULLBUSTER#Full Buster#

+520,3,6,1,-1,2,1:1:1:2:2:2:3:3:3:4,10,1,no,0,0,0,weapon,0	//GS_SPREADATTACK#Spread Attack#

+521,3,6,2,0,0,0,10,1,no,0,0,0,weapon,0	//GS_GROUNDDRIFT#Ground Drift#

 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0	//NJ_TOBIDOUGU#NJ_TOBIDOUGU#

 523,9,6,1,-1,0,0,10,1,no,0,0,0,weapon,0	//NJ_SYURIKEN#NJ_SYURIKEN#

 524,9,8,1,-1,0,0,5,3,no,0,0,0,weapon,0	//NJ_KUNAI#NJ_KUNAI#

diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt
index e27ee92fe..d8c2df333 100644
--- a/db/skill_require_db.txt
+++ b/db/skill_require_db.txt
@@ -394,14 +394,14 @@
 498,0,0,200,0,0,0,99,0,0,none,0,7134,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0//AM_TWILIGHT3##

 499,0,0,8,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//HT_POWER##

 500,0,0,2,0,0,1,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	//GS_GLITTERING

-501,0,0,10,0,0,0,17:18:19:20:21,0,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FLING

-502,0,0,20,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRIPLEACTION

-503,0,0,30,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_BULLSEYE

+501,0,0,10,0,0,0,17:18:19:20:21,3:5,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FLING

+502,0,0,20,0,0,0,17:18:19:20:21,3:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRIPLEACTION

+503,0,0,30,0,0,0,17:18:19:20:21,3:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_BULLSEYE

 504,0,0,30,0,0,0,17:18:19:20:21,0,0,none,4,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_MADNESSCANCEL

 505,0,0,15,0,0,0,17:18:19:20:21,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_ADJUSTMENT

 506,0,0,30,0,0,0,17:18:19:20:21,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_INCREASING

 507,0,0,7,0,0,0,17:18:19:20:21,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_MAGICALBULLET

-508,0,0,10,0,0,0,17:18,3,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_CRACKER

+508,0,0,10,0,0,0,17:18:19:20:21,3:5,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_CRACKER

 512,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_TRACKING

 513,0,0,15:20:25:30:35,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DISARM

 514,0,0,11:12:13:14:15,0,0,0,17:18,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_PIERCINGSHOT

@@ -410,7 +410,7 @@
 517,0,0,30:32:34:36:38:40:42:44:46:48,0,0,0,20,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GATLINGFEVER

 518,0,0,3:6:9:12:15:18:21:24:27:30,0,0,0,19,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_DUST

 519,0,0,20:25:30:35:40:45:50:55:60:65,0,0,0,19,3,2:2:4:4:6:6:8:8:10:10,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_FULLBUSTER

-520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,19,3,5,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK

+520,0,0,15:20:25:30:35:40:45:50:55:60,0,0,0,19,3,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_SPREADATTACK

 521,0,0,4:8:12:16:20:24:28:32:36:40,0,0,0,21,5,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GS_GROUNDDRIFT

 523,0,0,2,0,0,0,99,6,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_SYURIKEN

 524,0,0,30:25:20:15:10,0,0,0,99,7,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//NJ_KUNAI

diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 077aac090..822bce4ab 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -88,7 +88,7 @@
 484,0xb8,    ,  2, 0,1000,enemy, 0x808	//HW_GRAVITATION

 488,0xb9,    ,  3, 0,  -1,all,   0x200	//CG_HERMODE

 516,0xba,    ,  0, 3, 100,enemy, 0x000	//GS_DESPERADO

-538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000	//NJ_SUITON

+521,0xc2,    ,  0, 1,1000,enemy, 0x006	//GS_GROUNDDRIFT

 527,0xbc,    , -1, 0,2000,enemy, 0x000	//NJ_TATAMIGAESHI

 535,0xbd,    , -1, 0, 200,enemy, 0x008	//NJ_KAENSIN

-521,0xbe,    ,  0, 1,1000,enemy, 0x006	//GS_GROUNDDRIFT

+538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000	//NJ_SUITON