summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt40
2 files changed, 22 insertions, 20 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 5237d782f..580b353d2 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -20,6 +20,8 @@
=========================
09/02
+ * Applied Vicious's ranges on guns [Playtester]
+ - Rifle & Shotgun = 9, others = 7
* Updated various item names thanks to Haplo [Playtester]
- please update all the quests that use these item names
09/01
diff --git a/db/item_db.txt b/db/item_db.txt
index f846df1e8..a7bca3cf9 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2657,26 +2657,26 @@
13019,Ginnungagap_,Ginnungagap,4,,10,700,120,,1,1,0x008F5EEF,7,2,2,4,70,1,1,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500; bonus2 bAddEff2,Eff_Blind,50; },{},{}
13020,Warrior's_Balmung_,Warrior's Balmung,4,,10,1000,170,,1,0,0xFFFFFFFF,7,2,2,4,48,1,2,{ bonus bAllStats,5; },{},{}
// Guns
-13100,Six_Shooter,Six Shooter,4,4500,,400,30,,6,1,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
-13101,Six_Shooter_,Six Shooter,4,4500,,400,30,,6,2,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
-13102,Crimson_Bolt,Crimson Bolt,4,20000,,450,45,,6,1,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
-13103,Crimson_Bolt_,Crimson Bolt,4,20000,,450,45,,6,2,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
-13104,Garrison,Garrison,4,48000,,500,70,,6,1,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
-13105,Garrison_,Garrison,4,48000,,500,70,,6,2,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
-13106,Gold_Lux,Gold Lux,4,100000,,500,20,,6,0,0x01000000,7,2,34,3,12,1,17,{ bonus bHit,-10; if(getskilllv(500)>0) bonus3 bAutoSpell,500,getskilllv(500),10; },{},{}
-13150,Branch,Branch,4,3000,,500,50,,7,3,0x01000000,7,2,34,1,1,1,18,{},{},{}
-13151,Cyclone,Cyclone,4,17500,,700,120,,7,1,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
-13152,Cyclone_,Cyclone,4,17500,,700,120,,7,2,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
-13153,Dusk,Dusk,4,23500,,750,150,,7,1,0x01000000,7,2,34,2,56,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
-13154,Rolling_Stone,Rolling Stone,4,12000,,900,135,,5,1,0x01000000,7,2,34,1,14,1,19,{ bonus bSplashRange,1; },{},{}
-13155,Black_Rose,Black Rose,4,32000,,900,180,,5,1,0x01000000,7,2,34,2,35,1,19,{ bonus bSplashRange,1; },{},{}
-13156,Gate_Keeper,Gate Keeper,4,56000,,1000,210,,5,0,0x01000000,7,2,34,2,55,1,19,{ bonus bSplashRange,1; },{},{}
-13157,Drifter,Drifter,4,80000,,2300,50,,6,1,0x01000000,7,2,34,2,55,1,20,{},{},{}
-13158,Butcher,Butcher,4,130000,,2500,75,,6,0,0x01000000,7,2,34,3,68,1,20,{ bonus2 bCriticalAddRace,RC_Brute,5; },{},{}
-13159,Butcher_,Butcher,4,130000,,2500,75,,6,1,0x01000000,7,2,34,3,68,1,20,{ bonus2 bCriticalAddRace,RC_Brute,5; },{},{}
-13160,Destroyer,Destroyer,4,110000,,1200,220,,5,0,0x01000000,7,2,34,2,52,1,21,{ bonus bBreakArmorRate,100; },{},{}
-13161,Destroyer_,Destroyer,4,110000,,1200,220,,5,1,0x01000000,7,2,34,2,52,1,21,{ bonus bBreakArmorRate,100; },{},{}
-13162,Inferno,Inferno,4,230000,,1250,280,,5,1,0x01000000,7,2,34,2,65,1,21,{},{},{}
+13100,Six_Shooter,Six Shooter,4,4500,,400,30,,7,1,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
+13101,Six_Shooter_,Six Shooter,4,4500,,400,30,,7,2,0x01000000,7,2,34,1,10,1,17,{ bonus bHit,-10; },{},{}
+13102,Crimson_Bolt,Crimson Bolt,4,20000,,450,45,,7,1,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
+13103,Crimson_Bolt_,Crimson Bolt,4,20000,,450,45,,7,2,0x01000000,7,2,34,2,35,1,17,{ bonus bHit,-10; },{},{}
+13104,Garrison,Garrison,4,48000,,500,70,,7,1,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
+13105,Garrison_,Garrison,4,48000,,500,70,,7,2,0x01000000,7,2,34,2,55,1,17,{ bonus bHit,-10; },{},{}
+13106,Gold_Lux,Gold Lux,4,100000,,500,20,,7,0,0x01000000,7,2,34,3,12,1,17,{ bonus bHit,-10; if(getskilllv(500)>0) bonus3 bAutoSpell,500,getskilllv(500),10; },{},{}
+13150,Branch,Branch,4,3000,,500,50,,9,3,0x01000000,7,2,34,1,1,1,18,{},{},{}
+13151,Cyclone,Cyclone,4,17500,,700,120,,9,1,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
+13152,Cyclone_,Cyclone,4,17500,,700,120,,9,2,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
+13153,Dusk,Dusk,4,23500,,750,150,,9,1,0x01000000,7,2,34,2,56,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
+13154,Rolling_Stone,Rolling Stone,4,12000,,900,135,,9,1,0x01000000,7,2,34,1,14,1,19,{ bonus bSplashRange,1; },{},{}
+13155,Black_Rose,Black Rose,4,32000,,900,180,,9,1,0x01000000,7,2,34,2,35,1,19,{ bonus bSplashRange,1; },{},{}
+13156,Gate_Keeper,Gate Keeper,4,56000,,1000,210,,9,0,0x01000000,7,2,34,2,55,1,19,{ bonus bSplashRange,1; },{},{}
+13157,Drifter,Drifter,4,80000,,2300,50,,7,1,0x01000000,7,2,34,2,55,1,20,{},{},{}
+13158,Butcher,Butcher,4,130000,,2500,75,,7,0,0x01000000,7,2,34,3,68,1,20,{ bonus2 bCriticalAddRace,RC_Brute,5; },{},{}
+13159,Butcher_,Butcher,4,130000,,2500,75,,7,1,0x01000000,7,2,34,3,68,1,20,{ bonus2 bCriticalAddRace,RC_Brute,5; },{},{}
+13160,Destroyer,Destroyer,4,110000,,1200,220,,7,0,0x01000000,7,2,34,2,52,1,21,{ bonus bBreakArmorRate,100; },{},{}
+13161,Destroyer_,Destroyer,4,110000,,1200,220,,7,1,0x01000000,7,2,34,2,52,1,21,{ bonus bBreakArmorRate,100; },{},{}
+13162,Inferno,Inferno,4,230000,,1250,280,,7,1,0x01000000,7,2,34,2,65,1,21,{},{},{}
// Bullets
13200,Bullet,Bullet,10,1,,2,10,,,,0x01000000,7,2,32768,,1,,3,{},{},{}
13201,Silver_Bullet,Silver Bullet,10,15,,2,15,,,,0x01000000,7,2,32768,,1,,3,{ bonus bAtkEle,Ele_Holy; },{},{}