fankui and fix some bugs
This commit is contained in:
jazuo 2023-01-07 15:20:44 +08:00
parent 509cf29175
commit fcb6ce89a4
4 changed files with 32 additions and 4 deletions

View File

@ -135,7 +135,7 @@ function GameLogic:prepareForStart()
end
for _, p in ipairs(room.alive_players) do
room:handleAddLoseSkills(p, "zhiheng|mashu", nil, false)
room:handleAddLoseSkills(p, "zhiheng|mashu|fankui", nil, false)
end
self:addTriggerSkill(GameRule)

View File

@ -16,9 +16,32 @@ Fk:loadTranslationTable{
["caocao"] = "曹操",
}
local fankui = fk.CreateTriggerSkill{
name = "fankui",
events = {fk.Damaged},
frequency = Skill.NotFrequent,
can_trigger = function(self, event, target, player, data)
return target:hasSkill(self.name)
end,
on_trigger = function(self, event, target, player, data)
local damage = data.damage
local room = player.room
local from = room:getPlayerById(damage.from)
if event == fk.Damaged then
if from:isNude() then return false end
if room:askForSkillInvoke(target, self.name) then
local card = room:askForCardChosen(target, from, "he", self.name)
room:obtainCard(target.id, card, false, fk.ReasonPrey)
end
end
end
}
local simayi = General:new(extension, "simayi", "wei", 3)
simayi:addSkill(fankui)
Fk:loadTranslationTable{
["simayi"] = "司马懿",
["fankui"] = "反馈",
}
local xiahoudun = General:new(extension, "xiahoudun", "wei", 4)

View File

@ -172,8 +172,8 @@ function moveCards(moves) {
function setEmotion(id, emotion) {
let path;
if (OS === "Win") {
// Windows: file:/C:/xxx/xxxx
path = (SkinBank.PIXANIM_DIR + emotion).replace("file:/", "");
// Windows: file:///C:/xxx/xxxx
path = (SkinBank.PIXANIM_DIR + emotion).replace("file:///", "");
} else {
path = (SkinBank.PIXANIM_DIR + emotion).replace("file://", "");
}

View File

@ -89,7 +89,12 @@ void QmlBackend::cd(const QString &path) {
}
QStringList QmlBackend::ls(const QString &dir) {
return QDir(QUrl(dir).path()).entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
QString d = dir;
#ifdef Q_OS_WIN
if (d.startsWith("file:///"))
d.replace(0, 8, "file://");
#endif
return QDir(QUrl(d).path()).entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
}
QString QmlBackend::pwd() {