Bläddra i källkod

Bug Fixes
* Reverted a change made to Raising Dragon for HP/SP Regen.
* Fixed Rage Burst not consuming Rage Counters on use. (bugreport:7975)

aleos89 11 år sedan
förälder
incheckning
2cd1e8c393
2 ändrade filer med 5 tillägg och 1 borttagningar
  1. 3 0
      src/map/skill.c
  2. 2 1
      src/map/status.c

+ 3 - 0
src/map/skill.c

@@ -14818,6 +14818,9 @@ struct skill_condition skill_get_requirement(struct map_session_data* sd, uint16
 		case SR_RAMPAGEBLASTER:
 			req.spiritball = sd->spiritball?sd->spiritball:15;
 			break;
+		case LG_RAGEBURST:
+			req.spiritball = sd->spiritball?sd->spiritball:1;
+			break;
 		case SR_GATEOFHELL:
 			if( sc && sc->data[SC_COMBO] && sc->data[SC_COMBO]->val1 == SR_FALLENEMPIRE )
 				req.sp -= req.sp * 10 / 100;

+ 2 - 1
src/map/status.c

@@ -3886,6 +3886,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
 		|| sc->data[SC_TRICKDEAD]
 		|| sc->data[SC_BLEEDING]
 		|| sc->data[SC_MAGICMUSHROOM]
+		|| sc->data[SC_RAISINGDRAGON]
 		|| sc->data[SC_SATURDAYNIGHTFEVER]
 	)	// No regen
 		regen->flag = 0;
@@ -3896,7 +3897,7 @@ void status_calc_regen_rate(struct block_list *bl, struct regen_data *regen, str
 		sc->data[SC_MAXIMIZEPOWER] ||
 #endif
 			( (bl->type == BL_PC && ((TBL_PC*)bl)->class_&MAPID_UPPERMASK) == MAPID_MONK &&
-			(sc->data[SC_EXTREMITYFIST] || ((sc->data[SC_EXPLOSIONSPIRITS] || sc->data[SC_RAISINGDRAGON]) && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK)))
+			(sc->data[SC_EXTREMITYFIST] || (sc->data[SC_EXPLOSIONSPIRITS] && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK)))
 			)
 	)	// No natural SP regen
 		regen->flag &=~RGN_SP;