initial commit for magic v3

Fix Druid Tree and add hug to TMW

3 files changed, 137 insertions, 45 deletions

diff --git a/world/map/db/const-magic.txt b/world/map/db/const-magic.txt
new file mode 100644
index 00000000..9bf8e063
--- /dev/null
+++ b/world/map/db/const-magic.txt
@@ -0,0 +1,62 @@
+// NOTE: I think min_casttime should be in battle config if we don't make it a variable
+MIN_CASTTIME 200
+
+// Magic Skills
+SKILL_MAGIC           340
+SKILL_MAGIC_LIFE      341
+SKILL_MAGIC_WAR       342
+SKILL_MAGIC_TRANSMUTE 343
+SKILL_MAGIC_NATURE    344
+SKILL_MAGIC_ASTRAL    345
+SKILL_MAGIC_DARK      346
+
+// Elements
+ELT_NEUTRAL     0
+ELT_WATER       1
+ELT_EARTH       2
+ELT_FIRE        3
+ELT_WIND        4
+ELT_POISON      5
+ELT_SHADOW      6
+ELT_HOLY        7
+ELT_GHOST       8
+ELT_UNDEAD      9
+
+// Status effects
+SC_SHEARED          194
+SC_HIDE             194
+SC_HALT_REGENERATE  195
+SC_FLYING_BACKPACK  196
+SC_MBARRIER         197
+SC_HASTE            198
+SC_PHYS_SHIELD      199
+SO_GMHIDE           64
+SO_GMINVISIBLE      4096
+
+// Special effects
+SFX_DEFAULT         10
+SFX_SUMMON_START    21
+SFX_SUMMON_FIRE     22
+SFX_TELEPORT        24
+SFX_RAIN            25
+SFX_HIT             25
+SFX_ARROW_HAIL      27
+SFX_BARRIER         10
+SFX_UNBARRIER       10
+SFX_HEAL            3
+SFX_LIGHTNING       18
+
+// Magic Spell Const
+MIN_MARRY_LEVEL                 32
+MAX_RAIN_SPELL_RADIUS           15
+MAX_MAGIC_LEVEL                 2
+MFLAG_MADE_CONC_POTION          16384
+MFLAG_MADE_CONC_POTION_SHIFT    14
+// SCRIPT_XP "MAGIC_EXPERIENCE"
+SCRIPT_XP_MASK                  65535
+SCRIPT_XP_SHIFT                 0
+SCRIPT_HEALSPELL_MASK           255
+SCRIPT_HEALSPELL_SHIFT          24
+ATTACK_ICON_GENERIC             2000
+ATTACK_ICON_SHEARING            2001
+E10_FLAG_USED_FREE_WARP_SHIFT   17
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index d3b42ee4..2f7d63a8 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -1,39 +1,6 @@
 // Constants usable in scripts.
+// TODO remove all the bSomething and move them to params instead
 
-// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
-
-// Note: the type-1 constants and the bWhatever are actually
-// the same type internally, but they must be used differently.
-// A *few* can be used for both ...
-// TODO resolve that last, and change the names to match SP_*
-
-// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
-//BaseExp     1    1
-//JobExp      2    1
-Hp          5    1
-MaxHp       6    1
-Sp          7    1
-MaxSp       8    1
-StatusPoint 9    1
-BaseLevel   11   1
-//SkillPoint  12   1
-Class       19   1
-Zeny        20   1
-Sex         21   1
-//NextBaseExp 22   1
-//NextJobExp  23   1
-Weight      24   1
-MaxWeight   25   1
-//JobLevel    55   1
-//Upper       56   1
-Str        13   1
-Agi        14   1
-Vit        15   1
-Int        16   1
-Dex        17   1
-Luk        18   1
-
-// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
 bMaxHP      6
 bMaxSP      8
 bStr        13
@@ -44,7 +11,7 @@ bDex        17
 bLuk        18
 //bAtk        41
 //bAtk2       42
-//bMatk1      43
+bMatk1      43
 //bMatk2      44
 //bDef        45
 bMdef       47
@@ -102,8 +69,6 @@ bDeaf       70
 // Those which can be used with the arrow are only bCritical, bAtkEle, bHit, bAddEle, bAddRace, bAddSize and bAddEff. The other bonuses are ignored.
 // For more information, have a look here: http://code.google.com/p/eathena/source/browse/trunk/doc/item_bonus.txt
 
-// BEFORE UNCOMMENTING ANYTHING, TALK TO o11c!
-
 bAtkRange                1000 // A range bonus of n (bAtkRange,n;).
 //bAtkEle                  1001 // Gives the player's attacks a n element (bAtkEle,n;).
 //bDefEle                  1002 // Gives the player's defense a n element (bDefEle,n;).
@@ -265,6 +230,13 @@ sc_poison              132
 sc_slowpoison          14
 sc_raiseattackspeed0   37
 sc_raiseattackstrength 185
+SC_SHEARED             194
+SC_HIDE                194
+SC_HALT_REGENERATE     195
+SC_FLYING_BACKPACK     196
+SC_MBARRIER            197
+SC_HASTE               198
+SC_PHYS_SHIELD         199
 
 // Emotions
 EMOTE_DISGUST    1
@@ -311,6 +283,11 @@ EMOTE_TROLL      126
 EMOTE_PAIN       127
 EMOTE_TEARS      128
 
+// symbols used for registercmd (ASCII)
+MAGIC_SYMBOL 35
+ATCMD_SYMBOL 64
+DEBUG_SYMBOL 37
+
 sfx_skillup         1
 sfx_magic_generic   2
 sfx_magic_life      3
@@ -362,6 +339,7 @@ FX_MAGIC_BLUE_TELEPORT   41
 FX_MAGIC_DARK_EXPLOSION  42
 FX_PUMPKIN_EXPLOSION 43
 FX_GETITEM           44
+FX_HUG               49
 FX_MAGIC_SHIELD_ENDS 111
 FX_ELECTRICITY_RED   114
 FX_ELECTRICITY_BLUE  115
@@ -426,11 +404,12 @@ SKILL_RESIST_POISON   353
 SKILL_ASTRAL_SOUL     354
 SKILL_RAGING          355
 
-// Magic Skills
-SKILL_MAGIC           340
-SKILL_MAGIC_LIFE      341
-SKILL_MAGIC_WAR       342
-SKILL_MAGIC_TRANSMUTE 343
-SKILL_MAGIC_NATURE    344
-SKILL_MAGIC_ASTRAL    345
-SKILL_MAGIC_DARK      346
+// GM groups
+G_PLAYER              0
+G_BOT                 1
+G_TESTER              20
+G_DEV                 40
+G_EVENT               50
+G_GM                  60
+G_ADMIN               80
+G_SYSOP               99
diff --git a/world/map/db/params.txt b/world/map/db/params.txt
new file mode 100644
index 00000000..4d905522
--- /dev/null
+++ b/world/map/db/params.txt
@@ -0,0 +1,51 @@
+// Params usable in scripts
+// see SP enum in clif.t.hpp
+
+// TODO finish that list and add comments
+// TODO refactor: make the names match their SP:: counterpart <== halfway done
+
+BASEEXP                         1    1
+JOBEXP                          2    1
+Hp                              5    1
+MaxHp                           6    1
+Sp                              7    1
+MaxSp                           8    1
+STATUSPOINT                     9    1
+BaseLevel                       11   1
+SKILLPOINT                      12   1
+Str                             13   1
+Agi                             14   1
+Vit                             15   1
+Int                             16   1
+Dex                             17   1
+Luk                             18   1
+Class                           19   1
+Zeny                            20   1
+Sex                             21   1
+NEXTBASEEXP                     22   1
+NEXTJOBEXP                      23   1
+Weight                          24   1
+MaxWeight                       25   1
+ATK1                            41   1
+ATK2                            42   1
+MATK1                           43   1
+MATK2                           44   1
+DEF1                            45   1
+DEF2                            46   1
+MDEF1                           47   1
+MDEF2                           48   1
+HIT                             49   1
+FLEE1                           50   1
+FLEE2                           51   1
+CRITICAL                        52   1
+JOBLEVEL                        55   1
+PARTNER                         57   1
+GM                              500  1
+ATTACKRANGE                     1000 1
+BASE_ATK                        1014 1
+POS_X                           1074 1
+POS_Y                           1075 1
+PVP_CHANNEL                     1076 1
+BL_ID                           1077 1
+BL_TYPE                         1078 1
+CHAR_ID                         1079 1