From 8bdda26b39b47df78f5f1a4389ab507cdef2143c Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Mon, 28 Mar 2016 11:15:47 +0800
Subject: [PATCH] 1.8.1

---
 character/hearth.js |  1 +
 character/swd.js    |  1 +
 game/game.js        | 98 ++++++++++++++++++++++++++++++---------------
 game/update.js      |  6 +--
 index.html          |  1 +
 mode/stone.js       | 21 +++++++---
 6 files changed, 87 insertions(+), 41 deletions(-)

diff --git a/character/hearth.js b/character/hearth.js
index 37051635e..e8d9c9575 100755
--- a/character/hearth.js
+++ b/character/hearth.js
@@ -568,6 +568,7 @@ character.hearth={
 			enable:'phaseUse',
 			usable:1,
 			filter:function(event,player){
+				if(!lib.card.chiyuxi||!lib.card.jingleishan) return false;
 				return player.num('he')>0;
 			},
 			filterTarget:function(card,player,target){
diff --git a/character/swd.js b/character/swd.js
index ee1ddd82a..dba0947b6 100755
--- a/character/swd.js
+++ b/character/swd.js
@@ -2175,6 +2175,7 @@ character.swd={
 		huangyu:{
 			enable:'phaseUse',
 			filter:function(event,player){
+				if(!lib.card.chiyuxi) return false;
 				return !player.getStat('skill').huangyu&&player.num('he',{color:'red'})>1;
 			},
 			filterCard:{color:'red'},
diff --git a/game/game.js b/game/game.js
index 747c248ae..be593b853 100755
--- a/game/game.js
+++ b/game/game.js
@@ -9,9 +9,12 @@
             }
         }
         else{
-			alert(document.head.outerHTML)
             if(confirm('游戏似乎未正常载入，是否重置游戏？')){
+				var noname_inited=localStorage.getItem('noname_inited');
                 localStorage.clear();
+				if(noname_inited){
+					localStorage.setItem(noname_inited);
+				}
                 if(indexedDB) indexedDB.deleteDatabase('noname_0.9_data');
                 window.location.reload();
             }
@@ -36,18 +39,10 @@
 		dieClose:[]
 	};
 	var lib={
-		version:'1.8.1',
-		changeLog:[
-			'AI问题修复',
-			'检查更新功能',
-			'游戏内下载/更新素材',
-			'iOS/Mac/Windows版优化',
-			'iOS版支持录像、扩展等'
-		],
 		configprefix:'noname_0.9_',
 		updateURL:'http://isha.applinzi.com/',
-		onlineURL:'http',
 		assetURL:'',
+		changeLog:[],
 		updates:[],
 		canvasUpdates:[],
 		video:[],
@@ -1487,7 +1482,11 @@
 						onclick:function(){
 							var node=this;
 							if(node._clearing){
-								localStorage.clear();
+								var noname_inited=localStorage.getItem('noname_inited');
+				                localStorage.clear();
+								if(noname_inited){
+									localStorage.setItem(noname_inited);
+								}
 								game.reload();
 								return;
 							}
@@ -2542,6 +2541,7 @@
 						init:'3',
 						frequent:true,
 						item:{
+							'1':'一人',
 							'2':'两人',
 							'3':'三人',
 							'4':'四人',
@@ -2557,6 +2557,15 @@
 							}
 						},
 					},
+					mana_mode:{
+						name:'行动值变化',
+						init:'inc',
+						item:{
+							inf:'涨落',
+							inc:'递增'
+						},
+						frequent:true
+					},
 					skill_bar:{
 						name:'怒气值',
 						init:true,
@@ -2786,6 +2795,12 @@
 		},
 		init:{
 			init:function(){
+				if(window.noname_update){
+					lib.version=window.noname_update.version;
+					lib.changeLog=window.noname_update.changeLog;
+					delete window.noname_update;
+				}
+
 				var scripts=document.head.querySelectorAll('script');
 				for(var i=0;i<scripts.length;i++){
 					if(scripts[i].src&&scripts[i].src.indexOf('game/game.js')!=-1){
@@ -2979,26 +2994,32 @@
 						delete game.importedPack;
 					}
 				}
-
+				var toLoad=lib.config.all.cards.length+lib.config.all.characters.length+lib.config.plays.length+1;
+				var packLoaded=function(){
+					toLoad--;
+					if(toLoad==0){
+						if(_status.windowLoaded){
+							delete _status.windowLoaded;
+							lib.init.onload();
+						}
+						else{
+							_status.packLoaded=true;
+						}
+					}
+				};
 				if(localStorage.getItem(lib.configprefix+'playback')){
-					lib.init.js(lib.assetURL+'mode',lib.config.mode);
+					toLoad++;
+					lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded);
 				}
 				else if((localStorage.getItem(lib.configprefix+'directstart')||!lib.config.show_splash)&&
 					lib.config.all.mode.indexOf(lib.config.mode)!=-1){
-					lib.init.js(lib.assetURL+'mode',lib.config.mode);
+					toLoad++;
+					lib.init.js(lib.assetURL+'mode',lib.config.mode,packLoaded,packLoaded);
 				}
-				lib.init.js(lib.assetURL+'card',lib.config.all.cards);
-				lib.init.js(lib.assetURL+'character',lib.config.all.characters);
-				lib.init.js(lib.assetURL+'play',lib.config.plays);
-				lib.init.js(lib.assetURL+'character','rank',function(){
-					if(_status.windowLoaded){
-						delete _status.windowLoaded;
-						lib.init.onload();
-					}
-					else{
-						_status.packLoaded=true;
-					}
-				});
+				lib.init.js(lib.assetURL+'card',lib.config.all.cards,packLoaded,packLoaded);
+				lib.init.js(lib.assetURL+'character',lib.config.all.characters,packLoaded,packLoaded);
+				lib.init.js(lib.assetURL+'play',lib.config.plays,packLoaded,packLoaded);
+				lib.init.js(lib.assetURL+'character','rank',packLoaded,packLoaded);
 				ui.css={};
 				lib.init.css(lib.assetURL+'layout/default','menu');
 				var layout=lib.config.layout;
@@ -3670,7 +3691,7 @@
 				}
 			    return style;
 			},
-			js:function(path,file,onload){
+			js:function(path,file,onload,onerror){
 				if(path[path.length-1]=='/'){
 					path=path.slice(0,path.length-1);
 				}
@@ -3678,9 +3699,9 @@
 					lib.init['setMode_'+file]();
 					return;
 				}
-				if(typeof file=='object'){
+				if(Array.isArray(file)){
 					for(var i=0;i<file.length;i++){
-						lib.init.js(path,file[i]);
+						lib.init.js(path,file[i],onload,onerror);
 					}
 				}
 				else{
@@ -3689,6 +3710,7 @@
 					document.head.appendChild(script);
 					if(typeof onload=='function'){
 						script.addEventListener('load',onload);
+						script.addEventListener('error',onerror);
 					}
 					return script;
 				}
@@ -15875,7 +15897,11 @@
 													if(!data) return;
 													try{
 														data=JSON.parse(lib.init.decode(data));
-														localStorage.clear();
+														var noname_inited=localStorage.getItem('noname_inited');
+										                localStorage.clear();
+														if(noname_inited){
+															localStorage.setItem(noname_inited);
+														}
 														for(var i in data){
 															localStorage.setItem(i,data[i]);
 														}
@@ -17823,8 +17849,12 @@
 									if(update.version!=lib.version){
 										var str='有新版本'+update.version+'可用，是否下载？';
 										if(navigator.notification&&navigator.notification.confirm){
+											var str2=update.changeLog[0];
+											for(var i=1;i<update.changeLog.length;i++){
+												str2+='；'+update.changeLog[i];
+											}
 											navigator.notification.confirm(
-												update.content,
+												str2,
 												function(index){
 													if(index==1){
 														goupdate();
@@ -23387,7 +23417,11 @@
 			else if(e.keyCode==116||((e.ctrlKey||e.metaKey)&&e.keyCode==82)){
 				if(e.shiftKey){
 					if(confirm('是否重置游戏？')){
-						localStorage.clear();
+						var noname_inited=localStorage.getItem('noname_inited');
+		                localStorage.clear();
+						if(noname_inited){
+							localStorage.setItem(noname_inited);
+						}
 						if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
 						game.reload();
 						return;
diff --git a/game/update.js b/game/update.js
index 013ac7eb5..132183804 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,8 +1,8 @@
 window.noname_update={
     version:'1.8.1',
-    content:[
-        '检查更新功能',
-        '游戏内下载素材',
+    changeLog:[
+        '游戏内安装新版本和素材',
+        '可选择更新稳定版或测试版',
         'bug修复',
         'Mac/iOS优化'
     ]
diff --git a/index.html b/index.html
index 2530dcbe1..e7cd2b421 100755
--- a/index.html
+++ b/index.html
@@ -4,6 +4,7 @@
 <meta name="apple-mobile-web-app-capable" content="yes">
 <meta name="viewport" content="user-scalable=no">
 <title>无名杀</title>
+<script src="game/update.js"></script>
 <script src="game/config.js"></script>
 <script src="game/package.js"></script>
 <script src="game/game.js"></script>
diff --git a/mode/stone.js b/mode/stone.js
index 656675e9f..03ef36747 100755
--- a/mode/stone.js
+++ b/mode/stone.js
@@ -598,7 +598,7 @@ mode.stone={
 						player.node.actcount=ui.create.div('.actcount.hp',player);
 					}
 					if(typeof player.actcount!=='number'){
-						player.actcount=2;
+						player.actcount=0;
 					}
 					player.actused=0;
 					if(!player.actcharacterlist){
@@ -9011,13 +9011,22 @@ mode.stone={
 			content:function(){
 				player.actused=0;
 				if(player.side){
-					player.actcount=player.getEnemy().actcount;
-				}
-				else{
 					player.actcount=player.getEnemy().actcount+1;
 				}
+				else{
+					player.actcount=player.getEnemy().actcount;
+					if(!_status.actcoin){
+						_status.actcoin=true;
+						player.actused--;
+					}
+				}
 				if(player.actcount>6){
-					player.actcount-=4;
+					if(get.config('mana_mode')=='inc'){
+						player.actcount=6;
+					}
+					else{
+						player.actcount-=4;
+					}
 				}
 				player.updateActCount();
 				player.getEnemy().updateActCount('outphase');
@@ -10149,7 +10158,7 @@ mode.stone={
 		'<li>怒气值达到100时不再增加。回合开始阶段，若怒气值己满，可消耗全部怒气值并召唤一名传说随从</ul>'+
 		'<div style="margin:10px">战斗</div><ul style="margin-top:0"><li>游戏流程类似1v1，场上有两名主将进行对抗，主将的体力上限+1'+
 		'<li>游戏牌堆移除了乐不思蜀等跳过出牌阶段的卡牌'+
-		'<li>主将出牌阶段的出牌数量（行动值）有上限，先手为2，后手为3，装备牌不计入出牌上限<li>游戏每进行一轮，主将的出牌上限+1，超过6时减至3并重新累加'+
+		'<li>主将出牌阶段的出牌数量（行动值）有上限，从1开始递增，后手的首个回合有一点额外行动值，装备牌不计入出牌上限<li>游戏每进行一轮，主将的出牌上限+1，超过6时减至3并重新累加'+
 		'<li>使用随从牌可召唤一个随从，随从出场时背面朝上。每一方在场的随从数不能超过4<li>随从于摸牌阶段摸牌基数为1，随从的随从牌均视为闪，装备牌均视为杀<li>'+
 		'随从与其他所有角色相互距离基数为1<li>'+
 		'主将杀死对方随从后获得一个额外的行动值并摸两张牌，杀死己方随从无惩罚，随从杀死随从无效果'+