summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Changelog-Trunk.txt6
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/skill_cast_db.txt2
-rw-r--r--db/skill_unit_db.txt2
-rw-r--r--src/map/battle.c6
-rw-r--r--src/map/pc.c16
-rw-r--r--src/map/skill.c49
7 files changed, 53 insertions, 29 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index dfdfc7833..cd1c0313a 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,12 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
2006/03/02
+ * Gospel no longer blocks item usage of whoever is in the area of effect,
+ only the caster of Gospel can't use healing items now. [Skotlex]
+ * Added the long/near attack_def_rate card effects to battle_calc_magic
+ (horn card and the like will now work with spells) [Skotlex]
+ - Elemental fields should vanish on map-change now. [Skotlex]
+ - Land Protector only blocks magical ground skills now. [Skotlex]
* Fixed item pickup not picking anything unless you were in a party with
item distribution set [Skotlex]
2006/03/01
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 43a819fb4..7a40318a6 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -26,6 +26,7 @@
=========================
+ * Adjusted SC durations for Meteor Assault [Skotlex]
03/02
* Temp Plugs for NJ and GS items [Poki#3]
* Fixed some skill warnings. [Poki#3]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index aeeabdf35..8eb825fca 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -639,7 +639,7 @@
//-- PF_SPIDERWEB
405,0,0,30000,8000
//-- ASC_METEORASSAULT (Upkeep2 times are duration of: blind(lv1), stun(lv2) or bleeding (lv3)
-406,500,500,0,5000:5000:10000
+406,500,500,0,10000:5000:120000
//-- ASC_CDP
407,0,5000,0,0
//==========================================
diff --git a/db/skill_unit_db.txt b/db/skill_unit_db.txt
index 20b26f451..9d7cd692d 100644
--- a/db/skill_unit_db.txt
+++ b/db/skill_unit_db.txt
@@ -75,7 +75,7 @@
336,0xb2, , 0,-1, -1,noone, 0x000 //WE_CALLPARTNER#あなたに逢いたい
339,0x86, , -1, 0, 400,enemy, 0x000 //NPC_DARKGRANDCROSS#闇グランドクロス
362,0xb4, , 0, 3, -1,all, 0x000 //HP_BASILICA#バジリカ
-369,0xb3, , -1, 0,10000,all, 0x800 //PA_GOSPEL#ゴスペル
+369,0xb3, , -1, 0,10000,all, 0x000 //PA_GOSPEL#ゴスペル
404,0xb6, , -1, 0, -1,all, 0x000 //PF_FOGWALL#フォグウォール
405,0xb7, , 0, 1,1000,enemy, 0x000 //PF_SPIDERWEB#スパイダーウェッブ
484,0xb8, , 2, 0,1000,enemy, 0x808 //HW_GRAVITATION
diff --git a/src/map/battle.c b/src/map/battle.c
index ee7c4e6a8..4a5105d84 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -2671,6 +2671,12 @@ struct Damage battle_calc_magic_attack(
continue;
}
}
+ //It was discovered that ranged defense also counts vs magic! [Skotlex]
+ if (ad.flag&BF_SHORT)
+ cardfix=cardfix*(100-tsd->near_attack_def_rate)/100;
+ else
+ cardfix=cardfix*(100-tsd->long_attack_def_rate)/100;
+
cardfix=cardfix*(100-tsd->magic_def_rate)/100;
MATK_RATE(cardfix);
diff --git a/src/map/pc.c b/src/map/pc.c
index 0be77386f..4b73572eb 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -2710,7 +2710,7 @@ int pc_useitem(struct map_session_data *sd,int n)
sd->sc.data[SC_MARIONETTE].timer!=-1 ||
sd->sc.data[SC_GRAVITATION].timer!=-1 ||
//Cannot use Potions/Healing items while under Gospel.
- (sd->sc.data[SC_GOSPEL].timer!=-1 && sd->sc.data[SC_GOSPEL].val4 != BCT_SELF && sd->inventory_data[n]->type == 0)
+ (sd->sc.data[SC_GOSPEL].timer!=-1 && sd->sc.data[SC_GOSPEL].val4 == BCT_SELF && sd->inventory_data[n]->type == 0)
))
return 0;
@@ -3134,6 +3134,14 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
status_change_end(&sd->bl,SC_STAR_COMFORT,-1);
}
}
+
+ if (sd->mapindex != mapindex)
+ { //Misc map-changing settings
+ party_send_dot_remove(sd); //minimap dot fix [Kevin]
+ guild_send_dot_remove(sd);
+ skill_clear_element_field(&sd->bl);
+ }
+
if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 0) {
pet_stopattack(sd->pd);
pet_changestate(sd->pd,MS_IDLE,0);
@@ -3240,12 +3248,6 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
clif_changemap(sd,map[m].index,x,y); // [MouseJstr]
}
- if (sd->mapindex != mapindex) //minimap dot fix [Kevin]
- {
- party_send_dot_remove(sd);
- guild_send_dot_remove(sd);
- }
-
sd->mapindex = mapindex;
sd->bl.m = m;
sd->to_x = x;
diff --git a/src/map/skill.c b/src/map/skill.c
index 6207a639a..4c1a7dd57 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -2466,10 +2466,12 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
return 1;
if (skillid && skill_get_type(skillid) == BF_MAGIC &&
- !battle_config.gtb_pvp_only && status_isimmune(bl))
+ !battle_config.gtb_pvp_only && status_isimmune(bl)) {
+ if (sd) clif_skill_fail(sd,skillid,0,0);
//GTB makes all targetted skills silently fail.
return 1;
-
+ }
+
sc = status_get_sc(src);
if (sc && !sc->count)
sc = NULL; //Unneeded
@@ -5243,21 +5245,19 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
// Slim Pitcher
case CR_SLIMPITCHER:
- {
- if (sd && flag&1) {
- struct block_list tbl;
- int hp = potion_hp * (100 + pc_checkskill(sd,CR_SLIMPITCHER)*10 + pc_checkskill(sd,AM_POTIONPITCHER)*10 + pc_checkskill(sd,AM_LEARNINGPOTION)*5)/100;
- hp = hp * (100 + (status_get_vit(bl)<<1))/100;
- if (dstsd) {
- hp = hp * (100 + pc_checkskill(dstsd,SM_RECOVERY)*10)/100;
- }
- tbl.id = 0;
- tbl.m = src->m;
- tbl.x = src->x;
- tbl.y = src->y;
- clif_skill_nodamage(&tbl,bl,AL_HEAL,hp,1);
- battle_heal(NULL,bl,hp,0,0);
+ if (potion_hp) {
+ struct block_list tbl;
+ int hp = potion_hp;
+ hp = hp * (100 + (status_get_vit(bl)<<1))/100;
+ if (dstsd) {
+ hp = hp * (100 + pc_checkskill(dstsd,SM_RECOVERY)*10)/100;
}
+ tbl.id = 0;
+ tbl.m = src->m;
+ tbl.x = src->x;
+ tbl.y = src->y;
+ clif_skill_nodamage(&tbl,bl,AL_HEAL,hp,1);
+ battle_heal(NULL,bl,hp,0,0);
}
break;
// Full Chemical Protection
@@ -6120,6 +6120,12 @@ int skill_castend_pos2( struct block_list *src, int x,int y,int skillid,int skil
pc_delitem(sd,j,skill_db[skillid].amount[i],0);
potion_flag = 0;
clif_skill_poseffect(src,skillid,skilllv,x,y,tick);
+ //Apply skill bonuses
+ potion_hp = potion_hp * (100
+ + pc_checkskill(sd,CR_SLIMPITCHER)*10
+ + pc_checkskill(sd,AM_POTIONPITCHER)*10
+ + pc_checkskill(sd,AM_LEARNINGPOTION)*5
+ )/100;
if(potion_hp > 0) {
i = skill_get_splash(skillid, skilllv);
map_foreachinarea(skill_area_sub,
@@ -6634,7 +6640,8 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
nullpo_retr(0, sg=src->group);
nullpo_retr(0, ss=map_id2bl(sg->src_id));
- if (map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR))
+ if (skill_get_type(sg->skill_id) == BF_MAGIC &&
+ map_getcell(bl->m, bl->x, bl->y, CELL_CHKLANDPROTECTOR))
return 0; //AoE skills are ineffective. [Skotlex]
if (battle_check_target(&src->bl,bl,sg->target_flag)<=0)
@@ -6741,13 +6748,15 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
if(src->limit + sg->tick > tick + 700)
src->limit = DIFF_TICK(tick+700,sg->tick);
break;
+/* Removed. Gospel does not blocks item usage for others. [Skotlex]
case UNT_GOSPEL:
if (sg->src_id != bl->id && sc && sc->data[type].timer==-1
&& battle_check_target(ss,bl,BCT_PARTY)>0)
//Start Gospel Effect to prevent item usage affects party only. [Skotlex]
status_change_start(bl,type,100,sg->skill_lv,0,0,BCT_ALL,sg->limit,0);
break;
- }
+*/
+ }
return sg->skill_id;
}
@@ -9536,8 +9545,8 @@ int skill_landprotector(struct block_list *bl, va_list ap )
return 1;
}
- if (skill_get_inf2(unit->group->skill_id)&INF2_TRAP)
- return 0; //Traps cannot be removed by Land Protector/Ganbantein
+ if (skill_get_type(unit->group->skill_id) != BF_MAGIC)
+ return 0; //Only blocks out magical skills.````````
if (skillid == SA_LANDPROTECTOR || skillid == HW_GANBANTEIN ) {
skill_delunit(unit);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 13:15:18 +0000