From fcb6053fa9cd0b4722c14ad8a58045a0a473c99d Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 10:24:44 +0800 Subject: [PATCH 1/7] Updata ChapterB.lua --- ChapterB.lua | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/ChapterB.lua b/ChapterB.lua index 9a29945..543605d 100644 --- a/ChapterB.lua +++ b/ChapterB.lua @@ -1,7 +1,7 @@ --[[ 代码速查手册（B区） 技能索引： - 八阵、霸刀、霸王、拜印、豹变、豹变、暴敛、暴凌、暴虐、悲歌、北伐、賁育、奔雷、奔袭、崩坏、笔伐、闭月、变天、秉壹、补益、不屈、不屈 + 八阵、霸刀、霸王、拜印、豹变、豹变、暴敛、暴凌、暴虐、悲歌、悲鸣、北伐、賁育、奔雷、奔袭、崩坏、笔伐、闭月、变天、秉壹、补益、不屈、不屈 ]]-- --[[ 技能名：八阵（锁定技） @@ -9,44 +9,36 @@ 描述：若你的装备区没有防具牌，视为你装备【八卦阵】。 引用：LuaBazhen 状态：0405验证通过 + 备注：八阵改为直接发动八卦阵 ]]-- LuaBazhen = sgs.CreateTriggerSkill{ name = "LuaBazhen", frequency = sgs.Skill_Compulsory, - events = {sgs.CardAsked}, + events = {sgs.CardAsked} , + can_trigger = function(self, target) + return (target and target:isAlive() and target:hasSkill(self:objectName())) and not target:getArmor() and target:hasArmorEffect("eight_diagram") + end on_trigger = function(self, event, player, data) local room = player:getRoom() local pattern = data:toStringList()[1] if pattern == "jink" then - if player:askForSkillInvoke("EightDiagram", data) then + if player:askForSkillInvoke("eight_diagram", data) then local judge = sgs.JudgeStruct() judge.pattern = ".|red" judge.good = true - judge.reason = self:objectName() + judge.reason = "eight_diagram" judge.who = player - judge.play_animation = true - room:setEmotion(player, "armor/EightDiagram"); room:judge(judge) if judge:isGood() then + room:setEmotion(player, "armor/eight_diagram"); local jink = sgs.Sanguosha:cloneCard("jink", sgs.Card_NoSuit, 0) - jink:setSkillName(self:objectName()) + jink:setSkillName("eight_diagram") room:provide(jink) return true end end end return false - end, - can_trigger = function(self, target) - if target and target:isAlive() and target:hasSkill(self:objectName()) and target:getArmor() then - if target:getMark("Armor_Nullified")==0 and not target:hasFlag("WuqianTarget") then - if target:getMark("Equips_Nullified_to_Yourself") == 0 then - local list = target:getTag("Qinggang"):toStringList() - return #list == 0 - end - end - end - return false end } --[[ From 9db0c66e472d5e82072c564a2840e2cbc5164d03 Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 10:40:27 +0800 Subject: [PATCH 2/7] Update ChapterB.lua --- ChapterB.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChapterB.lua b/ChapterB.lua index 543605d..8419af9 100644 --- a/ChapterB.lua +++ b/ChapterB.lua @@ -17,12 +17,12 @@ LuaBazhen = sgs.CreateTriggerSkill{ events = {sgs.CardAsked} , can_trigger = function(self, target) return (target and target:isAlive() and target:hasSkill(self:objectName())) and not target:getArmor() and target:hasArmorEffect("eight_diagram") - end + end , on_trigger = function(self, event, player, data) local room = player:getRoom() local pattern = data:toStringList()[1] if pattern == "jink" then - if player:askForSkillInvoke("eight_diagram", data) then + if player:askForSkillInvoke("eight_diagram") then local judge = sgs.JudgeStruct() judge.pattern = ".|red" judge.good = true From 7c32ccb37eb9072d8fa25d71a9da05e121d8c145 Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 10:41:07 +0800 Subject: [PATCH 3/7] Update ChapterB.md --- ChapterB.md | 42 +++++++++++++++--------------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/ChapterB.md b/ChapterB.md index 5554e8d..90c38c1 100644 --- a/ChapterB.md +++ b/ChapterB.md @@ -2,56 +2,44 @@ 代码速查手册（B区） == #技能索引 -[八阵](#八阵)、[霸刀](#霸刀)、[霸王](#霸王)、[拜印](#拜印)、[豹变](#豹变)、[暴虐](#暴虐)、[悲歌](#悲歌)、[北伐](#北伐)、[崩坏](#崩坏)、[笔伐](#笔伐)、[闭月](#闭月)、[补益](#补益)、[不屈](#不屈)、[不屈-旧风](#不屈-旧风) +[八阵](#八阵)、[霸刀](#霸刀)、[霸王](#霸王)、[拜印](#拜印)、[豹变](#豹变)、[豹变-台](#豹变-台)、[暴敛](#暴敛)、[暴凌](#暴凌)、[暴虐](#暴虐)、[悲歌](#悲歌)、[悲鸣](#悲鸣)、[北伐](#北伐)、[賁育](#賁育)、[奔雷](#奔雷)、[奔袭](#奔袭)、[崩坏](#崩坏)、[笔伐](#笔伐)、[闭月](#闭月)、[变天](#变天)、[秉壹](#秉壹)、[补益](#补益)、[不屈](#不屈)、[不屈-旧风](#不屈-旧风) [返回目录](README.md#目录) ##八阵 **相关武将**：火·诸葛亮 -**描述**：**锁定技，**若你的装备区没有防具牌，视为你装备着【八卦阵】。 +**描述**：**锁定技，**若你的装备区没有防具牌，视为你装备【八卦阵】。 **引用**：LuaBazhen -**状态**：1217验证通过 +**状态**：0405验证通过 +**备注**：八阵改为直接发动八卦阵 ```lua LuaBazhen = sgs.CreateTriggerSkill{ name = "LuaBazhen", frequency = sgs.Skill_Compulsory, - events = {sgs.CardAsked}, + events = {sgs.CardAsked} , + can_trigger = function(self, target) + return (target and target:isAlive() and target:hasSkill(self:objectName())) and not target:getArmor() and target:hasArmorEffect("eight_diagram") + end , on_trigger = function(self, event, player, data) local room = player:getRoom() local pattern = data:toStringList()[1] if pattern == "jink" then - if player:askForSkillInvoke("EightDiagram",data) then + if player:askForSkillInvoke("eight_diagram") then local judge = sgs.JudgeStruct() judge.pattern = ".|red" judge.good = true - judge.reason = self:objectName() + judge.reason = "eight_diagram" judge.who = player - judge.play_animation = true - room:setEmotion(player, "armor/EightDiagram"); room:judge(judge) if judge:isGood() then + room:setEmotion(player, "armor/eight_diagram"); local jink = sgs.Sanguosha:cloneCard("jink", sgs.Card_NoSuit, 0) - jink:setSkillName(self:objectName()) + jink:setSkillName("eight_diagram") room:provide(jink) return true end end end return false - end, - can_trigger = function(self, target) - if target then - if target:isAlive() and target:hasSkill(self:objectName()) then - if not target:getArmor() then - if target:getMark("Armor_Nullified")==0 and not target:hasFlag("WuqianTarget") then - if target:getMark("Equips_Nullified_to_Yourself") == 0 then - local list = target:getTag("Qinggang"):toStringList() - return #list == 0 - end - end - end - end - end - return false end } ``` @@ -60,8 +48,8 @@ ##霸刀 **相关武将**：智·华雄 **描述**：当你成为黑色的【杀】目标后，你可以使用一张【杀】 -**引用**：LuaBadao -**状态**：1217验证通过 +**引用**：LuaBadao +**状态**：0405验证通过 ```lua LuaBadao = sgs.CreateTriggerSkill{ name = "LuaBadao" , @@ -791,4 +779,4 @@ end } ``` -[返回索引](#技能索引) \ No newline at end of file +[返回索引](#技能索引) From 47c867287c47f0ebb9b243c1f1c0f6607a93c7f5 Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 17:47:40 +0800 Subject: [PATCH 4/7] Update huoji --- ChapterH.lua | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ChapterH.lua b/ChapterH.lua index 286c5cf..c4d7710 100644 --- a/ChapterH.lua +++ b/ChapterH.lua @@ -1373,19 +1373,17 @@ LuaHunzi = sgs.CreateTriggerSkill{ 相关武将：火·诸葛亮 描述：你可以将一张红色手牌当【火攻】使用。 引用：LuaHuoji - 状态：1217验证通过 + 状态：0405验证通过 ]]-- LuaHuoji = sgs.CreateOneCardViewAsSkill{ name = "LuaHuoji", - filter_pattern = ".|red|.|hand", - view_as = function(self, card) - local suit = card:getSuit() - local point = card:getNumber() - local id = card:getId() - local fireattack = sgs.Sanguosha:cloneCard("FireAttack", suit, point) - fireattack:setSkillName(self:objectName()) - fireattack:addSubcard(id) - return fireattack + response_or_use = true, + filter_pattern = ".|red|.|hand" , + view_as = function(self, originalCard) + local fire_attack = sgs.Sanguosha:cloneCard("FireAttack", originalCard:getSuit(), originalCard:getNumber()) + fire_attack:setSkillName(self:objectName()) + fire_attack:addSubcard(originalCard) + return fire_attack end } --[[ From b875b447866f79f84a7a27fa86c0f06791bb3957 Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 17:48:19 +0800 Subject: [PATCH 5/7] Update kanpo --- ChapterK.lua | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/ChapterK.lua b/ChapterK.lua index 9855e54..0e96d7a 100644 --- a/ChapterK.lua +++ b/ChapterK.lua @@ -8,23 +8,21 @@ 相关武将：火·诸葛亮 描述：你可以将一张黑色手牌当【无懈可击】使用。 引用：LuaKanpo - 状态：1217验证通过 + 状态：0405验证通过 ]]-- LuaKanpo = sgs.CreateOneCardViewAsSkill{ name = "LuaKanpo", filter_pattern = ".|black|.|hand", - response_pattern = "nullification", - view_as = function(self, first) - local ncard = sgs.Sanguosha:cloneCard("nullification", first:getSuit(), first:getNumber()) - ncard:addSubcard(first) + response_pattern = "nullification", + response_or_use = true, + view_as = function(self, originalCard) + local ncard = sgs.Sanguosha:cloneCard("nullification", originalCard:getSuit(), originalCard:getNumber()) + ncard:addSubcard(originalCard) ncard:setSkillName(self:objectName()) return ncard - end, + end , enabled_at_nullification = function(self, player) - for _, card in sgs.qlist(player:getHandcards()) do - if card:isBlack() then return true end - end - return false + return not player:isKongcheng() or not player:getHandPile():isEmpty() end } --[[ From 40ea5a5a2d88f16bb1161c9f8f0fe992700f0eab Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 17:48:35 +0800 Subject: [PATCH 6/7] Update huoji2 --- ChapterH.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ChapterH.md b/ChapterH.md index e848858..93fcb6e 100644 --- a/ChapterH.md +++ b/ChapterH.md @@ -1377,19 +1377,17 @@ **相关武将**：火·诸葛亮 **描述**：你可以将一张红色手牌当【火攻】使用。 **引用**：LuaHuoji -**状态**：1217验证通过 +**状态**：0405验证通过 ```lua LuaHuoji = sgs.CreateOneCardViewAsSkill{ name = "LuaHuoji", filter_pattern = ".|red|.|hand", - view_as = function(self, card) - local suit = card:getSuit() - local point = card:getNumber() - local id = card:getId() - local fireattack = sgs.Sanguosha:cloneCard("FireAttack", suit, point) - fireattack:setSkillName(self:objectName()) - fireattack:addSubcard(id) - return fireattack + response_or_use = true, + view_as = function(self, originalCard) + local fire_attack = sgs.Sanguosha:cloneCard("FireAttack", originalCard:getSuit(), originalCard:getNumber()) + fire_attack:setSkillName(self:objectName()) + fire_attack:addSubcard(originalCard) + return fire_attack end } ``` From 9bd5ccba9e163f41f8e228c68da69a1140bcac00 Mon Sep 17 00:00:00 2001 From: peterli2012y Date: Fri, 10 Apr 2015 17:48:45 +0800 Subject: [PATCH 7/7] Update Kanpo2 --- ChapterK.md | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ChapterK.md b/ChapterK.md index d5f165f..60f06a1 100644 --- a/ChapterK.md +++ b/ChapterK.md @@ -8,23 +8,21 @@ **相关武将**：火·诸葛亮 **描述**：你可以将一张黑色手牌当【无懈可击】使用。 **引用**：LuaKanpo -**状态**：1217验证通过 +**状态**：0405验证通过 ```lua LuaKanpo = sgs.CreateOneCardViewAsSkill{ name = "LuaKanpo", filter_pattern = ".|black|.|hand", - response_pattern = "nullification", - view_as = function(self, first) - local ncard = sgs.Sanguosha:cloneCard("nullification", first:getSuit(), first:getNumber()) - ncard:addSubcard(first) + response_pattern = "nullification", + response_or_use = true, + view_as = function(self, originalCard) + local ncard = sgs.Sanguosha:cloneCard("nullification", originalCard:getSuit(), originalCard:getNumber()) + ncard:addSubcard(originalCard) ncard:setSkillName(self:objectName()) return ncard end, enabled_at_nullification = function(self, player) - for _, card in sgs.qlist(player:getHandcards()) do - if card:isBlack() then return true end - end - return false + return not player:isKongcheng() or not player:getHandPile():isEmpty() end } ```