From 8c76f62af38def5ebd8552f0e6c632e7cb32fa46 Mon Sep 17 00:00:00 2001 From: libccy Date: Mon, 13 Aug 2018 11:03:13 +0800 Subject: [PATCH] s --- game/game.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/game/game.js b/game/game.js index b3054764b..573d62e61 100644 --- a/game/game.js +++ b/game/game.js @@ -14666,12 +14666,15 @@ if(num==undefined) return 0; return num; }, - getStockSkills:function(unowned,unique){ + getStockSkills:function(unowned,unique,hidden){ var list=[]; - if(lib.character[this.name]&&!this.isUnseen(0)){ + if(lib.character[this.name]&&(hidden||!this.isUnseen(0))){ list.addArray(lib.character[this.name][3]); } - if(lib.character[this.name2]&&!this.isUnseen(1)){ + if(lib.character[this.name1]&&(hidden||!this.isUnseen(0))){ + list.addArray(lib.character[this.name1][3]); + } + if(lib.character[this.name2]&&(hidden||!this.isUnseen(1))){ list.addArray(lib.character[this.name2][3]); } if(!unowned){ @@ -18554,8 +18557,8 @@ hasSkill:function(skill){ return game.expandSkills(this.getSkills()).contains(skill); }, - hasStockSkill:function(skill,arg1,arg2){ - return this.getStockSkills(arg1,arg2).contains(skill); + hasStockSkill:function(skill,arg1,arg2,arg3){ + return this.getStockSkills(arg1,arg2,arg3).contains(skill); }, hasZhuSkill:function(skill,player){ if(!this.hasSkill(skill)) return false;