Skip to content
Closed
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
6 changes: 5 additions & 1 deletion ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,9 @@
"isEcma":false,
"LibraryEmitters":[],
"MetaData":{

"IDEVersion":"2024.1400.0.904",

},
"name":"ChapterMaster",
"resources":[
Expand Down Expand Up @@ -1115,8 +1117,10 @@
{"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},},
{"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},},
{"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},},
{"id":{"name":"spr_Contemptor_assault_cannon","path":"sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy",},},
{"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},},
{"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},},
{"id":{"name":"spr_Contemptor_Conversion_Beamer","path":"sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy",},},
{"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},},
{"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},},
{"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},},
Expand Down Expand Up @@ -1694,7 +1698,6 @@
{"id":{"name":"spr_tooltip1","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},},
{"id":{"name":"spr_torpedo_board","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},},
{"id":{"name":"spr_torpedo","path":"sprites/spr_torpedo/spr_torpedo.yy",},},
{"id":{"name":"spr_twl_Volkite_Culverins","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},},
{"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},},
{"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},},
{"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},},
Expand All @@ -1713,6 +1716,7 @@
{"id":{"name":"spr_um_mk6_helm","path":"sprites/spr_um_mk6_helm/spr_um_mk6_helm.yy",},},
{"id":{"name":"spr_um_mk7_helm","path":"sprites/spr_um_mk7_helm/spr_um_mk7_helm.yy",},},
{"id":{"name":"spr_view_small","path":"sprites/spr_view_small/spr_view_small.yy",},},
{"id":{"name":"spr_Volkite_Culverins","path":"sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy",},},
{"id":{"name":"spr_warp_level_icon","path":"sprites/spr_warp_level_icon/spr_warp_level_icon.yy",},},
{"id":{"name":"spr_warp_storm","path":"sprites/spr_warp_storm/spr_warp_storm.yy",},},
{"id":{"name":"spr_weapon_assca","path":"sprites/spr_weapon_assca/spr_weapon_assca.yy",},},
Expand Down
15 changes: 15 additions & 0 deletions objects/obj_shop/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,21 @@ if (shop = "equipment") {
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
nobuy[i]=1;
i += 1;
item[i] = "Heavy Conversion Beamer";
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
nobuy[i]=1;
i += 1;
item[i] = "Kheres Assault Cannon";
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
nobuy[i]=1;
i += 1;


var mc = 0;
repeat(i) {
Expand Down
29 changes: 28 additions & 1 deletion scripts/scr_culture_visuals/scr_culture_visuals.gml
Original file line number Diff line number Diff line change
Expand Up @@ -2039,6 +2039,7 @@ base: {
sprite: spr_weapon_cthon_autocannon,
}]
},


//40k weapons
"Assault Cannon": {
Expand Down Expand Up @@ -2235,7 +2236,33 @@ base: {
},
variants: [
{
sprite: spr_twl_Volkite_Culverins,
sprite: spr_Volkite_Culverins,
}
]
},
"Heavy Conversion Beamer":{
base: {
body_types: [3],
weapon_data: {
display_type: "dreadnought",
},
},
variants: [
{
sprite: spr_Contemptor_Conversion_Beamer,
}
]
},
"Kheres Assault Cannon":{
base: {
body_types: [3],
weapon_data: {
display_type: "dreadnought",
},
},
variants: [
{
sprite: spr_Contemptor_assault_cannon,
}
]
},
Expand Down
10 changes: 10 additions & 0 deletions scripts/scr_ruins_reward/scr_ruins_reward.gml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,16 @@ wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy");
wep8="Boarding Shield";
wen8=choose(1,2,3);
}
//Damaged Dreadnought
else if (ruins_type==7){
wep1="Contemptor Dreadnought";
wen1=1;
wep2=choose("Twin-linked Volkite Culverins","Heavy Conversion Beamer","Kheres Assault Cannon");
wen2=1;
wep3="Contemptor CCW";
wen3=3;
}


scr_add_item(wep1,wen1);
scr_add_item(wep2,wen2);
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ function dreadnought_sprite_components(component){
"Multi-Melta": spr_dread_plasma_cannon,
"Twin Linked Lascannon": spr_dread_lascannon,
"Heavy Conversion Beam Projector": spr_dread_plasma_cannon,
"Twin-linked Volkite Culverins":spr_twl_Volkite_Culverins,
"Twin-linked Volkite Culverins":spr_Volkite_Culverins,
"Contemptor CCW":spr_contemptor_CCW,

};
Expand Down
42 changes: 37 additions & 5 deletions scripts/scr_weapon/scr_weapon.gml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ global.weapons = {
"master_crafted": 270,
"artifact": 290
},
"description": "The pistol variant of the long-lost Volkite weapon type, the Serpenta was a mainstay of Moritats and often wielded by Centurions of the Legiones Astartes. Now a symbol of status to match its fearsome potency, a sighting of this ancient weapon would send many foes running.",
"description": "Mounted mostly on Contemptor dreadnoughts, twin-linked Volkite Culverins spit devastating energy beams that rend heavily armored targets and ignite volatile systems. Fired together with surgical precision, their overlapping beams punish evasive maneuvers and hollow out fortifications in a single, red-hot pass.",
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 10,
Expand Down Expand Up @@ -171,8 +171,8 @@ global.weapons = {
"artifact": 175
},
"description": "The smaller brother of the Ryzan Plasma Gun, it shares its characteristics as well as sleek design and purple glow. Once a regular weapon for Sergeants and some Moritats in the Legiones Astartes, with even some Consuls or Centurions favouring them over Volkites or Disintegrators, the humble Ryzan Plasma Pistol has earned its place as a vaunted relic of any armoury lucky enough to have it.",
"melee_hands": 1,
"ranged_hands": 2,
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 18,
"range": 14,
"spli": 5,
Expand Down Expand Up @@ -1161,7 +1161,7 @@ global.weapons = {
"description": "A pistol variant of the plasma gun, this dangerous-to-use weapon has exceptional armor-piercing capabilities.",
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 0,
"ammo": 16,
"range": 3.1,
"spli": 1,
"arp": 1,
Expand Down Expand Up @@ -1263,6 +1263,22 @@ global.weapons = {
"arp": 1,
"tags": ["heavy_ranged", "dreadnought"]
},
"Kheres Assault Cannon": {
"abbreviation": "KhrAssCnn",
"attack": {
"standard": 280,
"master_crafted": 300,
"artifact": 320
},
"description": "Forged in the forges of Mars and carried into battle by the mightiest of the Emperor's warriors, the Kheres Assault Cannon is a weapon of devastating reputation. Its rotary barrels roar with unceasing fury, unleashing a deluge of mass-reactive shells that tear through flesh, ceramite, and adamantium alike.",
"melee_hands": 2.1,
"ranged_hands": 3,
"ammo": 5,
"range": 14,
"spli": 20,
"arp": 1,
"tags": ["heavy_ranged", "dreadnought", "ancient"]
},
"Autocannon": {
"abbreviation": "Autocnn",
"attack": {
Expand Down Expand Up @@ -1327,6 +1343,22 @@ global.weapons = {
"arp": 1,
"tags": ["heavy_ranged", "ancient"]
},
"Heavy Conversion Beamer": {
"abbreviation": "HvyCnvBm",
"attack": {
"standard": 500,
"master_crafted": 550,
"artifact": 600
},
"description": "An ancient relic of the Dark Age of Technology, the Heavy Conversion Beamer is a marvel of destructive science rarely entrusted to Imperial commanders. This esoteric weapon channels vast reserves of energy into a focused beam of coruscating light, tearing matter apart at the molecular level and converting it into raw energy in a cataclysmic chain reaction. The weapon’s lethality grows with distance — the further its target, the more apocalyptic the discharge. To stand at the far end of a Heavy Conversion Beamer’s wrath is to be annihilated in a searing blaze that leaves nothing but scorched ruin in its wake. Few battlefields have witnessed its fury and remained unchanged, for the weapon is as much a terror to its enemies as a reminder of the Imperium’s dwindling grasp on its most potent technologies.",
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 1,
"range": 20,
"spli": 3,
"arp": 1,
"tags": ["heavy_ranged", "ancient", "dreadnought"]
},
"Integrated Bolter": {
"abbreviation": "IntgBltr",
"attack": {
Expand Down Expand Up @@ -2058,7 +2090,7 @@ global.weapons = {
"description": "An advanced thermal weapon from a bygone era, Volkite sakers are optimized for spreading damage across swaths of enemy troops.",
"melee_hands": 0,
"ranged_hands": 0,
"ammo": 25,
"ammo": 25,2
Copy link
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🔴 Critical

Critical data rune corrupted

Tech-Priest, the ammo field now chants "ammo": 25,2. In GML struct liturgies, the comma already separates fields; the lingering 2 invokes a compiler fault. Excise the stray numeral so only a single literal remains.

-		"ammo": 25,2
+		"ammo": 25,
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
"ammo": 25,2
"ammo": 25,
🤖 Prompt for AI Agents
In scripts/scr_weapon/scr_weapon.gml around line 2093, the struct field is
corrupted as `"ammo": 25,2` — remove the stray `,2` so the field is a single
valid literal (e.g. `"ammo": 25`) and ensure surrounding field separators/commas
remain correct for the struct literal.

"range": 18,
"spli": 30,
"arp": 0,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading