Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
51d9a65
Copilot CLI session 8689e9a8-e26a-41c6-84c1-77d5b487bdd5 changes
CptMacTavish2224 May 18, 2026
6306746
stuff
CptMacTavish2224 May 19, 2026
87a8d47
fix: monastery typo
CptMacTavish2224 Jun 2, 2026
c836498
feat: new template
CptMacTavish2224 Jun 2, 2026
3946d9a
style: Contemptor Dread description lol
CptMacTavish2224 Jun 2, 2026
6433cdd
feat: Attack Bike added and Bike amended
CptMacTavish2224 Jun 2, 2026
7c02137
feat: Bikes damage modifier
CptMacTavish2224 Jun 2, 2026
7b64b1b
fix: Attack Bike higher cost
CptMacTavish2224 Jun 2, 2026
2dc024d
feat: Attack Bike Squad and Bike Squad
CptMacTavish2224 Jun 3, 2026
966c268
feat: multi-role origin squads
CptMacTavish2224 Jun 3, 2026
c527543
fix: squad gen issues and company view bug
CptMacTavish2224 Jun 3, 2026
29bf8ba
feat: random pick equipment loadout
CptMacTavish2224 Jun 3, 2026
fb13d99
refactor: Company display tiles
CptMacTavish2224 Jun 3, 2026
9b87f15
fixes: various display related bugs and cleanups of small bugs
CptMacTavish2224 Jun 6, 2026
d58960e
feat: JSON compression on compositions
CptMacTavish2224 Jun 6, 2026
b9bf61b
fix: syntax lol
CptMacTavish2224 Jun 6, 2026
42bb426
feat: LW support for company gen cause I forgot
CptMacTavish2224 Jun 6, 2026
e15b2e9
fix: Scouts in Scout column
CptMacTavish2224 Jun 8, 2026
41036a4
fix: formation overrides+docs
CptMacTavish2224 Jun 8, 2026
de127d6
this is the previous commit, the file beforehand is from the next com…
CptMacTavish2224 Jun 8, 2026
ea21184
feat: Lightning Warriors Advantage 1.0
CptMacTavish2224 Jun 8, 2026
000f3f5
fix: default weapon encumbrance bug
CptMacTavish2224 Jun 9, 2026
dc78264
feat: better weapon options for Biker Sergeant
CptMacTavish2224 Jun 9, 2026
910356d
feat: bikers formation
CptMacTavish2224 Jun 10, 2026
26a2f74
fix:typo
CptMacTavish2224 Jun 10, 2026
76a051c
feat: Speed Force ability for Bikes
CptMacTavish2224 Jun 10, 2026
6be368f
feat: unique role support for equipment checks
CptMacTavish2224 Jun 19, 2026
3b8cc59
feat: LW final squad change pre-testing
CptMacTavish2224 Jun 19, 2026
77a968c
feat: final touches for the new Bike properties
CptMacTavish2224 Jun 19, 2026
8889412
fix: Terminator squad count
CptMacTavish2224 Jun 19, 2026
f1beee9
fix: terminator equipment issues
CptMacTavish2224 Jun 19, 2026
1fb45fc
fix: merge leftovers
CptMacTavish2224 Jun 20, 2026
1127311
fix: bike formation block
CptMacTavish2224 Jun 20, 2026
4170301
feat: Bikes balance changes
CptMacTavish2224 Jun 20, 2026
84d9307
refactor: opening game text composition
CptMacTavish2224 Jun 20, 2026
ad5b436
feat: Lightning Warriors Beta 1.0
CptMacTavish2224 Jun 20, 2026
6680fc3
feat: Attack Bikes Speed Force is now ranged-based
CptMacTavish2224 Jun 22, 2026
42458ca
refactor: speed force
CptMacTavish2224 Jun 24, 2026
5afbd55
feat: librarian log spam
CptMacTavish2224 Jun 25, 2026
03847e0
style: combat log text light green colour support
CptMacTavish2224 Jun 25, 2026
2da7f57
refactor: combat flavour log
CptMacTavish2224 Jun 25, 2026
1e029b7
fix: stale comments
CptMacTavish2224 Jun 25, 2026
0309395
fix: doubled text
CptMacTavish2224 Jun 26, 2026
76a4c71
feat: combat log now scrollable
CptMacTavish2224 Jun 26, 2026
5b6d8d5
fix: post-merge issues
CptMacTavish2224 Jun 30, 2026
0979dc6
fix: bike encumbrance
CptMacTavish2224 Jun 30, 2026
35d4b89
fix: ID was in the further part for some reason
CptMacTavish2224 Jun 30, 2026
bfc65b5
fix: equal specialist+scouts
CptMacTavish2224 Jun 30, 2026
dd22861
fix: cubic's issues and various oversights
CptMacTavish2224 Jun 30, 2026
f6c5244
fix: cubic again
CptMacTavish2224 Jun 30, 2026
6aaf05d
Merge branch 'main' into LWB_1.1
CptMacTavish2224 Jul 1, 2026
cb70d61
fix: cubic's issues
CptMacTavish2224 Jul 1, 2026
51a95cd
Merge branch 'LWB_1.1' of https://github.com/CptMacTavish2224/CM-Poli…
CptMacTavish2224 Jul 1, 2026
f51c04a
fix: bike formations reset
CptMacTavish2224 Jul 1, 2026
6f96c6d
fix: broken armour setup
CptMacTavish2224 Jul 1, 2026
2d84de0
fix: encumbrance issues
CptMacTavish2224 Jul 1, 2026
32bcbbe
fix: another set of cubic-found issues fixed
CptMacTavish2224 Jul 1, 2026
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
11 changes: 7 additions & 4 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"$GMProject":"v1",
"%Name":"ChapterMaster",
"AudioGroups":[
{"$GMAudioGroup":"v1","%Name":"audiogroup_default","exportDir":"","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
{"$GMAudioGroup":"v1","%Name":"audiogroup_sfx","exportDir":"","name":"audiogroup_sfx","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
{"$GMAudioGroup":"v1","%Name":"audiogroup_music","exportDir":"","name":"audiogroup_music","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
{"$GMAudioGroup":"","%Name":"audiogroup_default","name":"audiogroup_default","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
{"$GMAudioGroup":"","%Name":"audiogroup_sfx","name":"audiogroup_sfx","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
{"$GMAudioGroup":"","%Name":"audiogroup_music","name":"audiogroup_music","resourceType":"GMAudioGroup","resourceVersion":"2.0","targets":-1,},
],
"configs":{
"children":[],
Expand All @@ -22,6 +22,7 @@
{"$GMFolder":"","%Name":"Objects","folderPath":"folders/Objects.yy","name":"Objects","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"Combat_Fleet","folderPath":"folders/Objects/Combat_Fleet.yy","name":"Combat_Fleet","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"New Combat","folderPath":"folders/Objects/New Combat.yy","name":"New Combat","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"New Ground","folderPath":"folders/Objects/New Ground.yy","name":"New Ground","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"New UI","folderPath":"folders/Objects/New UI.yy","name":"New UI","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"Temp","folderPath":"folders/Objects/Temp.yy","name":"Temp","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"Paths","folderPath":"folders/Paths.yy","name":"Paths","resourceType":"GMFolder","resourceVersion":"2.0",},
Expand Down Expand Up @@ -462,6 +463,7 @@
{"$GMIncludedFile":"","%Name":"formation15.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation15.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation16.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation16.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation17.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation17.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation18.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation18.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation2.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation2.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation3.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation3.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"formation4.png","CopyToMask":-1,"filePath":"datafiles/images/ui","name":"formation4.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
Expand Down Expand Up @@ -578,6 +580,7 @@
{"$GMIncludedFile":"","%Name":"equal_scouts.json","CopyToMask":-1,"filePath":"datafiles/main/squads","name":"equal_scouts.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"equal_specialists.json","CopyToMask":-1,"filePath":"datafiles/main/squads","name":"equal_specialists.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"equal_spescout.json","CopyToMask":-1,"filePath":"datafiles/main/squads","name":"equal_spescout.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"lightning_warriors.json","CopyToMask":-1,"filePath":"datafiles/main/squads","name":"lightning_warriors.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"version.json","CopyToMask":-1,"filePath":"datafiles/main","name":"version.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"data.json","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee","name":"data.json","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"12.png","CopyToMask":-1,"filePath":"datafiles/main/visual_sets/Company_marks_roman_right_knee/one","name":"12.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
Expand All @@ -604,7 +607,7 @@
"isEcma":false,
"LibraryEmitters":[],
"MetaData":{
"IDEVersion":"2024.1400.5.1065",
"IDEVersion":"2024.1400.5.1055",
},
"name":"ChapterMaster",
"resources":[
Expand Down
2 changes: 1 addition & 1 deletion datafiles/data/armour.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"master_crafted": 25,
"standard": 20
},
"description": "PLACEHOLDER",
"description": "Once the standard Dreadnought pattern when Primarchs walked the stars and Legions conquered worlds, now one of the closest-guarded secrets in Mechanicum tech enclaves. With an Atomantic arc-reactor at its heart that gave it superior speed, strength and even shielding capabilities, it was far superior to any other Dreadnought pattern save for its maintenance demands and the possible meltdown of the reactor.",
"hp_mod": {
"artifact": 50,
"master_crafted": 35,
Expand Down
51 changes: 47 additions & 4 deletions datafiles/data/mobility.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,65 @@
"Bike": {
"abbreviation": "Bike",
"damage_resistance_mod": {
"artifact": 10,
"master_crafted": 10,
"standard": 5
"artifact": 40,
"master_crafted": 30,
"standard": 20
},
"description": "A robust bike that can propel an Astartes at very high speeds. Boasts highly responsive controls that allow for fluid movement on the battlefield and respectable Twin-Linked Bolters for offensive action.",
"hp_mod": {
"artifact": 35,
"master_crafted": 25,
"master_crafted": 30,
"standard": 25
},
"ranged_hands": -0.5,
"melee_mod":{
"artifact": 30,
"master_crafted": 25,
"standard": 20
},
"special_properties":[
"Speed Force"
],
"tags":[
"bike"
],
"second_profiles": [
"Twin Linked Bolters"
],
"value": 35,
"requires_to_forge": ["combi_1"]
},
"Attack Bike": {
"abbreviation": "At Bike",
"damage_resistance_mod": {
"artifact": 40,
"master_crafted": 30,
"standard": 25
},
"description": "A robust bike that can propel an Astartes at very high speeds. Boasts highly responsive controls that allow for fluid movement on the battlefield and respectable Twin-Linked Bolters for offensive action. Sports an additional sidecar with a heavy weapon of choice.",
"hp_mod": {
"artifact": 150,
"master_crafted": 120,
"standard": 100
},
"ranged_hands": 1,
"melee_mod":{
"artifact": 20,
"master_crafted": 15,
"standard": 10
},
"special_properties": [
"Speed Force (Ranged)"
],
"second_profiles": [
"Twin Linked Bolters"
],
"tags":[
"bike", "sf_ranged"
],
"value": 95,
"requires_to_forge": ["combi_1"]
},
"Conversion Beamer Pack": {
"abbreviation": "CnvBmr",
"buyable": false,
Expand Down
Binary file added datafiles/images/ui/formation18.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions datafiles/main/chapters/1.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@
},
"option": {
"wep2": [
[["Combiplasma", "Plasma Gun", "Meltagun"], 1]
[["Hand Flamer", "Grav-Pistol", "Infernus Pistol", "Plasma Pistol", "Volkite Serpenta"], 1]
]
}
}
Expand All @@ -1722,7 +1722,7 @@
},
"option": {
"wep2": [
[["Flamer", "Grav-Gun", "Meltagun", "Plasma Gun", "Plasma Pistol"], 2]
[["Hand Flamer", "Grav-Pistol", "Infernus Pistol", "Plasma Pistol"], 2]
]
}
}
Expand Down Expand Up @@ -1802,7 +1802,7 @@
"loadout": {
"required": {
"wep1": ["Relic Blade", 1],
"wep2": ["Plasma Pistol", 1],
"wep2": ["", 1],
"gear": ["Iron Halo", 1],
"armour": ["Artificer Armour", 1],
"mobi": ["Bike", 1]
Expand All @@ -1815,13 +1815,13 @@
"role": "Black Knight",
"loadout": {
"required": {
"wep1": ["Chainsword", 4],
"wep1": ["Power Sword", 4],
"wep2": ["Bolt Pistol", 2],
"mobi": ["Bike", 4]
},
"option": {
"wep2": [
[["Flamer", "Grav-Gun", "Meltagun", "Plasma Gun", "Plasma Pistol"], 2]
[["Hand Flamer", "Grav-Pistol", "Infernus Pistol", "Plasma Pistol", "Volkite Serpenta"], 2]
]
}
}
Expand Down
4 changes: 2 additions & 2 deletions datafiles/main/chapters/34.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"chapter": {
"id": 34,
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
"name": "Flesh Tearers",
"mutations": {
"betchers": 0.0,
Expand Down Expand Up @@ -38,7 +39,6 @@
"",
""
],
"id": 34,
"chapter_master": {
"ranged": 1.0,
"specialty": 2.0,
Expand Down Expand Up @@ -139,7 +139,7 @@
"culture_styles": [],
"home_planets": 1.0,
"flagship_name": "Victus",
"monastary_name": "",
"monastery_name": "",
"advantages": [
"",
"Assault Doctrine",
Expand Down
Loading
Loading