Merge pull request #426 from copcap/dev-bugfix1

bug修复
This commit is contained in:
Spmario233 2023-09-30 02:05:29 +08:00 committed by GitHub
commit 0ad24cf43a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 9 deletions

View File

@ -4825,7 +4825,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 10*Math.sqrt(Math.max(0.01,get.threaten(target)))/(3.5-draw)+dis/(2*game.countPlayer());
}
else{
if(target.isTurnedOver()) return -att-draw;
if(target.isTurnedOver()) return att-draw;
if(draw>=5) return -1;
if(current&&target.getSeatNum()<=current.getSeatNum()) return -att+draw/3;
return (4.25-draw)*10*Math.sqrt(Math.max(0.01,get.threaten(target)))+2*game.countPlayer()/dis;

View File

@ -711,6 +711,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},'hs');
},
groupSkill:true,
locked:false,
viewAs:{
name:'sha',
storage:{jsrgxianzhu:true},

View File

@ -4700,7 +4700,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
return 10*Math.sqrt(Math.max(0.01,get.threaten(target)))/(3.5-draw)+dis/(2*game.countPlayer());
}
else{
if(target.isTurnedOver()) return -att-draw;
if(target.isTurnedOver()) return att-draw;
if(draw>=5) return -1;
if(current&&target.getSeatNum()<=current.getSeatNum()) return -att+draw/3;
return (4.25-draw)*10*Math.sqrt(Math.max(0.01,get.threaten(target)))+2*game.countPlayer()/dis;

View File

@ -28963,29 +28963,37 @@
if(Array.isArray(card)){
if(card[2]=='huosha'){
card[2]='sha';
card[3]=['fire'];
card[3]='fire';
}
else if(card[2]=='leisha'){
card[2]='sha';
card[3]=['thunder'];
card[3]='thunder';
}
// else if(card[2]=='kamisha'){
// card[2]='sha';
// card[3]=['kami'];
// card[3]='kami';
// }
// else if(card[2]=='icesha'){
// card[2]='sha';
// card[3]=['ice'];
// card[3]='ice';
// }
else if(card[2]=='cisha'){
card[2]='sha';
card[3]=['stab'];
card[3]='stab';
}
else if(card[2].length>3){
let prefix=card[2].slice(0,card[2].lastIndexOf('sha'));
if(prefix.length+3==card[2].length){
if(lib.nature.has(prefix)){
if(prefix.length+3==card[2].length){
card[2]='sha';
card[3]=prefix;
}
}
if(card[2].indexOf('sha_')==0){
let suffix=card[2].slice(4);
let natureList=suffix.split('_');
card[2]='sha';
card[3]=[prefix];
card[3]=get.nature(natureList);
}
}
}