Skip to content

feat: Lightning Warriors with a small extra #1300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CptMacTavish2224 wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: Lightning Warriors with a small extra #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a263e8
feat: Squads, comps, LW
CptMacTavish2224 Jul 4, 2026
47829d0
feat: BT loadout changes
CptMacTavish2224 Jul 4, 2026
59fac69
chore: Move id higher
CptMacTavish2224 Jul 4, 2026
df849e2
fix: bike formations reset
CptMacTavish2224 Jul 1, 2026
cc5d455
fix: broken armour setup
CptMacTavish2224 Jul 1, 2026
ca1ab91
fix: review fixes
CptMacTavish2224 Jul 8, 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
2 changes: 2 additions & 0 deletions ChapterMaster.yyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,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 @@ -567,6 +568,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 Down
51 changes: 47 additions & 4 deletions datafiles/data/mobility.json
View file
Open in desktop
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"
],
Comment on lines +52 to +60

@EttyKitty EttyKitty Jul 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why both a special property Speed Force (Ranged) and a tag sf_ranged are needed? Why not one?

Can also use specials field, same as Servo-arm uses with combi_tool, if numerical value is needed for the ability (configurable power or something).

@CptMacTavish2224 CptMacTavish2224 Jul 7, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sf_ranged is the actual calc reference and "Speed Force (Ranged)" is purely visual for the player. I felt a middle ground between the two was annoyingly large in the script but not quite readable ingame

"value": 95,
"requires_to_forge": ["combi_1"]
},
"Conversion Beamer Pack": {
"abbreviation": "CnvBmr",
"buyable": false,
Expand Down
Binary file added datafiles/images/ui/formation18.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 7 additions & 5 deletions datafiles/main/chapters/1.JSON
View file
Open in desktop
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 @@ -1771,6 +1771,7 @@
"role": "Ravenwing Ancient",
"loadout": {
"required": {
"wep2": ["Power Axe",1],
"mobi": ["Bike", 1]
}
}
Expand All @@ -1781,6 +1782,7 @@
"role": "Librarian",
"loadout": {
"required": {
"wep2": ["", 0],
"mobi": ["Bike", 1]
Comment thread
CptMacTavish2224 marked this conversation as resolved.
}
}
Expand All @@ -1802,7 +1804,7 @@
"loadout": {
"required": {
"wep1": ["Relic Blade", 1],
"wep2": ["Plasma Pistol", 1],
"wep2": ["", 0],
"gear": ["Iron Halo", 1],
"armour": ["Artificer Armour", 1],
"mobi": ["Bike", 1]
Expand All @@ -1815,13 +1817,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
2 changes: 1 addition & 1 deletion datafiles/main/chapters/34.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"chapter": {
"id": 34,
"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
Loading
Loading