diff options
| author | Jessica Tรถlke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
|---|---|---|
| committer | Jessica Tรถlke <jtoelke@gmx.de> | 2013-08-25 18:01:05 +0200 |
| commit | 803b7fd5e4224276e5db57e8fa3d351d6529e80f (patch) | |
| tree | 67dff994f7673c7ed2efaef9d496631268668b2f /world/map/db/attr_fix.txt | |
| parent | 36c6803069bfe3be37d482e682a3167b8bf0363d (diff) | |
| parent | b3fc5b76efb0031277ad039d3f332b7c2b874d1c (diff) | |
| download | serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.gz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.bz2 serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.tar.xz serverdata-803b7fd5e4224276e5db57e8fa3d351d6529e80f.zip | |
Merge remote-tracking branch 'origin/master' into waric
Conflicts:
world/map/db/item_db.txt
Diffstat (limited to 'world/map/db/attr_fix.txt')
| -rw-r--r-- | world/map/db/attr_fix.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/world/map/db/attr_fix.txt b/world/map/db/attr_fix.txt index 2bdbbd9d..449a07cb 100644 --- a/world/map/db/attr_fix.txt +++ b/world/map/db/attr_fix.txt @@ -1,6 +1,6 @@ // ฎซCณ // ก:X^[ฬฎซ // c:Uฬฎซ -1,10 // lv1ฎซe[u +1,10 // lv1ฎซe[u // ณ
n ฮ ล น ร O s 100, 100, 100, 100, 100, 100, 100, 100, 25, 100, // ณ 100, 25, 100, 150, 50, 100, 75, 100, 100, 100, //
@@ -13,7 +13,7 @@ 25, 100, 100, 100, 100, 100, 75, 75, 125, 100, // O 100, 100, 100, 100, 100, 50, 100, 0, 100, 0, // s // ก:X^[ฬฎซ // c:Uฬฎซ -2,10 // lv2ฎซe[u +2,10 // lv2ฎซe[u //ณ
n ฮ ล น ร O s 100, 100, 100, 100, 100, 100, 100, 100, 25, 100, // ณ 100, 0, 100, 175, 25, 100, 50, 75, 100, 100, //
@@ -26,7 +26,7 @@ 0, 75, 75, 75, 75, 75, 50, 50, 150, 125, // O 100, 75, 75, 75, 75, 25, 125, 0, 100, 0, // s // ก:X^[ฬฎซ // c:Uฬฎซ -3,10 // lv3ฎซe[u +3,10 // lv3ฎซe[u // ณ
n ฮ ล น ร O s 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // ณ 100, -25, 100, 200, 0, 100, 25, 50, 100, 125, //
@@ -39,7 +39,7 @@ 0, 50, 50, 50, 50, 50, 25, 25, 175, 150, // O 100, 50, 50, 50, 50, 0, 150, 0, 100, 0, // s // ก:X^[ฬฎซ // c:Uฬฎซ -4,10 // lv4ฎซe[u +4,10 // lv4ฎซe[u // ณ
n ฮ ล น ร O s 100, 100, 100, 100, 100, 100, 100, 100, 0, 100, // ณ 100, -50, 100, 200, 0, 75, 0, 25, 100, 150, //
|