Skip to content

Commit

Permalink
Merge pull request #829 from cazfi/srvup
Browse files Browse the repository at this point in the history
  • Loading branch information
@cazfi
cazfi authored Apr 8, 2024
2 parents 7066ef4 + 37268be commit df59735
Show file tree
Hide file tree
Showing 5 changed files with 131 additions and 594 deletions.
137 changes: 69 additions & 68 deletions freeciv-web/src/main/webapp/javascript/fc_types.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,75 +218,76 @@ var ACTION_MINE2 = 65;
var ACTION_BASE = 66;
var ACTION_BASE2 = 67;
var ACTION_PILLAGE = 68;
var ACTION_TRANSPORT_BOARD = 69;
var ACTION_TRANSPORT_BOARD2 = 70;
var ACTION_TRANSPORT_BOARD3 = 71;
var ACTION_TRANSPORT_DEBOARD = 72;
var ACTION_TRANSPORT_EMBARK = 73;
var ACTION_TRANSPORT_EMBARK2 = 74;
var ACTION_TRANSPORT_EMBARK3 = 75;
var ACTION_TRANSPORT_EMBARK4 = 76;
var ACTION_TRANSPORT_DISEMBARK1 = 77;
var ACTION_TRANSPORT_DISEMBARK2 = 78;
var ACTION_TRANSPORT_DISEMBARK3 = 79;
var ACTION_TRANSPORT_DISEMBARK4 = 80;
var ACTION_TRANSPORT_LOAD = 81;
var ACTION_TRANSPORT_LOAD2 = 82;
var ACTION_TRANSPORT_LOAD3 = 83;
var ACTION_TRANSPORT_UNLOAD = 84;
var ACTION_SPY_SPREAD_PLAGUE = 85;
var ACTION_SPY_ATTACK = 86;
var ACTION_CONQUER_EXTRAS = 87;
var ACTION_CONQUER_EXTRAS2 = 88;
var ACTION_CONQUER_EXTRAS3 = 89;
var ACTION_CONQUER_EXTRAS4 = 90;
var ACTION_HUT_ENTER = 91;
var ACTION_HUT_ENTER2 = 92;
var ACTION_HUT_ENTER3 = 93;
var ACTION_HUT_ENTER4 = 94;
var ACTION_HUT_FRIGHTEN = 95;
var ACTION_HUT_FRIGHTEN2 = 96;
var ACTION_HUT_FRIGHTEN3 = 97;
var ACTION_HUT_FRIGHTEN4 = 98;
var ACTION_HEAL_UNIT = 99;
var ACTION_HEAL_UNIT2 = 100;
var ACTION_PARADROP = 101;
var ACTION_PARADROP_CONQUER = 102;
var ACTION_PARADROP_FRIGHTEN = 103;
var ACTION_PARADROP_FRIGHTEN_CONQUER = 104;
var ACTION_PARADROP_ENTER = 105;
var ACTION_PARADROP_ENTER_CONQUER = 106;
var ACTION_WIPE_UNITS = 107;
var ACTION_SPY_ESCAPE = 108;
var ACTION_UNIT_MOVE = 109;
var ACTION_UNIT_MOVE2 = 110;
var ACTION_UNIT_MOVE3 = 111;
var ACTION_TELEPORT = 112;
var ACTION_TELEPORT2 = 113;
var ACTION_TELEPORT3 = 114;
var ACTION_TELEPORT_CONQUER = 115;
var ACTION_TELEPORT_FRIGHTEN = 116;
var ACTION_TELEPORT_FRIGHTEN_CONQUER = 117;
var ACTION_TELEPORT_ENTER = 118;
var ACTION_TELEPORT_ENTER_CONQUER = 119;
var ACTION_CLEAN = 120;
var ACTION_CLEAN2 = 121;
var ACTION_COLLECT_RANSOM = 122;
var ACTION_FORTIFY = 123;
var ACTION_FORTIFY2 = 124;
var ACTION_CULTIVATE = 125;
var ACTION_CULTIVATE2 = 126;
var ACTION_PLANT = 127;
var ACTION_PLANT2 = 128;
var ACTION_TRANSFORM_TERRAIN = 129;
var ACTION_TRANSFORM_TERRAIN2 = 130;
var ACTION_PILLAGE2 = 69;
var ACTION_TRANSPORT_BOARD = 70;
var ACTION_TRANSPORT_BOARD2 = 71;
var ACTION_TRANSPORT_BOARD3 = 72;
var ACTION_TRANSPORT_DEBOARD = 73;
var ACTION_TRANSPORT_EMBARK = 74;
var ACTION_TRANSPORT_EMBARK2 = 75;
var ACTION_TRANSPORT_EMBARK3 = 76;
var ACTION_TRANSPORT_EMBARK4 = 77;
var ACTION_TRANSPORT_DISEMBARK1 = 78;
var ACTION_TRANSPORT_DISEMBARK2 = 79;
var ACTION_TRANSPORT_DISEMBARK3 = 80;
var ACTION_TRANSPORT_DISEMBARK4 = 81;
var ACTION_TRANSPORT_LOAD = 82;
var ACTION_TRANSPORT_LOAD2 = 83;
var ACTION_TRANSPORT_LOAD3 = 84;
var ACTION_TRANSPORT_UNLOAD = 85;
var ACTION_SPY_SPREAD_PLAGUE = 86;
var ACTION_SPY_ATTACK = 87;
var ACTION_CONQUER_EXTRAS = 88;
var ACTION_CONQUER_EXTRAS2 = 89;
var ACTION_CONQUER_EXTRAS3 = 90;
var ACTION_CONQUER_EXTRAS4 = 91;
var ACTION_HUT_ENTER = 92;
var ACTION_HUT_ENTER2 = 93;
var ACTION_HUT_ENTER3 = 94;
var ACTION_HUT_ENTER4 = 95;
var ACTION_HUT_FRIGHTEN = 96;
var ACTION_HUT_FRIGHTEN2 = 97;
var ACTION_HUT_FRIGHTEN3 = 98;
var ACTION_HUT_FRIGHTEN4 = 99;
var ACTION_HEAL_UNIT = 100;
var ACTION_HEAL_UNIT2 = 101;
var ACTION_PARADROP = 102;
var ACTION_PARADROP_CONQUER = 103;
var ACTION_PARADROP_FRIGHTEN = 104;
var ACTION_PARADROP_FRIGHTEN_CONQUER = 105;
var ACTION_PARADROP_ENTER = 106;
var ACTION_PARADROP_ENTER_CONQUER = 107;
var ACTION_WIPE_UNITS = 108;
var ACTION_SPY_ESCAPE = 109;
var ACTION_UNIT_MOVE = 110;
var ACTION_UNIT_MOVE2 = 111;
var ACTION_UNIT_MOVE3 = 112;
var ACTION_TELEPORT = 113;
var ACTION_TELEPORT2 = 114;
var ACTION_TELEPORT3 = 115;
var ACTION_TELEPORT_CONQUER = 116;
var ACTION_TELEPORT_FRIGHTEN = 117;
var ACTION_TELEPORT_FRIGHTEN_CONQUER = 118;
var ACTION_TELEPORT_ENTER = 119;
var ACTION_TELEPORT_ENTER_CONQUER = 120;
var ACTION_CLEAN = 121;
var ACTION_CLEAN2 = 122;
var ACTION_COLLECT_RANSOM = 123;
var ACTION_FORTIFY = 124;
var ACTION_FORTIFY2 = 125;
var ACTION_CULTIVATE = 126;
var ACTION_CULTIVATE2 = 127;
var ACTION_PLANT = 128;
var ACTION_PLANT2 = 129;
var ACTION_TRANSFORM_TERRAIN = 130;
var ACTION_TRANSFORM_TERRAIN2 = 131;

var ACTION_GAIN_VETERANCY = 131;
var ACTION_USER_ACTION1 = 132;
var ACTION_USER_ACTION2 = 133;
var ACTION_USER_ACTION3 = 134;
var ACTION_USER_ACTION4 = 135;
var ACTION_COUNT = 136;
var ACTION_GAIN_VETERANCY = 132;
var ACTION_USER_ACTION1 = 133;
var ACTION_USER_ACTION2 = 134;
var ACTION_USER_ACTION3 = 135;
var ACTION_USER_ACTION4 = 136;
var ACTION_COUNT = 137;

/* The action_decision enum */
/* Doesn't need the player to decide what action to take. */
Expand Down
8 changes: 4 additions & 4 deletions freeciv/apply_patches.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# https://osdn.net/projects/freeciv/ticket/?????
# https://redmine.freeciv.org/issues/???
#
# 0023-Improve-connecthand.-ch-coding-style.patch
# Set baseline for freeciv-web patches
# RM #264
# 0023-Fix-activity2char-assert-failure.patch
# Savegame loading fix
# RM #305
Expand All @@ -21,6 +18,9 @@
# 0041-Stop-sending-hidden-resources-to-the-client.patch
# Extra visibility fix
# RM #350
# 0051-Adjust-nationality-of-remaining-units-after-player-r.patch
# Fix to player removal
# RM #383

# Not in the upstream Freeciv server
# ----------------------------------
Expand All @@ -44,11 +44,11 @@ declare -a GIT_PATCHLIST=(
)

declare -a PATCHLIST=(
"backports/0023-Improve-connecthand.-ch-coding-style"
"backports/0023-Fix-activity2char-assert-failure"
"backports/0025-Purge-worklist-items-with-unfulfilled-local-range-im"
"backports/0002-Fix-allied-victory-of-all-players"
"backports/0041-Stop-sending-hidden-resources-to-the-client"
"backports/0051-Adjust-nationality-of-remaining-units-after-player-r"
"RevertAmplio2ExtraUnits"
"meson_webperimental"
"metachange"
Expand Down
Loading

0 comments on commit df59735

Please sign in to comment.