ChangeLog: v0.1.5

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ___
 
+## v0.1.5
+
+1. 控制他人
+2. 观星增加限制参数
+3. 修野心家bug
+4. 修死人连锁/翻面bug
+5. 修中闪电不传导
+6. 禁止技也影响视为技等等
+7. 火攻交互优化
+
+___
+
 ## v0.1.4
 
 看点：

CMakeLists.txt

@@ -2,7 +2,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-project(FreeKill VERSION 0.1.4)
+project(FreeKill VERSION 0.1.5)
 add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\")
 
 if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Emscripten")

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="104"
-  android:versionName="0.1.4">
+  android:versionCode="105"
+  android:versionName="0.1.5">
   <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" />

flake.nix

@@ -10,7 +10,7 @@
       with import nixpkgs { system = "x86_64-linux"; };
       stdenv.mkDerivation {
         name = "freekill";
-        version = "0.1.4";
+        version = "0.1.5";
         src = self;
 
         buildInputs = with qt6; [

lua/server/serverplayer.lua

@@ -643,7 +643,7 @@ function ServerPlayer:revealGeneral(isDeputy)
   if oldKingdom == "unknown" and #table.filter(room:getOtherPlayers(self),
     function(p)
       return p.kingdom == kingdom
-    end) >= #room.alive_players // 2 then
+    end) >= #room.players // 2 then
 
     self.kingdom = "wild"
     room:broadcastProperty(self, "kingdom")

packages/standard/hegemony.lua

@@ -342,7 +342,7 @@ local heg_rule = fk.CreateTriggerSkill{
         if killer.kingdom == "unknown" then return end
 
         local victim = damage.to
-        if killer.kingdom == victim.kingdom then
+        if killer.kingdom ~= "wild" and killer.kingdom == victim.kingdom then
           killer:throwAllCards("he")
         else
           killer:drawCards(victim.kingdom == "wild" and 1 or