攻击范围：1');
}
}
- else if(get.subtype(node)){
- uiintro.add(''+get.translation(get.subtype(node))+'
');
+ else if(get.subtype(name)){
+ uiintro.add(''+get.translation(get.subtype(name))+'
');
}
else if(lib.card[name]&&lib.card[name].addinfomenu){
uiintro.add(''+lib.card[name].addinfomenu+'
');
diff --git a/game/package.js b/game/package.js
index f66a17905..864122c8b 100644
--- a/game/package.js
+++ b/game/package.js
@@ -7,6 +7,7 @@ window.noname_package={
yijiang:'一将成名',
sp:'璀璨星河',
yingbian:'文德武备',
+ clan:'门阀士族',
sp2:'系列专属',
extra:'神将',
mobile:'移动版',
diff --git a/game/source.js b/game/source.js
index 3a055581e..e78e78db9 100644
--- a/game/source.js
+++ b/game/source.js
@@ -14,6 +14,7 @@ window.noname_source_list=[
'card/yunchou.js',
'card/zhenfa.js',
'card/zhulu.js',
+ 'character/clan.js',
'character/diy.js',
'character/extra.js',
'character/gujian.js',
diff --git a/game/update.js b/game/update.js
index 6cfe94879..a597184b2 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,16 +1,17 @@
window.noname_update={
- version:'1.9.117.2',
- update:'1.9.117.1',
+ version:'1.9.118',
+ update:'1.9.117.2',
changeLog:[
- '新的dialog Button',
- 'OL神孙权',
- '十周年界李儒、界朱桓、陈珪、黄权、胡班、丁尚涴、柯比能、全惠解、尹夫人',
- '其他技能调整和bug修复', 'players://["chengui","dc_huangquan","dc_huban","dc_liru","dingshangwan","junk_sunquan","kebineng","quanhuijie","re_zhuhuan","yinfuren"]',
+ '部分代码大改',
+ 'OL族吴苋、族吴班',
+ '十周年神张飞、卢弈、诸葛尚、刘晔、赵俨、王威',
+ '其他技能调整和bug修复',
+ 'players://["clan_wuban","clan_wuxian","dc_liuye","dc_zhaoyǎn","luyi","shen_zhangfei","wangwei","zhugeshang"]',
],
files:[
- //'card/extra.js',
+ 'card/extra.js',
//'card/gujian.js',
- //'card/guozhan.js',
+ 'card/guozhan.js',
//'card/gwent.js',
//'card/huanlekapai.js',
//'card/mtg.js',
@@ -18,10 +19,11 @@ window.noname_update={
'card/standard.js',
//'card/swd.js',
//'card/yunchou.js',
- //'card/yingbian.js',
- //'card/yongjian.js',
+ 'card/yingbian.js',
+ 'card/yongjian.js',
//'card/zhenfa.js',
//'card/zhulu.js',
+ 'character/clan.js',
'character/diy.js',
'character/extra.js',
//'character/hearth.js',
@@ -35,32 +37,32 @@ window.noname_update={
//'character/ow.js',
'character/rank.js',
'character/refresh.js',
- //'character/sb.js',
- //'character/shenhua.js',
+ 'character/sb.js',
+ 'character/shenhua.js',
'character/sp.js',
'character/sp2.js',
- //'character/standard.js',
+ 'character/standard.js',
'character/tw.js',
//'character/swd.js',
//'character/xianjian.js',
- //'character/xinghuoliaoyuan.js',
- 'character/yingbian.js',
+ 'character/xinghuoliaoyuan.js',
'character/yijiang.js',
+ 'character/yingbian.js',
//'character/yxs.js',
//'extension/boss/extension.js',
//'font/suits.ttf',
'layout/default/layout.css',
- 'layout/default/menu.css',
+ //'layout/default/menu.css',
//'layout/long2/layout.css',
//'layout/mobile/equip.css',
//'layout/mobile/layout.css',
//'layout/newlayout/global.css',
//'layout/nova/layout.css',
//'mode/boss.js',
- //'mode/brawl.js',
+ 'mode/brawl.js',
//'mode/chess.js',
//'mode/connect.js',
- //'mode/doudizhu.js',
+ 'mode/doudizhu.js',
'mode/guozhan.js',
//'mode/identity.js',
//'mode/single.js',
@@ -70,10 +72,10 @@ window.noname_update={
'game/game.js',
//'game/keyWords.js',
//'game/NoSleep.js',
- //'game/config.js',
- //'game/package.js',
+ 'game/config.js',
+ 'game/package.js',
//'game/asset.js',
- //'game/source.js',
+ 'game/source.js',
//'theme/style/hp/custom.css',
//'theme/style/hp/emotion.css',
//'theme/style/hp/glass.css',
diff --git a/image/card/handcard.png b/image/card/handcard.png
new file mode 100644
index 000000000..db56902ba
Binary files /dev/null and b/image/card/handcard.png differ
diff --git a/image/character/clan_wuban.jpg b/image/character/clan_wuban.jpg
new file mode 100644
index 000000000..489e02c91
Binary files /dev/null and b/image/character/clan_wuban.jpg differ
diff --git a/image/character/clan_wuxian.jpg b/image/character/clan_wuxian.jpg
new file mode 100644
index 000000000..68aa486dd
Binary files /dev/null and b/image/character/clan_wuxian.jpg differ
diff --git a/image/character/dc_liuye.jpg b/image/character/dc_liuye.jpg
new file mode 100644
index 000000000..1ca6d16eb
Binary files /dev/null and b/image/character/dc_liuye.jpg differ
diff --git a/image/character/dc_zhaoyǎn.jpg b/image/character/dc_zhaoyǎn.jpg
new file mode 100644
index 000000000..00b5b6a7f
Binary files /dev/null and b/image/character/dc_zhaoyǎn.jpg differ
diff --git a/image/character/luyi.jpg b/image/character/luyi.jpg
new file mode 100644
index 000000000..011776f1c
Binary files /dev/null and b/image/character/luyi.jpg differ
diff --git a/image/character/shen_zhangfei.jpg b/image/character/shen_zhangfei.jpg
new file mode 100644
index 000000000..fe95b0a01
Binary files /dev/null and b/image/character/shen_zhangfei.jpg differ
diff --git a/image/character/wangwei.jpg b/image/character/wangwei.jpg
new file mode 100644
index 000000000..71704ebe5
Binary files /dev/null and b/image/character/wangwei.jpg differ
diff --git a/image/character/zhugeshang.jpg b/image/character/zhugeshang.jpg
new file mode 100644
index 000000000..70bbfec20
Binary files /dev/null and b/image/character/zhugeshang.jpg differ
diff --git a/layout/default/layout.css b/layout/default/layout.css
index 252989f06..fc81d93bc 100644
--- a/layout/default/layout.css
+++ b/layout/default/layout.css
@@ -1733,7 +1733,10 @@ div:not(.handcards)>.card>.info>span,
}
.content>div {
position: relative;
- margin: 8px;
+ margin-top: 8px;
+ margin-bottom: 8px;
+ margin-left: 4px;
+ margin-right: 4px;
}
.content>.caption + .buttons:not(*:last-child){
margin-top: 0;
diff --git a/mode/brawl.js b/mode/brawl.js
index 07c8d8fd8..d91647067 100644
--- a/mode/brawl.js
+++ b/mode/brawl.js
@@ -1938,7 +1938,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var map3=[];
var list1=['司','夏','诸','皇'];
var list2=['马','侯','葛','甫'];
- var exclude=['界','新','大','旧','☆','神'];
+ var exclude=['界','新','大','旧','☆','神','晋','族','谋'];
for(var i in lib.character){
if(lib.filter.characterDisabled(i)) continue;
if(lib.character[i][1]=='key') continue;
diff --git a/mode/doudizhu.js b/mode/doudizhu.js
index 508f8db35..1c757fd75 100644
--- a/mode/doudizhu.js
+++ b/mode/doudizhu.js
@@ -2236,7 +2236,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
else event.finish();
'step 2'
- if(result.bool&&result.cards&&result.cards.length) target.gain(result.cards,player,'giveAuto');
+ if(result.bool&&result.cards&&result.cards.length) player.give(result.cards,target);
},
ai:{
viewHandcard:true,
diff --git a/mode/guozhan.js b/mode/guozhan.js
index aaede9fad..dd0e7ed6a 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -1993,7 +1993,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
}
'step 2'
- if(result.bool) event.gainner.gain(result.cards,event.giver,'giveAuto');
+ if(result.bool) event.giver.give(result.cards,event.gainner,'giveAuto');
'step 3'
if(target.isIn()) player.chooseBool('纵横：是否令'+get.translation(target)+'获得【锋略】？').set('ai',function(){
var evt=_status.event.getParent();
@@ -2053,7 +2053,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
}
'step 2'
- if(result.bool) event.gainner.gain(result.cards,event.giver,'giveAuto');
+ if(result.bool) event.giver.give(result.cards,event.gainner,'giveAuto');
},
ai:{
order:8,
@@ -2617,7 +2617,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
else event.goto(3);
'step 2'
- target.gain(result.cards,player,'giveAuto');
+ player.give(result.cards,target);
'step 3'
if(target.isIn()&&event.name=='gzweimeng') player.chooseBool('纵横：是否令'+get.translation(target)+'获得【危盟】？').set('ai',function(){
var evt=_status.event.getParent();
@@ -3359,6 +3359,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
})
},
filterCard:true,
+ position:'he',
filterTarget:function(card,player,target){
return target!=player&&target.countCards('he')>0;
},
@@ -3376,7 +3377,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
player.gainPlayerCard(target,'he',true);
event.finish();
}
- else player.gain(result.cards,target,'give');
+ else target.give(result.cards,player);
'step 2'
if(result.bool&&result.cards&&result.cards.length&&
target.isIn()&&player.isIn()&&get.suit(result.cards[0],target)=='spade'&&target.canUse('sha',player,false)) target.useCard({name:'sha',isCard:true},false,player);
@@ -4169,7 +4170,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
content:function(){
'step 0'
- target.gain(cards,player,'giveAuto');
+ player.give(cards,target);
'step 1'
player.chooseJunlingFor(target);
'step 2'
@@ -4494,6 +4495,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
filter:function(event,player){
return !player.getHistory('useCard').length||!player.getHistory('sourceDamage').length;
},
+ check:()=>false,
content:function(){
lib.skill.rekuangcai.change(player,player.getHistory('useCard').length?-1:1);
},
@@ -4996,7 +4998,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
'step 2'
if(result.bool){
event.card=result.cards[0];
- player.gain(result.cards,target,'give').gaintag.add('gzwenji');
+ target.give(result.cards,player).gaintag.add('gzwenji');
}
'step 3'
if(target.identity=='unknown'||target.isFriendOf(player)){
@@ -5015,7 +5017,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else event.finish();
'step 4'
if(result.bool){
- target.gain(result.cards,player,'give');
+ player.give(result.cards,target);
player.removeGaintag('gzwenji');
}
else{
@@ -6032,7 +6034,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else event.finish();
'step 3'
if(result.cards){
- target.gain(result.cards,player,'giveAuto');
+ player.give(result.cards,target);
}
},
group:['gzweidi_ft','gzweidi_ftc'],
@@ -6161,7 +6163,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
'step 1'
if(result.bool){
player.logSkill('gzfudi',trigger.source);
- trigger.source.gain(result.cards,player,'giveAuto');
+ player.give(result.cards,trigger.source);
}
else event.finish();
'step 2'
@@ -6516,7 +6518,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
player.line(result.targets,'green');
if(result.cards.length){
event.cards=result.cards;
- result.targets[0].gain(result.cards,player,'give');
+ player.give(result.cards,result.cards[0]);
}
else{
player.storage.gzzhengbi_eff1=result.targets[0];
@@ -6537,7 +6539,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else{
if(target.countCards('h')){
var cards=target.getCards('h');
- player.gain(cards,target,'giveAuto');
+ target.give(cards,player);
event.finish();
}
else event.finish();
@@ -6547,7 +6549,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
target.chooseCard('he',(check?1:2),{type:(check?['trick','delay','equip']:'basic')},true);
'step 5'
if(result.cards){
- player.gain(result.cards,target,'giveAuto');
+ target.give(result.cards,player);
}
},
subSkill:{
@@ -6703,7 +6705,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(result.bool){
event.target=result.targets[0];
player.logSkill('gzjieyue',result.targets);
- result.targets[0].gain(result.cards[0],player,'giveAuto');
+ player.give(result.cards[0],result.targets[0]);
player.chooseJunlingFor(result.targets[0]);
}
else event.finish();
@@ -7093,7 +7095,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
});
'step 1'
if(result.bool){
- player.gain(result.cards[0],trigger.source,'giveAuto');
+ trigger.source.give(result.cards[0],player,'giveAuto');
}
else trigger.source.loseHp();
},
@@ -7867,15 +7869,15 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
frequent:true,
preHidden:true,
- filter:function(event){
- return (event.num>0)
- },
content:function(){
- "step 0"
+ 'step 0'
event.cards=game.cardsGotoOrdering(get.cards(2)).cards;
- "step 1"
+ 'step 1'
+ if(_status.connectMode) game.broadcastAll(function(){_status.noclearcountdown=true});
+ event.given_map={};
+ 'step 2'
if(event.cards.length>1){
- player.chooseCardButton('将“遗计”牌分配给任意角色',true,event.cards,[1,event.cards.length]).set('ai',function(button){
+ player.chooseCardButton('遗计：请选择要分配的牌',true,event.cards,[1,event.cards.length]).set('ai',function(button){
if(ui.selected.buttons.length==0) return 1;
return 0;
});
@@ -7886,13 +7888,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
else{
event.finish();
}
- "step 2"
+ 'step 3'
if(result.bool){
- for(var i=0;i0) event.goto(2);
+ 'step 5'
+ if(_status.connectMode){
+ game.broadcastAll(function(){delete _status.noclearcountdown;game.stopCountChoose()});
+ }
+ var list=[];
+ for(var i in event.given_map){
+ var source=(_status.connectMode?lib.playerOL:game.playerMap)[i];
+ player.line(source,'green');
+ list.push([source,event.given_map[i]]);
+ }
+ game.loseAsync({
+ gain_list:list,
+ giver:player,
+ animate:'draw',
+ }).setContent('gaincardMultiple');
},
ai:{
maixie:true,
@@ -8620,12 +8635,12 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
return 5-get.value(card);
},
selectCard:[1,3],
- prepare:'give',
discard:false,
- // delay:0.5,
+ lose:false,
+ delay:false,
content:function(){
"step 0"
- target.gain(cards,player);
+ player.give(cards,target);
"step 1"
if(!target.isUnseen()){
player.draw(cards.length);
@@ -9829,12 +9844,11 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
var card=list.randomGet();
var owner=get.owner(card);
if(owner){
- player.gain(card,owner,'give');
+ player.gain(card,owner,'give','bySelf');
player.line(owner,'green');
}
else{
- player.gain(card,'log');
- player.$draw(card);
+ player.gain(card,'gain2');
}
}
},
@@ -9952,7 +9966,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
}
}
var owner=get.owner(cards[0]);
- if(owner) player.gain(cards,'give',owner);
+ if(owner) player.gain(cards,'give',owner,'bySelf');
else player.gain(cards,'gain2');
},
group:'zhangwu_draw',
@@ -10170,7 +10184,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
if(result.bool){
var card=result.links[0];
player.logSkill('ziliang',trigger.player);
- trigger.player.gain(card,player,'give');
+ player.give(card,trigger.player);
}
}
},
@@ -10213,7 +10227,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
target.equip(card);
}
else{
- target.gain(card,player,'giveAuto');
+ player.give(card,target);
event.finish();
}
}
@@ -11009,7 +11023,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
},
content:function(){
'step 0'
- if(player.phaseNumber==1&&player.isUnseen(0)&&(_status.connectMode?!lib.configOL.junzhu:get.config('junzhu'))){
+ if(player.phaseNumber==1&&player.isUnseen(0)&&(_status.connectMode?lib.configOL.junzhu:get.config('junzhu'))){
var name=player.name1;
if(name.indexOf('gz_')!=0||!lib.junList.contains(name.slice(3))){
event.goto(3);
@@ -12241,6 +12255,21 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
// }
}
},
+ dynamicTranslate:{
+ gzzhaosong:function(player){
+ var storage=player.getStorage('gzzhaosong');
+ var list1=['效果①','效果②','效果③'];
+ var str='每局游戏每项限一次。';
+ var list2=['①一名角色进入濒死状态时，你可以令其回复至2点体力并摸一张牌。','②出牌阶段，你可观看一名其他角色的所有暗置武将牌和手牌，然后可以获得其区域内的一张牌。','③一名角色使用【杀】选择唯一目标后，你可以为此【杀】增加两个目标。'];
+ for(var i=0;i<3;i++){
+ var bool=storage.contains(list1[i]);
+ if(bool) str+='';
+ str+=list2[i];
+ if(bool) str+='';
+ }
+ return str;
+ },
+ },
translate:{
ye:'野',
ye2:'野心家',
@@ -13286,7 +13315,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
'step 2'
if(event.junling=='junling2'&&source!=player){
if(result.cards.length&&event.ing){
- source.gain(result.cards,player,'giveAuto');
+ player.give(result.cards,source);
}
event.num++;
if(event.num<3){
@@ -13858,7 +13887,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
wontYe:function(group){
if(!group) group=lib.character[this.name1][1];
if(_status.yeidentity&&_status.yeidentity.contains(group)) return false;
- if(get.zhu(this,null,true)) return true;
+ if(get.zhu(this,null,group)) return true;
return get.totalPopulation(group)+1<=get.population()/2;
},
perfectPair:function(choosing){