Merge pull request #824 from universe-st/PR-Branch-fixsilent
为全局技能添加silent标签
This commit is contained in:
commit
9ff5e65cce
|
@ -2679,6 +2679,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
|||
priority:5,
|
||||
popup:false,
|
||||
forced:true,
|
||||
silent:true,
|
||||
filter:function(event,player){
|
||||
if(event.card.storage&&event.card.storage.nowuxie) return false;
|
||||
var card=event.card;
|
||||
|
|
|
@ -2030,10 +2030,10 @@ export const Content = {
|
|||
}
|
||||
else {
|
||||
event.choice = usableSkills.filter(n => n.priority == usableSkills[0].priority);
|
||||
//现在只要找到一个同优先度技能为silent 便优先执行该技能
|
||||
//现在只要找到一个同优先度技能为silent,或没有技能描述的技能 便优先执行该技能
|
||||
const silentSkill = event.choice.find(item => {
|
||||
const skillInfo = lib.skill[item.skill];
|
||||
return (skillInfo && skillInfo.silent);
|
||||
return (skillInfo && (skillInfo.silent || !lib.translate[item.skill]));
|
||||
})
|
||||
if (silentSkill){
|
||||
event.current = silentSkill;
|
||||
|
|
|
@ -11228,6 +11228,7 @@ export class Library extends Uninstantable {
|
|||
charlotte: true,
|
||||
priority: -100,
|
||||
lastDo: true,
|
||||
silent:true,
|
||||
content: function () {
|
||||
player.removeSkill('counttrigger');
|
||||
delete player.storage.counttrigger;
|
||||
|
@ -11253,6 +11254,7 @@ export class Library extends Uninstantable {
|
|||
priority: 100,
|
||||
firstDo: true,
|
||||
popup: false,
|
||||
silent:true,
|
||||
filter: function (event, player) {
|
||||
return player.hp >= player.maxHp;
|
||||
},
|
||||
|
@ -11341,6 +11343,7 @@ export class Library extends Uninstantable {
|
|||
popup: false,
|
||||
priority: -100,
|
||||
lastDo: true,
|
||||
silent:true,
|
||||
filter: function (event) {
|
||||
return !event._cleared && event.card.name != 'wuxie';
|
||||
},
|
||||
|
@ -11357,6 +11360,7 @@ export class Library extends Uninstantable {
|
|||
popup: false,
|
||||
priority: -100,
|
||||
lastDo: true,
|
||||
silent:true,
|
||||
filter: function (event) {
|
||||
return ui.todiscard[event.discardid] ? true : false;
|
||||
},
|
||||
|
@ -11386,6 +11390,7 @@ export class Library extends Uninstantable {
|
|||
priority: 5,
|
||||
forced: true,
|
||||
popup: false,
|
||||
silent:true,
|
||||
filter: function (event, player) {
|
||||
//if(!event.player.isDying()) return false;
|
||||
//if(event.source&&event.source.isIn()&&event.source!=player) return false;
|
||||
|
@ -11539,6 +11544,7 @@ export class Library extends Uninstantable {
|
|||
popup: false,
|
||||
logv: false,
|
||||
forceDie: true,
|
||||
silent:true,
|
||||
//priority:-5,
|
||||
content: function () {
|
||||
"step 0";
|
||||
|
@ -11567,6 +11573,7 @@ export class Library extends Uninstantable {
|
|||
forced: true,
|
||||
popup: false,
|
||||
forceDie: true,
|
||||
silent:true,
|
||||
filter: function (event, player) {
|
||||
var evt = event.getParent();
|
||||
return evt && evt.name == 'damage' && evt.hasNature('linked') && player.isLinked();
|
||||
|
|
Loading…
Reference in New Issue