diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f9895936..cb7e28605 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,3 +6,4 @@ * 小幅增强葵花魔攻 * 修正削弱辟邪剑法 * 修正青云鞭BUG +* 无双无对连发BUG修正 diff --git a/kungfu/skill/kuihua-mogong/perform/wswd.c b/kungfu/skill/kuihua-mogong/perform/wswd.c index 2168ec538..9721c7dc6 100644 --- a/kungfu/skill/kuihua-mogong/perform/wswd.c +++ b/kungfu/skill/kuihua-mogong/perform/wswd.c @@ -9,36 +9,36 @@ inherit F_SSERVER; int perform(object me, object target) { - object weapon; + object weapon; string msg; int ap, dp; int damage,busy,cost; if( !target ) target = offensive_target(me); - - if (userp(me) && ! me->query("can_perform/kuihua-mogong/ws")) + + if (userp(me) && ! me->query("can_perform/kuihua-mogong/ws")) return notify_fail("ʹõ⹦ûֹܡ\n"); if( !target || !me->is_fighting(target) || !living(target) ) - return notify_fail("˫޶ֻܶսеĶʹá\n"); + return notify_fail("˫޶ֻܶսеĶʹá\n"); if( ! objectp(weapon = me->query_temp("weapon")) - || (string)weapon->query("skill_type") != "sword" + || (string)weapon->query("skill_type") != "sword" || me->query_skill_mapped("sword") != "kuihua-mogong" ) return notify_fail("޷ʹþ\n"); - + if (me->query_skill("kuihua-mogong", 1) < 400) return notify_fail("ĿǰΪ"WS"\n"); - + if (me->query("max_neili") < 7000) return notify_fail("Ϊ"WSWD"裡\n"); - + if (me->query("neili") < 1000) return notify_fail(""WS"裡\n"); - - if (! living(target)) + + if (! living(target)) return notify_fail("ԷѾˣòôɣ\n"); - ap = me->query_skill("kuihua-mogong", 1) + me->query("dex") * 20 + me->query_skill("martial-cognize", 1); + ap = me->query_skill("kuihua-mogong", 1) + me->query("dex") * 20 + me->query_skill("martial-cognize", 1); dp = target->query_skill("parry",1) + target->query("dex") * 20 + target->query_skill("martial-cognize", 1); msg =HIM "$NͻȻһתգۼʹħռ----"NOR""WSWD""HIM"֮"NOR""WS"\n"HIW"$NӨȻй⣬ƺħ֮С\n" "$N" + weapon->name() + "˫Ӱ$n\n"; @@ -47,60 +47,60 @@ int perform(object me, object target) { msg += HIG "Ȼ$n" HIG "ֵ÷$N" HIG "Ĺƻ⡣\n" NOR; - busy = 2; + busy = 2; me->add("neili", -300); } else { - busy = 1; + busy = 1; me->add("neili", -500); damage = ap + random(ap * 1 / 4) - random(100); msg += COMBAT_D->do_damage(me, target, WEAPON_ATTACK, damage, 80, HIY "$n" BLU "ֻѾħ֮У"HIY"$N"+weapon->name()+ WHT "ͬеĹ㣬Ӹλ˹޿ɱܣ\n" NOR); - - if(me->query("can_perform/kuihua-mogong/wd")){ - call_out("perform2", 0, me, target, busy); - } - else{ - //ûѧ޶ - me->start_busy(busy); - call_out("check_wd", 3, me); - } + } message_vision(msg, me, target); - + if(me->query("can_perform/kuihua-mogong/wd")){ + call_out("perform2", 0, me, target, busy); + } + else{ + //ûѧ޶ + me->start_busy(busy); + call_out("check_wd", 3, me); + } + return 1; } int perform2(object me, object target,int busy) { int ap, dp; string msg; - int damage; + int damage; if (!me || !target) return notify_fail("Ѿˣ\n"); if(!living(target)) return notify_fail("Ѿսˡ\n"); - if(me->query("neili") < 1000) + if(me->query("neili") < 1000) return notify_fail("Ҫٳ"WD"ȴԼˣ\n"); - ap = me->query_skill("kuihua-mogong", 1) + me->query("dex") * 20 + me->query_skill("martial-cognize", 1); + ap = me->query_skill("kuihua-mogong", 1) + me->query("dex") * 20 + me->query_skill("martial-cognize", 1); dp = target->query_skill("parry",1) + target->query("dex") * 20 + target->query_skill("martial-cognize", 1); - + msg =HIM "˵ʱʱ죬$Nתʹ"NOR""WSWD"֮"WD""HIM"ʽɲǼܲ\n"NOR""HIM"$n༸ֹͣ$N\n"NOR; if (ap / 2 + random(ap) < dp) { msg += HIG "ʱ$nס" HIG "ֵ÷$N" HIG"Ĺһһ⡣\n" NOR; - busy += 2; + busy += 2; me->add("neili", -300); } else { - busy += 1; + busy += 1; me->add("neili",-600); damage = ap + random(ap * 1 / 2) - random(100); msg += COMBAT_D->do_damage(me, target, WEAPON_ATTACK, damage, 100, HIY "$n" BLU "ֻͬ򽣴һ㣬"HIY"$N" WHT "ͬһ㣬ƱҪȡ$n\n" NOR); } - me->start_busy(busy); + me->start_busy(busy); message_vision(msg, me, target); return 1; }