v1.9.101.1

This commit is contained in:
Spmario233 2020-08-15 08:50:57 +08:00 committed by GitHub
parent ef51702769
commit 314cddd11b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 33 deletions

View File

@ -4369,13 +4369,17 @@ game.import('character',function(lib,game,ui,get,ai,_status){
content:function(){
'step 0'
var str='令一名其他角色交给你一张牌';
if(player.storage.choulve){
str+='若其如此做,视为你使用【'+get.translation(player.storage.choulve)+'】';
var history=player.getAllHistory('damage',function(evt){
return evt.card&&evt.card.name&&lib.card[evt.card.name];
})
if(history.length) event.cardname=history[history.length-1].card.name;
if(event.cardname){
str+='若其如此做,视为你使用【'+get.translation(event.cardname)+'】';
}
var goon=true;
if(player.storage.choulve){
if(event.cardname){
goon=game.hasPlayer(function(current){
return player.canUse(player.storage.choulve,current)&&get.effect(current,player.storage.choulve,player,player)>0;
return player.canUse(event.cardname,current)&&get.effect(current,{name:event.cardname},player,player)>0;
});
}
player.chooseTarget(get.prompt('choulve'),str,function(card,player,target){
@ -4393,8 +4397,8 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var target=result.targets[0];
player.logSkill('choulve',target);
target.chooseCard('he','是否交给'+get.translation(player)+'一张牌?',
player.storage.choulve?('若如此做,视为'+get.translation(player)+
'使用【'+get.translation(player.storage.choulve)+'】'):null).set('ai',function(card){
event.cardname?('若如此做,视为'+get.translation(player)+
'使用【'+get.translation(event.cardname)+'】'):null).set('ai',function(card){
if(_status.event.goon) return 7-get.value(card);
return 0;
}).set('goon',get.attitude(target,player)>1);
@ -4406,23 +4410,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
'step 2'
if(result.bool){
event.target.give(result.cards,player);
if(player.storage.choulve){
player.chooseUseTarget(player.storage.choulve,true,false);
if(event.cardname){
player.chooseUseTarget(event.cardname,true,false);
}
}
},
group:'choulve_damage',
subSkill:{
damage:{
trigger:{player:'damageEnd'},
silent:true,
content:function(){
if(trigger.card&&get.info(trigger.card).enable&&get.type(trigger.card)!='delay'){
player.storage.choulve={name:trigger.card.name};
}
}
}
}
},
polu:{
audio:2,
@ -5063,7 +5055,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
trigger:{global:'phaseZhunbeiBegin'},
direct:true,
filter:function(event,player){
return event.player.isAlive()&event.player.countCards('e')&&
return event.player.isAlive()&&event.player.countCards('e')>0&&
lib.filter.targetEnabled({name:'sha'},player,event.player)&&(player.hasSha()||_status.connectMode&&player.countCards('h')>0);
},
content:function(){

View File

@ -200,6 +200,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
//kaisa:["male","western",4,["zhengfu"]],
},
characterIntro:{
zhangling:'张道陵34年2月22日—156年字辅汉原名陵道教正一道实际创立者汉朝东汉时期丰邑今江苏徐州丰县人。太上老君降临蜀地“授以三天正法命为天师”张道陵整合当时的黄老派、方仙道、文始派等先秦修道团体创立道教称正一盟威之道。后世尊称为“老祖天师”、“正一真人”、“三天扶教大法师”、高明上帝、张天师。著作《老子想尔注》弟子有3000多人设立24治奠基天师道。张道陵、葛玄、许逊、萨守坚合称四大天师。张道陵创建道教的背景当时在巴蜀一带原有巴人信奉原始巫教大规模的淫祀而害民。而这些祀奉鬼妖学名为妖邪的法教巫师聚众敛财无恶不作。张天师携王长、赵升二位弟子和黄帝九鼎丹经来到北邙山修行平定了那些祸害百姓的巫妖之教。川渝一带流传的张天师以太上老君剑印符箓大破鬼兵的故事就是以此为原型的。',
caiyang:'蔡阳201年又作蔡扬东汉丞相曹操部下武将汝南太守。于建安六年201奉曹操之命攻击与刘备联合的汝南贼龚都等人兵败被刘备所杀。明代小说《三国演义》改编为“云长擂鼓斩蔡阳”。',
pujing:'湖北省当阳境内有一座山,名叫玉泉山。东汉建安末年,山上住着一个老和尚,法名普净,普净原来是沂水关镇国寺方丈,后因云游天下,来到此处,风这地方山明水秀,就于山中结草为庵,每天坐禅参道,身边只有一个小和尚,外出化一些斋饭,供养师父。在《三国演义》中,当关羽通过汜水关时,正是由于普净提醒,关羽才揭穿了卞喜的阴谋,并杀死了卞喜。关羽死后,其怨魂亦在普净的指点下醒悟,放下了心中的仇恨,专心致力于造福一方百姓。',
huban:'为《三国演义》所杜撰的人物,正史无记载,荥阳太守王植麾下从事、桓帝时议郎胡华之子。关羽过五关斩六将时其中一关就是王植所镇守,胡班奉命放火夜袭关公,因敬服公之气概,并得其父托公所带家书,班看毕,叹曰:“险些误杀忠良!”故将之放走。胡班到荆州来投降关公,公念其旧日相救之情,甚爱之;令随费诗入川,见汉中王受爵。费诗辞别关公,带了胡班,自回蜀中去了。',
@ -19345,6 +19346,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
chenggong_info:'当有角色使用牌指定目标后若此牌对目标数大于1则你可令使用者摸一张牌。',
caiyang:'蔡阳',
yinka:'印卡',
zhangling:'张陵',
sp_default:"常规",
sp_whlw:"文和乱武",

View File

@ -1,26 +1,25 @@
window.noname_update={
version:'1.9.101',
update:'1.9.100.7.1',
version:'1.9.101.1',
update:'1.9.101',
changeLog:[
'千里单骑(乱斗)',
'bug修复',
],
files:[
//'card/extra.js',
//'card/huanlekapai.js',
'card/sp.js',
'card/standard.js',
//'card/sp.js',
//'card/standard.js',
//'card/swd.js',
//'card/mtg.js',
'card/gujian.js',
'card/guozhan.js',
'card/gwent.js',
//'card/gujian.js',
//'card/guozhan.js',
//'card/gwent.js',
//'card/yunchou.js',
//'card/zhenfa.js',
//'card/zhulu.js',
//'character/diy.js',
'character/extra.js',
//'character/extra.js',
//'character/hearth.js',
//'character/gujian.js',
//'character/gwent.js',
@ -36,7 +35,7 @@ window.noname_update={
//'character/swd.js',
//'character/xianjian.js',
//'character/xinghuoliaoyuan.js',
'character/yijiang.js',
//'character/yijiang.js',
//'character/yxs.js',
//'extension/boss/extension.js',
//'layout/default/layout.css',

View File

@ -2534,7 +2534,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
game.zhu.draw();
}],
['摸三张牌',function(){
game.zhu.recover();
game.zhu.draw(3);
}],
['将一张防具牌置入装备区并摸一张牌',function(){
var card=get.cardPile(function(card){
@ -2585,8 +2585,9 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
['弃置所有手牌并于下一关获得【涅槃】(标)',function(){
var hs=game.zhu.getCards('h');
if(hs.length) game.zhu.discard(hs);
game.zhu.addTempSkill('oldniepan','dieBegin');
game.zhu.addSkill('oldniepan');
game.zhu.restoreSkill('oldniepan');
game.zhu._oldniepan=true;
}],
['获得两张锦囊牌',function(){
var list=[];
@ -2649,6 +2650,10 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
],
replace_character:function(){
'step 0'
if(game.zhu._oldniepan){
game.zhu.removeSkill('oldniepan');
delete game.zhu._oldniepan;
}
_status.qianlidanji.completeNumber++;
if(!lib.config.qianlidanji_level||lib.config.qianlidanji_level<_status.qianlidanji.completeNumber){
lib.config.qianlidanji_level=_status.qianlidanji.completeNumber;