summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-10 16:49:00 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-10 16:49:00 +0000
commit35f3b96c8d060651befb7241f5de158a16283a8d (patch)
treee3a2a42ceebdd4917b7d2f6224e1c34bc4ebf492
parente1bf8d0f4b7ea46275817d6584c081cb84255259 (diff)
downloadhercules-35f3b96c8d060651befb7241f5de158a16283a8d.tar.gz
hercules-35f3b96c8d060651befb7241f5de158a16283a8d.tar.bz2
hercules-35f3b96c8d060651befb7241f5de158a16283a8d.tar.xz
hercules-35f3b96c8d060651befb7241f5de158a16283a8d.zip
* Reverted the change to MAX_SQUARE_LAYOUT.
* Evil Land will always as a 3x3 animation. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12550 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/skill_unit_db.txt2
-rw-r--r--src/map/skill.h2
4 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index bc1742026..c776cea21 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/04/10
+ * Rev. 12550 Reverted the change to MAX_SQUARE_LAYOUT. [L0ne_W0lf]
* Rev. 12548 Updated NPC skill "Evil Land". More gravity wtfage. [L0ne_W0lf]
- Based on visual observation, and experience with it on iRO Sakray.
2008/04/09
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 6ad31b6d1..411653b62 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -44,6 +44,7 @@
=======================
2008/04/10
+ * Rev. 12550 Evil Land will always as a 3x3 animation. [L0ne_W0lf]
* Rev. 12548 Updated skill "Evil Land" (skill_db, skill_unit_db) [L0ne_W0lf]
2008/04/07
* Rev. 12528 Reverted the Ice Wall change (r12526.) [L0ne_W0lf]
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index a55eee747..412d9b4cc 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -94,4 +94,4 @@
527,0xbc, , -1, 0,2000,enemy, 0x010 //NJ_TATAMIGAESHI
535,0xbd, , -1, 0, 20,enemy, 0x018 //NJ_KAENSIN
538,0xbb, , 1:1:1:2:2:2:3:3:3:4,0,-1,all,0x010 //NJ_SUITON
-670,0xc7, , 1:3:6:9:12:15:18:20:20:20, 1,1000,all, 0x008 //NPC_EVILLAND
+670,0xc7, , 1, 1:4:7:10:13:16:19:22:25:28,1000,all, 0x008 //NPC_EVILLAND
diff --git a/src/map/skill.h b/src/map/skill.h
index be7f213b6..70ebefe89 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -98,7 +98,7 @@ struct skill_name_db {
};
#define MAX_SKILL_UNIT_LAYOUT 50
-#define MAX_SQUARE_LAYOUT 20 // 11*11のユニット配置が最大
+#define MAX_SQUARE_LAYOUT 5 // 11*11のユニット配置が最大
#define MAX_SKILL_UNIT_COUNT ((MAX_SQUARE_LAYOUT*2+1)*(MAX_SQUARE_LAYOUT*2+1))
struct s_skill_unit_layout {
int count;