diff options
| -rw-r--r-- | db/job_db1.txt | 4 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 95 | ||||
| -rw-r--r-- | src/map/battle.c | 60 |
3 files changed, 155 insertions, 4 deletions
diff --git a/db/job_db1.txt b/db/job_db1.txt index a4f82b518..cc0b31029 100644 --- a/db/job_db1.txt +++ b/db/job_db1.txt @@ -52,9 +52,9 @@ // Super Novice
23, 20000,0 ,500 ,100 ,500 ,650 ,700 ,2000 ,2000 ,2000 ,800 ,2000 ,700 ,700 ,650 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
// Gunslinger
-24, 27000,75 ,300 ,600 ,400 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,650 ,2000 ,575 ,2000 ,2000 ,2000
+24, 20000,75 ,300 ,600 ,400 ,550 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,650 ,2000 ,575 ,2000 ,2000 ,2000
// Ninja
-25, 24000,110 ,500 ,400 ,400 ,500 ,650 ,2000 ,2000 ,2000 ,800 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
+25, 20000,110 ,500 ,400 ,400 ,500 ,650 ,2000 ,2000 ,2000 ,800 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,500
// Novice High
4001, 20000,0 ,500 ,100 ,500 ,650 ,700 ,2000 ,2000 ,2000 ,800 ,2000 ,700 ,700 ,650 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000
// Swordman High
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index 2855c91ae..6ca0cf5f2 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -616,7 +616,7 @@ //===== Clown / Gypsy ======================
//-- CG_ARROWVULCAN
-394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,800:800:800:800:800:1000:1000:1000:1000:1000,0,0,0
+394,2000:2200:2400:2600:2800:3000:3200:3400:3600:3800,2800:2800:2800:2800:2800:3000:3000:3000:3000:3000,2000,0,0
//-- CG_MOONLIT
395,0,0,0,20000:25000:30000:35000:40000,0
//-- CG_MARIONETTE
@@ -806,12 +806,105 @@ 499,0,-100,0,100,0
//==========================================
+
//===== Gunslinger =========================
+//-- GS_GLITTERING
+//500,0,0,0,0,0
+//-- GS_FLING
+//501,0,0,0,0,0
+//-- GS_TRIPLEACTION
+//502,0,0,0,0,0
+//-- GS_BULLSEYE
+//503,0,0,0,0,0
+//-- GS_MADNESSCANCEL
+//504,0,0,0,15000,0
+//-- GS_ADJUSTMENT
+//505,0,0,0,30000,0
+//-- GS_INCREASING
+//506,0,0,0,60000,0
+//-- GS_MAGICALBULLET
+//507,0,0,0,0,0
+//-- GS_CRACKER
+//508,0,0,0,0,0
+//-- GS_SINGLEACTION
+//509,0,0,0,0,0
+//-- GS_SNAKEEYE
+//510,0,0,0,0,0
+//-- GS_CHAINACTION
+//511,0,0,0,0,0
+//-- GS_TRACKING
+//512,1200:1400:1600:1800:2000:2200:2400:2600:2800:3000,0,0,0,0
+//-- GS_DISARM
+//513,0,0,0,0,0
+//-- GS_PIERCINGSHOT
+//514,0,0,0,0,0
+//-- GS_RAPIDSHOWER
+//515,0,0,0,0,0
+//-- GS_DESPERADO
+//516,0,0,0,0,0
+//-- GS_GATLINGFEVER
+//517,0,0,0,30000:45000:60000:75000:90000:105000:120000:135000:150000:160000,0
+//-- GS_DUST
+//518,0,0,0,0,0
+//-- GS_FULLBUSTER
+//519,0,1500:2000:2500:3000:3500,0,0,0
+//-- GS_SPREADATTACK
+//520,0,0,0,0,0
+//-- GS_GROUNDDRIFT
+//521,0,0,0,3000:6000:9000:12000:15000:18000:21000:24000:27000:30000,0
//==========================================
+
//===== Ninja ==============================
+//-- NJ_TOBIDOUGU
+//522,0,0,0,0,0
+//-- NJ_SYURIKEN
+//523,0,0,0,0,0
+//-- NJ_KUNAI
+//524,0,0,0,0,0
+//-- NJ_HUUMA
+//525,0,0,0,0,0
+//-- NJ_ZENYNAGE
+//526,0,5000,0,0,0
+//-- NJ_TATAMIGAESHI
+//527,0,0,0,0,0
+//-- NJ_KASUMIKIRI
+//528,0,0,0,0,0
+//-- NJ_SHADOWJUMP
+//529,0,0,0,0,0
+//-- NJ_KIRIKAGE
+//530,0,0,0,0,0
+//-- NJ_UTSUSEMI
+//531,0,0,0,20000:30000:40000:50000:60000,0
+//-- NJ_BUNSINJYUTSU
+//532,0,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
+//-- NJ_NINPOU
+//533,0,0,0,0,0
+//-- NJ_KOUENKA
+//534,0,0,0,0,0
+//-- NJ_KAENSIN
+//535,0,0,0,20000,0
+//-- NJ_BAKUENRYU
+//536,0,0,0,0,0
+//-- NJ_HYOUSENSOU
+//537,0,0,0,0,0
+//-- NJ_SUITON
+//538,0,0,0,15000:20000:25000:30000:35000:40000:45000:50000:55000:60000,0
+//-- NJ_HYOUSYOURAKU
+//539,0,0,0,0,0
+//-- NJ_HUUJIN
+//540,0,0,0,0,0
+//-- NJ_RAIGEKISAI
+//541,0,0,0,0,0
+//-- NJ_KAMAITACHI
+//542,0,0,0,0,0
+//-- NJ_NEN
+//543,0,0,0,0,0
+//-- NJ_ISSEN
+//544,0,0,0,0,0
//==========================================
+
//===== 2nd Jobs Quest Skills ==============
//-- KN_CHARGEATK
1001,300,300,0,0,0
diff --git a/src/map/battle.c b/src/map/battle.c index 81d7a5d11..6fc54318e 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -1809,6 +1809,49 @@ static struct Damage battle_calc_weapon_attack( if (sc && sc->data[SC_COMBO].timer != -1 && sc->data[SC_COMBO].val1 == skill_num)
skillratio += 10*status_get_lv(src)/3;
break;
+ case GS_TRIPLEACTION:
+ skillratio += 200;
+ break;
+ case GS_BULLSEYE:
+ skillratio += 400;
+ break;
+ case GS_TRACKING:
+ skillratio += 60*skill_lv;
+ if (skill_lv == 2) skillratio += 20;
+ if (skill_lv == 3) skillratio += 80;
+ if (skill_lv >= 4) skillratio += 60*(skill_lv-3);
+ if (skill_lv == 10) skillratio += 80;
+ break;
+ case GS_PIERCINGSHOT:
+ skillratio += 10*skill_lv;
+ break;
+ case GS_RAPIDSHOWER:
+ skillratio += 400 + 50*skill_lv;
+ break;
+ case GS_DESPERADO:
+ skillratio += 50*skill_lv-50;
+ break;
+ case GS_DUST:
+ skillratio += 50*skill_lv;
+ break;
+ case GS_FULLBUSTER:
+ skillratio += 150 + 250*skill_lv;
+ break;
+ case GS_SPREADATTACK:
+ skillratio += 20*skill_lv-20;
+ break;
+ case NJ_HUUMA:
+ skillratio += 50 + 150*skill_lv;
+ break;
+ case NJ_TATAMIGAESHI:
+ skillratio += 10*skill_lv;
+ break;
+ case NJ_KASUMIKIRI:
+ skillratio += 10*skill_lv;
+ break;
+ case NJ_KIRIKAGE:
+ skillratio += 100*skill_lv-100;
+ break;
case KN_CHARGEATK:
skillratio += wflag*15; //FIXME: How much is the actual bonus? [Skotlex]
break;
@@ -1818,7 +1861,7 @@ static struct Damage battle_calc_weapon_attack( case MO_BALKYOUNG:
skillratio += 200;
break;
- }
+ }
ATK_RATE(skillratio);
@@ -2577,6 +2620,21 @@ struct Damage battle_calc_magic_attack( case SL_SMA:
skillratio += -60 + status_get_lv(src); //Base damage is 40% + lv%
break;
+ case NJ_KOUENKA:
+ skillratio -= 10;
+ break;
+ case NJ_BAKUENRYU:
+ skillratio += 50 + 150*skill_lv;
+ break;
+ case NJ_HYOUSYOURAKU:
+ skillratio += 50*skill_lv;
+ break;
+ case NJ_RAIGEKISAI:
+ skillratio += 60 + 40*skill_lv;
+ break;
+ case NJ_KAMAITACHI:
+ skillratio += 100*skill_lv;
+ break;
}
if (sd && sd->skillatk[0].id != 0)
|