summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--about.html2
-rw-r--r--cover.1x.pngbin0 -> 57302 bytes
-rw-r--r--cover.2x.pngbin0 -> 212620 bytes
-rw-r--r--rules.js18
-rw-r--r--thumbnail.pngbin0 -> 31029 bytes
5 files changed, 11 insertions, 9 deletions
diff --git a/about.html b/about.html
index f54f9d0..14b7976 100644
--- a/about.html
+++ b/about.html
@@ -16,7 +16,7 @@ he perish in battle as he did historically?
<p>
Designer: Jerry Taylor.
-<br> Copyright &copy; 2009 <a href="https://columbiagames.com/cgi-bin/query/cfg/zoom.cfg?product_id=3171">Columbia Games</a> and Jerry Taylor.
+<br> Copyright &copy; 2009 <a href="https://secure.columbiagames.com/product/3171">Columbia Games</a> and Jerry Taylor.
<br> Programming &copy; 2021 Tor Andersson.
<ul>
diff --git a/cover.1x.png b/cover.1x.png
new file mode 100644
index 0000000..4c16b3c
--- /dev/null
+++ b/cover.1x.png
Binary files differ
diff --git a/cover.2x.png b/cover.2x.png
new file mode 100644
index 0000000..967c4fa
--- /dev/null
+++ b/cover.2x.png
Binary files differ
diff --git a/rules.js b/rules.js
index af0c0ac..94d5f8c 100644
--- a/rules.js
+++ b/rules.js
@@ -1984,6 +1984,7 @@ states.sea_move_to = {
if (game.active === game.piracy && is_contested_area(to)) {
// Can attack with piracy, but no port-to-port bonus.
+ // TODO: blocks attacking same area from another sea should go into reserve
log_move_continue(to, ATTACK_MARK)
set_add(game.is_pirate, game.who)
if (!game.attacker[to])
@@ -2714,10 +2715,6 @@ function goto_regroup() {
clear_undo()
}
-function is_attacker_with_piracy() {
- return game.active === game.piracy && game.active === game.attacker[game.where]
-}
-
states.regroup = {
prompt: function (view, current) {
if (is_inactive_player(current))
@@ -2727,9 +2724,8 @@ states.regroup = {
gen_action(view, 'end_regroup')
for (let b = 0; b < block_count; ++b) {
if (game.location[b] === game.where && !set_has(game.dead, b)) {
- if (is_attacker_with_piracy()) {
- if (set_has(game.is_pirate, b))
- gen_action(view, 'block', b)
+ if (game.active === game.piracy && set_has(game.is_pirate, b)) {
+ gen_action(view, 'block', b)
} else {
if (can_block_regroup(b))
gen_action(view, 'block', b)
@@ -2753,7 +2749,7 @@ states.regroup = {
states.regroup_to = {
prompt: function (view, current) {
- if (is_attacker_with_piracy() && set_has(game.is_pirate, game.who)) {
+ if (game.active === game.piracy && set_has(game.is_pirate, game.who)) {
if (is_inactive_player(current))
return view.prompt = "Waiting for " + game.active + " to regroup."
view.prompt = "Regroup: Move the army to a friendly or vacant area in the same sea zone."
@@ -3521,6 +3517,12 @@ function observer_hand() {
return hand
}
+exports.dont_snap = function(state) {
+ if (state.state === "play_card" && state.active !== BOTH)
+ return true
+ return false
+}
+
exports.view = function(state, current) {
game = state
diff --git a/thumbnail.png b/thumbnail.png
new file mode 100644
index 0000000..6f8eb3e
--- /dev/null
+++ b/thumbnail.png
Binary files differ