diff options
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | db/Changelog.txt | 1 | ||||
| -rw-r--r-- | db/skill_db.txt | 4 | ||||
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 2 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
6 files changed, 11 insertions, 8 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index b96386cf7..4f17ffee3 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/05/01
+ * Allowed SG_FEEL memorizing the same map for all three. [Skotlex]
+ * SC_FUSION won't end when you die now. [Skotlex]
+ * Added knockback when you run into a wall during running. However
+ position is not being refreshed on the client yet... [Skotlex]
* Fixed pc_disguise not allowing you to "redisguise". [Skotlex]
* Corrected a crash when sd is null in npc_event [Skotlex]
* After testing to make sure it works properly, I'm including
diff --git a/db/Changelog.txt b/db/Changelog.txt index 19e44b287..bceace60c 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -27,6 +27,7 @@ =========================
05/01
+ * Fixed Jump Kick's range to 9. [Skotlex]
* Modified the AM_TWILIGHT* skills to require 200 medicine bowls. [Skotlex]
* Added effect of Speed Potion [Playtester]
* Removed Kraben Card drop from G_Kraben [Playtester]
diff --git a/db/skill_db.txt b/db/skill_db.txt index 157f7fb5b..a17adea55 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -430,7 +430,7 @@ 408,9,6,4,0,1,0,1,1,yes,0,4,0,none,0 //WE_BABY#Baby#
409,9,6,4,0,1,3,1,1,yes,0,4,1,none,0 //WE_CALLPARENT#Call Parent#
410,9,6,4,0,1,3,1,1,yes,0,4,1,none,0 //WE_CALLBABY#Call Baby#
-411,0,6,4,0,1,0,10,1,yes,0,0,0,misc,0 //TK_RUN#Running#
+411,0,6,4,0,1,0,10,1,yes,0,0,0,misc,4 //TK_RUN#Running#
412,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYSTORM#Prepare Whirlwind#
413,-2,8,4,-1,2,2,7,-3,no,0,512,0,weapon,0 //TK_STORMKICK#Whirlwind Kick#
414,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYDOWN#Prepare Axe Kick#
@@ -440,7 +440,7 @@ 418,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_READYCOUNTER#Prepare Counter Kick#
419,-2,8,4,-1,0,0,7,-3,no,0,512,0,weapon,0 //TK_COUNTER#Counter Kick#
420,0,6,4,0,1,0,1,1,no,0,0,0,weapon,0 //TK_DODGE#Break Fall#
-421,8,8,4,-1,0,0,7,-3,no,0,512,0,weapon,0 //TK_JUMPKICK#Flying Side Kick#
+421,9,8,4,-1,0,0,7,-3,no,0,512,0,weapon,0 //TK_JUMPKICK#Flying Side Kick#
422,0,0,0,0,0,1,10,0,no,0,0,0,none,0 //TK_HPTIME#Peaceful Rest#
423,0,0,0,0,0,1,10,0,no,0,0,0,none,0 //TK_SPTIME#Enjoyable Rest#
424,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0 //TK_POWER#Fighting Chant#
diff --git a/src/map/skill.c b/src/map/skill.c index 7193cb98a..2ba07fecb 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5543,11 +5543,7 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in case SG_FEEL:
if (sd) {
if(!sd->feel_map[skilllv-1].index) {
- for (i = 0; i<3 && sd->feel_map[i].index != sd->mapindex; i++);
- if (i < 3) { //Avoid memorizing already known maps. [Skotlex]
- clif_skill_fail(sd, skillid, 0, 0);
- break;
- }
+ //AuronX reported you CAN memorize the same map as all three. [Skotlex]
clif_skill_nodamage(src,bl,skillid,skilllv,1);
clif_parse_ReqFeel(sd->fd,sd, skilllv);
}
diff --git a/src/map/status.c b/src/map/status.c index d2a744504..35c37bb25 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4799,7 +4799,7 @@ int status_change_clear(struct block_list *bl,int type) // Do not reset Xmas status when killed. [Valaris]
if(sc->data[i].timer == -1 ||
(type == 0 &&
- (i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS || i == SC_NOCHAT)))
+ (i == SC_EDP || i == SC_MELTDOWN || i == SC_XMAS || i == SC_NOCHAT || i == SC_FUSION)))
continue;
status_change_end(bl, i, -1);
diff --git a/src/map/unit.c b/src/map/unit.c index 84d964fe9..227e2bd43 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -364,7 +364,9 @@ int unit_run(struct block_list *bl) }
if(to_x == bl->x && to_y == bl->y) {
+ //If you can't run forward, you must be next to a wall, so bounce back. [Skotlex]
status_change_end(bl,SC_RUN,-1);
+ skill_blown(bl,bl,skill_get_blewcount(TK_RUN,sc->data[SC_RUN].val1)|0x10000);
return 0;
}
unit_walktoxy(bl, to_x, to_y, 1);
|