This commit is contained in:
libccy 2017-02-23 21:15:13 +08:00
parent d4b362445c
commit d15ccb7199
7 changed files with 75 additions and 33 deletions

View File

@ -1,28 +0,0 @@
character.guozhan={
connect:true,
character:{
ganfuren:['female','shu',3,['shushen','shenzhi']],
mifuren:['female','shu',3,['guixiu','cunsi']],
mateng:['male','qun',4,['xiongyi','mashu']],
tianfeng:['male','qun',3,['sijian','suishi']],
yuejin:['male','wei',4,['xiaoguo']],
chendong:['male','wu',4,['duanxie','fenming']],
sp_dongzhuo:['male','qun',5,['hengzheng']],
jiangfei:['male','shu',3,['shengxi','shoucheng']],
jiangqing:['male','wu',4,['shangyi']],
hetaihou:['female','qun',3,['zhendu','qiluan']],
kongrong:['male','qun',3,['lirang','mingshi']],
dingfeng:['male','wu',4,['fenxun','duanbing']],
panfeng:['male','qun',4,['kuangfu']],
},
characterIntro:{
ganfuren:'刘备起兵后,于沛城娶甘氏为妾。后来,甘夫人随刘备到荆州,生了阿斗(也就是后主刘禅)。223年四月刘备病死于白帝城追谥甘夫人为“昭烈皇后”。',
jiangfei:'蒋琬,蜀四英之一。初随刘备入蜀,诸葛亮卒后封大将军,辅佐刘禅,主持朝政,统兵御魏。采取闭关息民政策,国力大增。官至大司马,安阳亭侯,谥号恭侯。费祎,蜀国著名政治家和武将,官至大将军。在一次回途的筵会中,被降将郭修刺杀而亡,谥号敬侯。',
mifuren:'刘备夫人。徐州别驾糜竺之妹。长坂兵败,她怀抱年仅两岁的刘禅在乱军中走散,被赵云发现;但麋夫人因为赵云只有一匹马,不肯上马,在将阿斗托付给赵云后投井而亡。',
chendong:'陈武,东吴将领,孙策攻打刘繇,陈武前来相助,孙策非常喜爱陈武,拜为校尉,使作先锋。陈武以十数骑兵力杀敌五十余人。后于赤壁等战役屡立功勋。董袭献上严白虎的人头来降孙策。赤壁之战,董袭受周瑜命,分兵去汉阳,合肥会战时接应太史慈,逍遥津支援孙权。濡须口之战时,董袭在船上督战,船覆董袭坚守殉职。',
jiangqing:'擅长弓术。与周泰原为活跃于长江一带的江贼,孙策脱离袁术下江东自立门户时,和周泰一起率众投靠。 孙策攻刘繇,并引出城中麾下的陈横、薛礼、张英三名将领,陈横后被蒋钦一箭射杀,后与韩当等将乘舟过江,乱箭射杀敌军。曾在赤壁之战与周泰,还有擅使长枪的韩当率领水军在三江口踏江破敌。',
kongrong:'字文举,鲁国人,东汉文学家,“建安七子”之首。献帝即位后任北军中侯、虎贲中郎将、北海相,时称孔北海后因触怒曹操,为曹操所杀。能诗善文。',
mateng:'字寿成,扶风茂陵人,东汉末年征西将军,割据西凉一带的军阀,伏波将军马援的后代,官至卫尉,封爵槐里乡侯。因其子马超谋反,而被杀,夷灭三族。',
tianfeng:'字元皓。东汉末年大军阀袁绍部下重要谋士。为人刚直不阿,曾多次向袁绍进言而不被采纳。后因谏阻袁绍征伐曹操而被袁绍下令监禁,并于官渡之战后,被袁绍杀害。',
}
};

View File

@ -78,8 +78,30 @@ character.sp={
dongyun:['male','shu',3,['bingzheng','sheyan']],
kanze:['male','wu',3,['xiashu','kuanshi']],
heqi:['male','wu',4,['qizhou','shanxi']],
ganfuren:['female','shu',3,['shushen','shenzhi']],
mifuren:['female','shu',3,['guixiu','cunsi']],
mateng:['male','qun',4,['xiongyi','mashu']],
tianfeng:['male','qun',3,['sijian','suishi']],
yuejin:['male','wei',4,['xiaoguo']],
chendong:['male','wu',4,['duanxie','fenming']],
sp_dongzhuo:['male','qun',5,['hengzheng']],
jiangfei:['male','shu',3,['shengxi','shoucheng']],
jiangqing:['male','wu',4,['shangyi']],
hetaihou:['female','qun',3,['zhendu','qiluan']],
kongrong:['male','qun',3,['lirang','mingshi']],
dingfeng:['male','wu',4,['fenxun','duanbing']],
panfeng:['male','qun',4,['kuangfu']],
},
characterIntro:{
ganfuren:'刘备起兵后,于沛城娶甘氏为妾。后来,甘夫人随刘备到荆州,生了阿斗(也就是后主刘禅)。223年四月刘备病死于白帝城追谥甘夫人为“昭烈皇后”。',
jiangfei:'蒋琬,蜀四英之一。初随刘备入蜀,诸葛亮卒后封大将军,辅佐刘禅,主持朝政,统兵御魏。采取闭关息民政策,国力大增。官至大司马,安阳亭侯,谥号恭侯。费祎,蜀国著名政治家和武将,官至大将军。在一次回途的筵会中,被降将郭修刺杀而亡,谥号敬侯。',
mifuren:'刘备夫人。徐州别驾糜竺之妹。长坂兵败,她怀抱年仅两岁的刘禅在乱军中走散,被赵云发现;但麋夫人因为赵云只有一匹马,不肯上马,在将阿斗托付给赵云后投井而亡。',
chendong:'陈武,东吴将领,孙策攻打刘繇,陈武前来相助,孙策非常喜爱陈武,拜为校尉,使作先锋。陈武以十数骑兵力杀敌五十余人。后于赤壁等战役屡立功勋。董袭献上严白虎的人头来降孙策。赤壁之战,董袭受周瑜命,分兵去汉阳,合肥会战时接应太史慈,逍遥津支援孙权。濡须口之战时,董袭在船上督战,船覆董袭坚守殉职。',
jiangqing:'擅长弓术。与周泰原为活跃于长江一带的江贼,孙策脱离袁术下江东自立门户时,和周泰一起率众投靠。 孙策攻刘繇,并引出城中麾下的陈横、薛礼、张英三名将领,陈横后被蒋钦一箭射杀,后与韩当等将乘舟过江,乱箭射杀敌军。曾在赤壁之战与周泰,还有擅使长枪的韩当率领水军在三江口踏江破敌。',
kongrong:'字文举,鲁国人,东汉文学家,“建安七子”之首。献帝即位后任北军中侯、虎贲中郎将、北海相,时称孔北海后因触怒曹操,为曹操所杀。能诗善文。',
mateng:'字寿成,扶风茂陵人,东汉末年征西将军,割据西凉一带的军阀,伏波将军马援的后代,官至卫尉,封爵槐里乡侯。因其子马超谋反,而被杀,夷灭三族。',
tianfeng:'字元皓。东汉末年大军阀袁绍部下重要谋士。为人刚直不阿,曾多次向袁绍进言而不被采纳。后因谏阻袁绍征伐曹操而被袁绍下令监禁,并于官渡之战后,被袁绍杀害。',
caochun:'字子和,沛国谯(今安徽亳州)人。东汉末年曹操麾下将领,曹仁之弟。曹纯是曹操部下精锐部队“虎豹骑”的统领者之一,因在平定北方的战役中颇有功绩,被加封为高陵亭侯。死后谥曰威侯。曹纯擅战,甚得人心,为人重纲纪,不失理智,好学问,敬爱学士,闻名天下。',
hanba:'中国古代神话传说中引起旱灾的怪物。《诗·大雅·云汉》:“旱魃为虐,如惔如焚。”',
cuiyan:'字季珪清河东武城今河北省清河县人。东汉末年名士司空崔林的从兄曹操帐下谋士。崔琰相貌俊美很有威望曹操对他也很敬畏。建安二十一年216年崔琰在给杨训的书信中写道“时乎时乎会当有变时”曹操认为此句有不逊之意因而将崔琰下狱不久崔琰即被曹操赐死。',

View File

@ -26,7 +26,7 @@ window.config={
forbidboss:['caiwenji','gjqt_aruan','pal_xuanxiao','swd_hupo'],
forbiddouble:['zhugedan','swd_kangnalishi','dongzhuo','wutugu','hs_siwangzhiyi','hs_ronghejuren','hs_shanlingjuren'],
all:{
sgscharacters:['standard','shenhua','refresh','yijiang','sp','extra','guozhan','old'],
sgscharacters:['standard','shenhua','refresh','yijiang','sp','extra','old'],
sgscards:['standard','extra','sp','guozhan'],
sgsmodes:['identity','guozhan','versus','brawl','connect'],
stockmode:['identity','guozhan','versus','boss','chess','stone','connect','brawl','tafang','hearthstone'],

View File

@ -2684,6 +2684,11 @@
frequent:true,
intro:'主将和副将都明置后,若为特定组合,可摸两张牌或回复一点体力'
},
connect_onlyguozhan:{
name:'只开启国战武将',
init:true,
frequent:true,
},
connect_ban_weak:{
name:'屏蔽弱将',
init:false,
@ -2737,6 +2742,11 @@
frequent:true,
intro:'主将和副将都明置后,若为特定组合,可摸两张牌或回复一点体力'
},
onlyguozhan:{
name:'只开启国战武将',
init:true,
frequent:true,
},
double_hp:{
name:'双将体力上限',
init:'pingjun',
@ -4012,7 +4022,14 @@
var mode=get.mode();
if(type=='character'){
if(lib.characterPack['mode_'+mode]&&lib.characterPack['mode_'+mode][name]){
modeimage=mode;
if(mode=='guozhan'){
if(lib.character[name.slice(3)]){
name=name.slice(3);
}
}
else{
modeimage=mode;
}
}
else if(lib.character[name]){
nameinfo=lib.character[name];

View File

@ -5,7 +5,6 @@ character.pack={
yijiang:'一将成名',
sp:'SP',
extra:'神将',
guozhan:'国战',
old:'怀旧',
diy:'DIY',
yxs:'英雄杀',

View File

@ -11,7 +11,6 @@ window.noname_source_list=[
'character/diy.js',
'character/extra.js',
'character/gujian.js',
'character/guozhan.js',
'character/hearth.js',
'character/old.js',
'character/ow.js',

View File

@ -29,6 +29,15 @@ mode.guozhan={
game.delay();
game.showChangeLog();
}
for(var i in lib.characterPack.mode_guozhan){
lib.character[i]=lib.characterPack.mode_guozhan[i];
if(!lib.character[i][4]){
lib.character[i][4]=[];
}
if(!lib.translate[i]){
lib.translate[i]=lib.translate[i.slice(3)];
}
}
if(!_status.connectMode){
_status.mode=get.config('guozhan_mode');
if(_status.brawl&&_status.brawl.submode){
@ -110,6 +119,24 @@ mode.guozhan={
}
game.phaseLoop(player);
},
characterPack:{
mode_guozhan:{
gz_caocao:['male','wei',4,['jianxiong']],
gz_simayi:['male','wei',3,['fankui','guicai']],
gz_xiahoudun:['male','wei',4,['ganglie']],
gz_zhangliao:['male','wei',4,['tuxi']],
gz_xuzhu:['male','wei',4,['luoyi']],
gz_guojia:['male','wei',4,['tiandu','yiji']],
gz_zhenji:['female','wei',4,['luoshen','qingguo']],
gz_xiahouyuan:['male','wei',4,['shensu']],
gz_zhanghe:['male','wei',4,['qiaobian']],
gz_xuhuang:['male','wei',4,['duanliang']],
gz_caoren:['male','wei',4,['jushou']],
gz_dianwei:['male','wei',4,['qiangxi']],
gz_xunyu:['male','wei',3,['quhu','jieming']],
gz_caopi:['male','wei',3,['xingshang','fangzhu']],
}
},
game:{
getCharacterChoice:function(list,num){
var choice=list.splice(0,num);
@ -465,6 +492,12 @@ mode.guozhan={
for(i in lib.character){
if(chosen.contains(i)) continue;
if(lib.filter.characterDisabled(i)) continue;
if(get.config('onlyguozhan')){
}
else{
}
if(lib.character[i][2]==3||lib.character[i][2]==4||lib.character[i][2]==5)
event.list.push(i);
}
@ -792,7 +825,6 @@ mode.guozhan={
}
},
translate:{
change_identity_config:'自由选择座位',
ye:'野',
ye2:'野心家',
wei2:'魏国',
@ -812,6 +844,7 @@ mode.guozhan={
mingzhizhujiang:'明置主将',
mingzhifujiang:'明置副将',
tongshimingzhi:'同时明置',
mode_guozhan_character_config:'国战武将',
},
element:{
content:{