Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Freeciv server freeciv/freeciv@342fd98f20 #862

Merged
merged 1 commit into from
Oct 19, 2024
Merged

Update to Freeciv server freeciv/freeciv@342fd98f20 #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
163 changes: 82 additions & 81 deletions freeciv-web/src/main/webapp/javascript/fc_types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,88 +207,89 @@ var ACTION_CONQUER_CITY4 = 54;
var ACTION_BOMBARD = 55;
var ACTION_BOMBARD2 = 56;
var ACTION_BOMBARD3 = 57;
var ACTION_BOMBARD_LETHAL = 58;
var ACTION_BOMBARD_LETHAL2 = 59;
var ACTION_ROAD = 60;
var ACTION_ROAD2 = 61;
var ACTION_IRRIGATE = 62;
var ACTION_IRRIGATE2 = 63;
var ACTION_MINE = 64;
var ACTION_MINE2 = 65;
var ACTION_BASE = 66;
var ACTION_BASE2 = 67;
var ACTION_PILLAGE = 68;
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_BOMBARD4 = 58;
var ACTION_BOMBARD_LETHAL = 59;
var ACTION_BOMBARD_LETHAL2 = 60;
var ACTION_ROAD = 61;
var ACTION_ROAD2 = 62;
var ACTION_IRRIGATE = 63;
var ACTION_IRRIGATE2 = 64;
var ACTION_MINE = 65;
var ACTION_MINE2 = 66;
var ACTION_BASE = 67;
var ACTION_BASE2 = 68;
var ACTION_PILLAGE = 69;
var ACTION_PILLAGE2 = 70;
var ACTION_TRANSPORT_BOARD = 71;
var ACTION_TRANSPORT_BOARD2 = 72;
var ACTION_TRANSPORT_BOARD3 = 73;
var ACTION_TRANSPORT_DEBOARD = 74;
var ACTION_TRANSPORT_EMBARK = 75;
var ACTION_TRANSPORT_EMBARK2 = 76;
var ACTION_TRANSPORT_EMBARK3 = 77;
var ACTION_TRANSPORT_EMBARK4 = 78;
var ACTION_TRANSPORT_DISEMBARK1 = 79;
var ACTION_TRANSPORT_DISEMBARK2 = 80;
var ACTION_TRANSPORT_DISEMBARK3 = 81;
var ACTION_TRANSPORT_DISEMBARK4 = 82;
var ACTION_TRANSPORT_LOAD = 83;
var ACTION_TRANSPORT_LOAD2 = 84;
var ACTION_TRANSPORT_LOAD3 = 85;
var ACTION_TRANSPORT_UNLOAD = 86;
var ACTION_SPY_SPREAD_PLAGUE = 87;
var ACTION_SPY_ATTACK = 88;
var ACTION_CONQUER_EXTRAS = 89;
var ACTION_CONQUER_EXTRAS2 = 90;
var ACTION_CONQUER_EXTRAS3 = 91;
var ACTION_CONQUER_EXTRAS4 = 92;
var ACTION_HUT_ENTER = 93;
var ACTION_HUT_ENTER2 = 94;
var ACTION_HUT_ENTER3 = 95;
var ACTION_HUT_ENTER4 = 96;
var ACTION_HUT_FRIGHTEN = 97;
var ACTION_HUT_FRIGHTEN2 = 98;
var ACTION_HUT_FRIGHTEN3 = 99;
var ACTION_HUT_FRIGHTEN4 = 100;
var ACTION_HEAL_UNIT = 101;
var ACTION_HEAL_UNIT2 = 102;
var ACTION_PARADROP = 103;
var ACTION_PARADROP_CONQUER = 104;
var ACTION_PARADROP_FRIGHTEN = 105;
var ACTION_PARADROP_FRIGHTEN_CONQUER = 106;
var ACTION_PARADROP_ENTER = 107;
var ACTION_PARADROP_ENTER_CONQUER = 108;
var ACTION_WIPE_UNITS = 109;
var ACTION_SPY_ESCAPE = 110;
var ACTION_UNIT_MOVE = 111;
var ACTION_UNIT_MOVE2 = 112;
var ACTION_UNIT_MOVE3 = 113;
var ACTION_TELEPORT = 114;
var ACTION_TELEPORT2 = 115;
var ACTION_TELEPORT3 = 116;
var ACTION_TELEPORT_CONQUER = 117;
var ACTION_TELEPORT_FRIGHTEN = 118;
var ACTION_TELEPORT_FRIGHTEN_CONQUER = 119;
var ACTION_TELEPORT_ENTER = 120;
var ACTION_TELEPORT_ENTER_CONQUER = 121;
var ACTION_CLEAN = 122;
var ACTION_CLEAN2 = 123;
var ACTION_COLLECT_RANSOM = 124;
var ACTION_FORTIFY = 125;
var ACTION_FORTIFY2 = 126;
var ACTION_CULTIVATE = 127;
var ACTION_CULTIVATE2 = 128;
var ACTION_PLANT = 129;
var ACTION_PLANT2 = 130;
var ACTION_TRANSFORM_TERRAIN = 131;
var ACTION_TRANSFORM_TERRAIN2 = 132;

var ACTION_GAIN_VETERANCY = 132;
var ACTION_ESCAPE = 133;
var ACTION_USER_ACTION1 = 134;
var ACTION_USER_ACTION2 = 135;
var ACTION_USER_ACTION3 = 136;
var ACTION_USER_ACTION4 = 137;
var ACTION_COUNT = 138;
var ACTION_GAIN_VETERANCY = 133;
var ACTION_ESCAPE = 134;
var ACTION_USER_ACTION1 = 135;
var ACTION_USER_ACTION2 = 136;
var ACTION_USER_ACTION3 = 137;
var ACTION_USER_ACTION4 = 138;
var ACTION_COUNT = 139;

/* The action_decision enum */
/* Doesn't need the player to decide what action to take. */
Expand Down
4 changes: 2 additions & 2 deletions freeciv/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=32c340600f9c0195fd5ec3a0139b0420529cdff5
FCREV=342fd98f209c0a4490b368ffc5156b9ef093af34

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.May.09"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.May.11"

# There's no need to bump this constantly as current freeciv-web
# makes no connections to outside world - all connections are
Expand Down
Loading