Update db from upstream.

6 files changed, 77 insertions, 14 deletions

diff --git a/db/cashshop_db.conf b/db/cashshop_db.conf
index a50c30198..a020417cc 100644
--- a/db/cashshop_db.conf
+++ b/db/cashshop_db.conf
@@ -1,3 +1,25 @@
+//====================================================
+//=       _   _                     _           
+//=      | | | |                   | |          
+//=      | |_| | ___ _ __ ___ _   _| | ___  ___ 
+//=      |  _  |/ _ \ '__/ __| | | | |/ _ \/ __|
+//=      | | | |  __/ | | (__| |_| | |  __/\__ \
+//=      \_| |_/\___|_|  \___|\__,_|_|\___||___/
+//=                                                  
+//=            http://hercules.ws/board/                        
+//================= More Information =================
+//= http://hercules.ws/board/topic/367-introducing-cash-shop-support/
+//====================================================
+// This file handles the entire Cashshop. You can simply
+// add in any amount of items you like within each category.
+// Please keep in mind that the Cashshop does not work
+// with ragexere clients.
+// Categories can be empty or even missing, but, if
+// present, their names must be kept as cat_<n>, where
+// <n> is a valid tab index, as descripbed in 'enum
+// CASH_SHOP_TABS' in clif.c (normally 0 through 7)
+//====================================================
+
 cash_shop: (
 {
 }
diff --git a/db/castle_db.txt b/db/castle_db.txt
index e69de29bb..89b00eee7 100644
--- a/db/castle_db.txt
+++ b/db/castle_db.txt
@@ -0,0 +1,13 @@
+// Guild Castles Database
+//
+// Structure of Database:
+// CastleID,MapName,CastleName,OnGuildBreakEventName,Flag
+//
+// 01. CastleID                  Unique ID of the castle. Must remain unique across all map-servers.
+// 02. MapName                   Map name to be considered as the castle map.
+// 03. CastleName                Name of the castle (used by scripts and guardian name tags).
+// 04. OnGuildBreakEventName     NPC unique name to invoke ::OnGuildBreak on, when a occupied
+//                               castle is abandoned during guild break.
+// 05. Flag                      Switch flag (reserved as of athena-dev mod0796~0801, not used by server).
+
+
diff --git a/db/const.txt b/db/const.txt
index 979a15f5c..2af95607b 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1,3 +1,19 @@
+// Script Constant Database
+//
+// Structure of Database:
+// Identifier   Value[  Type]
+//
+// Alternatively:
+// Identifier,Value[,Type]
+//
+// 01. Identifier       Unique name for the constant, must not have same name as script commands, functions or variables.
+// 02. Value            Value assigned to the constant. This value cannot be changed during the runtime of the server.
+// 03. Type                     Specifies whether the identifier is a constant (0) or a parameter (1) (optional, defaults to 0).
+//
+// NOTE:                        Parameters are special in that they retrieve certain runtime values depending on the specified ID
+//                                      in field Value. Depending on the implementation values assigned by scripts to parameters will affect
+//                                      runtime values, such as Zeny, as well (see pc_readparam/pc_setparam).
+
 Job_Novice	0
 Job_Swordman	1
 Job_Mage	2
diff --git a/db/magicmushroom_db.txt b/db/magicmushroom_db.txt
index 264a54701..5705e537e 100644
--- a/db/magicmushroom_db.txt
+++ b/db/magicmushroom_db.txt
@@ -1,3 +1,27 @@
 // Magic Mushroom DB.
 // Database for skills that are randomly used through Magic Mushroom status change.
 // Format: SkillID
+
+7	//SM_MAGNUM
+8	//SM_ENDURE
+10	//MG_SIGHT
+24	//AL_RUWACH
+32	//AL_CRUCIS
+33	//AL_ANGELUS
+45	//AC_CONCENTRATION
+61	//KN_AUTOCOUNTER
+74	//PR_MAGNIFICAT
+110	//BS_HAMMERFALL
+114	//BS_MAXIMIZE
+142	//NV_FIRSTAID
+150	//TF_BACKSLIDING
+151	//TF_PICKSTONE
+157	//MG_ENERGYCOAT
+249	//CR_AUTOGUARD
+256	//CR_PROVIDENCE
+261	//MO_CALLSPIRITS
+270	//MO_EXPLOSIONSPIRITS
+326	//DC_SCREAM
+500	//GS_GLITTERING
+527	//NJ_TATAMIGAESHI
+531	//NJ_UTSUSEMI
diff --git a/db/pet_db.txt b/db/pet_db.txt
index 33f62e4d8..2a6ba4c5d 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -43,10 +43,6 @@
 //Casts a support skill when the health levels are below the specified hp% and
 //sp%. Delay is the minimum time in seconds before the skill can be cast again
 
-//petheal amount, delay, hp%, sp%
-//Similar to petskillsupport, but the skill is fixed to heal (28) and the
-//heal-amount is fixed to the value given.
-
 //petrecovery type, delay: Cures the "type" status effect after "delay" seconds
 
 //petskillbonus type, value, duration, delay
@@ -55,7 +51,4 @@
 //delay is the time elapsed after the bonus ends and before it starts again.
 
 //A single pet can have petloot, petskillbonus, petskillattack (or
-//petskillattack2) and petskillsupport (or petheal) at the same time,
-//but only one of each.
-
-1002,Piou,Piou,701,4000,0,507,80,60,50,100,250,20,5000,150,1,0,350,400,800,{ petloot 10; },{ bonus bLuk,2; bonus bCritical,1; }
+//petskillattack2) and petskillsupport at the same time, but only one of each.
diff --git a/db/pet_db2.txt b/db/pet_db2.txt
index cf39171e8..ca5e4e14a 100644
--- a/db/pet_db2.txt
+++ b/db/pet_db2.txt
@@ -43,10 +43,6 @@
 //Casts a support skill when the health levels are below the specified hp% and
 //sp%. Delay is the minimum time in seconds before the skill can be cast again
 
-//petheal amount, delay, hp%, sp%
-//Similar to petskillsupport, but the skill is fixed to heal (28) and the
-//heal-amount is fixed to the value given.
-
 //petrecovery type, delay: Cures the "type" status effect after "delay" seconds
 
 //petskillbonus type, value, duration, delay
@@ -55,6 +51,5 @@
 //delay is the time elapsed after the bonus ends and before it starts again.
 
 //A single pet can have petloot, petskillbonus, petskillattack (or
-//petskillattack2) and petskillsupport (or petheal) at the same time,
-//but only one of each.
+//petskillattack2) and petskillsupport at the same time, but only one of each.