summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-01-06 22:49:35 +0300
committerAndrei Karas <akaras@inbox.ru>2016-01-06 22:49:35 +0300
commitfad3e940e2fe4f49dca3d3ada0a5db16181f805c (patch)
tree8a2aa6c5aa9be700c7a3b8efd58953ac0a97dc2a
parent272b552c5a1abd8a62111d24ee9597b3f7b24bd9 (diff)
downloadserverdata-fad3e940e2fe4f49dca3d3ada0a5db16181f805c.tar.gz
serverdata-fad3e940e2fe4f49dca3d3ada0a5db16181f805c.tar.bz2
serverdata-fad3e940e2fe4f49dca3d3ada0a5db16181f805c.tar.xz
serverdata-fad3e940e2fe4f49dca3d3ada0a5db16181f805c.zip
Update configs and db from hercules.
-rw-r--r--conf/battle/client.conf7
-rw-r--r--conf/messages.conf5
-rw-r--r--db/const.txt1
-rw-r--r--db/re/skill_unit_db.txt2
4 files changed, 12 insertions, 3 deletions
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index a0e1e217..c5a0762b 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -26,6 +26,8 @@ min_hair_color: 0
max_hair_color: 20
min_cloth_color: 0
max_cloth_color: 4
+min_body_style: 0
+max_body_style: 4
// When set to yes, the damage field in packets sent from woe maps will be set
// to -1, making it impossible for GMs, Bots and Hexed clients to know the
@@ -75,6 +77,11 @@ wedding_modifydisplay: no
// Save Clothes color. (This will degrade performance) (Note 1)
save_clothcolor: yes
+// Save body styles? (Note 1)
+// Note: Don't turn this on unless you know what your doing.
+// Sprites are not released officially.
+save_body_style: no
+
// Do not display cloth colors for the wedding costume?
// Note: Both save_clothcolor and wedding_modifydisplay have to be enabled
// for this option to take effect. Set this to yes if your cloth palettes
diff --git a/conf/messages.conf b/conf/messages.conf
index 97ad178d..437a351b 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -1035,7 +1035,7 @@
// @changelook
1177: Usage: @changelook {<position>} <view id>
-1178: Position: 1:Top 2:Middle 3:Bottom 4:Weapon 5:Shield 6:Shoes 7:Robe
+1178: Position: 1:Top 2:Middle 3:Bottom 4:Weapon 5:Shield 6:Shoes 7:Robe 8:Body
// @autotrade
1179: Autotrade is not allowed in this map.
@@ -1516,8 +1516,9 @@
//src/map/atcommand.c::ACMD(auction)
1484: Auction is disabled
+//1485: FREE
+
//Monster Transformation
-1485: Traaaansformation-!! %s form!!
1486: Cannot transform into monster while in disguise.
1487: Character cannot be disguised while in monster form.
1488: Transforming into monster is not allowed in Guild Wars.
diff --git a/db/const.txt b/db/const.txt
index 785969f0..7c0d3506 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -633,6 +633,7 @@ LOOK_SHOES 9
LOOK_BODY 10
LOOK_FLOOR 11
LOOK_ROBE 12
+LOOK_BODY2 13
Eff_Stone 0
Eff_Freeze 1
diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt
index fc74dcbc..ba9b3841 100644
--- a/db/re/skill_unit_db.txt
+++ b/db/re/skill_unit_db.txt
@@ -30,7 +30,7 @@
21,0x86, , 0, 2,1000,enemy, 0x018 //MG_THUNDERSTORM
25,0x85, , 1, 0, -1,all, 0x2003 //AL_PNEUMA
27,0x81,0x80, 0, 0, -1,all, 0x00E //AL_WARP
- 47,0x86, , 0, 2:2:2:2:2:3:3:3:3:3,1000,enemy, 0x080 //AC_SHOWER
+ 47,0x86, , 0, 1:1:1:1:1:2:2:2:2:2,1000,enemy, 0x080 //AC_SHOWER
70,0x83, , -1, 1,1000,all, 0x018 //PR_SANCTUARY
79,0x84, , -1, 1,3000,enemy, 0x018 //PR_MAGNUS
80,0x87,0x88, 0, 1,2000,enemy, 0x006 //WZ_FIREPILLAR