summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt4
-rw-r--r--db/produce_db.txt1
-rw-r--r--db/skill_unit_db.txt4
-rw-r--r--src/map/mob.c6
-rw-r--r--src/map/status.c10
5 files changed, 22 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 72b0c8cff..5c84ad45c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/04
+ * SC_REFLECTSHIELD will now be passed to devoted characters at cast-time.
+ [Skotlex]
+ * Added a check to make a mob's level 1 if the read level from the db is
+ less than it. [Skotlex]
* status_calc_misc will now be invoked in status_calc_bl even on the first
call, since status could have gone up due to skill bonuses. [Skotlex]
* Moved max HP/SP calculations to before invoking status_calc_misc
diff --git a/db/produce_db.txt b/db/produce_db.txt
index a06e8db26..fa3e41005 100644
--- a/db/produce_db.txt
+++ b/db/produce_db.txt
@@ -378,7 +378,6 @@
970,22,228,1,7127,0,713,1,7033,5,905,5,1092,1
//-- Embryo <-- AM_PHARMACY & Potion Creation Guide & 1 Seed of Life, 1 Morning Dew of Yggdrasil, 1 Glass Tube
7142,22,228,1,7144,0,7140,1,7141,1,7143,1
-// ProduceItemID,ItemLV,RequireSkill,MaterialID1,MaterialAmount1,......
//----------------------------------------------
//==============================================
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 1d30e942e..087412117 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -89,7 +89,7 @@
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
488,0xb9, , 3, 0, -1,all, 0x200 //CG_HERMODE
516,0xba, , 0, 3, 100,enemy, 0x000 //GS_DESPERADO
-538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000 //NJ_SUITON
+521,0xbe, , 0, 1,1000,enemy, 0x006 //GS_GROUNDDRIFT
527,0xbc, , -1, 0,2000,enemy, 0x000 //NJ_TATAMIGAESHI
535,0xbd, , -1, 0, 200,enemy, 0x008 //NJ_KAENSIN
-521,0xbe, , 0, 1,1000,enemy, 0x006 //GS_GROUNDDRIFT
+538,0xbb,,1:1:1:2:2:2:3:3:3:4,0,-1,all,0x000 //NJ_SUITON
diff --git a/src/map/mob.c b/src/map/mob.c
index 0d7fceb83..d0d182b4e 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3172,6 +3172,9 @@ static int mob_readdb(void)
memcpy(mob_db_data[class_]->jname, str[2], NAME_LENGTH-1);
memcpy(mob_db_data[class_]->name, str[3], NAME_LENGTH-1);
mob_db_data[class_]->lv = atoi(str[4]);
+ if (mob_db_data[class_]->lv < 1)
+ mob_db_data[class_]->lv = 1;
+
status = &mob_db_data[class_]->status;
status->max_hp = atoi(str[5]);
@@ -3870,6 +3873,9 @@ static int mob_read_sqldb(void)
memcpy(mob_db_data[class_]->jname, TO_STR(2), NAME_LENGTH-1);
memcpy(mob_db_data[class_]->name, TO_STR(3), NAME_LENGTH-1);
mob_db_data[class_]->lv = TO_INT(4);
+ if (mob_db_data[class_]->lv < 1)
+ mob_db_data[class_]->lv = 1;
+
status = &mob_db_data[class_]->status;
status->max_hp = TO_INT(5);
status->max_sp = TO_INT(6);
diff --git a/src/map/status.c b/src/map/status.c
index f73513ca2..9e39d814b 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -4911,6 +4911,16 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val
break;
case SC_REFLECTSHIELD:
val2=10+val1*3; //% Dmg reflected
+ if (sd)
+ { //Pass it to devoted chars.
+ struct map_session_data *tsd;
+ int i;
+ for (i = 0; i < 5; i++)
+ { //Pass the status to the other affected chars. [Skotlex]
+ if (sd->devotion[i] && (tsd = map_id2sd(sd->devotion[i])))
+ status_change_start(&tsd->bl,SC_AUTOGUARD,10000,val1,val2,0,0,tick,1);
+ }
+ }
break;
case SC_STRIPWEAPON:
if (bl->type != BL_PC) //Watk reduction