summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 03:15:51 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-14 03:15:51 +0000
commit7a8dc0434b420af441041e2ec2fe32ee614c4555 (patch)
treea0f149b4b0565d1f3ee93ccf4c0a5a1fdb8b717c /db
parent851f1599bd54aad53efa05863a7b5a5441972b54 (diff)
downloadhercules-7a8dc0434b420af441041e2ec2fe32ee614c4555.tar.gz
hercules-7a8dc0434b420af441041e2ec2fe32ee614c4555.tar.bz2
hercules-7a8dc0434b420af441041e2ec2fe32ee614c4555.tar.xz
hercules-7a8dc0434b420af441041e2ec2fe32ee614c4555.zip
* Random accumulated bits and pieces.
- Added checks/warnings to pc_paycash and pc_getcash (follow up to r12264). - Added missing packet_db.txt and packet length table entries for packet 0x0859 (follow up to r14799). - Added set of map_id2xx wrappers for map_id2bl for most common map objects, which return NULL when the bl-type is not the expected one (also updated map_id2nd to behave this way). - Fixed missing ',' in mob_skill_db.txt example (follow up to r14270). - Updated mapcache with recent maps (up to que_lhz). - Functions 'msg_txt' and 'job_name' now return a const pointer. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14813 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/map_cache.datbin1940566 -> 1952236 bytes
-rw-r--r--db/map_index.txt10
-rw-r--r--db/mob_skill_db.txt2
-rw-r--r--db/packet_db.txt1
4 files changed, 12 insertions, 1 deletions
diff --git a/db/map_cache.dat b/db/map_cache.dat
index de5e23957..6f034c6c7 100644
--- a/db/map_cache.dat
+++ b/db/map_cache.dat
Binary files differ
diff --git a/db/map_index.txt b/db/map_index.txt
index d120516e9..f30553b19 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -810,6 +810,16 @@ mal_dun01
1@cash
iz_dun05
evt_mobroom
+alde_tt03
+dic_dun03
+//mjolnir_04_1
+//evt_swar_b
+//evt_swar_r
+//evt_swar_s
+//evt_swar_t
+1@lhz
+lhz_dun04
+que_lhz
// Only add maps under this line if they are not standard maps!
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 81de7614f..6bba81d28 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -2,7 +2,7 @@
//
//MOB_ID,dummy value (info only),STATE,SKILL_ID,SKILL_LV,rate (10000 = 100%),casttime,delay,cancelable,target,condition type,condition value,val1,val2,val3,val4,val5,emotion,chat
//Example
-//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7
+//1001,Poring@TF_POISON,attack,52,3,100,1500,10000,no,target,always,0,,,,,7,
//
//rate refers to the chance of the skill being casted when the condition is fulfilled.
//delay is the time in milliseconds that has to be pass before recasting the same skill.
diff --git a/db/packet_db.txt b/db/packet_db.txt
index dc5b72346..f00c6d08e 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -1603,6 +1603,7 @@ packet_ver: 26
0x0856,-1
0x0857,-1
0x0858,-1
+0x0859,-1
//Add new packets here
//packet_ver: 27