4

card/gujian.js

@@ -846,7 +846,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 	            content:function(){
 	                var list=[];
 	                for(var i=0;i<2;i++){
-	                    list.push(game.createCard('shan','red'));
+	                    list.push(game.createCard('shan'));
 	                }
 	                target.gain(list,'gain2');
 	            },

card/standard.js

@@ -190,6 +190,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				audio:true,
 				fullskin:true,
 				type:'basic',
+				cardcolor:'red',
 				ai:{
 					basic:{
 						useful:[7,2],
@@ -200,6 +201,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			tao:{
 				fullskin:true,
 				type:'basic',
+				cardcolor:'red',
 				enable:function(card,player){
 					return player.hp<player.maxHp;
 				},
@@ -767,6 +769,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				type:'trick',
 				enable:true,
 				selectTarget:-1,
+				cardcolor:'red',
 				filterTarget:function(card,player,target){
 					return target==player;
 				},

card/swd.js

@@ -1779,6 +1779,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				enable:true,
 				selectTarget:-1,
 				reverseOrder:true,
+				cardcolor:'black',
 				filterTarget:function(card,player,target){
 					return target!=player;
 				},
@@ -1838,6 +1839,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				enable:true,
 				selectTarget:-1,
 				reverseOrder:true,
+				cardcolor:'red',
 				filterTarget:function(card,player,target){
 					return target!=player;
 				},

card/yunchou.js

@@ -713,6 +713,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 			huoshan:{
 				fullskin:true,
 				type:'delay',
+				cardcolor:'red',
 				modTarget:function(card,player,target){
 					return lib.filter.judge(card,player,target);
 				},
@@ -871,6 +872,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				type:'trick',
 				enable:true,
 				filterTarget:true,
+				cardcolor:'red',
 				content:function(){
 					"step 0"
 					if(target.countCards('he')<2){

character/hearth.js

@@ -6366,7 +6366,32 @@ game.import('character',function(lib,game,ui,get,ai,_status){
     	},
     	card:{
             hsjixie_zhadan:{
-
+                enable:true,
+				fullimage:true,
+				type:'hsjixie',
+    			vanish:true,
+    			derivation:'hs_pengpeng',
+				filterTarget:function(card,player,target){
+					return target==player;
+				},
+				modTarget:true,
+				selectTarget:-1,
+                cardcolor:'black',
+				content:function(){
+					var targets=target.getEnemies();
+					if(targets.length){
+						var target2=targets.randomGet();
+						target2.addExpose(0.2);
+                        target2.damage('fire');
+					}
+				},
+				ai:{
+					value:8,
+					result:{
+						target:1
+					},
+					order:4,
+				}
             },
             hsqizhou_feng:{
     			type:'hsqizhou',
@@ -7199,6 +7224,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
             hs_yinggencao:'萤根草',
             hs_zhihuanhua:'致幻花',
             hs_shirencao:'食人草',
+            hs_fachaotuteng:'法潮图腾',
+            hs_huolituteng:'活力图腾',
+            hs_manyututeng:'蛮鱼图腾',
 
             zhaochao:'招潮',
             zhaochao_info:'锁定技，结束阶段，你视为对一名随机敌人使用一张杀；若此杀被闪避，你视为对另一名随机敌人使用一张杀',

game/asset.js

@@ -63,6 +63,7 @@ window.noname_asset_list=[
     'image/card/hsdusu_kuyecao.jpg',
     'image/card/hsdusu_huangxuecao.jpg',
     'image/card/hsdusu_huoyanhua.jpg',
+    'image/card/hsjixie_zhadan.jpg',
     'image/card/hsqizhou_feng.jpg',
     'image/card/hsqizhou_huo.jpg',
     'image/card/hsqizhou_shui.jpg',
@@ -375,6 +376,7 @@ window.noname_asset_list=[
     'image/character/hs_bolvar.jpg',
     'image/character/hs_brann.jpg',
     'image/character/hs_aedwin.jpg',
+    'image/character/hs_fachaotuteng.jpg',
     'image/character/hs_finley.jpg',
     'image/character/hs_fenjie.jpg',
     'image/character/hs_fandral.jpg',
@@ -383,6 +385,7 @@ window.noname_asset_list=[
     'image/character/hs_guldan.jpg',
     'image/character/hs_hemite.jpg',
     'image/character/hs_hudunren.jpg',
+    'image/character/hs_huolituteng.jpg',
     'image/character/hs_hallazeal.jpg',
     'image/character/hs_huzhixiannv.jpg',
     'image/character/hs_jgarrosh.jpg',
@@ -405,6 +408,7 @@ window.noname_asset_list=[
     'image/character/hs_lrexxar.jpg',
     'image/character/hs_lrhonin.jpg',
     'image/character/hs_magni.jpg',
+    'image/character/hs_manyututeng.jpg',
     'image/character/hs_malfurion.jpg',
     'image/character/hs_malorne.jpg',
     'image/character/hs_malygos.jpg',

game/game.js

@@ -23512,6 +23512,9 @@
                 noclick=true;
                 suit=null;
             }
+			if(!suit&&lib.card[name].cardcolor){
+				suit=lib.card[name].cardcolor;
+			}
 			if(typeof suit!='string'){
 				suit=['heart','diamond','club','spade'].randomGet();
 			}

game/update.js

@@ -10,9 +10,9 @@ window.noname_update={
         // 'game/config.js',
         // 'game/source.js',
         // 'game/pressure.js',
-        // 'game/asset.js',
+        'game/asset.js',
-        // 'card/*',
+        'card/*',
-        'card/swd.js',
+        // 'card/swd.js',
         // 'card/standard.js',
         'character/*',
         // 'character/rank.js',