Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Removed Magic Rod's cast bar.

Browse Source 
- Corrected warning on login sql.
- Gravitation no longer causes damage flinch.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10038 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-03-20 14:59:16 +00:00
parent 3d83f71043
commit 3ee61db52f
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog-Trunk.txt
View File

@ -3,6 +3,9 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/03/21
* Removed Magic Rod's cast bar.
* Gravitation no longer causes damage flinch. [Skotlex]
2007/03/20
* Increased MAX_STATUSCHANGE to 300 to make room for new statuses [DracoRPG]
* Reverted mapindex reading from map_list.txt for the map-server [DracoRPG]

2
db/skill_cast_db.txt
View File

@ -431,7 +431,7 @@
//===== Sage ===============================
//-- SA_MAGICROD
276,0,1500,0,400:600:800:1000:1200,0
276,0,0,0,400:600:800:1000:1200,0
//-- SA_SPELLBREAKER
277,700,0,0,0,0

2
src/login_sql/login.c
View File

@ -1545,7 +1545,7 @@ int parse_login(int fd)
default : error = "Unknown Error."; break;
}
sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s', '%d','login failed : %s')", loginlog_db, ntohl(ipl), t_uid, result, error);
sprintf(tmpsql, "INSERT DELAYED INTO `%s`(`time`,`ip`,`user`,`rcode`,`log`) VALUES (NOW(), '%lu', '%s', '%d','login failed : %s')", loginlog_db, (unsigned int)ntohl(ipl), t_uid, result, error);
//query
if(mysql_query(&mysql_handle, tmpsql)) {

1
src/map/battle.c
View File

@ -2177,6 +2177,7 @@ struct Damage battle_calc_magic_attack(
ad.blewcount = 0; //No knockback
else
ad.blewcount |= 0x10000;
case HW_GRAVITATION:
ad.dmotion = 0; //No flinch animation.
break;
case WZ_STORMGUST: //Should knockback randomly.

2
src/map/map.c
View File

@ -479,6 +479,8 @@ int map_moveblock(struct block_list *bl, int x1, int y1, unsigned int tick) {
status_change_end(bl, SC_BASILICA, -1);
if (sc->data[SC_TATAMIGAESHI].timer != -1)
status_change_end(bl, SC_TATAMIGAESHI, -1);
if (sc->data[SC_MAGICROD].timer != -1)
status_change_end(bl, SC_MAGICROD, -1);
}
}
if (moveblock) map_delblock_sub(bl,0);

4
src/map/script.c
View File

@ -9257,10 +9257,10 @@ BUILDIN_FUNC(setcastledata)
case 25:
gc->guardian[index-18].hp = value;
if (gc->guardian[index-18].id)
{ //Update this mob's HP.
{ //Update this mob's HP.
struct block_list *bl = map_id2bl(gc->guardian[index-18].id);
if (!bl)
{ //Wrong target?
{ //Wrong target?
gc->guardian[index-18].id = 0;
break;
}

6
src/map/skill.c
View File

@ -812,7 +812,6 @@ int skill_calc_heal (struct block_list *bl, int skill_lv)
if(bl->type == BL_HOM && (skill = merc_hom_checkskill(((TBL_HOM*)bl), HLIF_BRAIN)) > 0)
heal += heal * skill * 2 / 100;
return heal;
}
@ -5711,10 +5710,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data)
if (ud->walktimer != -1 && ud->skillid != TK_RUN)
unit_stop_walking(src,1);
if (ud->skillid == SA_MAGICROD)
ud->canact_tick = tick;
else
ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv);
if (skill_get_state(ud->skillid) != ST_MOVE_ENABLE)
unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1);

1
src/map/unit.c
View File

@ -966,7 +966,6 @@ int unit_skilluse_id2(struct block_list *src, int target_id, int skill_num, int
if (sc && sc->data[SC_RUN].timer != -1)
casttime = 0;
break;
case SA_MAGICROD:
case SA_SPELLBREAKER:
temp =1;
break;