YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fix

This commit is contained in:
copcap 2023-11-25 07:58:53 +08:00
parent e643544215
commit 251befbe4d
No known key found for this signature in database
GPG Key ID: 30E7AB6699451AEE
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/huicui.js
View File

@ -11353,7 +11353,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
dcxunjie_info:'每轮每项限一次。一名角色的回合结束时，若你本回合于摸牌阶段外得到过牌，你可以选择一项：1.令一名角色将手牌数摸或弃置至与其体力值相同；2.令一名角色将体力值回复或失去至与其手牌数相同。',
dc_dongzhao:'董昭',
dcyijia:'移驾',
dcyijia_info:'当你距离1以内的角色受到伤害后，你可以将场上一张装备牌移动至其对应装备栏（替换原装备）。若其因此脱离了一名角色的攻击范围，你摸一张牌。',
dcyijia_info:'一名角色受到伤害后，若你至其的距离不大于1，你可以将场上一张装备牌移动至其对应装备栏（替换原装备）。若其因此脱离了一名角色的攻击范围，你摸一张牌。',
dcdingji:'定基',
dcdingji_info:'准备阶段，你可以令一名角色将手牌摸或弃置至五张，然后其展示手牌。若牌名均不同，则其可以视为使用其中一张基本或普通锦囊牌。',

17
game/game.js
View File

@ -18507,15 +18507,20 @@ new Promise(resolve=>{
var player=_status.event.player;
var att=get.attitude(player,target);
var sgnatt=get.sgn(att);
var aimTargets=get.event('aimTargets'),filterCard=get.event('filter');
if(ui.selected.targets.length==0){
if(att>0){
if(!_status.event.nojudge&&target.countCards('j',function(card){
if(!filterCard(card)) return false;
return game.hasPlayer(function(current){
if(!aimTargets.includes(current)) return false;
return current!=target&&current.canAddJudge(card)&&get.attitude(player,current)<0;
})
})) return 14;
if(target.countCards('e',function(card){
if(!filterCard(card)) return false;
return get.value(card,target)<0&&game.hasPlayer(function(current){
if(!aimTargets.includes(current)) return false;
return current!=target&&get.attitude(player,current)<0&&current.canEquip(card,_status.event.canReplace)&&get.effect(target,card,player,player)<0;
});
})>0) return 9;
@ -18523,9 +18528,9 @@ new Promise(resolve=>{
else if(att<0){
if(game.hasPlayer(function(current){
if(current!=target&&get.attitude(player,current)>0){
var es=target.getCards('e');
var es=target.getCards('e',filterCard);
for(var i=0;i<es.length;i++){
if(get.value(es[i],target)>0&&current.canEquip(es[i],_status.event.canReplace)&&get.effect(current,es[i],player,player)>0) return true;
if(get.value(es[i],target)>0&&current.canEquip(es[i],_status.event.canReplace)&&get.effect(current,es[i],player,player)>_status.event.canReplace?get.effect(target,es[i],player,player):0) return true;
}
}
})){
@ -18534,7 +18539,7 @@ new Promise(resolve=>{
}
return 0;
}
var es=ui.selected.targets[0].getCards('e');
var es=ui.selected.targets[0].getCards('e',filterCard);
var i;
var att2=get.sgn(get.attitude(player,ui.selected.targets[0]));
for(i=0;i<es.length;i++){
@ -18546,6 +18551,7 @@ new Promise(resolve=>{
}
}
if(i==es.length&&(_status.event.nojudge||!ui.selected.targets[0].countCards('j',function(card){
if(!filterCard(card)) return false;
return target.canAddJudge(card);
})||att2<=0)){
return 0;
@ -25160,7 +25166,10 @@ new Promise(resolve=>{
if(withatt){
if(get.sgn(get.value(es[i],current))!=-att) return false;
var att2=get.sgn(get.attitude(player,current2));
if(att==att2||att2!=get.sgn(get.effect(current2,es[i],player,current2))) return false;
if(!canReplace||att<0&&current2.countEquipableSlot(get.subtype(es[i]))){
if(att==att2||att2!=get.sgn(get.effect(current2,es[i],player,current2))) return false;
}
// if((!canReplace||!current2.countEquipableSlot(get.subtype(es[i]))&&current2.canEquip(es[i],true))&&(att==att2||att2!=get.sgn(get.effect(current2,es[i],player,current2)))) return false;
}
return current!=current2&&!current2.isMin()&&current2.canEquip(es[i],canReplace);
})){

46
mode/identity.js
View File

@ -3539,29 +3539,29 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return -3;
}
return -4;
case 'commoner':
if(to.identity=='zhong') return 0;
if(get.population('fan')==0){
if(to.ai.identity_mark=='zhong'&&to.ai.shown<1) return 0;
return -0.5;
}
if(zhongmode&&to.ai.sizhong&&to.ai.shown<1) return 6;
if(game.players.length==3){
var fan;
for(var i=0; i<game.players.length; i++){
if(game.players[i].identity=='fan'){
fan=game.players[i]; break;
}
case 'commoner':
if(to.identity=='zhong') return 0;
if(get.population('fan')==0){
if(to.ai.identity_mark=='zhong'&&to.ai.shown<1) return 0;
return -0.5;
}
if(zhongmode&&to.ai.sizhong&&to.ai.shown<1) return 6;
if(game.players.length==3){
var fan;
for(var i=0; i<game.players.length; i++){
if(game.players[i].identity=='fan'){
fan=game.players[i]; break;
}
if(fan){
if(to.hp>1&&to.hp>fan.hp&&to.countCards('he')>fan.countCards('he')){
return -3;
}
}
return 3;
}
if(situation<0&&game.zhu&&game.zhu.hp<=2) return -3.8;
return 2-get.population('fan');
if(fan){
if(to.hp>1&&to.hp>fan.hp&&to.countCards('he')>fan.countCards('he')){
return -3;
}
}
return 3;
}
if(situation<0&&game.zhu&&game.zhu.hp<=2) return -3.8;
return Math.max(-4,2-get.population('fan'));
}
break;
case 'zhong':case 'mingzhong':
@ -3574,7 +3574,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return Math.min(3,-situation);
case 'fan': return -8;
case 'commoner':
return Math.min(3,Math.max(-3,situation));
return Math.min(3,Math.max(-3,situation-0.2));
}
break;
case 'nei':
@ -3684,7 +3684,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return Math.min(3,situation);
case 'fan': return 5;
case 'commoner':
return 2*get.population('fan')-2;
return 2*get.population('fan')-3;
}
break;
case 'commoner':