Code

Implemented Resupply Module#5158

Code

Draft

IllianiCBT wants to merge 143 commits intoMegaMek:masterMegaMek/mekhq:masterfrom IllianiCBT:supplyDropsIllianiCBT/mekhq:supplyDropsCopy head branch name to clipboard

+8,438-644

Commits

Commits on Oct 23, 2024

• Add SupplyDrop class for managing campaign supply drops

  Show description for 4ab0f32
  IllianiCBT

  committed
  4ab0f32

Commits on Oct 24, 2024

• Add SupplyDrops feature to campaign

  Show description for f5321e0
  IllianiCBT

  committed
  f5321e0

• Remove bonus parts feature

  Show description for 8ee73cd
  IllianiCBT

  committed
  8ee73cd

• Refactor ResolveScenarioWizardDialog constructor

  Show description for 90a081a
  IllianiCBT

  committed
  90a081a

• Update copyright years to 2024

  Show description for a2a9e35
  IllianiCBT

  committed
  a2a9e35

• Refactored getWeight method in SupplyDrops

  Show description for 40c1000
  IllianiCBT

  committed
  40c1000

• Add support for converting remaining points to Supply Drops

  Show description for 81305fc
  IllianiCBT

  committed
  81305fc

• Update SupplyDrops logic for historical accuracy and bug fixes

  Show description for 29229d0
  IllianiCBT

  committed
  29229d0

• Refactor SupplyDrops to include enemy units and parts

  Show description for bdc42e1
  IllianiCBT

  committed
  bdc42e1

Commits on Oct 25, 2024

• Add ComStar interest-based suspicious death mechanic

  Show description for 6897fb3
  IllianiCBT

  committed
  6897fb3

• Removed suspicious death logic and moved SupplyDrops

  Show description for 5c1753c
  IllianiCBT

  committed
  5c1753c

• Add new classes and update supply drop handling

  Show description for efd259b
  IllianiCBT

  committed
  efd259b

• Merge branch 'refs/heads/master' into supplyDrops

  Show description for 4694aa4
  IllianiCBT

  committed
  4694aa4

Commits on Oct 26, 2024

• Refactor supply drop and status update messaging.

  Show description for fa18c5e
  IllianiCBT

  committed
  fa18c5e

• Refactor SupplyDrop dialog handling and message creation

  Show description for 2da6f31
  IllianiCBT

  committed
  2da6f31

• Reduce interception chance and clean up supply text

  Show description for 123e103
  IllianiCBT

  committed
  123e103

• Refactor: Rename SupplyDrop to Resupply and reorganize package

  Show description for 9fb834a
  IllianiCBT

  committed
  9fb834a

Commits on Oct 27, 2024

• Refactor resupply mission handling

  Show description for 1b9c804
  IllianiCBT

  committed
  1b9c804

• Refactored resupply process in Campaign.java

  Show description for 7d0b2f3
  IllianiCBT

  committed
  7d0b2f3

• Merge branch 'refs/heads/master' into supplyDrops

  IllianiCBT

  committed
  e6dcc28

• Edited in final text

  IllianiCBT

  committed
  8822f43

• Finished final text so generic status updates

  IllianiCBT

  committed
  6b14d7a

• Improve intercepted convoy message logic

  Show description for 6249dd7
  IllianiCBT

  committed
  6249dd7

• Added final text for statusUpdateEnemyCritical events

  IllianiCBT

  committed
  28d3044

Commits on Oct 28, 2024

• Add placeholder tags in Resupply.properties

  Show description for e33438e
  IllianiCBT

  committed
  e33438e

• Refactor resupply package structure and enhance resupply logic

  Show description for 81a3265
  IllianiCBT

  committed
  81a3265

• Remove commented-out resupply code

  Show description for c84b109
  IllianiCBT

  committed
  c84b109

• Update convoy interception handling and messaging

  Show description for fa8ae4d
  IllianiCBT

  committed
  fa8ae4d

• Refactor Resupply class and update resource file

  Show description for 70ae6a3
  IllianiCBT

  committed
  70ae6a3

• Merge branch 'refs/heads/stratCon_utility' into supplyDrops

  Show description for 7d03abf
  IllianiCBT

  committed
  7d03abf

• Refactored convoy interception scenario generation

  Show description for 7091502
  IllianiCBT

  committed
  7091502

• Add scenario template to StratCon emergency convoy defense

  Show description for 34ad0ce
  IllianiCBT

  committed
  34ad0ce

• Add Emergency Convoy Defense scenario template

  Show description for c7a0841
  IllianiCBT

  committed
  c7a0841

• Merge branch 'refs/heads/fg3_balancing' into supplyDrops

  IllianiCBT

  committed
  322f7a4

• Refactor Convoy Defense scenario template

  Show description for 5bbb51d
  IllianiCBT

  committed
  5bbb51d

• Fix resupply logic and refactor scenario completion

  Show description for a9ee577
  IllianiCBT

  committed
  a9ee577

Commits on Oct 29, 2024

• Add resupply management for independent contracts

  Show description for 3bbe1f8
  IllianiCBT

  committed
  3bbe1f8

• Merge branch 'refs/heads/master' into supplyDrops

  Show description for 573727d
  IllianiCBT

  committed
  573727d

• Merge branch 'refs/heads/master' into supplyDrops

  Show description for 8e1e921
  IllianiCBT

  committed
  8e1e921

• Introduce player-managed convoys and improve StratCon scenarios

  Show description for 947ce95
  IllianiCBT

  committed
  947ce95

Commits on Oct 30, 2024

• Remove getPlayerConvoy method and update scenario templates

  Show description for 5147875
  IllianiCBT

  committed
  5147875

• Refactored convoy handling and personnel status update logic

  Show description for f60547e
  IllianiCBT

  committed
  f60547e

• Refactored convoy force unit handling to prevent concurrent modifications

  Show description for ce74ce9
  IllianiCBT

  committed
  ce74ce9

• Add SupplyDrop class for managing campaign supply drops

  Show description for a49520b
  IllianiCBT

  committed
  a49520b

• Add SupplyDrops feature to campaign

  Show description for 8243e3b
  IllianiCBT

  committed
  8243e3b

• Remove bonus parts feature

  Show description for 08b9aa5
  IllianiCBT

  committed
  08b9aa5

• Refactor ResolveScenarioWizardDialog constructor

  Show description for 6d84c25
  IllianiCBT

  committed
  6d84c25

• Update copyright years to 2024

  Show description for 60133f7
  IllianiCBT

  committed
  60133f7

• Refactored getWeight method in SupplyDrops

  Show description for efe6c12
  IllianiCBT

  committed
  efe6c12

• Add support for converting remaining points to Supply Drops

  Show description for 4e31f60
  IllianiCBT

  committed
  4e31f60

• Update SupplyDrops logic for historical accuracy and bug fixes

  Show description for e7082d4
  IllianiCBT

  committed
  e7082d4

• Refactor SupplyDrops to include enemy units and parts

  Show description for b4c3c32
  IllianiCBT

  committed
  b4c3c32

• Add ComStar interest-based suspicious death mechanic

  Show description for 1f4f57a
  IllianiCBT

  committed
  1f4f57a

• Removed suspicious death logic and moved SupplyDrops

  Show description for d14270d
  IllianiCBT

  committed
  d14270d

• Add new classes and update supply drop handling

  Show description for aef6e2c
  IllianiCBT

  committed
  aef6e2c

• Refactor supply drop and status update messaging.

  Show description for eaf1aa6
  IllianiCBT

  committed
  eaf1aa6

• Refactor SupplyDrop dialog handling and message creation

  Show description for 8f35ebb
  IllianiCBT

  committed
  8f35ebb

• Reduce interception chance and clean up supply text

  Show description for fa7d795
  IllianiCBT

  committed
  fa7d795

• Refactor: Rename SupplyDrop to Resupply and reorganize package

  Show description for 5ba13d8
  IllianiCBT

  committed
  5ba13d8

• Refactor resupply mission handling

  Show description for e6bd7bf
  IllianiCBT

  committed
  e6bd7bf

• Refactored resupply process in Campaign.java

  Show description for 51eec2d
  IllianiCBT

  committed
  51eec2d

• Edited in final text

  IllianiCBT

  committed
  f97df53

• Finished final text so generic status updates

  IllianiCBT

  committed
  6cca118

• Improve intercepted convoy message logic

  Show description for 1e4229d
  IllianiCBT

  committed
  1e4229d

• Added final text for statusUpdateEnemyCritical events

  IllianiCBT

  committed
  c13ced2

• Add placeholder tags in Resupply.properties

  Show description for a2ae287
  IllianiCBT

  committed
  a2ae287

• Refactor resupply package structure and enhance resupply logic

  Show description for e2840f7
  IllianiCBT

  committed
  e2840f7

• Update convoy interception handling and messaging

  Show description for 14cdb27
  IllianiCBT

  committed
  14cdb27

• Refactor Resupply class and update resource file

  Show description for 90dd2f3
  IllianiCBT

  committed
  90dd2f3

• Refactored convoy interception scenario generation

  Show description for d96fcdd
  IllianiCBT

  committed
  d96fcdd

• Add scenario template to StratCon emergency convoy defense

  Show description for f16164e
  IllianiCBT

  committed
  f16164e

• Add Emergency Convoy Defense scenario template

  Show description for 77d38ba
  IllianiCBT

  committed
  77d38ba

• Refactor Convoy Defense scenario template

  Show description for ca9db59
  IllianiCBT

  committed
  ca9db59

• Fix resupply logic and refactor scenario completion

  Show description for 798552b
  IllianiCBT

  committed
  798552b

• Add resupply management for independent contracts

  Show description for 319743c
  IllianiCBT

  committed
  319743c

• Introduce player-managed convoys and improve StratCon scenarios

  Show description for 6e9dc7a
  IllianiCBT

  committed
  6e9dc7a

• Remove getPlayerConvoy method and update scenario templates

  Show description for c9cc178
  IllianiCBT

  committed
  c9cc178

• Refactored convoy handling and personnel status update logic

  Show description for f3ba999
  IllianiCBT

  committed
  f3ba999

• Refactored convoy force unit handling to prevent concurrent modifications

  Show description for 984a954
  IllianiCBT

  committed
  984a954

• Merge remote-tracking branch 'origin/supplyDrops' into supplyDrops

  IllianiCBT

  committed
  0953eb1

• Refactor resupply dialog and improve convoy handling

  Show description for 9766df6
  IllianiCBT

  committed
  9766df6

• Add StratconCoords parameter to convoy interception

  Show description for b136e07
  IllianiCBT

  committed
  b136e07

• Add method to set convoy status recursively

  Show description for 4fbaf61
  IllianiCBT

  committed
  4fbaf61

• Reorder import statements for market-related classes

  Show description for 2c1a7ea
  IllianiCBT

  committed
  2c1a7ea

• Add Javadoc comments and make method access modifiers private

  Show description for 6136ce5
  IllianiCBT

  committed
  6136ce5

• Remove excessive whitespace from Resupply.properties

  Show description for 6080eff
  IllianiCBT

  committed
  6080eff

• Refactor "StratconTrackState" usage in Resupply class

  Show description for c30da4d
  IllianiCBT

  committed
  c30da4d

• Add fatigue increase mechanism for independent convoys

  Show description for d95bfdd
  IllianiCBT

  committed
  d95bfdd

• Refactored fatigue calculation in resupply mission.

  Show description for f235e9a
  IllianiCBT

  committed
  f235e9a

• Finalized statusUpdateEnemyCritical and statusUpdateEnemyStalemate text

  IllianiCBT

  committed
  d7a461f

• Finalized statusUpdateEnemyDominating text

  IllianiCBT

  committed
  294566a

Commits on Oct 31, 2024

• Finalized statusUpdateEnemyOverwhelming text

  IllianiCBT

  committed
  49dc198

• Add smuggler interactions and refactor resupply dialog.

  Show description for df191c7
  IllianiCBT

  committed
  df191c7

• Update documentation and smuggler fee calculation

  Show description for 5ed6396
  IllianiCBT

  committed
  5ed6396

• Refactored swindle message generation

  Show description for fe25a93
  IllianiCBT

  committed
  fe25a93

• Remove debug log statement from AtBContract.java

  Show description for 3f79d54
  IllianiCBT

  committed
  3f79d54

• Fixed infantry survival logic in Campaign.java

  Show description for d4aae13
  IllianiCBT

  committed
  d4aae13

• Fix convoy pluralization in resupply details

  Show description for 396f148
  IllianiCBT

  committed
  396f148

• Delete unused comStarInterest.java and refactor starLeagueCache.java

  Show description for a7ef3d7
  IllianiCBT

  committed
  a7ef3d7

• Limited intact units to actual count available

  Show description for 3121f81
  IllianiCBT

  committed
  3121f81

• Refactored StarLeagueCache for flexibility in cache types

  Show description for 428836f
  IllianiCBT

  committed
  428836f

Commits on Nov 1, 2024

• Add dud cache dialog generation to StarLeagueCache

  Show description for 264f529
  IllianiCBT

  committed
  264f529

• Add proposals for hidden Star League caches

  Show description for dccdc2c
  IllianiCBT

  committed
  dccdc2c

• Refactor resupply to simplify and remove unit handling

  Show description for ae7a8ed
  IllianiCBT

  committed
  ae7a8ed

• Remove redundant Resupply constructor parameters

  Show description for 0deec39
  IllianiCBT

  committed
  0deec39

• Refactor and enhance resupply contract messaging

  Show description for f8c0e89
  IllianiCBT

  committed
  f8c0e89

• Update convoy resupply process and refactor code

  Show description for f2cb529
  IllianiCBT

  committed
  f2cb529

• Refactored string formatting and improved switch statement.

  Show description for 02fa093
  IllianiCBT

  committed
  02fa093

• Fix potential bug in resupply weight calculation

  Show description for 0f0801a
  IllianiCBT

  committed
  0f0801a

• Adjusted resupply multiplier for AmmoBin parts

  Show description for d77008d
  IllianiCBT

  committed
  d77008d

Commits on Nov 3, 2024

• Remove convoy error message and update resupply logic.

  Show description for 409ea01
  IllianiCBT

  committed
  409ea01

• Add Procurement Class and Improve Resupply Logic

  Show description for 46109de
  IllianiCBT

  committed
  46109de

• Refactor nullability annotations for consistency

  Show description for d1547ba
  IllianiCBT

  committed
  d1547ba

• Implement targeted convoy defense scenarios

  Show description for 31717a6
  IllianiCBT

  committed
  31717a6

• Prevent incorrect convoy message creation when conditions fail

  Show description for bb701ad
  IllianiCBT

  committed
  bb701ad

• Correct typos in comment sentences

  Show description for 96be946
  IllianiCBT

  committed
  96be946

Commits on Nov 4, 2024

• history.txt Updates

  HammerGS

  committed
  2d89265

• Add scenario type handling for resupply and roleplay items

  Show description for b2ad061
  IllianiCBT

  committed
  b2ad061

• Refactor access to stratConScenarioType

  Show description for 3259fa1
  IllianiCBT

  committed
  3259fa1

• Merge branch 'MegaMek:master' into supplyDrops

  IllianiCBT

  authored
  b30a781

• Merge remote-tracking branch 'origin/supplyDrops' into supplyDrops

  IllianiCBT

  committed
  9bebc3e

• Refactor random selection and loop length

  Show description for 6e28db0
  IllianiCBT

  committed
  6e28db0

• Refactored resupply logic and added scenario types

  Show description for 2cc5bda
  IllianiCBT

  committed
  2cc5bda

Commits on Dec 4, 2024

• Merge branch 'refs/heads/master' into supplyDrops

  Show description for 0fbdedc
  IllianiCBT

  committed
  0fbdedc

• Post-merge adjustments

  IllianiCBT

  committed
  eaf310a

• Post-merge adjustments

  IllianiCBT

  committed
  7d8600c

• Update MekHQ/src/mekhq/campaign/force/Force.java

  Show description for 080e772
  

  IllianiCBT

  and

  Scoppio

  authored
  080e772

• Refactored convoy processing method

  Show description for ec78a18
  IllianiCBT

  committed
  ec78a18

• Disabled Star League Caches

  IllianiCBT

  committed
  6e1b0ae

• Merge remote-tracking branch 'origin/supplyDrops' into supplyDrops

  IllianiCBT

  committed
  2cf2a88

• Add cargo requirements estimation to MissionViewPanel

  Show description for ab0f0be
  IllianiCBT

  committed
  ab0f0be

• Refactored convoy force handling logic.

  Show description for f718637
  IllianiCBT

  committed
  f718637

• Add copyright notice for 2024 to MekHQ files

  Show description for a5180b0
  IllianiCBT

  committed
  a5180b0

Commits on Dec 6, 2024

• Refactored part preparation with null-checks

  Show description for 33c87ce
  IllianiCBT

  committed
  33c87ce

• Added tooltips and improved mission panel layout.

  Show description for b84b44b
  IllianiCBT

  committed
  b84b44b

• Merge branch 'refs/heads/master' into supplyDrops

  IllianiCBT

  committed
  55a041b

• Refactored force handling logic in convoy and combat contexts

  Show description for f20a101
  IllianiCBT

  committed
  f20a101

• Refactor Resupply class and update cargo calculation

  Show description for c0dc805
  IllianiCBT

  committed
  c0dc805

Commits on Dec 11, 2024

• Fix typo in Resupply.properties for convoy text

  Show description for 2c0a16b
  IllianiCBT

  committed
  2c0a16b

• Refactored cargo tonnage calculation to use integers

  Show description for da7d2a1
  IllianiCBT

  committed
  da7d2a1

• Merged in changes from cargoCalculations

  IllianiCBT

  committed
  5c49153

• Adjust cargo divider for resupply tonnage calculation

  Show description for 6627fed
  IllianiCBT

  committed
  6627fed

Commits on Dec 12, 2024

• Refactored cargo tonnage calculation in Resupply logic

  Show description for 6d3c699
  IllianiCBT

  committed
  6d3c699