Changelog: v0.2.0

CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ___
 
+## v0.2.0
+
+修复了标准版吕布属性杀不触发无双、貂蝉决斗可被无懈。
+
+由于标准包更加完善了，所以增加一位中版本号。
+
+1. 获得了中文名“新月杀”
+2. 房间可设置密码
+3. 手牌上限不等于HP时会显示
+4. 修禁用铁锁无法重铸
+5. 修视为技按钮一直亮着
+6. 使命技机制，完善游戏逻辑
+7. 拖孩
+
+___
+
 ## v0.1.9
 
 1. 实现移动场上一张牌

CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.1.9)
+project(FreeKill VERSION 0.2.0)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 find_package(Qt6 REQUIRED COMPONENTS

android/AndroidManifest.xml

@@ -3,8 +3,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="org.notify.FreeKill"
   android:installLocation="preferExternal"
-  android:versionCode="109"
+  android:versionCode="200"
-  android:versionName="0.1.9">
+  android:versionName="0.2.0">
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

image/logo/freekill.png

@@ -1 +0,0 @@
-/home/notify/develop/FreeKill/image/icon.png

lang/zh_CN.ts

@@ -183,6 +183,10 @@
     <source>room password error</source>
     <translation>房间密码错误</translation>
   </message>
+  <message>
+    <source>no such room</source>
+    <translation>房间不存在</translation>
+  </message>
 </context>
 
 <context>

lua/client/i18n/zh_CN.lua

@@ -208,19 +208,18 @@ FreeKill使用的是libgit2的C API，与此同时使用Git完成拓展包的下
   ["$NoWinner"] = "平局！",
   ["Back To Lobby"] = "返回大厅",
 
-  ["Bulletin Info"] = "<h2>更新说明</h2>\
+  ["Bulletin Info"] = [==[<h2>v0.2.0 更新说明</h2>
-  1. 实现移动场上一张牌；<br>\
+  修复了标准版吕布属性杀不触发无双、貂蝉决斗可被无懈。<br/>
-  2. 实现用作记录牌名并可查看的mark；<br>\
+
-  3. 将askForChoice和interaction的文本解析方式改为prompt；<br>\
+  由于标准包更加完善了，所以增加一位中版本号。<br/>
-  4. 新增属性将牌移至牌堆指定索引位置；<br>\
+
-  5. 修改时机“游戏开始时”至正确位置；<br>\
+  1. 获得了中文名“新月杀”<br/>
-  6. 优化衍生牌逻辑；<br>\
+  2. 房间可设置密码<br/>
-  7. 新增“卡牌展示后”时机；<br>\
+  3. 手牌上限不等于HP时会显示<br/>
-  8. 修改qml文件结构；<br>\
+  4. 修禁用铁锁无法重铸<br/>
-  9. 新增手气卡机制；<br>\
+  5. 修视为技按钮一直亮着<br/>
-  10. 新增大厅表情功能；<br>\
+  6. 使命技机制，完善游戏逻辑<br/>
-  11. 新增选将时技能描述查看，以及查看卡牌描述的功能；<br>\
+  7. 砸拖鞋<br/>]==],
-  12. 查看角色技能描述侧栏新增“送花”和“砸蛋”功能。",
 }
 
 -- Game concepts

lua/core/player.lua

@@ -425,11 +425,14 @@ end
 
 --- 获取其他玩家是否在玩家的攻击距离内。
 ---@param other Player @ 其他玩家
-function Player:inMyAttackRange(other)
+---@param fixLimit number|null @ 卡牌距离限制增加专用
+function Player:inMyAttackRange(other, fixLimit)
   if self == other then
     return false
   end
 
+  fixLimit = fixLimit or 0
+
   local status_skills = Fk:currentRoom().status_skills[AttackRangeSkill] or {}
   for _, skill in ipairs(status_skills) do
     if skill:withinAttackRange(self, other) then
@@ -438,7 +441,7 @@ function Player:inMyAttackRange(other)
   end
 
   local baseAttackRange = self:getAttackRange()
-  return self:distanceTo(other) <= baseAttackRange
+  return self:distanceTo(other) <= (baseAttackRange + fixLimit)
 end
 
 --- 增加玩家使用特定牌的历史次数。

packages/maneuvering/init.lua

@@ -276,7 +276,7 @@ local supplyShortageSkill = fk.CreateActiveSkill{
       local player = Fk:currentRoom():getPlayerById(to_select)
       if Self ~= player then
         return not player:hasDelayedTrick("supply_shortage") and
-          Self:distanceTo(player) <= self:getDistanceLimit(Self, card, Fk:currentRoom():getPlayerById(to_select))
+          Self:distanceTo(player) <= self:getDistanceLimit(Self, card, player)
       end
     end
     return false

packages/standard_cards/init.lua

@@ -38,10 +38,7 @@ local slashSkill = fk.CreateActiveSkill{
   target_filter = function(self, to_select, selected, _, card)
     if #selected < self:getMaxTargetNum(Self, card) then
       local player = Fk:currentRoom():getPlayerById(to_select)
-      return Self ~= player and
+      return Self ~= player and Self:inMyAttackRange(player, self:getDistanceLimit(Self, card, player))
-        (self:getDistanceLimit(Self, card, Fk:currentRoom():getPlayerById(to_select)) -- for no distance limit for slash
-        + Self:getAttackRange()
-        >= Self:distanceTo(player))
     end
   end,
   on_effect = function(self, room, effect)
@@ -229,7 +226,7 @@ local snatchSkill = fk.CreateActiveSkill{
       local player = Fk:currentRoom():getPlayerById(to_select)
       return
         Self ~= player and
-        Self:distanceTo(player) <= self:getDistanceLimit(Self, card, Fk:currentRoom():getPlayerById(to_select)) and -- for no distance limit for snatch
+        Self:distanceTo(player) <= self:getDistanceLimit(Self, card, player) and -- for no distance limit for snatch
         not player:isAllNude()
     end
   end,