diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-04 18:21:21 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-05-04 18:21:21 +0000 |
| commit | 471eeea2f896b96fd76bbe0f285e7cad1ab76060 (patch) | |
| tree | d3778111774f1d52c78e23de7a04df5e123dcc77 | |
| parent | 11c193241c6b1b45814ac8c4fb44842da9a42e46 (diff) | |
| download | hercules-471eeea2f896b96fd76bbe0f285e7cad1ab76060.tar.gz hercules-471eeea2f896b96fd76bbe0f285e7cad1ab76060.tar.bz2 hercules-471eeea2f896b96fd76bbe0f285e7cad1ab76060.tar.xz hercules-471eeea2f896b96fd76bbe0f285e7cad1ab76060.zip | |
- All KA-spells are interruptable.
- Added a temporary SI_RUN state. Actual value needs to be found...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6469 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | db/Changelog.txt | 1 | ||||
| -rw-r--r-- | db/skill_db.txt | 10 | ||||
| -rw-r--r-- | src/map/status.c | 6 | ||||
| -rw-r--r-- | src/map/status.h | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt index 9f5cdc69a..8c333b8ad 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -28,6 +28,7 @@ =========================
05/04
+ * All KA-spells are interruptable. [Skotlex]
* Modified NPC_STUNATTACK: Max level is 5, stun duration is 1+lv seconds
(these duration values are guessed, but they are better than the previous
5+lv seconds) [Skotlex]
diff --git a/db/skill_db.txt b/db/skill_db.txt index 328a45de7..5d8aa9beb 100644 --- a/db/skill_db.txt +++ b/db/skill_db.txt @@ -481,11 +481,11 @@ 459,0,6,4,0,3,-1,1,1,no,0,8,0,weapon,0 //BS_ADRENALINE2#Full Adrenaline Rush#
460,9,6,16,0,1,0,5,1,yes,0,0,0,magic,0 //SL_HUNTER#Spirit of the Hunter#
461,9,6,16,0,1,0,5,1,yes,0,512,0,magic,0 //SL_SOULLINKER#Spirit of the Soul Linker#
-462,9,6,16,0,1,0,7,1,no,0,0,0,magic,0 //SL_KAIZEL#Kaizel#
-463,9,6,16,0,1,0,7,1,no,0,0,0,magic,0 //SL_KAAHI#Kahai#
-464,9,6,16,0,1,0,3,1,no,0,0,0,magic,0 //SL_KAUPE#Kauf#
-465,9,6,16,0,1,0,7,1,no,0,0,0,magic,0 //SL_KAITE#Kaite#
-466,0,0,0,0,0,0,7,0,no,0,0,0,magic,0 //SL_KAINA#Kaina#
+462,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAIZEL#Kaizel#
+463,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAAHI#Kahai#
+464,9,6,16,0,1,0,3,1,yes,0,0,0,magic,0 //SL_KAUPE#Kauf#
+465,9,6,16,0,1,0,7,1,yes,0,0,0,magic,0 //SL_KAITE#Kaite#
+466,0,0,0,0,0,0,7,0,yes,0,0,0,magic,0 //SL_KAINA#Kaina#
467,9,6,1,-2,0,0,7,1,no,0,0,0,magic,2 //SL_STIN#Estin#
468,9,6,1,-2,0,0,7,1,no,0,0,0,magic,0 //SL_STUN#Estern#
469,9,8,1,-2,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0 //SL_SMA#Esma#
diff --git a/src/map/status.c b/src/map/status.c index 279d2e5f3..2dd28505e 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -239,7 +239,7 @@ void initChangeTables(void) { set_sc(PF_FOGWALL, SC_FOGWALL, SI_BLANK);
set_sc(PF_SPIDERWEB, SC_SPIDERWEB, SI_BLANK);
set_sc(WE_BABY, SC_BABY, SI_BLANK);
- set_sc(TK_RUN, SC_RUN, SI_BLANK);
+ set_sc(TK_RUN, SC_RUN, SI_RUN);
set_sc(TK_RUN, SC_SPURT, SI_SPURT);
set_sc(TK_READYSTORM, SC_READYSTORM, SI_READYSTORM);
set_sc(TK_READYDOWN, SC_READYDOWN, SI_READYDOWN);
@@ -3202,8 +3202,6 @@ int status_get_size(struct block_list *bl) nullpo_retr(1, bl);
switch (bl->type) {
case BL_MOB:
- if (((struct mob_data *)bl)->sc.data[SC_SWOO].timer != -1) // [marquis007]
- return 0;
return ((struct mob_data *)bl)->db->size;
case BL_PET:
return ((struct pet_data *)bl)->db->size;
@@ -5339,7 +5337,7 @@ int status_change_end( struct block_list* bl , int type,int tid ) clif_changeoption(bl);
if (sd && calc_flag)
- status_calc_pc((struct map_session_data *)bl,0); /* ステ?タス再計算 */
+ status_calc_pc(sd,0);
}
return 1;
diff --git a/src/map/status.h b/src/map/status.h index ad3053df1..e625bbc07 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -341,6 +341,7 @@ enum { SI_READYTURN = 139,
SI_READYCOUNTER = 141,
SI_DODGE = 143,
+ SI_RUN = 144,
SI_SPURT = 145,
SI_SHADOWWEAPON = 146,
SI_ADRENALINE2 = 147,
|