Branch data for eAthena

1 files changed, 46 insertions, 101 deletions

diff --git a/db/const.txt b/db/const.txt
index 76095b9c..73e60c04 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1,73 +1,4 @@
-Job_Novice	0
-Job_Swordman	1
-Job_Mage	2
-Job_Archer	3
-Job_Acolyte	4
-Job_Merchant	5
-Job_Thief	6
-Job_Knight	7
-Job_Priest	8
-Job_Wizard	9
-Job_Blacksmith	10
-Job_Hunter	11
-Job_Assassin	12
-Job_Knight2	13
-Job_Crusader	14
-Job_Monk	15
-Job_Sage	16
-Job_Rogue	17
-Job_Alchem	18
-Job_Bard	19
-Job_Dancer	20
-Job_Crusader2	21
-Job_SuperNovice	23
-Job_Novice_High	24
-Job_Swordman_High	25
-Job_Mage_High	26
-Job_Archer_High	27
-Job_Acolyte_High	28
-Job_Merchant_High	29
-Job_Thief_High	30
-Job_Lord_Knight	31
-Job_High_Priest	32
-Job_High_Wizard	33
-Job_Whitesmith	34
-Job_Sniper	35
-Job_Assassin_Cross	36
-Job_Lord_Knight2	37
-Job_Paladin	38
-Job_Champion	39
-Job_Professor	40
-Job_Stalker	41
-Job_Creator	42
-Job_Clown	43
-Job_Gypsy	44
-Job_Paladin2	45
-Job_Baby	46
-Job_Baby_Swordman	47
-Job_Baby_Mage	48
-Job_Baby_Archer	49
-Job_Baby_Acolyte	50
-Job_Baby_Merchant	51
-Job_Baby_Thief	52
-Job_Baby_Knight	53
-Job_Baby_Priest	54
-Job_Baby_Wizard	55
-Job_Baby_Blacksmith	56
-Job_Baby_Hunter	57
-Job_Baby_Assassin	58
-Job_Baby_Knight2	59
-Job_Baby_Crusader	60
-Job_Baby_Monk	61
-Job_Baby_Sage	62
-Job_Baby_Rogue	63
-Job_Baby_Alchem	64
-Job_Baby_Bard	65
-Job_Baby_Dancer	66
-Job_Baby_Crusader2	67
-Job_Super_Baby	68
-
-
+// Constants usable in scripts
 
 mf_nomemo	0
 mf_noteleport	1
@@ -196,36 +127,50 @@ bAgiVit			1071
 bAgiDexStr		1072
 bPerfectHide		1073
 
-bRestartFullRecover	2000
-bNoCastCancel	2001
-bNoSizeFix	2002
-bNoMagicDamage	2003
-bNoWeaponDamage	2004
-bNoGemStone	2005
-bNoCastCancel2	2006
-bInfiniteEndure	2007
+equip_head 1
+equip_shield 2
+equip_hand2 3
+equip_hand1 4
+equip_gloves 5
+equip_shoes 6
+equip_misc1 7
+equip_misc2 8
+equip_torso 9
+equip_legs 10
+
+cNone  11
+cWhite 10
+cRed    0
+cGreen  1
+cDarkBlue  2
+cYellow 3
+cLightBlue  4
+cPink   5
+cBlack  6
+cOrange 7
+cPurple 8
+cDarkGreen 9
+
+NIBBLE_0_SHIFT 0
+NIBBLE_0_MASK 15
+
+NIBBLE_1_SHIFT 4
+NIBBLE_1_MASK 240
+
+NIBBLE_2_SHIFT 8
+NIBBLE_2_MASK 3840
+
+NIBBLE_3_SHIFT 12
+NIBBLE_3_MASK 61440
+
+NIBBLE_4_SHIFT 16
+NIBBLE_4_MASK 983040
+
+NIBBLE_5_SHIFT 20
+NIBBLE_5_MASK 15728640
 
-Eff_Stone	0
-Eff_Freeze	1
-Eff_Stan	2
-Eff_Sleep	3
-Eff_Poison	4
-Eff_Curse	5
-Eff_Silence	6
-Eff_Confusion	7
-Eff_Blind	8
+NIBBLE_6_SHIFT 24
+NIBBLE_6_MASK 251658240
 
-SC_Stone	128
-SC_Freeze	129
-SC_Stan		130
-SC_Sleep	131
-SC_Poison	132
-SC_Curse	133
-SC_Silence	134
-SC_Confusion	135
-SC_Blind	136
-SC_SpeedPot0	37
-SC_SpeedPot1	38
-SC_SpeedPot2	39
-SC_ATKPot	185
-SC_MATKPot	186
+NIBBLE_7_SHIFT 28
+NIBBLE_7_MASK 4026531840