summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-29 08:19:07 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-29 08:19:07 +0000
commite7bae02e70b98330adbf1a44ace9a9939636cd50 (patch)
tree4081aac30fe79be4d8364435dc31439e7b2c8ff5 /src/common
parentb91483219d36a4fb7359a5fdc17cedaf73b18dc5 (diff)
downloadhercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.gz
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.bz2
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.xz
hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.zip
Renamed struct 'skill' to 's_skill' to remove naming collisions.
Added defines for mercenary skill ranges. Added a mapping of mercenary skills to the skill db (700-799 atm). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13012 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/mmo.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 858a8a513..35af37d85 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -30,7 +30,7 @@
#define MAX_ZENY 1000000000
#define MAX_FAME 1000000000
#define MAX_CART 100
-#define MAX_SKILL 1100 // Bumped to 1100 for new quest skills, will need to further increase one day... [DracoRPG]
+#define MAX_SKILL 1020
#define GLOBAL_REG_NUM 96
#define ACCOUNT_REG_NUM 64
#define ACCOUNT_REG2_NUM 16
@@ -104,6 +104,10 @@
#define MAIL_TITLE_LENGTH 40
#define MAIL_BODY_LENGTH 200
+//Mercenary System
+#define MC_SKILLBASE 8201
+#define MAX_MERCSKILL 37
+
enum item_types {
IT_HEALING = 0,
IT_UNKNOWN, //1
@@ -157,7 +161,7 @@ struct point {
short x,y;
};
-struct skill {
+struct s_skill {
unsigned short id,lv,flag;
};
@@ -216,7 +220,7 @@ struct s_homunculus { //[orn]
int hp,max_hp,sp,max_sp;
unsigned int intimacy; //[orn]
short hunger;
- struct skill hskill[MAX_HOMUNSKILL]; //albator
+ struct s_skill hskill[MAX_HOMUNSKILL]; //albator
short skillpts;
short level;
unsigned int exp;
@@ -280,7 +284,7 @@ struct mmo_charstatus {
struct point last_point,save_point,memo_point[MAX_MEMOPOINTS];
struct item inventory[MAX_INVENTORY],cart[MAX_CART];
struct storage_data storage;
- struct skill skill[MAX_SKILL];
+ struct s_skill skill[MAX_SKILL];
struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex]
#ifdef HOTKEY_SAVING