- Updated the stun length to 5 secs of: Meteor Storm, Sonic Blow, Throw Stone, Sightless Raid, Smite, Cart Termination

- SG Union will consume now SP if you use it while not soul linked.
- Added variable "skip" to the mob spawn data, to know how many mobs to skip when spawning because they were not removed due to the "mob_remove_damaged" setting.
- Corrected the Hp/Sp regen formulas from Hp/Sp/Spirit Recovery and Happy/Peaceful break according to recent forums discussions (formula is changed from x*lv +max*lv/500 to lv*(x+max/500).


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9944 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 2 insertions, 2 deletions

diff --git a/src/map/npc.c b/src/map/npc.c
index 59d21e7ba..f6fa6e9ac 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2307,14 +2307,14 @@ int npc_parse_mob2 (struct spawn_data *mob, int index)
 	int i;
 	struct mob_data *md;
 
-	for (i = 0; i < mob->num; i++) {
+	for (i = mob->skip; i < mob->num; i++) {
 		md = mob_spawn_dataset(mob);
 		md->spawn = mob;
 		md->spawn_n = index;
 		md->special_state.cached = (index>=0);	//If mob is cached on map, it is dynamically removed
 		mob_spawn(md);
 	}
-
+	mob->skip = 0;
 	return 1;
 }