Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/pr-title-checker-config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"CHECKS": {
"regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch"
},
"MESSAGES": {
"failure": "Invalid PR Title. Please use the following formats: `<type>(<optional-scope>): <Short summary>`. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)."
}
"CHECKS": {
"regexp": "((feat|fix|ci|chore|docs|test|refactor|revert|style|perf|build)(\\(.*\\))?!?: )|Merge branch"
},
"MESSAGES": {
"failure": "Invalid PR Title. Please use the following formats: `<type>(<optional-scope>): <Short summary>`. Refer to the list of [conventional commit types](https://github.com/pvdlg/conventional-commit-types?tab=readme-ov-file#commit-types)."
}
}
19 changes: 9 additions & 10 deletions .goborc.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"useTabs": false,
"tabSize": 4,
"multilineStructs": 2,
"multilineArrays": 2,
"multilineTernary": false,
"multilineArguments": 0,
"blankLineAfterBlocks": false,
"flatExpressions": false,
"explicitUndefined": false

"blankLineAfterBlocks": false,
"explicitUndefined": false,
"flatExpressions": false,
"multilineArguments": 0,
"multilineArrays": 2,
"multilineStructs": 2,
"multilineTernary": false,
"tabSize": 4,
"useTabs": false
}
2 changes: 1 addition & 1 deletion datafiles/data/armour.json
Original file line number Diff line number Diff line change
Expand Up @@ -626,4 +626,4 @@
],
"value": 400
}
}
}
2 changes: 1 addition & 1 deletion datafiles/data/dialogue/sisters.json
Original file line number Diff line number Diff line change
Expand Up @@ -162,4 +162,4 @@
"What is the meaning of this?"
]
}
}
}
6 changes: 4 additions & 2 deletions datafiles/data/gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
"Gene Pod Incubator": {
"abbreviation": "GenePod",
"description": "Required to house gene slaves in order to generate new gene seed for the chapter.",
"tags":["no_equip"],
"tags": [
"no_equip"
],
"value": 20
},
"Iron Halo": {
Expand Down Expand Up @@ -116,4 +118,4 @@
"abbreviation": "SorMed",
"description": "A multi-purpose medkit designed to deal with basic battlefield ailments until further medical assistance can be sought."
}
}
}
8 changes: 5 additions & 3 deletions datafiles/data/mobility.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@
"master_crafted": 25,
"standard": 25
},
"requires_to_forge": [
"combi_1"
],
"second_profiles": [
"Twin Linked Bolters"
],
"value": 35,
"requires_to_forge": ["combi_1"]
"value": 35
},
"Conversion Beamer Pack": {
"abbreviation": "CnvBmr",
Expand Down Expand Up @@ -147,4 +149,4 @@
],
"value": 150
}
}
}
14 changes: 7 additions & 7 deletions datafiles/data/psychic_disciplines.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"minor_biomancy": {
"name": "Minor Biomancy",
"perils_chance": 0.10,
"perils_chance": 0.1,
"perils_strength": 10,
"powers": [
"haemorrhage",
Expand Down Expand Up @@ -77,7 +77,7 @@
},
"minor_nu": {
"name": "Minor Not Nurgle",
"perils_chance": 0.10,
"perils_chance": 0.1,
"perils_strength": 10,
"powers": [
"wave_of_entropy",
Expand All @@ -93,7 +93,7 @@
},
"minor_nu_daemon": {
"name": "Minor Nurgle",
"perils_chance": 0.30,
"perils_chance": 0.3,
"perils_strength": 30,
"powers": [
"wave_of_entropy",
Expand Down Expand Up @@ -124,7 +124,7 @@
},
"minor_sl_daemon": {
"name": "Minor Slaanesh",
"perils_chance": 0.30,
"perils_chance": 0.3,
"perils_strength": 30,
"powers": [
"warp_bolts",
Expand Down Expand Up @@ -154,7 +154,7 @@
},
"minor_tz_daemon": {
"name": "Minor Tzeentch",
"perils_chance": 0.30,
"perils_chance": 0.3,
"perils_strength": 30,
"powers": [
"wave_of_change",
Expand All @@ -171,7 +171,7 @@
},
"minor_what_the_fuck_man": {
"name": "Occultism",
"perils_chance": 0.20,
"perils_chance": 0.2,
"perils_strength": 20,
"powers": [
"blood_dementia",
Expand Down Expand Up @@ -223,4 +223,4 @@
],
"prefix": "TEL"
}
}
}
6 changes: 1 addition & 5 deletions datafiles/data/psychic_powers.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/*
TODO: Change flavour_text format from a struct with structs, to an array with structs;
I see no reason to have these named structs, as their names are not used for anything and just make looping more difficult;
*/
{
"assail": {
"additional_kills": -1,
Expand Down Expand Up @@ -855,4 +851,4 @@ I see no reason to have these named structs, as their names are not used for any
"target_type": "enemy_unit",
"type": "attack"
}
}
}
2 changes: 1 addition & 1 deletion datafiles/data/ruins_loot.json
Original file line number Diff line number Diff line change
Expand Up @@ -477,4 +477,4 @@
]
}
]
}
}
2 changes: 1 addition & 1 deletion datafiles/data/ships.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@
"request_duration": 10,
"value": 8000
}
}
}
2 changes: 1 addition & 1 deletion datafiles/data/technologies.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@
],
"value": 300
}
}
}
25 changes: 5 additions & 20 deletions datafiles/data/traits.json
Original file line number Diff line number Diff line change
Expand Up @@ -435,11 +435,11 @@
},
"lobotomized": {
"charisma": -5,
"constitution": 1, // Slight buff to health, as clear mind helps to stay healthy in some cases
"constitution": 1,
"display_name": "Lobotomized",
"flavour_text": "received treatment or damage, which resulted in portion of brain missing, akin to servitors",
"intelligence": -50,
"technology": 1, // Also helps with some boring tasks, I think?
"technology": 1,
"wisdom": -50
},
"lone_survivor": {
Expand Down Expand Up @@ -629,28 +629,13 @@
"max"
]
},
"psychotic": { // IT IS THE BANEBLAAADE!!! - Captain Diomedes, DoW 2 Retribution
"constitution": -1, // Being bonkers can sometimes be damaging to one's health, I think..?
"psychotic": {
"constitution": -1,
"display_name": "Psychotic",
"flavour_text": "whether due to experience or some other cause, acquired access to hidden knowledge...",
"intelligence": -5,
"wisdom": 10
},
// "crazy": {
// "wisdom": [5, 2],
// "intelligence": [-2, 2],
// "constitution": -1,
// "display_name": "Crazy",
// "flavor_text": "lost sense of reason"
// },
// "eccentric": {
// "wisdom": [3, 2],
// "intelligence": [3, 2],
// "charisma": [3, 2],
// "technology": [3, 2],
// "display_name": "Eccentric",
// "flavor_text": "has a tendency to do things in original way"
// }
"recluse": {
"charisma": [
-3,
Expand Down Expand Up @@ -983,4 +968,4 @@
"technology": -2,
"wisdom": 3
}
}
}
21 changes: 1 addition & 20 deletions datafiles/data/unit_stats.json
Original file line number Diff line number Diff line change
Expand Up @@ -411,25 +411,6 @@
3
]
},
/* TODO - check and tweak if necessary
"chapter_servitor":{
"title" : "Chapter Servitor",
"strength":[36,4],
"constitution":[36,3],
"weapon_skill" : [30,2,"max"],
"ballistic_skill" : [30,2,"max"],
"dexterity":[36,3],
"intelligence":0,
"wisdom":0,
"charisma" :[10,1],
"religion" : "imperial_cult",
"piety" : [28,3],
"luck" : 10,
"technology" :[30,3],
"start_gear":{"armour":"power_armour", "wep1":"Combat Knife", "gear":"Servo-arm"}, TODO - tweak and check if correct
"base_group" : "astartes",
traits:["lobotomized"],
},*/
"sector_commander": {
"ballistic_skill": [
20,
Expand Down Expand Up @@ -732,4 +713,4 @@
2
]
}
}
}
2 changes: 1 addition & 1 deletion datafiles/data/vehicle_gear.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@
"voidshield"
]
}
}
}
2 changes: 1 addition & 1 deletion datafiles/data/vehicles.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
],
"value": 180
}
}
}
46 changes: 23 additions & 23 deletions datafiles/data/weapons.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,10 @@
},
"range": 1,
"ranged_hands": 0,
"spli": 15,
"second_profiles": [
"Twin Linked Bolters"
],
"spli": 15,
"tags": [
"vehicle",
"power",
Expand Down Expand Up @@ -1021,6 +1021,23 @@
],
"value": 60
},
"HK Missile": {
"abbreviation": "HKMssl",
"ammo": 1,
"arp": 4,
"attack": {
"artifact": 450,
"master_crafted": 400,
"standard": 350
},
"description": "A single shot hunter killer missile that serves as a powerful anti armour/aircraft deterent.",
"range": 50,
"spli": 1,
"tags": [
"vehicle"
],
"value": 10
},
"Hand Flamer": {
"abbreviation": "HndFlmr",
"ammo": 4,
Expand Down Expand Up @@ -1265,23 +1282,6 @@
],
"value": 20
},
"HK Missile": {
"abbreviation": "HKMssl",
"ammo": 1,
"arp": 4,
"attack": {
"artifact": 450,
"master_crafted": 400,
"standard": 350
},
"description": "A single shot hunter killer missile that serves as a powerful anti armour/aircraft deterent.",
"range": 50,
"spli": 1,
"tags": [
"vehicle"
],
"value": 10
},
"Hurricane Bolter Sponsons": {
"abbreviation": "HrcBltrs",
"ammo": 10,
Expand Down Expand Up @@ -1537,7 +1537,7 @@
"spli": 1,
"tags": [
"heavy_ranged",
"dreadnought",
"dreadnought",
"las",
"energy"
],
Expand Down Expand Up @@ -2706,9 +2706,9 @@
"description": "Ancient Blades of various origins smited through arcane forging or lost techniques, these blades are deadly beyond belief. These peerless blades slice through ceramite and flesh with ease.",
"melee_hands": 1,
"melee_mod": {
"artifact": 1.0,
"master_crafted": 1.0,
"standard": 1.0
"artifact": 1,
"master_crafted": 1,
"standard": 1
},
"range": 1,
"ranged_hands": 1,
Expand Down Expand Up @@ -3272,4 +3272,4 @@
"xenos"
]
}
}
}
Loading
Loading