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

こんなにも美しい嘘じゃない本当の仆らをありがとう

This commit is contained in:
Spmario233 2020-04-06 14:23:59 +08:00 committed by GitHub
parent 507aed218e
commit d8e2b19760
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
audio/skill/jianshu1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/jianshu2.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/yongdi1.mp3 Normal file
View File

Binary file not shown.

BIN
audio/skill/yongdi2.mp3 Normal file
View File

Binary file not shown.

2
character/diy.js
View File

@ -98,7 +98,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
diy:{ diy:{
diy_tieba:["diy_wenyang","ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua","ns_zhangwei"], diy_tieba:["diy_wenyang","ns_zuoci","ns_lvzhi","ns_wangyun","ns_nanhua","ns_nanhua_left","ns_nanhua_right","ns_huamulan","ns_huangzu","ns_jinke","ns_yanliang","ns_wenchou","ns_caocao","ns_caocaosp","ns_zhugeliang","ns_wangyue","ns_yuji","ns_xinxianying","ns_guanlu","ns_simazhao","ns_sunjian","ns_duangui","ns_zhangbao","ns_masu","ns_zhangxiu","ns_lvmeng","ns_shenpei","ns_yujisp","ns_yangyi","ns_liuzhang","ns_xinnanhua","ns_zhangwei"],
diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"], diy_default:["diy_feishi","diy_liuyan","diy_yuji","diy_caiwenji","diy_lukang","diy_zhenji","diy_liufu","diy_xizhenxihong","diy_liuzan","diy_zaozhirenjun","diy_yangyi","diy_tianyu"],
diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa"], diy_key:["key_lucia","key_kyousuke","key_yuri","key_haruko","key_kagari","key_umi","key_rei","key_komari","key_yukine","key_yusa","key_misa","key_masato","key_iwasawa","key_kengo"],
}, },
}, },
characterIntro:{ characterIntro:{

4
character/refresh.js
View File

@ -2600,7 +2600,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(event.dialog) event.dialog.close(); if(event.dialog) event.dialog.close();
if(event.control) event.control.close(); if(event.control) event.control.close();
var top=[]; var top=[];
var judges=player.node.judges.childNodes; var judges=player.getCards('j');
var stopped=false; var stopped=false;
if(!player.hasWuxie()){ if(!player.hasWuxie()){
for(var i=0;i<judges.length;i++){ for(var i=0;i<judges.length;i++){
@ -5448,7 +5448,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
rejinjiu3:'禁酒', rejinjiu3:'禁酒',
ol_xiahouyuan:'界夏侯渊', ol_xiahouyuan:'界夏侯渊',
shebian:'设变', shebian:'设变',
shebian_info:'当你的武将牌翻面后，你可以移动场上的一张牌。', shebian_info:'当你的武将牌翻面后，你可以移动场上的一张装备牌。',
cangzhuo:'藏拙', cangzhuo:'藏拙',
cangzhuo_info:'弃牌阶段开始时，若你本回合内没有使用过锦囊牌，则你的锦囊牌不计入手牌上限。', cangzhuo_info:'弃牌阶段开始时，若你本回合内没有使用过锦囊牌，则你的锦囊牌不计入手牌上限。',

1
character/shenhua.js
View File

@ -6390,6 +6390,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
ai:{ ai:{
save:true, save:true,
mingzhi:true,
skillTagFilter:function(player){ skillTagFilter:function(player){
if(player.hp>0) return false; if(player.hp>0) return false;
}, },

5
character/sp.js
View File

@ -1164,10 +1164,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}, },
}, },
//花鬘 //花鬘
manyi:{audio:2},
hmmanyi:{ hmmanyi:{
trigger:{target:'useCardToBefore'}, trigger:{target:'useCardToBefore'},
forced:true, forced:true,
audio:2, audio:'manyi',
filter:function(event,player){ filter:function(event,player){
return event.card.name=='nanman'; return event.card.name=='nanman';
}, },
@ -8352,7 +8353,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
list.push('cancel2'); list.push('cancel2');
if(list.length){ if(list.length){
player.chooseControl(list).set('prompt',get.prompt2('xinzhengnan')).set('ai',function(){ player.chooseControl(list).set('prompt',get.prompt2('xinzhengnan')).set('ai',function(){
if(list.contains('new_rewusheng')) return 1; if(list.contains('xindangxian')) return 'xindangxian';
return 0; return 0;
}); });
} }

2
character/standard.js
View File

@ -1175,7 +1175,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(event.dialog) event.dialog.close(); if(event.dialog) event.dialog.close();
if(event.control) event.control.close(); if(event.control) event.control.close();
var top=[]; var top=[];
var judges=player.node.judges.childNodes; var judges=player.getCards('j');
var stopped=false; var stopped=false;
if(!player.hasWuxie()){ if(!player.hasWuxie()){
for(var i=0;i<judges.length;i++){ for(var i=0;i<judges.length;i++){

2
character/yijiang.js
View File

@ -3482,12 +3482,14 @@ game.import('character',function(lib,game,ui,get,ai,_status){
popup:false, popup:false,
audio:false, audio:false,
content:function(){ content:function(){
"step 0"
if(player.storage.xinsidi4.isAlive()&&!player.getHistory('useCard',function(evt){ if(player.storage.xinsidi4.isAlive()&&!player.getHistory('useCard',function(evt){
return evt.card.name=='sha'; return evt.card.name=='sha';
}).length&&player.storage.xinsidi4.canUse({name:'sha',isCard:true},player,false)){ }).length&&player.storage.xinsidi4.canUse({name:'sha',isCard:true},player,false)){
player.storage.xinsidi4.logSkill('xinsidi',player); player.storage.xinsidi4.logSkill('xinsidi',player);
player.storage.xinsidi4.useCard({name:'sha',isCard:true},player); player.storage.xinsidi4.useCard({name:'sha',isCard:true},player);
} }
"step 1"
delete player.storage.xinsidi2; delete player.storage.xinsidi2;
delete player.storage.xinsidi3; delete player.storage.xinsidi3;
delete player.storage.xinsidi4; delete player.storage.xinsidi4;

4
game/asset.js
View File

@ -2383,6 +2383,10 @@ window.noname_asset_list=[
'audio/skill/shebian2.mp3', 'audio/skill/shebian2.mp3',
'audio/skill/shensu1_ol_xiahouyuan1.mp3', 'audio/skill/shensu1_ol_xiahouyuan1.mp3',
'audio/skill/shensu1_ol_xiahouyuan2.mp3', 'audio/skill/shensu1_ol_xiahouyuan2.mp3',
'audio/skill/jianshu1.mp3',
'audio/skill/jianshu2.mp3',
'audio/skill/yongdi1.mp3',
'audio/skill/yongdi2.mp3',
'font/huangcao.ttf', 'font/huangcao.ttf',
'font/shousha.ttf', 'font/shousha.ttf',

2
game/game.js
View File

@ -20958,7 +20958,7 @@
} }
var range=get.subtype(name); var range=get.subtype(name);
if(this.isDisabled(range)) return false; if(this.isDisabled(range)) return false;
if(['equip3','equip4'].contains(range)&&!this.isEmpty(6)) return false; if(['equip3','equip4'].contains(range)&&!this.isDisabled(6)) return false;
if(!replace&&!this.isEmpty(range)) return false; if(!replace&&!this.isEmpty(range)) return false;
return true; return true;
}, },

12
game/update.js
View File

@ -1,6 +1,6 @@
window.noname_update={ window.noname_update={
version:'1.9.98.5', version:'1.9.98.5.1',
update:'1.9.98.4.5', update:'1.9.98.5',
changeLog:[ changeLog:[
'The final...「My Song」...', 'The final...「My Song」...',
], ],
@ -8,7 +8,7 @@ window.noname_update={
//'card/extra.js', //'card/extra.js',
//'card/huanlekapai.js', //'card/huanlekapai.js',
//'card/sp.js', //'card/sp.js',
'card/standard.js', //'card/standard.js',
//'card/swd.js', //'card/swd.js',
//'card/mtg.js', //'card/mtg.js',
//'card/guozhan.js', //'card/guozhan.js',
@ -22,14 +22,14 @@ window.noname_update={
//'character/gujian.js', //'character/gujian.js',
//'character/gwent.js', //'character/gwent.js',
//'character/hearth.js', //'character/hearth.js',
'character/mobile.js', //'character/mobile.js',
//'character/mtg.js', //'character/mtg.js',
'character/old.js', //'character/old.js',
'character/refresh.js', 'character/refresh.js',
'character/shenhua.js', 'character/shenhua.js',
'character/sp.js', 'character/sp.js',
//'character/tw.js', //'character/tw.js',
//'character/standard.js', 'character/standard.js',
//'character/swd.js', //'character/swd.js',
//'character/xianjian.js', //'character/xianjian.js',
//'character/xinghuoliaoyuan.js', //'character/xinghuoliaoyuan.js',

10
mode/guozhan.js
View File

@ -457,7 +457,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var list=[ var list=[
'sha','tao','jiu', 'sha','tao','jiu',
'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman', 'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman',
'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi' 'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi','yiyi'
]; ];
var list2=[]; var list2=[];
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
@ -2609,7 +2609,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
skillAnimation:true, skillAnimation:true,
animationColor:'wood', animationColor:'wood',
audio:"hunshang", audio:"hunshang",
derivation:["reyingzi","gzyinghun"], derivation:["baka_yingzi","baka_yinghun"],
viceSkill:true, viceSkill:true,
init:function (player){ init:function (player){
if(player.checkViceSkill('baka_hunshang')&&!player.viceChanged){ if(player.checkViceSkill('baka_hunshang')&&!player.viceChanged){
@ -4176,7 +4176,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
dialog:function(){ dialog:function(){
var list=[ var list=[
'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman', 'taoyuan','wugu','juedou','huogong','jiedao','tiesuo','guohe','shunshou','wuzhong','wanjian','nanman',
'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi', 'xietianzi','shuiyanqijunx','lulitongxin','lianjunshengyan','chiling','diaohulishan','yuanjiao','huoshaolianying','zhibi','yiyi',
]; ];
for(var i=0;i<list.length;i++){ for(var i=0;i<list.length;i++){
list[i]=['锦囊','',list[i]]; list[i]=['锦囊','',list[i]];
@ -4736,7 +4736,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return { return {
filterCard:function(){return false}, filterCard:function(){return false},
selectCard:-1, selectCard:-1,
viewAs:{name:'sha'}, viewAs:{name:'sha',cards:links},
cards:links, cards:links,
onuse:function(result,player){ onuse:function(result,player){
result.cards=lib.skill[result.skill].cards; result.cards=lib.skill[result.skill].cards;
@ -8508,7 +8508,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var toidentity=to.identity; var toidentity=to.identity;
if(toidentity=='unknown'){ if(toidentity=='unknown'){
toidentity=lib.character[to.name1][1]; toidentity=lib.character[to.name1][1];
if(get.population(toidentity)>=get.population()-2){ if(!to.wontYe()){
toidentity='ye'; toidentity='ye';
} }
} }

4
mode/identity.js
View File

@ -2733,7 +2733,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
intro:{ intro:{
content:'准备阶段开始时，可以观看牌堆顶的三张牌，然后将这些牌以任意顺序置于牌堆顶或牌堆底' content:'准备阶段开始时，可以观看牌堆顶的三张牌，然后将这些牌以任意顺序置于牌堆顶或牌堆底'
}, },
trigger:{player:'phaseBegin'}, trigger:{player:'phaseZhunbeiBegin'},
silent:true, silent:true,
content:function(){ content:function(){
"step 0" "step 0"
@ -2748,7 +2748,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(event.dialog) event.dialog.close(); if(event.dialog) event.dialog.close();
if(event.control) event.control.close(); if(event.control) event.control.close();
var top=[]; var top=[];
var judges=player.node.judges.childNodes; var judges=player.getCards('j');
var stopped=false; var stopped=false;
if(!player.countCards('h','wuxie')){ if(!player.countCards('h','wuxie')){
for(var i=0;i<judges.length;i++){ for(var i=0;i<judges.length;i++){