v1.9.53
This commit is contained in:
parent
9eb57cad97
commit
b89e059a65
|
@ -130,6 +130,13 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
||||||
enable:true,
|
enable:true,
|
||||||
content:function(){
|
content:function(){
|
||||||
'step 0'
|
'step 0'
|
||||||
|
if(!target.countCards('e',function(card){
|
||||||
|
return lib.filter.cardDiscardable(card,target);
|
||||||
|
})){
|
||||||
|
target.damage('thunder');
|
||||||
|
event.finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
target.chooseControl('discard_card','take_damage',function(event,player){
|
target.chooseControl('discard_card','take_damage',function(event,player){
|
||||||
if(get.damageEffect(player,event.player,player,'thunder')>=0){
|
if(get.damageEffect(player,event.player,player,'thunder')>=0){
|
||||||
return 'take_damage';
|
return 'take_damage';
|
||||||
|
|
|
@ -1021,10 +1021,14 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
filterTarget:function(card,player,target){
|
filterTarget:function(card,player,target){
|
||||||
if(player==target) return false;
|
if(player==target) return false;
|
||||||
return (target.countCards('hej')>0);
|
return target.countCards('hej',function(card){
|
||||||
|
return lib.filter.canBeDiscarded(card,player,target);
|
||||||
|
})>0;
|
||||||
},
|
},
|
||||||
content:function(){
|
content:function(){
|
||||||
if(target.countCards('hej')){
|
if(target.countCards('hej',function(card){
|
||||||
|
return lib.filter.canBeDiscarded(card,player,target);
|
||||||
|
})){
|
||||||
player.discardPlayerCard('hej',target,true);
|
player.discardPlayerCard('hej',target,true);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -2582,15 +2582,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
longyi:{
|
longyi:{
|
||||||
mod:{
|
mod:{
|
||||||
maxHandcard:function(player,num){
|
ignoredHandcard:function(card,player){
|
||||||
var hs=player.getCards('h');
|
if(get.color(card)=='black'){
|
||||||
for(var i=0;i<hs.length;i++){
|
return true;
|
||||||
if(get.color(hs[i])=='black'){
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return num;
|
}
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
zhongji:{
|
zhongji:{
|
||||||
|
@ -5138,14 +5134,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
xiaorong:{
|
xiaorong:{
|
||||||
mod:{
|
mod:{
|
||||||
maxHandcard:function(player,num){
|
ignoredHandcard:function(card,player){
|
||||||
var hs=player.getCards('h');
|
if(get.type(card)=='equip'){
|
||||||
for(var i=0;i<hs.length;i++){
|
return true;
|
||||||
if(get.type(hs[i])=='equip'){
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return num;
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
trigger:{player:'phaseEnd'},
|
trigger:{player:'phaseEnd'},
|
||||||
|
|
|
@ -192,6 +192,7 @@ window.noname_character_rank={
|
||||||
'maliang',
|
'maliang',
|
||||||
],
|
],
|
||||||
am:[
|
am:[
|
||||||
|
'caocao',
|
||||||
'gw_oudimu',
|
'gw_oudimu',
|
||||||
'guanyinping',
|
'guanyinping',
|
||||||
'dongyun',
|
'dongyun',
|
||||||
|
@ -318,6 +319,7 @@ window.noname_character_rank={
|
||||||
'liuye',
|
'liuye',
|
||||||
],
|
],
|
||||||
bp:[
|
bp:[
|
||||||
|
'zhenji',
|
||||||
'gw_qigaiwang',
|
'gw_qigaiwang',
|
||||||
'quyi',
|
'quyi',
|
||||||
'wangyun',
|
'wangyun',
|
||||||
|
@ -587,7 +589,6 @@ window.noname_character_rank={
|
||||||
're_lvbu',
|
're_lvbu',
|
||||||
'chendong',
|
'chendong',
|
||||||
'simayi',
|
'simayi',
|
||||||
'zhenji',
|
|
||||||
'ganning',
|
'ganning',
|
||||||
'luxun',
|
'luxun',
|
||||||
'zhangjiao',
|
'zhangjiao',
|
||||||
|
@ -618,7 +619,6 @@ window.noname_character_rank={
|
||||||
'machao',
|
'machao',
|
||||||
're_gongsunzan',
|
're_gongsunzan',
|
||||||
'caohong',
|
'caohong',
|
||||||
'caocao',
|
|
||||||
'lvbu',
|
'lvbu',
|
||||||
'yujin',
|
'yujin',
|
||||||
],
|
],
|
||||||
|
|
|
@ -6381,14 +6381,10 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
content:function(){},
|
content:function(){},
|
||||||
mod:{
|
mod:{
|
||||||
maxHandcard:function(player,num){
|
ignoredHandcard:function(card,player){
|
||||||
var hs=player.getCards('h');
|
if(get.type(card)!='basic'){
|
||||||
for(var i=0;i<hs.length;i++){
|
return true;
|
||||||
if(get.type(hs[i])!='basic'){
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return num;
|
|
||||||
},
|
},
|
||||||
cardDiscardable:function(card,player,name){
|
cardDiscardable:function(card,player,name){
|
||||||
if(name=='phaseDiscard'&&get.type(card)!='basic') return false;
|
if(name=='phaseDiscard'&&get.type(card)!='basic') return false;
|
||||||
|
|
|
@ -4,21 +4,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
name:'standard',
|
name:'standard',
|
||||||
connect:true,
|
connect:true,
|
||||||
character:{
|
character:{
|
||||||
caocao:['male','wei',4,['hujia','jianxiong'],['zhu']],
|
caocao:['male','wei',4,['hujia','xinjianxiong'],['zhu']],
|
||||||
simayi:['male','wei',3,['fankui','guicai']],
|
simayi:['male','wei',3,['fankui','guicai']],
|
||||||
xiahoudun:['male','wei',4,['ganglie']],
|
xiahoudun:['male','wei',4,['ganglie']],
|
||||||
zhangliao:['male','wei',4,['tuxi']],
|
zhangliao:['male','wei',4,['tuxi']],
|
||||||
xuzhu:['male','wei',4,['luoyi']],
|
xuzhu:['male','wei',4,['luoyi']],
|
||||||
guojia:['male','wei',3,['tiandu','yiji']],
|
guojia:['male','wei',3,['tiandu','yiji']],
|
||||||
zhenji:['female','wei',3,['luoshen','qingguo']],
|
zhenji:['female','wei',3,['xinluoshen','qingguo']],
|
||||||
liubei:['male','shu',4,['rende','jijiang'],['zhu']],
|
liubei:['male','shu',4,['rende','jijiang'],['zhu']],
|
||||||
guanyu:['male','shu',4,['wusheng']],
|
guanyu:['male','shu',4,['wusheng']],
|
||||||
zhangfei:['male','shu',4,['paoxiao']],
|
zhangfei:['male','shu',4,['paoxiao']],
|
||||||
zhugeliang:['male','shu',3,['guanxing','kongcheng']],
|
zhugeliang:['male','shu',3,['xinguanxing','kongcheng']],
|
||||||
zhaoyun:['male','shu',4,['longdan']],
|
zhaoyun:['male','shu',4,['longdan']],
|
||||||
machao:['male','shu',4,['mashu','tieji']],
|
machao:['male','shu',4,['mashu','tieji']],
|
||||||
huangyueying:['female','shu',3,['jizhi','qicai']],
|
huangyueying:['female','shu',3,['xinjizhi','xinqicai']],
|
||||||
sunquan:['male','wu',4,['zhiheng','jiuyuan'],['zhu']],
|
sunquan:['male','wu',4,['xinzhiheng','xinjiuyuan'],['zhu']],
|
||||||
ganning:['male','wu',4,['qixi']],
|
ganning:['male','wu',4,['qixi']],
|
||||||
lvmeng:['male','wu',4,['keji']],
|
lvmeng:['male','wu',4,['keji']],
|
||||||
huanggai:['male','wu',4,['kurou']],
|
huanggai:['male','wu',4,['kurou']],
|
||||||
|
@ -28,7 +28,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
sunshangxiang:['female','wu',3,['xiaoji','jieyin']],
|
sunshangxiang:['female','wu',3,['xiaoji','jieyin']],
|
||||||
huatuo:['male','qun',3,['qingnang','jijiu']],
|
huatuo:['male','qun',3,['qingnang','jijiu']],
|
||||||
lvbu:['male','qun',4,['wushuang']],
|
lvbu:['male','qun',4,['wushuang']],
|
||||||
diaochan:['female','qun',3,['lijian','biyue']],
|
diaochan:['female','qun',3,['lijian','xinbiyue']],
|
||||||
},
|
},
|
||||||
characterIntro:{
|
characterIntro:{
|
||||||
liubei:'先主姓刘,讳备,字玄德,涿郡涿县人,汉景帝子中山靖王胜之后也。以仁德治天下。',
|
liubei:'先主姓刘,讳备,字玄德,涿郡涿县人,汉景帝子中山靖王胜之后也。以仁德治天下。',
|
||||||
|
@ -151,6 +151,31 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
xinjianxiong:{
|
||||||
|
audio:'jianxiong',
|
||||||
|
alter:true,
|
||||||
|
trigger:{player:'damageEnd'},
|
||||||
|
filter:function(event,player){
|
||||||
|
return get.itemtype(event.cards)=='cards'&&get.position(event.cards[0])=='d';
|
||||||
|
},
|
||||||
|
content:function(){
|
||||||
|
player.gain(trigger.cards);
|
||||||
|
player.$gain2(trigger.cards);
|
||||||
|
if(get.is.altered('xinjianxiong')){
|
||||||
|
player.draw();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
ai:{
|
||||||
|
maixie:true,
|
||||||
|
maixie_hp:true,
|
||||||
|
effect:{
|
||||||
|
target:function(card,player,target){
|
||||||
|
if(player.hasSkillTag('jueqing',false,target)) return [1,-1];
|
||||||
|
if(get.tag(card,'damage')) return [1,0.55];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
fankui:{
|
fankui:{
|
||||||
audio:2,
|
audio:2,
|
||||||
trigger:{player:'damageEnd'},
|
trigger:{player:'damageEnd'},
|
||||||
|
@ -482,6 +507,67 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
xinluoshen:{
|
||||||
|
audio:'luoshen',
|
||||||
|
alter:true,
|
||||||
|
trigger:{player:'phaseBegin'},
|
||||||
|
frequent:true,
|
||||||
|
content:function(){
|
||||||
|
"step 0"
|
||||||
|
if(event.cards==undefined) event.cards=[];
|
||||||
|
player.judge(function(card){
|
||||||
|
if(get.color(card)=='black') return 1.5;
|
||||||
|
return -1.5;
|
||||||
|
},ui.special);
|
||||||
|
"step 1"
|
||||||
|
if(result.judge>0){
|
||||||
|
event.cards.push(result.card);
|
||||||
|
if(lib.config.autoskilllist.contains('luoshen')){
|
||||||
|
player.chooseBool('是否再次发动【洛神】?');
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event._result={bool:true};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
for(var i=0;i<event.cards.length;i++){
|
||||||
|
if(get.position(event.cards[i])!='s'){
|
||||||
|
event.cards.splice(i,1);i--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
player.gain(event.cards,'gain2');
|
||||||
|
player.storage.xinluoshen=event.cards.slice(0);
|
||||||
|
event.finish();
|
||||||
|
}
|
||||||
|
"step 2"
|
||||||
|
if(result.bool){
|
||||||
|
event.goto(0);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(event.cards.length){
|
||||||
|
player.gain(event.cards,'gain2');
|
||||||
|
player.storage.xinluoshen=event.cards.slice(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mod:{
|
||||||
|
ignoredHandcard:function(card,player){
|
||||||
|
if(get.is.altered('xinluoshen')&&player.storage.xinluoshen&&player.storage.xinluoshen.contains(card)){
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
group:'xinluoshen_clear',
|
||||||
|
subSkill:{
|
||||||
|
clear:{
|
||||||
|
trigger:{player:'phaseAfter'},
|
||||||
|
silent:true,
|
||||||
|
content:function(){
|
||||||
|
delete player.storage.xinluoshen;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
qingguo:{
|
qingguo:{
|
||||||
audio:2,
|
audio:2,
|
||||||
enable:['chooseToRespond'],
|
enable:['chooseToRespond'],
|
||||||
|
@ -792,6 +878,134 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
xinguanxing:{
|
||||||
|
audio:'guanxing',
|
||||||
|
alter:true,
|
||||||
|
trigger:{player:['phaseBegin','phaseEnd']},
|
||||||
|
frequent:true,
|
||||||
|
filter:function(event,player,name){
|
||||||
|
if(name=='phaseEnd'){
|
||||||
|
return player.hasSkill('xinguanxing_on');
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
content:function(){
|
||||||
|
'step 0'
|
||||||
|
if(get.is.altered('xinguanxing')){
|
||||||
|
event.num=game.countPlayer()<4?3:5;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.num=Math.min(5,game.countPlayer());
|
||||||
|
}
|
||||||
|
event.cards=get.cards(event.num);
|
||||||
|
event.chosen=[];
|
||||||
|
event.num1=0;
|
||||||
|
event.num2=0;
|
||||||
|
event.bottom=-1;
|
||||||
|
'step 1'
|
||||||
|
var js=player.getCards('j');
|
||||||
|
var pos;
|
||||||
|
var choice=-1;
|
||||||
|
var getval=function(card,pos){
|
||||||
|
if(js[pos]){
|
||||||
|
return (get.judge(js[pos]))(card);
|
||||||
|
}
|
||||||
|
else if(event.triggername=='phaseEnd'&&get.attitude(player,player.getNext())<=0){
|
||||||
|
return 11.5-get.value(card,player);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
return get.value(card,player);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
event.discard=false;
|
||||||
|
var minval=6;
|
||||||
|
for(pos=0;pos<event.cards.length;pos++){
|
||||||
|
var max=getval(event.cards[pos],pos);
|
||||||
|
for(var j=pos+1;j<event.cards.length;j++){
|
||||||
|
var current=getval(event.cards[j],pos);
|
||||||
|
if(current>max){
|
||||||
|
choice=j;
|
||||||
|
max=current;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(event.bottom<0){
|
||||||
|
if(!js[pos]){
|
||||||
|
if(max<minval){
|
||||||
|
event.bottom=pos;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(max<0){
|
||||||
|
event.bottom=pos;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(event.bottom>=0&&event.bottom<=pos){
|
||||||
|
choice=pos;
|
||||||
|
event.discard=true;break;
|
||||||
|
}
|
||||||
|
if(choice!=-1){
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
player.chooseCardButton('观星:选择要移动的牌',event.cards).set('filterButton',function(button){
|
||||||
|
return !_status.event.chosen.contains(button.link);
|
||||||
|
}).set('chosen',event.chosen).set('ai',function(button){
|
||||||
|
return button.link==_status.event.choice?1:0;
|
||||||
|
}).set('choice',event.cards[choice]);
|
||||||
|
event.pos=pos;
|
||||||
|
'step 2'
|
||||||
|
if(result.bool){
|
||||||
|
var card=result.links[0];
|
||||||
|
var index=event.cards.indexOf(card);
|
||||||
|
event.card=card;
|
||||||
|
event.chosen.push(card);
|
||||||
|
event.cards.remove(event.card);
|
||||||
|
var controlai=event.pos||0;
|
||||||
|
if(event.discard){
|
||||||
|
controlai=event.cards.length+1;
|
||||||
|
}
|
||||||
|
var buttons=event.cards.slice(0);
|
||||||
|
player.chooseControl(function(){
|
||||||
|
return _status.event.controlai;
|
||||||
|
}).set('controlai',controlai).set('sortcard',buttons).set('tosort',card);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.goto(4);
|
||||||
|
}
|
||||||
|
'step 3'
|
||||||
|
if(typeof result.index=='number'){
|
||||||
|
if(result.index>event.cards.length){
|
||||||
|
ui.cardPile.appendChild(event.card);
|
||||||
|
event.num2++;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.cards.splice(result.index,0,event.card);
|
||||||
|
}
|
||||||
|
event.num--;
|
||||||
|
if(event.num>0){
|
||||||
|
event.goto(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'step 4'
|
||||||
|
while(event.cards.length){
|
||||||
|
ui.cardPile.insertBefore(event.cards.pop(),ui.cardPile.firstChild);
|
||||||
|
event.num1++;
|
||||||
|
}
|
||||||
|
var js=player.getCards('j');
|
||||||
|
if(js.length==1){
|
||||||
|
if((get.judge(js[0]))(ui.cardPile.firstChild)<0){
|
||||||
|
player.addTempSkill('guanxing_fail');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
player.popup(get.cnNumber(event.num1)+'上'+get.cnNumber(event.num2)+'下');
|
||||||
|
game.log(player,'将','#y'+get.cnNumber(event.num1)+'张牌','置于牌堆顶,','#y'+get.cnNumber(event.num2)+'张牌','置于牌堆底');
|
||||||
|
if(event.triggername=='phaseBegin'&&get.is.altered('xinguanxing')&&event.num1==0){
|
||||||
|
player.addTempSkill('xinguanxing_on');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
subSkill:{
|
||||||
|
on:{}
|
||||||
|
}
|
||||||
|
},
|
||||||
guanxing:{
|
guanxing:{
|
||||||
audio:2,
|
audio:2,
|
||||||
audioname:['jiangwei'],
|
audioname:['jiangwei'],
|
||||||
|
@ -802,6 +1016,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
event.num=Math.min(5,game.countPlayer());
|
event.num=Math.min(5,game.countPlayer());
|
||||||
event.cards=get.cards(event.num);
|
event.cards=get.cards(event.num);
|
||||||
event.chosen=[];
|
event.chosen=[];
|
||||||
|
event.num1=0;
|
||||||
|
event.num2=0;
|
||||||
'step 1'
|
'step 1'
|
||||||
var js=player.getCards('j');
|
var js=player.getCards('j');
|
||||||
var pos;
|
var pos;
|
||||||
|
@ -852,6 +1068,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
if(typeof result.index=='number'){
|
if(typeof result.index=='number'){
|
||||||
if(result.index>event.cards.length){
|
if(result.index>event.cards.length){
|
||||||
ui.cardPile.appendChild(event.card);
|
ui.cardPile.appendChild(event.card);
|
||||||
|
event.num2++;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
event.cards.splice(result.index,0,event.card);
|
event.cards.splice(result.index,0,event.card);
|
||||||
|
@ -864,6 +1081,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
'step 4'
|
'step 4'
|
||||||
while(event.cards.length){
|
while(event.cards.length){
|
||||||
ui.cardPile.insertBefore(event.cards.pop(),ui.cardPile.firstChild);
|
ui.cardPile.insertBefore(event.cards.pop(),ui.cardPile.firstChild);
|
||||||
|
event.num1++;
|
||||||
}
|
}
|
||||||
var js=player.getCards('j');
|
var js=player.getCards('j');
|
||||||
if(js.length==1){
|
if(js.length==1){
|
||||||
|
@ -871,6 +1089,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
player.addTempSkill('guanxing_fail');
|
player.addTempSkill('guanxing_fail');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
player.popup(get.cnNumber(event.num1)+'上'+get.cnNumber(event.num2)+'下');
|
||||||
|
game.log(player,'将','#y'+get.cnNumber(event.num1)+'张牌','置于牌堆顶,','#y'+get.cnNumber(event.num2)+'张牌','置于牌堆底');
|
||||||
},
|
},
|
||||||
ai:{
|
ai:{
|
||||||
guanxing:true
|
guanxing:true
|
||||||
|
@ -1227,6 +1447,66 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
noautowuxie:true,
|
noautowuxie:true,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
xinjizhi:{
|
||||||
|
audio:'jizhi',
|
||||||
|
trigger:{player:'useCard'},
|
||||||
|
frequent:true,
|
||||||
|
alter:true,
|
||||||
|
filter:function(event){
|
||||||
|
return (get.type(event.card)=='trick'&&event.cards[0]&&event.cards[0]==event.card);
|
||||||
|
},
|
||||||
|
init:function(player){
|
||||||
|
player.storage.xinjizhi=0;
|
||||||
|
},
|
||||||
|
content:function(){
|
||||||
|
'step 0'
|
||||||
|
player.draw();
|
||||||
|
'step 1'
|
||||||
|
if(get.is.altered('xinjizhi')&&get.type(result[0])=='basic'){
|
||||||
|
event.card=result[0];
|
||||||
|
player.chooseBool('是否弃置'+get.translation(event.card)+'并令本回合手牌上限+1?').set('ai',function(evt,player){
|
||||||
|
return _status.currentPhase==player&&player.needsToDiscard(-3)&&_status.event.value<6;
|
||||||
|
}).set('value',get.value(event.card,player));
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.finish();
|
||||||
|
}
|
||||||
|
'step 2'
|
||||||
|
if(result.bool){
|
||||||
|
player.discard(event.card);
|
||||||
|
player.storage.xinjizhi++;
|
||||||
|
if(_status.currentPhase==player){
|
||||||
|
player.markSkill('xinjizhi');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
ai:{
|
||||||
|
threaten:1.4,
|
||||||
|
noautowuxie:true,
|
||||||
|
},
|
||||||
|
mod:{
|
||||||
|
maxHandcard:function(player,num){
|
||||||
|
if(get.is.altered('xinjizhi')&&_status.currentPhase==player){
|
||||||
|
return num+player.storage.xinjizhi;
|
||||||
|
}
|
||||||
|
return num;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
intro:{
|
||||||
|
content:'本回合手牌上限+#'
|
||||||
|
},
|
||||||
|
group:'xinjizhi_clear',
|
||||||
|
subSkill:{
|
||||||
|
clear:{
|
||||||
|
trigger:{global:'phaseAfter'},
|
||||||
|
silent:true,
|
||||||
|
content:function(){
|
||||||
|
player.storage.xinjizhi=0;
|
||||||
|
player.unmarkSkill('xinjizhi');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
qicai:{
|
qicai:{
|
||||||
mod:{
|
mod:{
|
||||||
targetInRange:function(card,player,target,now){
|
targetInRange:function(card,player,target,now){
|
||||||
|
@ -1235,6 +1515,53 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
xinqicai:{
|
||||||
|
alter:true,
|
||||||
|
mod:{
|
||||||
|
targetInRange:function(card,player,target,now){
|
||||||
|
var type=get.type(card);
|
||||||
|
if(type=='trick'||type=='delay') return true;
|
||||||
|
},
|
||||||
|
canBeDiscarded:function(card){
|
||||||
|
if(get.is.altered('xinqicai')&&get.position(card)=='e') return false;
|
||||||
|
},
|
||||||
|
cardDiscardable:function(card){
|
||||||
|
if(get.is.altered('xinqicai')&&get.position(card)=='e') return false;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
xinzhiheng:{
|
||||||
|
audio:'zhiheng',
|
||||||
|
enable:'phaseUse',
|
||||||
|
alter:true,
|
||||||
|
usable:1,
|
||||||
|
position:'he',
|
||||||
|
filterCard:true,
|
||||||
|
selectCard:[1,Infinity],
|
||||||
|
check:function(card){
|
||||||
|
var player=_status.event.player;
|
||||||
|
if(get.is.altered('xinzhiheng')&&get.position(card)=='h'&&!player.countCards('h',function(card){
|
||||||
|
return get.value(card)>=8;
|
||||||
|
})){
|
||||||
|
return 8-get.value(card);
|
||||||
|
}
|
||||||
|
return 6-get.value(card)
|
||||||
|
},
|
||||||
|
content:function(){
|
||||||
|
var num=cards.length;
|
||||||
|
if(get.is.altered('xinzhiheng')&&player.countCards('h')==0){
|
||||||
|
num++;
|
||||||
|
}
|
||||||
|
player.draw(num);
|
||||||
|
},
|
||||||
|
ai:{
|
||||||
|
order:1,
|
||||||
|
result:{
|
||||||
|
player:1
|
||||||
|
},
|
||||||
|
threaten:1.55
|
||||||
|
},
|
||||||
|
},
|
||||||
zhiheng:{
|
zhiheng:{
|
||||||
audio:2,
|
audio:2,
|
||||||
enable:'phaseUse',
|
enable:'phaseUse',
|
||||||
|
@ -1274,6 +1601,63 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
player.recover();
|
player.recover();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
xinjiuyuan:{
|
||||||
|
audio:'jiuyuan',
|
||||||
|
unique:true,
|
||||||
|
alter:true,
|
||||||
|
trigger:{target:'taoBegin'},
|
||||||
|
zhuSkill:true,
|
||||||
|
forced:true,
|
||||||
|
filter:function(event,player){
|
||||||
|
if(get.is.altered('xinjiuyuan')) return false;
|
||||||
|
if(event.player==player) return false;
|
||||||
|
if(!player.hasZhuSkill('jiuyuan')) return false;
|
||||||
|
if(player.hp>0) return false;
|
||||||
|
if(event.player.group!='wu') return false;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
content:function(){
|
||||||
|
player.recover();
|
||||||
|
},
|
||||||
|
global:'xinjiuyuan2',
|
||||||
|
},
|
||||||
|
xinjiuyuan2:{
|
||||||
|
audio:'jiuyuan',
|
||||||
|
forceaudio:true,
|
||||||
|
trigger:{player:'taoBegin'},
|
||||||
|
filter:function(event,player){
|
||||||
|
if(!get.is.altered('xinjiuyuan')) return false;
|
||||||
|
if(player.group!='wu') return false;
|
||||||
|
return game.hasPlayer(function(target){
|
||||||
|
return player!=target&&target.isDamaged()&&target.hp<player.hp&&target.hasZhuSkill('xinjiuyuan',player);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
direct:true,
|
||||||
|
content:function(){
|
||||||
|
'step 0'
|
||||||
|
var list=game.filterPlayer(function(target){
|
||||||
|
return player!=target&&target.isDamaged()&&target.hp<player.hp&&target.hasZhuSkill('xinjiuyuan',player);
|
||||||
|
});
|
||||||
|
list.sortBySeat();
|
||||||
|
event.list=list;
|
||||||
|
'step 1'
|
||||||
|
if(event.list.length){
|
||||||
|
var current=event.list.shift();
|
||||||
|
event.current=current;
|
||||||
|
player.chooseBool(get.prompt('xinjiuyuan',current)).set('choice',get.attitude(player,current)>0);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.finish();
|
||||||
|
}
|
||||||
|
'step 2'
|
||||||
|
if(result.bool){
|
||||||
|
player.logSkill('xinjiuyuan',event.current);
|
||||||
|
event.current.recover();
|
||||||
|
player.draw();
|
||||||
|
}
|
||||||
|
event.goto(1);
|
||||||
|
}
|
||||||
|
},
|
||||||
qixi:{
|
qixi:{
|
||||||
audio:4,
|
audio:4,
|
||||||
enable:'chooseToUse',
|
enable:'chooseToUse',
|
||||||
|
@ -1747,6 +2131,19 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
player.draw();
|
player.draw();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
xinbiyue:{
|
||||||
|
audio:'biyue',
|
||||||
|
trigger:{player:'phaseEnd'},
|
||||||
|
frequent:true,
|
||||||
|
alter:true,
|
||||||
|
content:function(){
|
||||||
|
var num=1;
|
||||||
|
if(get.is.altered('xinbiyue')&&!player.countCards('h')){
|
||||||
|
num=2;
|
||||||
|
}
|
||||||
|
player.draw(num);
|
||||||
|
},
|
||||||
|
}
|
||||||
},
|
},
|
||||||
translate:{
|
translate:{
|
||||||
caocao:'曹操',
|
caocao:'曹操',
|
||||||
|
@ -1777,6 +2174,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
|
|
||||||
hujia:'护驾',
|
hujia:'护驾',
|
||||||
jianxiong:'奸雄',
|
jianxiong:'奸雄',
|
||||||
|
xinjianxiong:'奸雄',
|
||||||
fankui:'反馈',
|
fankui:'反馈',
|
||||||
guicai:'鬼才',
|
guicai:'鬼才',
|
||||||
ganglie:'刚烈',
|
ganglie:'刚烈',
|
||||||
|
@ -1786,6 +2184,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
tiandu:'天妒',
|
tiandu:'天妒',
|
||||||
yiji:'遗计',
|
yiji:'遗计',
|
||||||
luoshen:'洛神',
|
luoshen:'洛神',
|
||||||
|
xinluoshen:'洛神',
|
||||||
qingguo:'倾国',
|
qingguo:'倾国',
|
||||||
rende:'仁德',
|
rende:'仁德',
|
||||||
jijiang:'激将',
|
jijiang:'激将',
|
||||||
|
@ -1824,10 +2223,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
wushuang2:'无双',
|
wushuang2:'无双',
|
||||||
lijian:'离间',
|
lijian:'离间',
|
||||||
biyue:'闭月',
|
biyue:'闭月',
|
||||||
|
xinbiyue:'闭月',
|
||||||
pileTop:'牌堆顶',
|
pileTop:'牌堆顶',
|
||||||
pileBottom:'牌堆底',
|
pileBottom:'牌堆底',
|
||||||
hujia_info:'主公技,魏势力角色可以替你打出[闪]',
|
hujia_info:'主公技,魏势力角色可以替你打出[闪]',
|
||||||
jianxiong_info:'你可以立即获得对你造成伤害的牌',
|
jianxiong_info:'你可以立即获得对你造成伤害的牌',
|
||||||
|
xinjianxiong_info:'你可以立即获得对你造成伤害的牌',
|
||||||
|
xinjianxiong_info_alter:'你可以立即获得对你造成伤害的牌,然后摸一张牌',
|
||||||
fankui_info:'当你受到伤害时,可以获得伤害来源的一张牌',
|
fankui_info:'当你受到伤害时,可以获得伤害来源的一张牌',
|
||||||
guicai_info:'在任意角色的判定牌生效前,你可以打出一张手牌代替之',
|
guicai_info:'在任意角色的判定牌生效前,你可以打出一张手牌代替之',
|
||||||
ganglie_info:'每当你受到一次伤害,可进行一次判定,若结果不为红桃,则伤害来源须弃置两张手牌或受到来自你的一点伤害',
|
ganglie_info:'每当你受到一次伤害,可进行一次判定,若结果不为红桃,则伤害来源须弃置两张手牌或受到来自你的一点伤害',
|
||||||
|
@ -1836,21 +2238,38 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
tiandu_info:'你可以立即获得你的判定牌',
|
tiandu_info:'你可以立即获得你的判定牌',
|
||||||
yiji_info:'每当你受到一点伤害,可以观看牌堆顶的两张牌,并将其交给任意1~2名角色',
|
yiji_info:'每当你受到一点伤害,可以观看牌堆顶的两张牌,并将其交给任意1~2名角色',
|
||||||
luoshen_info:'准备阶段,你可以进行一定判定,若为黑色则可以继续判定,直到出现红色。然后你获得所有黑色的判定牌',
|
luoshen_info:'准备阶段,你可以进行一定判定,若为黑色则可以继续判定,直到出现红色。然后你获得所有黑色的判定牌',
|
||||||
|
xinluoshen_info:'准备阶段,你可以进行一定判定,若为黑色则可以继续判定,直到出现红色。然后你获得所有黑色的判定牌',
|
||||||
|
xinluoshen_info_alter:'准备阶段,你可以进行一定判定,若为黑色则可以继续判定,直到出现红色。然后你获得所有黑色的判定牌。你通过洛神获得的牌,不计入当前回合的手牌上限',
|
||||||
qingguo_info:'你可以将一张黑色手牌当[闪]使用或打出',
|
qingguo_info:'你可以将一张黑色手牌当[闪]使用或打出',
|
||||||
rende_info:'出牌阶段,你可以将任意手牌送给其他角色,若送出的手牌不少于两张,你回复一点体力',
|
rende_info:'出牌阶段,你可以将任意手牌送给其他角色,若送出的手牌不少于两张,你回复一点体力',
|
||||||
jijiang_info:'主公技,蜀势力角色可以帮你使用或打出[杀]',
|
jijiang_info:'主公技,蜀势力角色可以帮你使用或打出[杀]',
|
||||||
wusheng_info:'你可以将一张红色牌当[杀]使用',
|
wusheng_info:'你可以将一张红色牌当[杀]使用',
|
||||||
paoxiao_info:'出牌阶段,你使用[杀]无数量限制',
|
paoxiao_info:'出牌阶段,你使用[杀]无数量限制',
|
||||||
guanxing_info:'准备阶段,你可以观看牌堆顶的x张牌,并将其以任意顺序置于牌堆项或牌堆底,x为存活角色个数且不超过5',
|
guanxing_info:'准备阶段,你可以观看牌堆顶的x张牌,并将其以任意顺序置于牌堆项或牌堆底,x为存活角色个数且不超过5',
|
||||||
|
xinguanxing:'观星',
|
||||||
|
xinguanxing_info:'准备阶段,你可以观看牌堆顶的x张牌,并将其以任意顺序置于牌堆项或牌堆底,x为存活角色个数且不超过5',
|
||||||
|
xinguanxing_info_alter:'准备阶段,你可以观看牌堆顶的5张牌(存活角色小于4时改为3张),并将其以任意顺序置于牌堆项或牌堆底,如果你把观星的牌都放在牌堆底,你可以在结束阶段再进行1次观星',
|
||||||
kongcheng_info:'锁定技,当你没有手牌时,不能成为[杀]或[决斗]的目标',
|
kongcheng_info:'锁定技,当你没有手牌时,不能成为[杀]或[决斗]的目标',
|
||||||
longdan_info:'你可以将[杀]当[闪],或[闪]当[杀]使用或打出',
|
longdan_info:'你可以将[杀]当[闪],或[闪]当[杀]使用或打出',
|
||||||
mashu_info:'锁定技,你的进攻距离+1',
|
mashu_info:'锁定技,你的进攻距离+1',
|
||||||
feiying_info:'锁定技,你的防御距离+1',
|
feiying_info:'锁定技,你的防御距离+1',
|
||||||
tieji_info:'当你使用一张[杀]时,可进行一次判定,若为红色则此[杀]不可闪避',
|
tieji_info:'当你使用一张[杀]时,可进行一次判定,若为红色则此[杀]不可闪避',
|
||||||
jizhi_info:'每当你使用一张非转化的普通锦囊牌,可以摸一张牌',
|
jizhi_info:'每当你使用一张非转化的普通锦囊牌,可以摸一张牌',
|
||||||
|
xinjizhi:'集智',
|
||||||
|
xinjizhi_info:'每当你使用一张非转化的普通锦囊牌,可以摸一张牌',
|
||||||
|
xinjizhi_info_alter:'每当你使用一张非转化的普通锦囊牌,可以摸一张牌,如果摸到的是基本牌,你可以弃置这张牌,然后本回合手牌上限+1',
|
||||||
|
xinqicai:'奇才',
|
||||||
|
xinqicai_info:'锁定技,你使用的锦囊牌无距离限制',
|
||||||
|
xinqicai_info_alter:'锁定技,你使用的锦囊牌无距离限制,你装备区内的牌不能被弃置',
|
||||||
qicai_info:'锁定技,你使用的锦囊牌无距离限制',
|
qicai_info:'锁定技,你使用的锦囊牌无距离限制',
|
||||||
zhiheng_info:'出牌阶段,你可以弃置任意张牌并摸等量的牌,每阶段限1次',
|
zhiheng_info:'出牌阶段,你可以弃置任意张牌并摸等量的牌,每阶段限1次',
|
||||||
|
xinzhiheng:'制衡',
|
||||||
|
xinzhiheng_info:'出牌阶段限1次,你可以弃置任意张牌并摸等量的牌',
|
||||||
|
xinzhiheng_info_alter:'出牌阶段限1次,你可以弃置任意张牌并摸等量的牌,如果在发动制衡时弃置了所有手牌,你额外摸一张牌',
|
||||||
jiuyuan_info:'主公技,锁定技,濒死阶段,吴势力角色对你使用的[桃]额外回复一点体力',
|
jiuyuan_info:'主公技,锁定技,濒死阶段,吴势力角色对你使用的[桃]额外回复一点体力',
|
||||||
|
xinjiuyuan:'救援',
|
||||||
|
xinjiuyuan_info:'主公技,锁定技,濒死阶段,吴势力角色对你使用的[桃]额外回复一点体力',
|
||||||
|
xinjiuyuan_info_alter:'主公技,其他吴国角色对自己使用【桃】时,如果他的体力值大于你,他可以选择让你回复1点体力,然后他摸1张牌',
|
||||||
qixi_info:'你可以将一张黑色牌当[过河拆桥]使用',
|
qixi_info:'你可以将一张黑色牌当[过河拆桥]使用',
|
||||||
keji_info:'若你在出牌阶段没有使用[杀],则可跳过弃牌阶段',
|
keji_info:'若你在出牌阶段没有使用[杀],则可跳过弃牌阶段',
|
||||||
kurou_info:'出牌阶段,你可以流失一点体力并摸两张牌',
|
kurou_info:'出牌阶段,你可以流失一点体力并摸两张牌',
|
||||||
|
@ -1867,6 +2286,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
wushuang_info:'锁定技,你使用的【杀】或【决斗】需要两张【闪】或【杀】响应',
|
wushuang_info:'锁定技,你使用的【杀】或【决斗】需要两张【闪】或【杀】响应',
|
||||||
lijian_info:'出牌阶段,你可以弃一张牌,视为一名男性角色对另一名男性角色使用一张[决斗],每阶段限一次',
|
lijian_info:'出牌阶段,你可以弃一张牌,视为一名男性角色对另一名男性角色使用一张[决斗],每阶段限一次',
|
||||||
biyue_info:'结束阶段,你可以摸一张牌',
|
biyue_info:'结束阶段,你可以摸一张牌',
|
||||||
|
xinbiyue_info:'结束阶段,你可以摸一张牌',
|
||||||
|
xinbiyue_info_alter:'结束阶段,你可以摸一张牌,如果你没有手牌,改为摸2张牌',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -2329,7 +2329,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
order:10,
|
order:10,
|
||||||
result:{
|
result:{
|
||||||
player:function(player){
|
player:function(player){
|
||||||
if(player.countCards('h')<player.getHandcardLimit()){
|
if(!player.needsToDiscard(1)){
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3052,15 +3052,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
|
||||||
},
|
},
|
||||||
fulin2:{
|
fulin2:{
|
||||||
mod:{
|
mod:{
|
||||||
maxHandcard:function(player,num){
|
ignoredHandcard:function(card,player){
|
||||||
if(player.storage.fulin&&player.storage.fulin.length){
|
if(player.storage.fulin&&player.storage.fulin.contains(card)){
|
||||||
var hs=player.getCards('h');
|
return true;
|
||||||
for(var i=0;i<player.storage.fulin.length;i++){
|
|
||||||
if(hs.contains(player.storage.fulin[i])){
|
|
||||||
num++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return num;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
@ -2,7 +2,7 @@ window.config={
|
||||||
forbidai:['miheng','ns_liuzhang'],
|
forbidai:['miheng','ns_liuzhang'],
|
||||||
forbidai_user:[],
|
forbidai_user:[],
|
||||||
forbidall:['xiahouyuan','huangzhong','weiyan','dianwei','zhangjiao',
|
forbidall:['xiahouyuan','huangzhong','weiyan','dianwei','zhangjiao',
|
||||||
'caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu'],
|
're_caocao','simayi','guanyu','zhangfei','zhaoyun','ganning','lvmeng','lvbu'],
|
||||||
forbidversus:['swd_kangnalishi'],
|
forbidversus:['swd_kangnalishi'],
|
||||||
forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','hs_siwangzhiyi',
|
forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','hs_siwangzhiyi',
|
||||||
'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao','hs_xuanzhuanjijia',
|
'gjqt_bailitusu','yuanshao','swd_anka','swd_nicole','daqiao','re_daqiao','hs_xuanzhuanjijia',
|
||||||
|
@ -13,7 +13,7 @@ window.config={
|
||||||
],
|
],
|
||||||
replacecharacter:{
|
replacecharacter:{
|
||||||
zhangjiao:'sp_zhangjiao',
|
zhangjiao:'sp_zhangjiao',
|
||||||
caocao:'re_caocao',
|
re_caocao:'caocao',
|
||||||
simayi:'re_simayi',
|
simayi:'re_simayi',
|
||||||
guanyu:'re_guanyu',
|
guanyu:'re_guanyu',
|
||||||
zhangfei:'re_zhangfei',
|
zhangfei:'re_zhangfei',
|
||||||
|
|
170
game/game.js
170
game/game.js
|
@ -8475,14 +8475,15 @@
|
||||||
var mode=lib.config.all.mode.slice(0);
|
var mode=lib.config.all.mode.slice(0);
|
||||||
mode.remove('connect');
|
mode.remove('connect');
|
||||||
mode.remove('brawl');
|
mode.remove('brawl');
|
||||||
var banned=['yxs_luzhishen','zhenji','shen_guanyu','shen_caocao','zhurong',
|
var banned=['yxs_luzhishen','shen_guanyu','shen_caocao','caopi','re_daqiao',
|
||||||
'daqiao','lingcao','liuzan','lusu','luxun','yanwen','zhouyu','ns_wangyue','gw_yenaifa',
|
'daqiao','lingcao','liuzan','lusu','luxun','yanwen','zhouyu','ns_wangyue','gw_yenaifa',
|
||||||
'old_caozhen','guojia','simayi','sp_pangde','swd_kangnalishi','hs_siwangzhiyi'];
|
'old_caozhen','guojia','simayi','swd_kangnalishi','hs_siwangzhiyi','old_zhuzhi'];
|
||||||
var bannedcards=['zengbin','huoshan','hongshui','guiyoujie','fengyinzhidan','sifeizhenmian'];
|
var bannedcards=['zengbin','huoshan','hongshui','guiyoujie','fengyinzhidan','sifeizhenmian','lebu'];
|
||||||
for(var i=0;i<mode.length;i++){
|
for(var i=0;i<mode.length;i++){
|
||||||
game.saveConfig(mode[i]+'_banned',banned);
|
game.saveConfig(mode[i]+'_banned',banned);
|
||||||
game.saveConfig(mode[i]+'_bannedcards',bannedcards);
|
game.saveConfig(mode[i]+'_bannedcards',bannedcards);
|
||||||
}
|
}
|
||||||
|
game.saveConfig('theme','simple');
|
||||||
game.saveConfig('cards',lib.config.all.cards);
|
game.saveConfig('cards',lib.config.all.cards);
|
||||||
game.saveConfig('characters',lib.config.all.characters);
|
game.saveConfig('characters',lib.config.all.characters);
|
||||||
game.saveConfig('change_skin',false);
|
game.saveConfig('change_skin',false);
|
||||||
|
@ -9998,7 +9999,7 @@
|
||||||
},
|
},
|
||||||
phaseDiscard:function(){
|
phaseDiscard:function(){
|
||||||
"step 0"
|
"step 0"
|
||||||
event.num=player.countCards('h')-player.getHandcardLimit();
|
event.num=player.needsToDiscard();
|
||||||
if(event.num<=0) event.finish();
|
if(event.num<=0) event.finish();
|
||||||
else{
|
else{
|
||||||
if(lib.config.show_phase_prompt){
|
if(lib.config.show_phase_prompt){
|
||||||
|
@ -11434,28 +11435,42 @@
|
||||||
}
|
}
|
||||||
var directh=true;
|
var directh=true;
|
||||||
for(var i=0;i<event.position.length;i++){
|
for(var i=0;i<event.position.length;i++){
|
||||||
if(event.position[i]=='h'&&target.countCards('h')){
|
if(event.position[i]=='h'){
|
||||||
event.dialog.addText('手牌区');
|
var hs=target.getCards('h',function(card){
|
||||||
var hs=target.getCards('h');
|
return lib.filter.canBeDiscarded(card,player,target);
|
||||||
hs.randomSort();
|
});
|
||||||
if(event.visible||target.isUnderControl(true)){
|
if(hs.length){
|
||||||
event.dialog.add(hs);
|
event.dialog.addText('手牌区');
|
||||||
|
hs.randomSort();
|
||||||
|
if(event.visible||target.isUnderControl(true)){
|
||||||
|
event.dialog.add(hs);
|
||||||
|
directh=false;
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
event.dialog.add([hs,'blank']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(event.position[i]=='e'){
|
||||||
|
var es=target.getCards('e',function(card){
|
||||||
|
return lib.filter.canBeDiscarded(card,player,target);
|
||||||
|
});
|
||||||
|
if(es.length){
|
||||||
|
event.dialog.addText('装备区');
|
||||||
|
event.dialog.add(es);
|
||||||
directh=false;
|
directh=false;
|
||||||
}
|
}
|
||||||
else{
|
}
|
||||||
event.dialog.add([hs,'blank']);
|
else if(event.position[i]=='j'){
|
||||||
|
var js=target.getCards('j',function(card){
|
||||||
|
return lib.filter.canBeDiscarded(card,player,target);
|
||||||
|
});
|
||||||
|
if(js.length){
|
||||||
|
event.dialog.addText('判定区');
|
||||||
|
event.dialog.add(js);
|
||||||
|
directh=false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(event.position[i]=='e'&&target.countCards('e')){
|
|
||||||
event.dialog.addText('装备区');
|
|
||||||
event.dialog.add(target.getCards('e'));
|
|
||||||
directh=false;
|
|
||||||
}
|
|
||||||
else if(event.position[i]=='j'&&target.countCards('j')){
|
|
||||||
event.dialog.addText('判定区');
|
|
||||||
event.dialog.add(target.getCards('j'));
|
|
||||||
directh=false;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(event.dialog.buttons.length==0){
|
if(event.dialog.buttons.length==0){
|
||||||
event.finish();
|
event.finish();
|
||||||
|
@ -18327,7 +18342,14 @@
|
||||||
},
|
},
|
||||||
needsToDiscard:function(num){
|
needsToDiscard:function(num){
|
||||||
if(typeof num!='number') num=0;
|
if(typeof num!='number') num=0;
|
||||||
return Math.max(0,num+this.countCards('h')-this.getHandcardLimit());
|
var hs=this.getCards('h');
|
||||||
|
num+=hs.length;
|
||||||
|
for(var i=0;i<hs.length;i++){
|
||||||
|
if(game.checkMod(hs[i],this,false,'ignoredHandcard',this)==true){
|
||||||
|
num--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Math.max(0,num-this.getHandcardLimit());
|
||||||
},
|
},
|
||||||
distanceTo:function(target,method){
|
distanceTo:function(target,method){
|
||||||
return get.distance(this,target,method);
|
return get.distance(this,target,method);
|
||||||
|
@ -21174,7 +21196,6 @@
|
||||||
if(lib.characterFilter[i]&&!lib.characterFilter[i](get.mode())) return true;
|
if(lib.characterFilter[i]&&!lib.characterFilter[i](get.mode())) return true;
|
||||||
if(_status.connectMode){
|
if(_status.connectMode){
|
||||||
if(lib.configOL.banned.contains(i)) return true;
|
if(lib.configOL.banned.contains(i)) return true;
|
||||||
if(lib.config.replacecharacter[i]&&libCharacter&&libCharacter[lib.config.replacecharacter[i]]) return true;
|
|
||||||
var double_character=false;
|
var double_character=false;
|
||||||
if(lib.configOL.mode=='guozhan'){
|
if(lib.configOL.mode=='guozhan'){
|
||||||
double_character=true;
|
double_character=true;
|
||||||
|
@ -21189,6 +21210,7 @@
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(lib.configOL.ban_weak){
|
if(lib.configOL.ban_weak){
|
||||||
|
if(lib.config.replacecharacter[i]&&libCharacter&&libCharacter[lib.config.replacecharacter[i]]) return true;
|
||||||
if(lib.config.forbidall.contains(i)) return true;
|
if(lib.config.forbidall.contains(i)) return true;
|
||||||
if(!double_character&&get.rank(i,true)<=2){
|
if(!double_character&&get.rank(i,true)<=2){
|
||||||
return true;
|
return true;
|
||||||
|
@ -21200,7 +21222,6 @@
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
if(lib.config.banned.contains(i)) return true;
|
if(lib.config.banned.contains(i)) return true;
|
||||||
if(lib.config.replacecharacter[i]&&lib.character[lib.config.replacecharacter[i]]) return true;
|
|
||||||
var double_character=false;
|
var double_character=false;
|
||||||
if(get.mode()=='guozhan'){
|
if(get.mode()=='guozhan'){
|
||||||
double_character=true;
|
double_character=true;
|
||||||
|
@ -21215,6 +21236,7 @@
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if(get.config('ban_weak')){
|
if(get.config('ban_weak')){
|
||||||
|
if(lib.config.replacecharacter[i]&&lib.character[lib.config.replacecharacter[i]]) return true;
|
||||||
if(lib.config.forbidall.contains(i)) return true;
|
if(lib.config.forbidall.contains(i)) return true;
|
||||||
if(!double_character&&get.rank(i,true)<=2){
|
if(!double_character&&get.rank(i,true)<=2){
|
||||||
return true;
|
return true;
|
||||||
|
@ -21294,6 +21316,12 @@
|
||||||
if(mod!='unchanged') return mod;
|
if(mod!='unchanged') return mod;
|
||||||
return true;
|
return true;
|
||||||
},
|
},
|
||||||
|
canBeDiscarded:function(card,player,target,event){
|
||||||
|
event=event||_status.event;
|
||||||
|
var mod=game.checkMod(card,player,target,event.getParent().name,'unchanged','canBeDiscarded',target);
|
||||||
|
if(mod!='unchanged') return mod;
|
||||||
|
return true;
|
||||||
|
},
|
||||||
cardAiIncluded:function(card){
|
cardAiIncluded:function(card){
|
||||||
if(_status.event.isMine()) return true;
|
if(_status.event.isMine()) return true;
|
||||||
return (_status.event._aiexclude.contains(card)==false);
|
return (_status.event._aiexclude.contains(card)==false);
|
||||||
|
@ -30169,6 +30197,27 @@
|
||||||
|
|
||||||
ui.window.appendChild(layer);
|
ui.window.appendChild(layer);
|
||||||
},
|
},
|
||||||
|
identitycircle:function(list,target){
|
||||||
|
var container=ui.create.div('.identitycircle.menubg',target);
|
||||||
|
var circle=ui.create.div(container);
|
||||||
|
container.dataset.num=list.length;
|
||||||
|
for(var i=0;i<list.length;i++){
|
||||||
|
var sec1=ui.create.div(circle);
|
||||||
|
sec1.dataset.color=list[i];
|
||||||
|
var sec2=ui.create.div(circle);
|
||||||
|
sec2.dataset.color=list[i];
|
||||||
|
var deg1=360/list.length*i;
|
||||||
|
var deg2=0;
|
||||||
|
if(list.length==2){
|
||||||
|
deg2=90;
|
||||||
|
}
|
||||||
|
else if(list.length==3){
|
||||||
|
deg2=30;
|
||||||
|
}
|
||||||
|
sec1.style.transform='rotate('+deg1+'deg)';
|
||||||
|
sec2.style.transform='rotate('+(deg1+deg2)+'deg)';
|
||||||
|
}
|
||||||
|
},
|
||||||
chat:function(){
|
chat:function(){
|
||||||
var chat=ui.create.system('聊天',null,true);
|
var chat=ui.create.system('聊天',null,true);
|
||||||
ui.chatButton=chat;
|
ui.chatButton=chat;
|
||||||
|
@ -32157,10 +32206,10 @@
|
||||||
page.appendChild(cfgnode);
|
page.appendChild(cfgnode);
|
||||||
if(alterableCharacters.length){
|
if(alterableCharacters.length){
|
||||||
var cfgnode2=createConfig({
|
var cfgnode2=createConfig({
|
||||||
name:'平衡强度',
|
name:'新版替换',
|
||||||
_name:mode,
|
_name:mode,
|
||||||
init:charactersToAlter.length==0,
|
init:charactersToAlter.length==0,
|
||||||
intro:'以下武将将被削弱:'+get.translation(alterableCharacters),
|
intro:'以下武将将被修改:'+get.translation(alterableCharacters),
|
||||||
onclick:function(bool){
|
onclick:function(bool){
|
||||||
if(bool){
|
if(bool){
|
||||||
for(var i=0;i<alterableSkills.length;i++){
|
for(var i=0;i<alterableSkills.length;i++){
|
||||||
|
@ -39138,6 +39187,31 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
click:{
|
click:{
|
||||||
|
identitycircle:function(){
|
||||||
|
var list=[];
|
||||||
|
this.classList.toggle('transparent');
|
||||||
|
for(var i=0;i<this.parentNode.childNodes.length;i++){
|
||||||
|
if(!this.parentNode.childNodes[i].classList.contains('transparent')){
|
||||||
|
list.add(this.parentNode.childNodes[i].link[2]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var info=this.link;
|
||||||
|
if(list.length==1){
|
||||||
|
for(var i=0;i<this.parentNode.childNodes.length;i++){
|
||||||
|
if(!this.parentNode.childNodes[i].classList.contains('transparent')){
|
||||||
|
var info2=this.parentNode.childNodes[i].link;
|
||||||
|
info[0].firstChild.innerHTML=info2[1];
|
||||||
|
info[0].dataset.color=info2[2];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
info[0].firstChild.innerHTML='';
|
||||||
|
info[0].dataset.color='';
|
||||||
|
ui.create.identitycircle(list,info[0].firstChild);
|
||||||
|
}
|
||||||
|
this._source._guozhanguess=list;
|
||||||
|
},
|
||||||
connectEvents:function(){
|
connectEvents:function(){
|
||||||
if(this.info){
|
if(this.info){
|
||||||
var button=this;
|
var button=this;
|
||||||
|
@ -39725,7 +39799,7 @@
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
identity:function(){
|
identity:function(e){
|
||||||
if(_status.dragged) return;
|
if(_status.dragged) return;
|
||||||
_status.clicked=true;
|
_status.clicked=true;
|
||||||
if(!game.getIdentityList) return;
|
if(!game.getIdentityList) return;
|
||||||
|
@ -39758,6 +39832,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
if(get.mode()=='guozhan'){
|
||||||
|
list={wei:'魏',shu:'蜀',wu:'吴',qun:'群'};
|
||||||
|
}
|
||||||
var list2=get.copy(list);
|
var list2=get.copy(list);
|
||||||
if(game.getIdentityList2){
|
if(game.getIdentityList2){
|
||||||
game.getIdentityList2(list2);
|
game.getIdentityList2(list2);
|
||||||
|
@ -39795,35 +39872,8 @@
|
||||||
node.classList.add('transparent');
|
node.classList.add('transparent');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
node.listen(function(){
|
node._source=source;
|
||||||
var list=[];
|
node.listen(ui.click.identitycircle);
|
||||||
if(this.link[2]!='unknown'){
|
|
||||||
this.classList.toggle('transparent');
|
|
||||||
if(!this.classList.contains('transparent')){
|
|
||||||
var info=this.link;
|
|
||||||
info[0].firstChild.innerHTML=info[1];
|
|
||||||
info[0].dataset.color=info[2];
|
|
||||||
list.add(info[2]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else{
|
|
||||||
var info=this.link;
|
|
||||||
info[0].firstChild.innerHTML=info[1];
|
|
||||||
info[0].dataset.color=info[2];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
for(var i=0;i<this.parentNode.childNodes.length;i++){
|
|
||||||
if(!this.parentNode.childNodes[i].classList.contains('transparent')){
|
|
||||||
var info=this.parentNode.childNodes[i].link;
|
|
||||||
if(!list.length){
|
|
||||||
info[0].firstChild.innerHTML=info[1];
|
|
||||||
info[0].dataset.color=info[2];
|
|
||||||
}
|
|
||||||
list.add(info[2]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
source._guozhanguess=list;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
node.listen(function(){
|
node.listen(function(){
|
||||||
|
@ -39839,10 +39889,7 @@
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
ui.click.touchpop();
|
ui.click.touchpop();
|
||||||
ui.click.intro.call(this,{
|
ui.click.intro.call(this,e);
|
||||||
clientX:rect.left+rect.width/2,
|
|
||||||
clientY:rect.top+rect.height/2+30
|
|
||||||
});
|
|
||||||
// var nodes=[];
|
// var nodes=[];
|
||||||
// _status.clickingidentity=[this.parentNode,nodes];
|
// _status.clickingidentity=[this.parentNode,nodes];
|
||||||
// var num=1;
|
// var num=1;
|
||||||
|
@ -43058,6 +43105,7 @@
|
||||||
jun:function(name){
|
jun:function(name){
|
||||||
if(get.mode()=='guozhan'){
|
if(get.mode()=='guozhan'){
|
||||||
if(name&&typeof name=='object'){
|
if(name&&typeof name=='object'){
|
||||||
|
if(name.isUnseen&&name.isUnseen(0)) return false;
|
||||||
name=name.name1;
|
name=name.name1;
|
||||||
}
|
}
|
||||||
if(typeof name=='string'&&name.indexOf('gz_jun_')==0){
|
if(typeof name=='string'&&name.indexOf('gz_jun_')==0){
|
||||||
|
|
|
@ -1,13 +1,28 @@
|
||||||
window.noname_update={
|
window.noname_update={
|
||||||
version:'1.9.52.1',
|
version:'1.9.53',
|
||||||
update:'1.9.52',
|
update:'1.9.52.1',
|
||||||
changeLog:[
|
changeLog:[
|
||||||
'bug修复(李丰、赵襄、鲁芝、左慈)'
|
'国战标身份改进、bug修复',
|
||||||
|
'新版标准武将(需在武将菜单中手动开启)'
|
||||||
|
],
|
||||||
|
players:[
|
||||||
|
'caocao',
|
||||||
|
'huangyueying',
|
||||||
|
'zhenji',
|
||||||
|
'sunquan',
|
||||||
|
'zhugeliang',
|
||||||
|
'diaochan'
|
||||||
],
|
],
|
||||||
files:[
|
files:[
|
||||||
'character/shenhua.js',
|
'card/guozhan.js',
|
||||||
|
'card/standard.js',
|
||||||
|
'character/hearth.js',
|
||||||
|
'character/rank.js',
|
||||||
'character/sp.js',
|
'character/sp.js',
|
||||||
'game/directory.js',
|
'character/standard.js',
|
||||||
'game/game.js'
|
'character/yijiang.js',
|
||||||
|
'game/config.js',
|
||||||
|
'game/game.js',
|
||||||
|
'layout/default/layout.css'
|
||||||
]
|
]
|
||||||
};
|
};
|
|
@ -2566,6 +2566,48 @@ div:not(.handcards)>.card>.info>span,
|
||||||
top: 2px;
|
top: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.identity .identitycircle {
|
||||||
|
position: relative;
|
||||||
|
width: 20px;
|
||||||
|
height: 20px;
|
||||||
|
left: 1px;
|
||||||
|
top: 1px;
|
||||||
|
border-radius: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div {
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
left: 1px;
|
||||||
|
top: 1px;
|
||||||
|
border-radius: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div > div {
|
||||||
|
width: 9px;
|
||||||
|
height: 9px;
|
||||||
|
left: 9px;
|
||||||
|
top: 0px;
|
||||||
|
transform-origin: bottom left;
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div > div[data-color='wei'] {
|
||||||
|
background-image: radial-gradient(circle at bottom left, rgb(157, 198, 255), rgb(117, 147, 189))
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div > div[data-color='shu'] {
|
||||||
|
background-image: radial-gradient(circle at bottom left, rgb(185, 72, 36), rgb(158, 62, 31))
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div > div[data-color='wu'] {
|
||||||
|
background-image: radial-gradient(circle at bottom left, rgb(120, 218, 83), rgb(104, 189, 73))
|
||||||
|
}
|
||||||
|
|
||||||
|
.identitycircle > div > div[data-color='qun'] {
|
||||||
|
background-image: radial-gradient(circle at bottom left, rgb(255, 218, 71), rgb(224, 191, 62))
|
||||||
|
}
|
||||||
|
|
||||||
.unseen>.avatar,.unseen>.name:not(.name2),
|
.unseen>.avatar,.unseen>.name:not(.name2),
|
||||||
.unseen2>.avatar2,.unseen2>.name2 {
|
.unseen2>.avatar2,.unseen2>.name2 {
|
||||||
opacity: 0 !important;
|
opacity: 0 !important;
|
||||||
|
|
Loading…
Reference in New Issue