summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-12 11:10:46 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2005-03-12 11:10:46 +0000
commit2658339a3679ff5e495adf83d59136d20ed82d66 (patch)
tree6cb2d4b881d8f268a8843568beee8f3331425a5f
parentc8745227f8cead250ccb8af5e932fa696b352cfc (diff)
downloadhercules-2658339a3679ff5e495adf83d59136d20ed82d66.tar.gz
hercules-2658339a3679ff5e495adf83d59136d20ed82d66.tar.bz2
hercules-2658339a3679ff5e495adf83d59136d20ed82d66.tar.xz
hercules-2658339a3679ff5e495adf83d59136d20ed82d66.zip
* Fixed usage of mvp_hp_rate and monster_hp_rate. MVP rate was used for common monsters [Lupus]
* Added additional random respawn delay for instant respawning monsters (0..5 seconds) [Lupus] - Should be made as an option of battle_athena.conf git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@1225 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-SVN.txt4
-rw-r--r--Dev/bugs.txt7
-rw-r--r--src/map/mob.c2
-rw-r--r--src/map/status.c12
4 files changed, 18 insertions, 7 deletions
diff --git a/Changelog-SVN.txt b/Changelog-SVN.txt
index fab76fc5b..9ddb4c563 100644
--- a/Changelog-SVN.txt
+++ b/Changelog-SVN.txt
@@ -1,5 +1,9 @@
Date Added
+03/12
+ * Fixed usage of mvp_hp_rate and monster_hp_rate. MVP rate was used for common monsters [Lupus]
+ * Added additional random respawn delay for instant respawning monsters (0..5 seconds) [Lupus]
+ - Should be made as an option of battle_athena.conf
03/11
* Fixed "--en/ja--" usage in 'monster' script not working properly, thanks
to sbilly [celest]
diff --git a/Dev/bugs.txt b/Dev/bugs.txt
index 27c38c5b5..b47a36452 100644
--- a/Dev/bugs.txt
+++ b/Dev/bugs.txt
@@ -398,3 +398,10 @@ Problem: Party EXP share bug
* SQL parties have been fixed in Freya (but the whole file int_party.c has been rewritten there)
Assigned: N/A
Progress: 0%
+
+Problem: Guilds Breaking
+ When you BREAK your guild and then someone re-creates another guild with the same Name
+ Then new GULD would have LEVEL, EXP, STATS of the broken guild
+ Probably it isn't being deleted from memory.
+Assigned: N/A
+Progress: 0%
diff --git a/src/map/mob.c b/src/map/mob.c
index 8f41f93c7..3e2386bfb 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -903,7 +903,7 @@ int mob_setdelayspawn(int id)
spawntime1=md->last_spawntime+md->spawndelay1;
spawntime2=md->last_deadtime+md->spawndelay2;
- spawntime3=gettick()+5000;
+ spawntime3=gettick()+5000+rand()%5000; //Lupus
// spawntime = max(spawntime1,spawntime2,spawntime3);
if(DIFF_TICK(spawntime1,spawntime2)>0)
spawntime=spawntime1;
diff --git a/src/map/status.c b/src/map/status.c
index a1826265f..006fb44d1 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1669,15 +1669,15 @@ int status_get_max_hp(struct block_list *bl)
if(battle_config.mobs_level_up) // mobs leveling up increase [Valaris]
max_hp += (md->level - mob_db[md->class_].lv) * status_get_vit(bl);
- if(mob_db[md->class_].mexp > 0) {
+ if(mob_db[md->class_].mexp > 0) { //MVP Monsters
if(battle_config.mvp_hp_rate != 100) {
double hp = (double)max_hp * battle_config.mvp_hp_rate / 100.0;
max_hp = (hp > 0x7FFFFFFF ? 0x7FFFFFFF : (int)hp);
}
}
- else {
- if(battle_config.mvp_hp_rate != 100) {
- double hp = (double)max_hp * battle_config.mvp_hp_rate / 100.0;
+ else { //Common MONSTERS
+ if(battle_config.monster_hp_rate != 100) {
+ double hp = (double)max_hp * battle_config.monster_hp_rate / 100.0;
max_hp = (hp > 0x7FFFFFFF ? 0x7FFFFFFF : (int)hp);
}
}
@@ -1687,11 +1687,11 @@ int status_get_max_hp(struct block_list *bl)
nullpo_retr(1, pd = (struct pet_data*)bl);
max_hp = mob_db[pd->class_].max_hp;
- if(mob_db[pd->class_].mexp > 0) {
+ if(mob_db[pd->class_].mexp > 0) { //MVP Monsters
if(battle_config.mvp_hp_rate != 100)
max_hp = (max_hp * battle_config.mvp_hp_rate)/100;
}
- else {
+ else { //Common MONSTERS
if(battle_config.monster_hp_rate != 100)
max_hp = (max_hp * battle_config.monster_hp_rate)/100;
}