summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-02-08 21:24:30 -0500
committermekolat <mekolat@users.noreply.github.com>2016-02-08 21:24:30 -0500
commitd9cd196c2f7b856c16a8b435cc3090436ec298d2 (patch)
treee66ed8c462c1a7358277787343e59a9ce5589e7f /world/map/db
parent062fb12c6386d2ac2c5e4f1dc8cf7596e11c82c1 (diff)
parentec011e27ec8459277563222d94c4cf981d752d11 (diff)
downloadserverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.gz
serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.bz2
serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.tar.xz
serverdata-d9cd196c2f7b856c16a8b435cc3090436ec298d2.zip
Merge pull request #455 from mekolat/headstyle-gender
3rd gender, new races
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/const.txt42
-rw-r--r--world/map/db/item_db_use.txt2
2 files changed, 22 insertions, 22 deletions
diff --git a/world/map/db/const.txt b/world/map/db/const.txt
index af5cc476..d3b42ee4 100644
--- a/world/map/db/const.txt
+++ b/world/map/db/const.txt
@@ -14,7 +14,7 @@ Hp 5 1
MaxHp 6 1
Sp 7 1
MaxSp 8 1
-//StatusPoint 9 1
+StatusPoint 9 1
BaseLevel 11 1
//SkillPoint 12 1
Class 19 1
@@ -209,26 +209,26 @@ LOOK_MISC2 13
// Hairstyles
HS_Bald 0
-HS_FlatPonytail 1
-HS_BowlCut 2
-HS_CombedBack 3
-HS_Emo 4
-HS_Mohawk 5
-HS_Pompadour 6
-HS_CenterParting 7
-HS_LongAndSlick 8
-HS_ShortAndCurly 9
-HS_Pigtails 10
-HS_LongAndCurly 11
-HS_Parted 12
-HS_PerkyPonytail 13
-HS_Wave 14
-HS_Mane 15
-HS_Bun 16
-HS_ShoulderLengthFlick 17
-HS_Fizzy 18
-HS_LongAndClipped 19
-HS_BaldTwo 20
+HS_BaldTwo 1
+HS_FlatPonytail 2
+HS_BowlCut 3
+HS_CombedBack 4
+HS_Emo 5
+HS_Mohawk 6
+HS_Pompadour 7
+HS_CenterParting 8
+HS_LongAndSlick 9
+HS_ShortAndCurly 10
+HS_Pigtails 11
+HS_LongAndCurly 12
+HS_Parted 13
+HS_PerkyPonytail 14
+HS_Wave 15
+HS_Mane 16
+HS_Bun 17
+HS_ShoulderLengthFlick 18
+HS_Fizzy 19
+HS_LongAndClipped 20
// Hair Colors
HC_LIGHT_BROWN 0
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt
index 8015786d..65acd000 100644
--- a/world/map/db/item_db_use.txt
+++ b/world/map/db/item_db_use.txt
@@ -90,7 +90,7 @@
3007, Marshmallow, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
3009, JellySkull, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
3010, CandyPumpkin, 0, 5, 1, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 10, 0, 1;}, {}
-4035, PickledBeets, 0, 100, 50, 150, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 50, 0, 1; setlook LOOK_HAIR_COLOR, HC_PURPLE;}, {}
+4035, PickledBeets, 0, 100, 50, 150, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "usePickledBeets";}, {}
4036, RoastedAcorn, 0, 100, 50, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 15, 0, 1;}, {}
5126, MTJarofOwnBlood, 0, 200, 100, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {heal -250, 0;getitem 5127, 1;}, {}
//ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript}