移除怒气隐藏

game/game.js

@@ -4871,11 +4871,9 @@
 					update:function(config,map){
 						if(config.connect_identity_mode=='mougong'){
 							map.connect_round1_use_nuqi.show();
-							map.connect_nuqi_seen_for_others.show();
 						}
 						else{
 							map.connect_round1_use_nuqi.hide();
-							map.connect_nuqi_seen_for_others.hide();
 						}
 						if(config.connect_identity_mode=='zhong'){
 							map.connect_player_number.hide();
@@ -5004,13 +5002,6 @@
 						restart:true,
 						intro:'谋攻篇规则为第二轮开始才可使用怒气强化卡牌，开启此选项从游戏开始即可强化卡牌。'
 					},
-					connect_nuqi_seen_for_others:{
-						name:'开启其他角色怒气可见',
-						init:false,
-						frequent:false,
-						restart:true,
-						intro:'谋攻篇实测效果为无法看见其他角色剩余怒气。开启此选项即可令所有角色的怒气值被其他玩家可见。'
-					},
 					// connect_ban_weak:{
 					// 	name:'屏蔽弱将',
 					// 	init:true,
@@ -5032,12 +5023,10 @@
 					update:function(config,map){
 						if(config.identity_mode=='mougong'){
 							map.round1_use_nuqi.show();
-							map.nuqi_seen_for_others.show();
 							map.nei_auto_mark_camouflage.show();
 						}
 						else{
 							map.round1_use_nuqi.hide();
-							map.nuqi_seen_for_others.hide();
 							map.nei_auto_mark_camouflage.hide();
 						}
 						if(config.identity_mode=='zhong'){
@@ -5373,13 +5362,6 @@
 						restart:true,
 						intro:'谋攻篇规则为第二轮开始才可使用怒气强化卡牌，开启此选项从游戏开始即可强化卡牌。'
 					},
-					nuqi_seen_for_others:{
-						name:'开启其他角色怒气可见',
-						init:false,
-						frequent:false,
-						restart:true,
-						intro:'谋攻篇实测效果为无法看见其他角色剩余怒气。开启此选项即可令其他玩家的怒气值被你可见。'
-					},
 					nei_auto_mark_camouflage:{
 						name:'内奸自动标记伪装反贼',
 						intro:'玩家内奸在游戏开始洞察结束后，自动将被洞察角色标记为反贼。',
@@ -34359,7 +34341,7 @@
 						return `<span style="color:#def7ca" data-nature="watermm">${prefix}</span>`;
 					}
 					if(simple) return '<span>手杀</span>';
-					return `<span style="writing-mode:horizontal-tb;-webkit-writing-mode:horizontal-tb;font-family:xinwei;transform:scaleY(0.85);transform:scaleX(0.55);">手杀</span>`;
+					return `<span style="font-family:NonameSuits">📱</span>`;
 				},
 			}],
 			['TW',{

mode/identity.js

@@ -264,7 +264,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				});
 				if(_status.connectMode){
 					_status.round1_use_nuqi=lib.configOL.round1_use_nuqi;
-					_status.nuqi_seen_for_others=lib.configOL.nuqi_seen_for_others;
 					if(!_status.postReconnect.mougong_reinit){
 						_status.postReconnect.mougong_reinit=[
 							function(){
@@ -279,7 +278,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				}
 				else{
 					_status.round1_use_nuqi=get.config('round1_use_nuqi');
-					_status.nuqi_seen_for_others=get.config('nuqi_seen_for_others');
 				}
 				for(var current of game.players){
 					if(current.identity=='zhu') current.addSkill('mougong_showZhu');
@@ -365,9 +363,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					},
 				});
 				for(var i=0;i<game.players.length;i++){
-					if(game.players[i]==game.me||_status.nuqi_seen_for_others){
 					game.addVideo('markSkill',game.players[i],['mougong_nuqi']);
-					}
 					game.players[i].ai.shown=0;
 				}
 				game.neiDoCamouflage();
@@ -440,7 +436,6 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				if(lib.configOL.identity_mode!='zhong'){
 					if(lib.configOL.identity_mode=='mougong'){
 						uiintro.add('<div class="text chat">首轮强化：'+(lib.configOL.round1_use_nuqi?'开启':'关闭'));
-						uiintro.add('<div class="text chat">怒气可见：'+(lib.configOL.nuqi_seen_for_others?'是':'否'));
 					}
 					else{
 						uiintro.add('<div class="text chat">双内奸：'+(lib.configOL.double_nei?'开启':'关闭'));
@@ -1307,13 +1302,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					game.players.forEach(current=>{
 						current.storage.zhibi=[];
 						current.storage.zhibi_for=[];
-						if(lib.configOL.nuqi_seen_for_others){
 						current.markSkill('mougong_nuqi');
-						}
-						else{
-							if(current==game.me) localMark('mougong_nuqi');
-							else if(current.isOnline()) current.send(localMark,'mougong_nuqi');
-						}
 					});
 					
 					setTimeout(function(){
@@ -2130,9 +2119,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 						game.players.forEach(i=>{
 							i.storage.zhibi=[];
 							i.storage.zhibi_for=[];
-							if(i.isUnderControl(true)||_status.nuqi_seen_for_others){
+							i.markSkill('mougong_nuqi');
-								i.markSkill('mougong_nuqi')
-							}
 						});
 					}
 					setTimeout(function(){
@@ -2659,15 +2646,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 					var del=player.storage.mougong_nuqi-tmp;
 					if(del===0) return;
 					game.log(player,del>=0?'获得了':'失去了',get.cnNumber(Math.abs(del))+'点<span class="firetext">怒气</span>');
-					if(player.storage.mougong_nuqi>=0&&del!=0){
-						if(player==game.me||_status.nuqi_seen_for_others){
 					player.markSkill('mougong_nuqi');
-						}
-						player.syncStorage('mougong_nuqi');
-						game.broadcast(function(player,num){
-							player.storage.mougong_nuqi=num;
-						},player,player.storage.mougong_nuqi);
-					}
 				},
 				addExpose:function(num){
 					if(!game.zhu||!game.zhu.isZhu||!game.zhu.identityShown) return;
@@ -3862,6 +3841,7 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 							global:'loseHpEnd',
 						},
 						filter:function(event,player){
+							if(event.player.identityShown) return false;
 							var source=event.source;
 							if(event.name=='loseHp'){
 								if(event.getParent()._trigger) source=event.getParent()._trigger.source;