summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--data/scripts/libs/libtmw-constants.lua66
-rw-r--r--data/scripts/libs/libtmw.lua54
3 files changed, 73 insertions, 53 deletions
diff --git a/ChangeLog b/ChangeLog
index 25e36fce..1228675d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-02 Philipp Sehmisch <tmw@crushnet.org>
+
+ * data/scripts/libs/libtmw.lua, data/scripts/libs/libtmw-constants.lua:
+ Moved the long list of constants at the beginning of libtmw to an
+ additional lua source file.
+
2008-11-01 Roderic Morris <roderic@ccs.neu.edu>
* src/game-server/commandhandler.hpp, src/game-server/gamehander.cpp,
diff --git a/data/scripts/libs/libtmw-constants.lua b/data/scripts/libs/libtmw-constants.lua
new file mode 100644
index 00000000..cdc711da
--- /dev/null
+++ b/data/scripts/libs/libtmw-constants.lua
@@ -0,0 +1,66 @@
+-------------------------------------------------------------
+-- TMW Support Library Constants --
+-- --
+-- Some useful numeric values for use by other scripts. --
+-- --
+----------------------------------------------------------------------------------
+-- Copyright 2008 The Mana World Development Team --
+-- --
+-- This file is part of The Mana World. --
+-- --
+-- The Mana World is free software; you can redistribute it and/or modify it --
+-- under the terms of the GNU General Public License as published by the Free --
+-- Software Foundation; either version 2 of the License, or any later version. --
+----------------------------------------------------------------------------------
+
+DAMAGE_PHYSICAL = 0
+DAMAGE_MAGICAL = 1
+DAMAGE_OTHER = 2
+
+ELEMENT_NEUTRAL = 0
+ELEMENT_FIRE = 1
+ELEMENT_WATER = 2
+ELEMENT_EARTH = 3
+ELEMENT_AIR = 4
+ELEMENT_LIGHTNING = 5
+ELEMENT_METAL = 6
+ELEMENT_WOOD = 7
+ELEMENT_ICE = 8
+
+ATTR_PHY_ATK_MIN = 0
+ATTR_PHY_ATK_DELTA = 1
+ATTR_MAG_ATK = 2
+ATTR_PHY_RES = 3
+ATTR_MAG_RES = 4
+ATTR_EVADE = 5
+ATTR_HIT = 6
+ATTR_HP = 7
+ATTR_HP_REGEN = 8
+ELEM_NEUTRAL = 9
+ELEM_FIRE = 10
+ELEM_WATER = 11
+ELEM_EARTH = 12
+ELEM_AIR = 13
+ELEM_SACRED = 14
+ELEM_DEATH = 15
+ATTR_STRENGTH = 16
+ATTR_AGILITY = 17
+ATTR_DEXTERITY = 18
+ATTR_VITALITY = 19
+ATTR_INTELLIGENCE = 20
+ATTR_WILLPOWER = 21
+SKILL_WEAPON_NONE = 22
+SKILL_WEAPON_KNIFE = 23
+SKILL_WEAPON_SWORD = 24
+SKILL_WEAPON_POLEARM = 25
+SKILL_WEAPON_STAFF = 26
+SKILL_WEAPON_WHIP = 27
+SKILL_WEAPON_BOW = 28
+SKILL_WEAPON_SHOOTING = 29
+SKILL_WEAPON_MACE = 30
+SKILL_WEAPON_AXE = 31
+SKILL_WEAPON_THROWN = 32
+
+TILESIZE = 32
+HOURS = 3600
+MINUTES = 60 \ No newline at end of file
diff --git a/data/scripts/libs/libtmw.lua b/data/scripts/libs/libtmw.lua
index 2c6670f0..4002a5af 100644
--- a/data/scripts/libs/libtmw.lua
+++ b/data/scripts/libs/libtmw.lua
@@ -14,59 +14,7 @@
-- Software Foundation; either version 2 of the License, or any later version. --
----------------------------------------------------------------------------------
--- constant identifiers (is there some LUA way to make them real constants?)
-
-DAMAGE_PHYSICAL = 0
-DAMAGE_MAGICAL = 1
-DAMAGE_OTHER = 2
-
-ELEMENT_NEUTRAL = 0
-ELEMENT_FIRE = 1
-ELEMENT_WATER = 2
-ELEMENT_EARTH = 3
-ELEMENT_AIR = 4
-ELEMENT_LIGHTNING = 5
-ELEMENT_METAL = 6
-ELEMENT_WOOD = 7
-ELEMENT_ICE = 8
-
-ATTR_PHY_ATK_MIN = 0
-ATTR_PHY_ATK_DELTA = 1
-ATTR_MAG_ATK = 2
-ATTR_PHY_RES = 3
-ATTR_MAG_RES = 4
-ATTR_EVADE = 5
-ATTR_HIT = 6
-ATTR_HP = 7
-ATTR_HP_REGEN = 8
-ELEM_NEUTRAL = 9
-ELEM_FIRE = 10
-ELEM_WATER = 11
-ELEM_EARTH = 12
-ELEM_AIR = 13
-ELEM_SACRED = 14
-ELEM_DEATH = 15
-ATTR_STRENGTH = 16
-ATTR_AGILITY = 17
-ATTR_DEXTERITY = 18
-ATTR_VITALITY = 19
-ATTR_INTELLIGENCE = 20
-ATTR_WILLPOWER = 21
-SKILL_WEAPON_NONE = 22
-SKILL_WEAPON_KNIFE = 23
-SKILL_WEAPON_SWORD = 24
-SKILL_WEAPON_POLEARM = 25
-SKILL_WEAPON_STAFF = 26
-SKILL_WEAPON_WHIP = 27
-SKILL_WEAPON_BOW = 28
-SKILL_WEAPON_SHOOTING = 29
-SKILL_WEAPON_MACE = 30
-SKILL_WEAPON_AXE = 31
-SKILL_WEAPON_THROWN = 32
-
-TILESIZE = 32
-HOURS = 3600
-MINUTES = 60
+dofile("data/scripts/libs/libtmw-constants.lua")
-- Table that associates to each NPC pointer the handler function that is