Code

Water units#288

Code

Merged

kazzmir merged 27 commits intomasterkazzmir/master-of-magic:masterfrom water-unitskazzmir/master-of-magic:water-unitsCopy head branch name to clipboardFeb 9, 2025

+486-91

Commits

Commits on Feb 4, 2025

• set sailing to true

  kazzmir

  committed
  9f0fb7c

  Copy full SHA for 9f0fb7c

• prevent land movement for sailing units

  kazzmir

  committed
  f014405

  Copy full SHA for f014405

• Merge branch 'master' into water-units

  kazzmir

  committed
  6b759b1

  Copy full SHA for 6b759b1

• Merge branch 'master' into water-units

  kazzmir

  committed
  b02a172

  Copy full SHA for b02a172

Commits on Feb 5, 2025

• Merge branch 'master' into water-units

  kazzmir

  committed
  601d648

  Copy full SHA for 601d648

Commits on Feb 6, 2025

• Merge branch 'master' into water-units

  kazzmir

  committed
  737ae12

  Copy full SHA for 737ae12

• Merge branch 'master' into water-units

  kazzmir

  committed
  9003873

  Copy full SHA for 9003873

Commits on Feb 7, 2025

• abort moving to land immediately for sailing units

  kazzmir

  committed
  9d0ece2

  Copy full SHA for 9d0ece2

• Merge branch 'master' into water-units

  kazzmir

  committed
  e7fade3

  Copy full SHA for e7fade3

• use convenience function

  kazzmir

  committed
  80e8d48

  Copy full SHA for 80e8d48

Commits on Feb 8, 2025

• Merge branch 'master' into water-units

  kazzmir

  authored
  83b8e1a

  Copy full SHA for 83b8e1a

• Merge branch 'master' into water-units

  kazzmir

  authored
  6193497

  Copy full SHA for 6193497

Commits on Feb 9, 2025

• units can move onto sailing unit

  kazzmir

  committed
  48d5782

  Copy full SHA for 48d5782

• transport costs dont consider units being transported

  kazzmir

  committed
  e1d6740

  Copy full SHA for e1d6740

• ignore units being transported for movement cost

  kazzmir

  committed
  aa6b588

  Copy full SHA for aa6b588

• show water landscape in combat

  kazzmir

  committed
  e5675d8

  Copy full SHA for e5675d8

• dont add land units to water combat

  kazzmir

  committed
  45391e8

  Copy full SHA for 45391e8

• cant right click on non-visible enemy units

  kazzmir

  committed
  03b8b48

  Copy full SHA for 03b8b48

• return combat water for ocean

  kazzmir

  committed
  f26b2b8

  Copy full SHA for f26b2b8

• kill units after a water battle if there is no transport

  kazzmir

  committed
  8a1736a

  Copy full SHA for 8a1736a

• dont consider winner when killing non-water units

  kazzmir

  committed
  31f0571

  Copy full SHA for 31f0571

• copy

  kazzmir

  committed
  d669921

  Copy full SHA for d669921

• merge in

  kazzmir

  committed
  3709069

  Copy full SHA for 3709069

• fix scenario 41

  kazzmir

  committed
  0b52e01

  Copy full SHA for 0b52e01

• just check land

  kazzmir

  committed
  f74076a

  Copy full SHA for f74076a

• simplify

  kazzmir

  committed
  ffb481f

  Copy full SHA for ffb481f

• handle wind walking stacks

  kazzmir

  committed
  5cc837e

  Copy full SHA for 5cc837e