summaryrefslogtreecommitdiff
path: root/src/map/map.h
diff options
context:
space:
mode:
authorDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-17 00:15:33 +0000
committerDracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-17 00:15:33 +0000
commit7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b (patch)
tree34fb42eb5bf938c6c02b56e26931c6b1937e4c89 /src/map/map.h
parent5a064d5a6723601d08610082ab6c203bc94cdab0 (diff)
downloadhercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.gz
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.bz2
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.tar.xz
hercules-7b2f7c0503cb5be8bc45f57353d838a4dbf84d7b.zip
Orn's and Albator's Homunculus system, finally, YAY!!
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7706 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
-rw-r--r--src/map/map.h37
1 files changed, 24 insertions, 13 deletions
diff --git a/src/map/map.h b/src/map/map.h
index 75c6fe95a..a82f8bee1 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -485,6 +485,7 @@ struct party_data {
struct npc_data;
struct pet_db;
+struct homunculus_db; //[orn]
struct item_data;
struct square;
@@ -747,6 +748,7 @@ struct map_session_data {
struct s_pet pet;
struct pet_data *pd;
+ struct s_homunculus homunculus ; //[orn]
struct homun_data *hd; // [blackhole89]
struct{
@@ -932,26 +934,35 @@ struct homun_data {
struct view_data *vd;
struct status_data base_status, battle_status;
struct status_change sc;
-
- char name[NAME_LENGTH];
- int id;
- short class_;
+ struct homunculus_db *homunculusDB; //[orn]
struct map_session_data *master; //pointer back to its master
- short hunger_rate;
+ int hungry_timer; //[orn]
- struct {
- int id; //0 = none
- int level;
- } hskill[4]; //skills (max. 4 for now)
int target_id,attacked_id;
+ short attackable;
- short level;
- short regenhp,regensp;
- unsigned long exp,exp_next;
- short skillpts;
+ int natural_heal_timer; //[orn]
+ int hp_sub,sp_sub;
+ int inchealhptick,inchealsptick;
+ int nhealhp,nhealsp,nshealhp,nshealsp,nsshealhp,nsshealsp;
+ short hp_loss_value;
+ short sp_loss_value;
+ short hp_loss_type;
+ short sp_gain_value;
+ short hp_gain_value;
+ int hp_loss_tick;
+ int sp_loss_tick;
+ int hp_loss_rate;
+ int sp_loss_rate;
+ unsigned int canregen_tick;
+
+
+ unsigned short regenhp,regensp;
+ unsigned long exp_next;
+ char blockskill[MAX_SKILL]; // [orn]
};
struct pet_data {