Skip to content

Commit

Permalink
K-a-n-a-d-e-!
Browse files Browse the repository at this point in the history
  • Loading branch information
@Spmario233
Spmario233 authored Sep 19, 2020
1 parent a9343aa commit 0bbe7bb
Show file tree
Hide file tree
Showing 8 changed files with 12,665 additions and 12,532 deletions.
29 changes: 23 additions & 6 deletions character/refresh.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
},
connect:true,
character:{
re_liubiao:['male','qun',3,['rezishou','zongshi'],['unseen']],
//re_liubiao:['male','qun',3,['rezishou','zongshi'],['unseen']],
xin_fazheng:['male','shu',3,['xinenyuan','xinxuanhuo'],['die_audio']],
wangyi:['female','wei',3,['zhenlie','miji']],
old_madai:['male','shu',4,['mashu','qianxi']],
guanzhang:['male','shu',4,['fuhun']],
xin_xusheng:['male','wu',4,['decadepojun']],
re_taishici:['male','wu',4,['tianyi','hanzhan']],
re_masu:['male','shu',3,['resanyao','rezhiman']],
re_sunluban:['female','wu',3,['rechanhui','rejiaojin']],re_zhonghui:['male','wei',4,['requanji','zili']],
re_sunluban:['female','wu',3,['rechanhui','rejiaojin']],
re_zhonghui:['male','wei',4,['requanji','zili']],
re_handang:['male','wu',4,['regongji','jiefan']],
re_lingtong:['male','wu',4,['rexuanfeng']],
yujin_yujin:['male','wei',4,['rejieyue']],
Expand Down Expand Up @@ -157,7 +158,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
audio:'zishou',
trigger:{player:'phaseDrawBegin2'},
check:function(event,player){
return player.countCards('h')<=(player.hasSkill('zongshi')?player.maxHp:(player.hp-2))||player.skipList.contains('phaseUse');
return player.countCards('h')<=(player.hasSkill('zongshi')?player.maxHp:(player.hp-2))||player.skipList.contains('phaseUse')||!player.countCards('h',function(card){
return get.tag(card,'damage')&&player.hasUseTarget(card);
});
},
filter:function(event,player){
return !event.numFixed;
Expand Down Expand Up @@ -206,7 +209,21 @@ game.import('character',function(lib,game,ui,get,ai,_status){
}
if(game.hasPlayer(function(current){
return filterTarget(null,player,current)
})) player.chooseTarget(filterTarget,'是否将一名其他角色装备区内的一张牌移动到自己的装备区？');
})) player.chooseTarget(filterTarget,'是否将一名其他角色装备区内的一张牌移动到自己的装备区？').set('ai',function(target){
var player=_status.event.player;
var att=get.attitude(player,target);
if(att>0&&!target.hasSkillTag('noe')) return 0;
var num=0;
target.countCards('e',function(card){
if(player.isEmpty(get.subtype(card))){
var eff=get.effect(player,card,player,player);
if(eff>num) num=eff;
}
});
if(num<=0) return 0;
if(att<0) return num*-att;
return 1/num;
});
else event.finish();
}
'step 1'
Expand Down Expand Up @@ -6535,7 +6552,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
if(_status.event.goon) return 8-get.value(card);
return 0;
});
next.set('logSkill','beige');
next.set('logSkill','rebeige');
next.set('goon',check);
"step 1"
if(result.bool){
Expand Down Expand Up @@ -7212,7 +7229,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
re_liubiao:'界刘表',
rezishou:'自守',
rezishou2:'自守',
rezishou_info:'摸牌阶段，你可以多摸X张牌，然后本回合你对其他角色造成伤害时，防止此伤害。结束阶段，若你本回合没有使用牌指定其他角色为目标，你可以将场上一张装备牌移动到自己的装备区。（X为场上势力数）',
rezishou_info:'摸牌阶段，你可以多摸X张牌。若如此做，本回合你对其他角色造成伤害时，防止此伤害，且结束阶段，若你本回合没有使用牌指定其他角色为目标，则你可以将场上的一张装备牌移动到自己的装备区。（X为场上势力数）',
ol_dongzhuo:'界董卓',
olbaonue:'暴虐',
olbaonue_info:'主公技，其他群雄角色造成1点伤害后，其可进行判定，若为♠，你回复1点体力并获得判定牌。',
Expand Down
6 changes: 4 additions & 2 deletions character/sp2.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
var cards=[];
for(var i of lib.inpile) list.add(get.type2(i));
for(var i of list){
if(!target.countCards('h',{type:i})){
if(!target.countCards('h',function(card){
return get.type2(card,target)==i;
})){
var card=get.cardPile2(function(card){
return get.type(card,false)==i;
return get.type2(card,false)==i;
});
if(card) cards.push(card);
}
Expand Down
25,121 changes: 12,618 additions & 12,503 deletions character/yijiang.js
View file

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions game/asset.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
window.noname_asset_list=[
'v1.9.103.3',
'v1.9.103.4',
'audio/background/aozhan_chaoming.mp3',
'audio/background/aozhan_online.mp3',
'audio/background/aozhan_rewrite.mp3',
Expand Down Expand Up @@ -5078,5 +5078,6 @@ window.noname_skin_list={
key_yui:2,
key_yuri:3,
key_yuzuru:2,
sp_key_kanade:6,
sp_key_kanade:1,
key_kamome:1,
};
12 changes: 6 additions & 6 deletions game/game.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6309,9 +6309,9 @@
else{
dialog.style.left=(e.clientX/game.documentZoom-dialog.offsetWidth-10)+'px';
}
var idealtop=e.clientY/game.documentZoom-dialog.offsetHeight/2;
if(idealtop<10){
idealtop=10;
var idealtop=(e.clientY||0)/game.documentZoom-dialog.offsetHeight/2;
if(typeof idealtop!='number'||isNaN(idealtop)||idealtop<=5){
idealtop=5;
}
else if(idealtop+dialog.offsetHeight+10>ui.window.offsetHeight){
idealtop=ui.window.offsetHeight-10-dialog.offsetHeight;
Expand Down Expand Up @@ -9888,7 +9888,7 @@
game.checkMod(card,player,range,'selectTarget',player);
}
if(info.notarget||range[1]==-1){
if(range[1]==-1){
if(!info.notarget&&range[1]==-1){
for(var i=0;i<targets.length;i++){
if(!player.canUse(card,targets[i],event.nodistance?false:null)){
targets.splice(i--,1);
Expand Down Expand Up @@ -16865,7 +16865,7 @@
if(!unique){
for(var i=0;i<list.length;i++){
var info=lib.skill[list[i]];
if(!info||info.unique||info.temp||info.sub){
if(!info||info.unique||info.temp||info.sub||info.charlotte){
list.splice(i--,1);
}
}
Expand Down Expand Up @@ -25195,7 +25195,7 @@
}
return 1;
},
ai2:get.effect,
ai2:get.effect_use,
type:'dying',
targetRequired:true,
dying:event.dying
Expand Down
24 changes: 11 additions & 13 deletions game/update.js
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
window.noname_update={
version:'1.9.103.3',
update:'1.9.103.2',
version:'1.9.103.4',
update:'1.9.103.3',
changeLog:[
'水濑秋子',
'曹不兴、新服马良',
'新诸葛诞',
'新孙休、曹休、刘表、张春华',
'bug修复',

],
files:[
//'card/extra.js',
//'card/huanlekapai.js',
//'card/sp.js',
'card/standard.js',
//'card/standard.js',
//'card/swd.js',
//'card/mtg.js',
//'card/gujian.js',
Expand All @@ -21,30 +19,30 @@ window.noname_update={
//'card/yunchou.js',
//'card/zhenfa.js',
//'card/zhulu.js',
'character/diy.js',
//'character/diy.js',
//'character/extra.js',
//'character/hearth.js',
//'character/gujian.js',
//'character/gwent.js',
//'character/hearth.js',
'character/mobile.js',
//'character/mobile.js',
//'character/mtg.js',
//'character/old.js',
//'character/refresh.js',
'character/refresh.js',
//'character/shenhua.js',
'character/sp.js',
//'character/sp.js',
'character/sp2.js',
//'character/tw.js',
//'character/standard.js',
//'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',
//'layout/nova/layout.css',
'mode/identity.js',
//'mode/identity.js',
//'mode/doudizhu.js',
//'mode/guozhan.js',
//'mode/chess.js',
Expand All @@ -54,7 +52,7 @@ window.noname_update={
//'mode/brawl.js',
//'mode/versus.js',
//'mode/boss.js',
//'game/game.js',
'game/game.js',
//'game/NoSleep.js',
//'game/config.js',
//'game/package.js',
Expand Down
Binary file added image/skin/key_kamome/1.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/skin/sp_key_kanade/7.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0bbe7bb

Please sign in to comment.