summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-25 04:26:14 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-10-25 04:26:14 +0000
commitc9b4a887c5c9102d566508c75ebfaa803928e1d9 (patch)
tree3a7b393da4c3fa7d81a289a97c1505bbac2fa64d
parentd0444d585daf3f0203adb5779371e2e2cef57adf (diff)
downloadhercules-c9b4a887c5c9102d566508c75ebfaa803928e1d9.tar.gz
hercules-c9b4a887c5c9102d566508c75ebfaa803928e1d9.tar.bz2
hercules-c9b4a887c5c9102d566508c75ebfaa803928e1d9.tar.xz
hercules-c9b4a887c5c9102d566508c75ebfaa803928e1d9.zip
* Just some random updates and bugfixes!
- Corrected Landmine's placement range. (bugreport:2305) - Corrected comment in merc skill db. (bugreport:2324) - Corrected the casting range for traps. (Based on visial comparison from iRO) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13323 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt5
-rw-r--r--db/mercenary_skill_db.txt2
-rw-r--r--db/skill_db.txt18
-rw-r--r--db/skill_unit_db.txt2
4 files changed, 16 insertions, 11 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index d1c3bdbf1..aa4f7c00f 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,6 +40,11 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/10/25
+ * Rev. 13323 Just some random updates and bugfixes! [L0ne_W0lf]
+ - Corrected Landmine's placement range. (bugreport:2305)
+ - Corrected comment in merc skill db. (bugreport:2324)
+ - Corrected the casting range for traps. (Based on visial comparison from iRO)
2008/10/11
* Rev. 13282 Just some minor updates and fixes I've been putting off :D [L0ne_W0lf]
- Corrected some of the item typos mentioned by Argatlahm. (bugreport:2326)
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index f72c94a71..b743ba34f 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -19,7 +19,7 @@
6021,8213,1 //MA_REMOVETRAP
// MER_ARCHER06
6022,8207,7 //MA_DOUBLE
-6022,8209,3 //MA_LANDMINE
+6022,8209,3 //MA_SKIDTRAP
6022,8234,1 //MER_DECAGI
// MER_ARCHER07
6023,8208,10 //MA_SHOWER
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 92ccc52c7..fed3fca83 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -156,15 +156,15 @@
112,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0, BS_WEAPONPERFECT,Weapon Perfection
113,0,6,4,0,0x3,-1,5,1,no,0,0,0,weapon,0, BS_OVERTHRUST,Power-Thrust
114,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0, BS_MAXIMIZE,Maximize Power
-115,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10, HT_SKIDTRAP,Skid Trap
-116,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0, HT_LANDMINE,Land Mine
-117,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,0, HT_ANKLESNARE,Ankle Snare
-118,3,6,2,0,0x2,1,5,1,no,0,0x80,0,misc,0, HT_SHOCKWAVE,Shockwave Trap
-119,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0, HT_SANDMAN,Sandman
-120,3,6,2,0,0x3,1,5,1,no,0,0x80,0,misc,0, HT_FLASHER,Flasher
-121,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0, HT_FREEZINGTRAP,Freezing Trap
-122,3,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0, HT_BLASTMINE,Blast Mine
-123,3,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0, HT_CLAYMORETRAP,Claymore Trap
+115,2,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10, HT_SKIDTRAP,Skid Trap
+116,2,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0, HT_LANDMINE,Land Mine
+117,2,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,0, HT_ANKLESNARE,Ankle Snare
+118,2,6,2,0,0x2,1,5,1,no,0,0x80,0,misc,0, HT_SHOCKWAVE,Shockwave Trap
+119,2,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0, HT_SANDMAN,Sandman
+120,2,6,2,0,0x3,1,5,1,no,0,0x80,0,misc,0, HT_FLASHER,Flasher
+121,2,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0, HT_FREEZINGTRAP,Freezing Trap
+122,2,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0, HT_BLASTMINE,Blast Mine
+123,2,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0, HT_CLAYMORETRAP,Claymore Trap
124,2,6,32,0,0x1,0,1,1,no,0,0,0,misc,0, HT_REMOVETRAP,Remove Trap
125,3,6,2,0,0x1,0,1,1,no,0,0,0,misc,0, HT_TALKIEBOX,Talkie Box
126,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, HT_BEASTBANE,Beast Bane
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index de97ecaa4..9741d7d88 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -40,7 +40,7 @@
91,0x86, , 0, 2,1000,enemy, 0x010 //WZ_HEAVENDRIVE
92,0x8e, , 2, 0, -1,enemy, 0x010 //WZ_QUAGMIRE
115,0x90, , 0, 1,1000,enemy, 0x006 //HT_SKIDTRAP
-116,0x93, , 0, 0,1000,enemy, 0x006 //HT_LANDMINE
+116,0x93, , 0, 1,1000,enemy, 0x006 //HT_LANDMINE
117,0x91, , 0, 1,1000,enemy, 0x006 //HT_ANKLESNARE
118,0x94, , 0, 1,1000,enemy, 0x006 //HT_SHOCKWAVE
119,0x95, , 0, 1,1000,enemy, 0x006 //HT_SANDMAN