summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
Diffstat (limited to 'src/map')
-rw-r--r--src/map/intif.c10
-rw-r--r--src/map/mercenary.c7
-rw-r--r--src/map/status.c22
3 files changed, 17 insertions, 22 deletions
diff --git a/src/map/intif.c b/src/map/intif.c
index ef0833b71..7183533db 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -821,12 +821,12 @@ int intif_homunculus_requestsave(int account_id, struct s_homunculus* sh)
{
if (CheckForCharServer())
return 0;
- WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+10);
+ WFIFOHEAD(inter_fd, sizeof(struct s_homunculus)+8);
WFIFOW(inter_fd,0) = 0x3092;
- WFIFOL(inter_fd,2) = sizeof(struct s_homunculus)+10;
- WFIFOL(inter_fd,6) = account_id;
- memcpy(WFIFOP(inter_fd,10),sh,sizeof(struct s_homunculus));
- WFIFOSET(inter_fd, sizeof(struct s_homunculus)+10);
+ WFIFOW(inter_fd,2) = sizeof(struct s_homunculus)+8;
+ WFIFOL(inter_fd,4) = account_id;
+ memcpy(WFIFOP(inter_fd,8),sh,sizeof(struct s_homunculus));
+ WFIFOSET(inter_fd, WFIFOW(inter_fd,2));
return 0;
}
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index 7270f9dd8..0ed0f891c 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -521,7 +521,6 @@ int merc_natural_heal(int tid,unsigned int tick,int id,int data)
return 0;
}
-#ifndef TXT_ONLY
void merc_save(struct homun_data *hd)
{
// copy data that must be saved in homunculus struct ( hp / sp )
@@ -532,12 +531,6 @@ void merc_save(struct homun_data *hd)
sd->homunculus.sp = sd->homunculus.max_sp;
intif_homunculus_requestsave(sd->status.account_id, &sd->homunculus) ;
}
-#else
-void merc_save(struct homun_data *hd)
-{
- //Not implemented...
-}
-#endif
static int merc_calc_pos(struct homun_data *hd,int tx,int ty,int dir) //[orn]
{
diff --git a/src/map/status.c b/src/map/status.c
index 43455725b..57eb86d7e 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -351,7 +351,7 @@ void initChangeTables(void) {
set_sc(GS_MADNESSCANCEL, SC_MADNESSCANCEL, SI_MADNESSCANCEL, SCB_BATK|SCB_ASPD);
set_sc(GS_ADJUSTMENT, SC_ADJUSTMENT, SI_ADJUSTMENT, SCB_HIT|SCB_FLEE);
set_sc(GS_INCREASING, SC_INCREASING, SI_ACCURACY, SCB_AGI|SCB_DEX|SCB_HIT);
- set_sc(GS_GATLINGFEVER, SC_GATLINGFEVER, SI_GATLINGFEVER, SCB_FLEE|SCB_SPEED|SCB_ASPD);
+ set_sc(GS_GATLINGFEVER, SC_GATLINGFEVER, SI_GATLINGFEVER, SCB_BATK|SCB_FLEE|SCB_SPEED|SCB_ASPD);
set_sc(NJ_TATAMIGAESHI, SC_TATAMIGAESHI, SI_BLANK, SCB_NONE);
set_sc(NJ_SUITON, SC_SUITON, SI_BLANK, SCB_AGI|SCB_SPEED);
add_sc(NJ_HYOUSYOURAKU, SC_FREEZE);
@@ -698,9 +698,13 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
skill_clear_unitgroup(target);
status_change_clear(target,0);
- if(flag&2) //remove the unit from the map.
+ if(flag&4) //Delete from memory. (also invokes map removal code)
+ unit_free(target);
+ else
+ if(flag&2) //remove from map
unit_remove_map(target,1);
- else { //These are handled by unit_remove_map.
+ else
+ { //Some death states that would normally be handled by unit_remove_map
unit_stop_attack(target);
unit_stop_walking(target,0);
unit_skillcastcancel(target,0);
@@ -708,11 +712,6 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
skill_unit_move(target,gettick(),4);
skill_cleartimerskill(target);
}
-
- if(flag&4) { //Delete from memory.
- map_delblock(target);
- unit_free(target);
- }
return hp+sp;
}
@@ -3137,6 +3136,8 @@ static unsigned short status_calc_batk(struct block_list *bl, struct status_chan
//Curse shouldn't effect on this? <- Curse OR Bleeding??
// if(sc->data[SC_BLEEDING].timer != -1)
// batk -= batk * 25/100;
+ if(sc->data[SC_GATLINGFEVER].timer!=-1)
+ batk += sc->data[SC_GATLINGFEVER].val3;
if(sc->data[SC_MADNESSCANCEL].timer!=-1)
batk += 100;
return cap_value(batk,0,USHRT_MAX);
@@ -3280,7 +3281,7 @@ static signed short status_calc_flee(struct block_list *bl, struct status_change
if(sc->data[SC_ADJUSTMENT].timer!=-1)
flee += 30;
if(sc->data[SC_GATLINGFEVER].timer!=-1)
- flee -= sc->data[SC_GATLINGFEVER].val1*5;
+ flee -= sc->data[SC_GATLINGFEVER].val4;
if(sc->data[SC_SPEED].timer!=-1)
flee += 10 + sc->data[SC_SPEED].val1 * 10 ;
@@ -5342,7 +5343,8 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
// gs_something1 [Vicious]
case SC_GATLINGFEVER:
val2 = 20*val1; //Aspd increase
- val3 = 5*val1; //Flee decrease
+ val3 = 20+10*val1; //Batk increase
+ val4 = 5*val1; //Flee decrease
break;
case SC_FLING: