alihan/freeciv-web
1
0
Fork 0
mirror of https://github.com/freeciv/freeciv-web.git synced 2021-06-12 22:18:43 +03:00
Code Issues Projects Releases Wiki Activity

Update to Freeciv server freeciv/freeciv@4add33c249

Browse Source 
Freeciv commit message:
Add Action "Wipe Units"

Wipe Units wipes all the units from the target tile if none
of them has positive defense value. This applies even when
stack death does not usually apply.

Requested by Alexandro Ignatiev

See hrm Feature #864356

(Signed-off-by line removed from FCW commit message to avoid confusion)
This commit is contained in:
Sveinung Kvilhaugsvik
2021-06-03 00:24:33 +02:00
parent b70e00a3fd
commit 99f16dcf75
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
freeciv-web/src/main/webapp/javascript/fc_types.js
View File

@@ -115,7 +115,8 @@ var ACTRES_HUT_FRIGHTEN = 57;
var ACTRES_UNIT_MOVE = 58;
var ACTRES_PARADROP_CONQUER = 59;
var ACTRES_HOMELESS = 60;
var ACTRES_NONE = 61;
var ACTRES_WIPE_UNITS = 61;
var ACTRES_NONE = 62;
/* enum action_sub_result */
var ACT_SUB_RES_HUT_ENTER = 0;
@@ -240,7 +241,8 @@ var ACTION_PARADROP_FRIGHTEN_CONQUER = 101;
var ACTION_PARADROP_ENTER = 102;
var ACTION_PARADROP_ENTER_CONQUER = 103;
var ACTION_HOMELESS = 104;
var ACTION_COUNT = 105;
var ACTION_WIPE_UNITS = 105;
var ACTION_COUNT = 106;
/* The action_decision enum */
/* Doesn't need the player to decide what action to take. */

4
freeciv/version.txt
View File

@@ -1,9 +1,9 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv
FCREV=a4b7021cbc95f32a154ddcc16435fa4eefdfced0
FCREV=4add33c249a81bb4d20494d8cce8ec006d7e0ce0
ORIGCAPSTR="+Freeciv.Devel-3.2-2021.Mar.29"
ORIGCAPSTR="+Freeciv.Devel-3.2-2021.Mar.31"
# There's no need to bump this constantly as current freeciv-web
# makes no connections to outside world - all connections are