summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-25 10:14:46 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-25 10:14:46 +0000
commitb003c06063b37f5b9e8e7c156e961ee2bb3067bc (patch)
tree9d0ffc00f0d5a10a0238abaf257a61000b04ef22
parent05f18f323842aeedf413384464fc48abef420ddc (diff)
downloadhercules-b003c06063b37f5b9e8e7c156e961ee2bb3067bc.tar.gz
hercules-b003c06063b37f5b9e8e7c156e961ee2bb3067bc.tar.bz2
hercules-b003c06063b37f5b9e8e7c156e961ee2bb3067bc.tar.xz
hercules-b003c06063b37f5b9e8e7c156e961ee2bb3067bc.zip
Removed some extra 0's
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1292 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/item_db.txt26
-rw-r--r--db/skill_unit_db.txt26
3 files changed, 30 insertions, 23 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index d346eb4a7..ae3ce317f 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -6,6 +6,7 @@
Skill databases == celest working on them i believe.
03/25
+ * Removed some extra 0's in the item_db, thanks to Zoc
* Corrected some item effects according to the mentoned earlier doc [Lupus]
03/24
* Corrected exp table entries for level 11 and 99, thanks to Dino9021
diff --git a/db/item_db.txt b/db/item_db.txt
index 8f20fc889..4948370af 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1793,19 +1793,19 @@
7313,Witch's_Voucher,Witch's Voucher,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
7314,The_Sign,The Sign,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
-7315,Black_Quartz_Piece,Piece of Black Quartz,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7316,Insect_Long_leg,Insect's Long Leg,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7317,Rusted_Bolt,Rusted Bolt,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7318,Old_Pick,Old Pick,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7319,Old_Iron_Plate,Old Iron Plate,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7320,Dust,Dust,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7321,Quartz_Piece,Piece of Quartz,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7322,Poison_Gas,Poison Gas,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7323,Battered_Kettle,Battered Kettle,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7324,Toothed_Wheel,Gear,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7325,Tube,Tube,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7326,Fluorescent_Colored_Liquid,Fluorescent Liquid,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
-7327,Flashlight,Flashlight,3,,,10,0,0,0,0,0,0,0,0,0,0,0,{},{}
+7315,Black_Quartz_Piece,Piece of Black Quartz,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7316,Insect_Long_leg,Insect's Long Leg,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7317,Rusted_Bolt,Rusted Bolt,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7318,Old_Pick,Old Pick,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7319,Old_Iron_Plate,Old Iron Plate,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7320,Dust,Dust,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7321,Quartz_Piece,Piece of Quartz,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7322,Poison_Gas,Poison Gas,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7323,Battered_Kettle,Battered Kettle,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7324,Toothed_Wheel,Gear,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7325,Tube,Tube,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7326,Fluorescent_Colored_Liquid,Fluorescent Liquid,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
+7327,Flashlight,Flashlight,3,20,0,10,0,0,0,0,0,0,0,0,0,0,{},{}
7500,THG_Membership,THG Membership,3,20,0,10,,,,,,,,,,,{},{}
7501,Token_Bag,Token Bag,3,20,0,10,,,,,,,,,,,{},{}
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index c154d39e8..e9e7dffaf 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -1,20 +1,26 @@
-// id,unit,unit,layout,range,interval,target,flag
-// position -1:特殊, 0:1*1, 1:3*3, 2:5*5,..., 5:11*11
-// target friend:NOENEMY, party:PARTY, 0x20000:BCT_ALL, enemy:ENEMY
-// flag 0x001(UF_DEFNOTENEMY) defunit_not_enemyの影響を受ける
-// 0x002(UF_NOREITERRATION) 重ね置き不可
-// 0x004(UF_NOFOOTSET) 足元置き不可
-// 0x008(UF_NOOVERLAP) 効果が重複しない
-// 0x100(UF_DANCE) ダンススキル
-// 0x200(UF_ENSEMBLE) 合奏スキル
+// ID,unit ID,unit ID 2,layout,range,interval,target,flag
//
+// layout = -1:special, 0:1*1, 1:3*3, 2:5*5, up to 5:11*11
+// target = friend / party / all / enemy
+// flag 0x001(UF_DEFNOTENEMY) Affected by 'defunit_not_enemy'
+// 0x002(UF_NOREITERRATION) Spell cannot be stacked
+// 0x004(UF_NOFOOTSET) Spell cannot be cast near/on players
+// 0x008(UF_NOOVERLAP) Spell effects do not overlap
+// 0x100(UF_DANCE) Dance skill
+// 0x200(UF_ENSEMBLE) Ensemble skill
+// Example: 0x006 = 0x002+0x004 -> Cannot be stacked nor cast near players
+//
+// Notes:
+// ------
// 0x89,0x8a,0x8b 表示無し
// 0x9a 炎属性の詠唱みたいなエフェクト
// 0x9b 水属性の詠唱みたいなエフェクト
// 0x9c 風属性の詠唱みたいなエフェクト
// 0x9d 白い小さなエフェクト
-//
+//
+//
// u1 u2 lay r intr target flag
+//
12,0x7e, , 0, 0, -1,all, 0x003 //MG_SAFETYWALL#セイフティウォール
18,0x7f, , -1, 0, 1,enemy, 0x000 //MG_FIREWALL#ファイアーウォール
21,0x86, , 0, 1,1000,enemy, 0x008 //MG_THUNDERSTORM#サンダーストーム