Code

Caravan interrupts and more#296

Code

Open

O5MO wants to merge 56 commits intopyanodon:masterpyanodon/pyalienlife:masterfrom O5MO:caravan_interruptO5MO/pyalienlife:caravan_interruptCopy head branch name to clipboard

+1,594-395

Commits

Commits on Jan 22, 2025

• something something caravan interrupts

  

  Osmo

  committed
  0c1a67b

  Copy full SHA for 0c1a67b

Commits on Jan 23, 2025

• Added initial version of edit interrupt gui

  

  Osmo

  committed
  24ccf4d

  Copy full SHA for 24ccf4d

• Interrupts are now properly added to and stored in caravans

  

  Osmo

  committed
  9cee5bd

  Copy full SHA for 9cee5bd

• Interrupts can now be renamed

  

  Osmo

  committed
  5f9813e

  Copy full SHA for 5f9813e

Commits on Jan 24, 2025

• Made interrupt gui relative (temporarily?)

  

  Osmo

  committed
  fcc700e

  Copy full SHA for fcc700e

• Added interrupt edit button and added all core elements to interrupt edit gui

  

  Osmo

  committed
  3d420f2

  Copy full SHA for 3d420f2

Commits on Jan 25, 2025

• Interrupt schedule should now be rendered

  

  Osmo

  committed
  be22f47

  Copy full SHA for be22f47

Commits on Jan 26, 2025

• circuit condition static is now a free action

  

  Osmo

  committed
  f5d4b91

  Copy full SHA for f5d4b91

Commits on Jan 28, 2025

• renamed prtotypes to caravan_prototypes

  

  Osmo

  committed
  c7729f6

  Copy full SHA for c7729f6

• Improved several caravan tasks, increased number of fuel slots

  

  Osmo

  committed
  9987f11

  Copy full SHA for 9987f11

Commits on Jan 29, 2025

• Implemented changing interrupt schedule

  

  Osmo

  committed
  af5a39f

  Copy full SHA for af5a39f

Commits on Jan 30, 2025

• Fixed shuffling schedule in caravan gui

  

  Osmo

  committed
  8641d14

  Copy full SHA for 8641d14

• Interrupts now add temporary stops to the schedule

  

  Osmo

  committed
  1cece08

  Copy full SHA for 1cece08

• TODO

  

  Osmo

  committed
  846ddd9

  Copy full SHA for 846ddd9

• Improved fuel slot spacing to be consitent with train gui

  

  Osmo

  committed
  11257df

  Copy full SHA for 11257df

• Separated building actions gui into a separate function, changed some functioins to support that.

  Show description for acc4e8e
  

  Osmo

  committed
  acc4e8e

  Copy full SHA for acc4e8e

Commits on Jan 31, 2025

• Melon does not know the difference between left and right

  

  Osmo

  committed
  32bddae

  Copy full SHA for 32bddae

• Some action refactoring

  

  Osmo

  committed
  f5c6f7c

  Copy full SHA for f5c6f7c

• Added "specific food" action, bug fixes

  

  Osmo

  committed
  534f3ca

  Copy full SHA for 534f3ca

Commits on Feb 3, 2025

• Fixed default actions

  

  Osmo

  committed
  e373b89

  Copy full SHA for e373b89

• Open on map button in caravan gui and slightly improved gui

  

  Osmo

  committed
  61c22bf

  Copy full SHA for 61c22bf

• Added localised name to caravan gui (only affects new caravans)

  

  Osmo

  committed
  63aa0bb

  Copy full SHA for 63aa0bb

• Fixed clicking on schedule in interrupt gui, fixed interrupt data resetting

  

  Osmo

  committed
  afb859f

  Copy full SHA for afb859f

• Fuel inventory now supports basic stack transfer actions

  

  Osmo

  committed
  b054a21

  Copy full SHA for b054a21

Commits on Feb 5, 2025

• "View on map" button now opens the position on the camera instead of always openeing the caravan

  

  Osmo

  committed
  bc8cadf

  Copy full SHA for bc8cadf

• New interrupt conditions, bugfixes

  

  Osmo

  committed
  a7265eb

  Copy full SHA for a7265eb

Commits on Feb 8, 2025

• Added "Allow interrupting other interrupts" functionality

  

  Osmo

  committed
  6f8fed8

  Copy full SHA for 6f8fed8

• Fixed caravans of all types being smaller than intended

  

  Osmo

  committed
  cc179cd

  Copy full SHA for cc179cd

• Increased selection boxes of all caravan types to better match their graphics

  

  Osmo

  committed
  7d9c222

  Copy full SHA for 7d9c222

Commits on Feb 10, 2025

• Changed load/unload actions back to using goal amount and "wait until fulfilled" instead of min/max.

  Show description for e0d7a9a
  

  Osmo

  committed
  e0d7a9a

  Copy full SHA for e0d7a9a

• Fix bug with action shuffling

  

  Osmo

  committed
  e771213

  Copy full SHA for e771213

• Fix actions not accounting for when goal is nil

  

  Osmo

  committed
  0ef5873

  Copy full SHA for 0ef5873

Commits on Feb 11, 2025

• Migrations

  

  Osmo

  committed
  647d1b2

  Copy full SHA for 647d1b2

Commits on Feb 12, 2025

• Gui improvements

  

  Osmo

  committed
  9f32a50

  Copy full SHA for 9f32a50

• Interrupt tooltips

  

  Osmo

  committed
  ecaf4bf

  Copy full SHA for ecaf4bf

• "Add interrupt" gui improvements

  

  Osmo

  committed
  2f52403

  Copy full SHA for 2f52403

• Implemented deleting interrupts

  

  Osmo

  committed
  808414f

  Copy full SHA for 808414f

Commits on Feb 13, 2025

• Made interrupt play button functional

  

  Osmo

  committed
  73262b5

  Copy full SHA for 73262b5

• Interrupt window close button

  

  Osmo

  committed
  308321b

  Copy full SHA for 308321b

Commits on Feb 14, 2025

• Interrupts are now copy-pastable between caravans

  

  Osmo

  committed
  3f7b3b0

  Copy full SHA for 3f7b3b0

• Fuel slot tooltips now show item tooltip if present

  

  Osmo

  committed
  e0c26ad

  Copy full SHA for e0c26ad

• Action validity check and bugfixes

  

  Osmo

  committed
  aeae057

  Copy full SHA for aeae057

• bugfixes

  

  Osmo

  committed
  8da697a

  Copy full SHA for 8da697a

• bugfixes

  

  Osmo

  committed
  ef652d1

  Copy full SHA for ef652d1

Commits on Feb 15, 2025

• "at outpost" conditions, fixes

  

  Osmo

  committed
  4478d1c

  Copy full SHA for 4478d1c

• Updated valid actions

  

  Osmo

  committed
  1f17d35

  Copy full SHA for 1f17d35

• Migrations

  

  Osmo

  committed
  3f0b3a4

  Copy full SHA for 3f0b3a4

• EN locale

  

  Osmo

  committed
  a9a8a03

  Copy full SHA for a9a8a03

• RU locale

  

  Osmo

  committed
  98f7120

  Copy full SHA for 98f7120

• RU locale

  

  Osmo

  committed
  7f20317

  Copy full SHA for 7f20317

• UK locale

  

  Osmo

  committed
  f5434e5

  Copy full SHA for f5434e5

• Locale fix

  

  Osmo

  committed
  777f867

  Copy full SHA for 777f867

• Check that entity is an outpost for "at outpost" actions

  

  Osmo

  committed
  7773c95

  Copy full SHA for 7773c95

• Changelog

  

  Osmo

  committed
  72ce159

  Copy full SHA for 72ce159

Commits on Feb 24, 2025

• Merge branch 'master' into caravan_interrupt

  notnotmelon

  authored
  38fe9a7

  Copy full SHA for 38fe9a7

• Resolve crash when waiting at infinity chest.

  notnotmelon

  committed
  453c763

  Copy full SHA for 453c763