Srvup

freeciv/apply_patches.sh

@@ -21,6 +21,9 @@
 # 0017-Fix-city-removal-server-crashes.patch
 #   Crash fix
 #   RM #81
+# 0004-Fix-bombard-rate-always-being-1.patch
+#   Bombard action fix
+#   RM #93
 
 # Not in the upstream Freeciv server
 # ----------------------------------
@@ -48,6 +51,7 @@ declare -a PATCHLIST=(
   "backports/0031-Meson-Enable-implicit-fallthrough-compiler-warnings"
   "backports/0014-Improve-savemain.c-coding-style"
   "backports/0017-Fix-city-removal-server-crashes"
+  "backports/0004-Fix-bombard-rate-always-being-1"
   "meson_webperimental"
   "metachange"
   "text_fixes"

freeciv/patches/backports/0004-Fix-bombard-rate-always-being-1.patch

@@ -0,0 +1,31 @@
+From 8998a1c138c94f5d73bf9b6ee2e8b2a3f518ee3f Mon Sep 17 00:00:00 2001
+From: Marko Lindqvist <[email protected]>
+Date: Fri, 29 Dec 2023 17:26:30 +0200
+Subject: [PATCH 04/22] Fix bombard rate always being 1
+
+Ruleset defined value had no effect, as unit_bombard_rate()
+erroneously sanitised scaling result with MIN(), and not MAX()
+
+See RM #93
+
+Signed-off-by: Marko Lindqvist <[email protected]>
+---
+ common/combat.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/combat.c b/common/combat.c
+index a6552696a8..9af193d7c4 100644
+--- a/common/combat.c
++++ b/common/combat.c
+@@ -1025,7 +1025,7 @@ int unit_bombard_rate(struct unit *punit)
+   if (game.info.damage_reduces_bombard_rate && base_bombard_rate > 0) {
+     int rate = (base_bombard_rate * punit->hp) / utype->hp;
+
+-    return MIN(rate, 1);
++    return MAX(rate, 1);
+   }
+
+   return base_bombard_rate;
+-- 
+2.43.0
+

freeciv/version.txt

@@ -1,7 +1,7 @@
 # The Git SHA hash for the commit to checkout from
 # https://github.com/freeciv/freeciv
 
-FCREV=4e9292e4a52c257d0b02f667614609cb31a686ab
+FCREV=5775c24ef12f60e5658c54594a71c11456700638
 
 ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2023.Dec.04"