From 5a5ee5a7ef589c6a47b2549a55d752c4fd8a0033 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 20 Mar 2024 17:00:03 +0200 Subject: [PATCH] Update to Freeciv server freeciv/freeciv@16048eb132 Signed-off-by: Marko Lindqvist --- .../src/main/webapp/javascript/fc_types.js | 25 ++++++++++--------- freeciv/version.txt | 4 +-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/freeciv-web/src/main/webapp/javascript/fc_types.js b/freeciv-web/src/main/webapp/javascript/fc_types.js index 15e4e1f73..3b637a103 100644 --- a/freeciv-web/src/main/webapp/javascript/fc_types.js +++ b/freeciv-web/src/main/webapp/javascript/fc_types.js @@ -272,19 +272,20 @@ var ACTION_TELEPORT_ENTER_CONQUER = 119; var ACTION_CLEAN = 120; var ACTION_COLLECT_RANSOM = 121; var ACTION_FORTIFY = 122; -var ACTION_CULTIVATE = 123; -var ACTION_CULTIVATE2 = 124; -var ACTION_PLANT = 125; -var ACTION_PLANT2 = 126; -var ACTION_TRANSFORM_TERRAIN = 127; -var ACTION_TRANSFORM_TERRAIN2 = 128; +var ACTION_FORTIFY2 = 123; +var ACTION_CULTIVATE = 124; +var ACTION_CULTIVATE2 = 125; +var ACTION_PLANT = 126; +var ACTION_PLANT2 = 127; +var ACTION_TRANSFORM_TERRAIN = 128; +var ACTION_TRANSFORM_TERRAIN2 = 129; -var ACTION_GAIN_VETERANCY = 129; -var ACTION_USER_ACTION1 = 130; -var ACTION_USER_ACTION2 = 131; -var ACTION_USER_ACTION3 = 132; -var ACTION_USER_ACTION4 = 133; -var ACTION_COUNT = 134; +var ACTION_GAIN_VETERANCY = 130; +var ACTION_USER_ACTION1 = 131; +var ACTION_USER_ACTION2 = 132; +var ACTION_USER_ACTION3 = 133; +var ACTION_USER_ACTION4 = 134; +var ACTION_COUNT = 135; /* The action_decision enum */ /* Doesn't need the player to decide what action to take. */ diff --git a/freeciv/version.txt b/freeciv/version.txt index 7293d1353..e627a9246 100644 --- a/freeciv/version.txt +++ b/freeciv/version.txt @@ -1,9 +1,9 @@ # The Git SHA hash for the commit to checkout from # https://github.com/freeciv/freeciv -FCREV=6ebfac2ab44c29511a016f5866c95f286bbcb849 +FCREV=16048eb132118f21eb6c9bfbbf4193b9a9fbec08 -ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Feb.01" +ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Feb.07" # There's no need to bump this constantly as current freeciv-web # makes no connections to outside world - all connections are