From 03906e2a0bb72881d56d786f18250fe1a2cde60a Mon Sep 17 00:00:00 2001 From: Werwolf Date: Fri, 3 Oct 2025 23:12:26 +0200 Subject: [PATCH 1/6] contemptor --- ChapterMaster.yyp | 6 +- objects/obj_shop/Create_0.gml | 12 +++ .../scr_culture_visuals.gml | 29 +++++- scripts/scr_ruins_reward/scr_ruins_reward.gml | 10 ++ .../scr_ui_display_weapons.gml | 2 +- scripts/scr_weapon/scr_weapon.gml | 34 ++++++- .../cdc4c2e7-a824-4a45-8406-fe470c6eae31.png | Bin 0 -> 4175 bytes .../af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png | Bin 0 -> 4175 bytes .../spr_Contemptor_Conversion_Beamer.yy | 92 ++++++++++++++++++ .../1b47a347-6927-4943-981c-dfba95287448.png | Bin 0 -> 3393 bytes .../719740c0-402f-4dc6-af3e-0d8475287311.png | Bin 0 -> 3393 bytes .../spr_Contemptor_assault_cannon.yy | 92 ++++++++++++++++++ .../d532989d-6b36-48dc-9ccb-1daf433cbb1f.png | Bin .../1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png | Bin .../spr_Volkite_Culverins.yy} | 10 +- 15 files changed, 277 insertions(+), 10 deletions(-) create mode 100644 sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png create mode 100644 sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png create mode 100644 sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy create mode 100644 sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png create mode 100644 sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png create mode 100644 sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy rename sprites/{spr_twl_Volkite_Culverins => spr_Volkite_Culverins}/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png (100%) rename sprites/{spr_twl_Volkite_Culverins => spr_Volkite_Culverins}/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png (100%) rename sprites/{spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy => spr_Volkite_Culverins/spr_Volkite_Culverins.yy} (90%) diff --git a/ChapterMaster.yyp b/ChapterMaster.yyp index c983780a72..6af904944b 100644 --- a/ChapterMaster.yyp +++ b/ChapterMaster.yyp @@ -576,7 +576,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.1400.0.892", + "IDEVersion":"2024.1400.0.901", }, "name":"ChapterMaster", "resources":[ @@ -1113,8 +1113,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",},}, @@ -1684,7 +1686,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",},}, @@ -1703,6 +1704,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",},}, diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index b41435bfbf..147ff36c29 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -675,6 +675,18 @@ if (shop = "equipment") { item_stocked[i] = scr_item_count(item[i]); item_cost[i] = 0; forge_cost[i] = 0; + i += 1; + item[i] = "Heavy Conversion Beamer"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + item[i] = "Kheres Assault Cannon"; + item_stocked[i] = scr_item_count(item[i]); + item_cost[i] = 0; + forge_cost[i] = 0; + i += 1; + var mc = 0; repeat(i) { diff --git a/scripts/scr_culture_visuals/scr_culture_visuals.gml b/scripts/scr_culture_visuals/scr_culture_visuals.gml index 54ed91f3c9..3b3b161699 100644 --- a/scripts/scr_culture_visuals/scr_culture_visuals.gml +++ b/scripts/scr_culture_visuals/scr_culture_visuals.gml @@ -1986,6 +1986,7 @@ base: { sprite: spr_weapon_cthon_autocannon, }] }, + //40k weapons "Assault Cannon": { @@ -2182,7 +2183,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, } ] }, diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 913435b469..00eeff7901 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -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); diff --git a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml index 6e55042f90..e0e9dc2b4d 100644 --- a/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml +++ b/scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml @@ -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, }; diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 06eb316eb6..46ede9fdd4 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -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, @@ -1262,6 +1262,22 @@ global.weapons = { "arp": 1, "tags": ["heavy_ranged", "dreadnought"] }, + "Kheres Assault Cannon": { + "abbreviation": "AssCann", + "attack": { + "standard": 280, + "master_crafted": 300, + "artifact": 320 + }, + "description": "AForged 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": { @@ -1326,6 +1342,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": { diff --git a/sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png b/sprites/spr_Contemptor_Conversion_Beamer/cdc4c2e7-a824-4a45-8406-fe470c6eae31.png new file mode 100644 index 0000000000000000000000000000000000000000..acabb491b56483b0e4fd2a698047ad10a1efefc2 GIT binary patch literal 4175 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 ud*Q?WGoav?oizx!_`e literal 0 HcmV?d00001 diff --git a/sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png b/sprites/spr_Contemptor_Conversion_Beamer/layers/cdc4c2e7-a824-4a45-8406-fe470c6eae31/af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808.png new file mode 100644 index 0000000000000000000000000000000000000000..acabb491b56483b0e4fd2a698047ad10a1efefc2 GIT binary patch literal 4175 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 ud*Q?WGoav?oizx!_`e literal 0 HcmV?d00001 diff --git a/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy b/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy new file mode 100644 index 0000000000..183e2441ba --- /dev/null +++ b/sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_Contemptor_Conversion_Beamer", + "bboxMode":0, + "bbox_bottom":165, + "bbox_left":196, + "bbox_right":283, + "bbox_top":78, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808","blendMode":0,"displayName":"default","isLocked":false,"name":"af2cc7f4-f5e3-470f-aa0e-ad3ebfbba808","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_Contemptor_Conversion_Beamer", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_Contemptor_Conversion_Beamer", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_Contemptor_Conversion_Beamer", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cdc4c2e7-a824-4a45-8406-fe470c6eae31","path":"sprites/spr_Contemptor_Conversion_Beamer/spr_Contemptor_Conversion_Beamer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"227c838d-d979-4091-a8ea-a4389830d2ac","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png b/sprites/spr_Contemptor_assault_cannon/1b47a347-6927-4943-981c-dfba95287448.png new file mode 100644 index 0000000000000000000000000000000000000000..0abf3469386a1b11eb52e9a9eed54d37f47e879d GIT binary patch literal 3393 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png b/sprites/spr_Contemptor_assault_cannon/layers/1b47a347-6927-4943-981c-dfba95287448/719740c0-402f-4dc6-af3e-0d8475287311.png new file mode 100644 index 0000000000000000000000000000000000000000..0abf3469386a1b11eb52e9a9eed54d37f47e879d GIT binary patch literal 3393 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 literal 0 HcmV?d00001 diff --git a/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy b/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy new file mode 100644 index 0000000000..959f799cc9 --- /dev/null +++ b/sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy @@ -0,0 +1,92 @@ +{ + "$GMSprite":"v2", + "%Name":"spr_Contemptor_assault_cannon", + "bboxMode":0, + "bbox_bottom":167, + "bbox_left":199, + "bbox_right":280, + "bbox_top":77, + "collisionKind":1, + "collisionTolerance":0, + "DynamicTexturePage":false, + "edgeFiltering":false, + "For3D":false, + "frames":[ + {"$GMSpriteFrame":"v1","%Name":"1b47a347-6927-4943-981c-dfba95287448","name":"1b47a347-6927-4943-981c-dfba95287448","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, + ], + "gridX":0, + "gridY":0, + "height":250, + "HTile":false, + "layers":[ + {"$GMImageLayer":"","%Name":"719740c0-402f-4dc6-af3e-0d8475287311","blendMode":0,"displayName":"default","isLocked":false,"name":"719740c0-402f-4dc6-af3e-0d8475287311","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, + ], + "name":"spr_Contemptor_assault_cannon", + "nineSlice":null, + "origin":9, + "parent":{ + "name":"dreadnought", + "path":"folders/Sprites/Marine Viewer/dreadnought.yy", + }, + "preMultiplyAlpha":false, + "resourceType":"GMSprite", + "resourceVersion":"2.0", + "sequence":{ + "$GMSequence":"v1", + "%Name":"spr_Contemptor_assault_cannon", + "autoRecord":true, + "backdropHeight":768, + "backdropImageOpacity":0.5, + "backdropImagePath":"", + "backdropWidth":1366, + "backdropXOffset":0.0, + "backdropYOffset":0.0, + "events":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "eventStubScript":null, + "eventToFunction":{}, + "length":1.0, + "lockOrigin":false, + "moments":{ + "$KeyframeStore":"", + "Keyframes":[], + "resourceType":"KeyframeStore", + "resourceVersion":"2.0", + }, + "name":"spr_Contemptor_assault_cannon", + "playback":1, + "playbackSpeed":30.0, + "playbackSpeedType":0, + "resourceType":"GMSequence", + "resourceVersion":"2.0", + "seqHeight":250.0, + "seqWidth":306.0, + "showBackdrop":true, + "showBackdropImage":false, + "timeUnits":1, + "tracks":[ + {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ + {"$Keyframe":"","Channels":{ + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1b47a347-6927-4943-981c-dfba95287448","path":"sprites/spr_Contemptor_assault_cannon/spr_Contemptor_assault_cannon.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + },"Disabled":false,"id":"04d2904f-f8a8-4807-9f2b-0ba94c26d67b","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, + ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange":null, + "volume":1.0, + "xorigin":61, + "yorigin":18, + }, + "swatchColours":null, + "swfPrecision":2.525, + "textureGroupId":{ + "name":"MarineViewer", + "path":"texturegroups/MarineViewer", + }, + "type":0, + "VTile":false, + "width":306, +} \ No newline at end of file diff --git a/sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png b/sprites/spr_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png similarity index 100% rename from sprites/spr_twl_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png rename to sprites/spr_Volkite_Culverins/d532989d-6b36-48dc-9ccb-1daf433cbb1f.png diff --git a/sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png b/sprites/spr_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png similarity index 100% rename from sprites/spr_twl_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png rename to sprites/spr_Volkite_Culverins/layers/d532989d-6b36-48dc-9ccb-1daf433cbb1f/1f3e5664-e536-47f4-b0bf-214e1fd9c23a.png diff --git a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy b/sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy similarity index 90% rename from sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy rename to sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy index 5d386c8d61..3d38eddb88 100644 --- a/sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy +++ b/sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy @@ -1,6 +1,6 @@ { "$GMSprite":"v2", - "%Name":"spr_twl_Volkite_Culverins", + "%Name":"spr_Volkite_Culverins", "bboxMode":0, "bbox_bottom":173, "bbox_left":203, @@ -21,7 +21,7 @@ "layers":[ {"$GMImageLayer":"","%Name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","blendMode":0,"displayName":"default","isLocked":false,"name":"1f3e5664-e536-47f4-b0bf-214e1fd9c23a","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, ], - "name":"spr_twl_Volkite_Culverins", + "name":"spr_Volkite_Culverins", "nineSlice":null, "origin":9, "parent":{ @@ -33,7 +33,7 @@ "resourceVersion":"2.0", "sequence":{ "$GMSequence":"v1", - "%Name":"spr_twl_Volkite_Culverins", + "%Name":"spr_Volkite_Culverins", "autoRecord":true, "backdropHeight":768, "backdropImageOpacity":0.5, @@ -57,7 +57,7 @@ "resourceType":"KeyframeStore", "resourceVersion":"2.0", }, - "name":"spr_twl_Volkite_Culverins", + "name":"spr_Volkite_Culverins", "playback":1, "playbackSpeed":30.0, "playbackSpeedType":0, @@ -71,7 +71,7 @@ "tracks":[ {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, + "0":{"$SpriteFrameKeyframe":"","Id":{"name":"d532989d-6b36-48dc-9ccb-1daf433cbb1f","path":"sprites/spr_Volkite_Culverins/spr_Volkite_Culverins.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, },"Disabled":false,"id":"1a3b8ccb-c022-4cad-95b2-9d1f0d2d8c12","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, ], From 962651bbddaa20df8495aa64bbcf10d82f7a176c Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 6 Nov 2025 23:48:45 +0000 Subject: [PATCH 2/6] Update scripts/scr_ruins_reward/scr_ruins_reward.gml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/scr_ruins_reward/scr_ruins_reward.gml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/scr_ruins_reward/scr_ruins_reward.gml b/scripts/scr_ruins_reward/scr_ruins_reward.gml index 00eeff7901..aaf82f82dc 100644 --- a/scripts/scr_ruins_reward/scr_ruins_reward.gml +++ b/scripts/scr_ruins_reward/scr_ruins_reward.gml @@ -174,13 +174,13 @@ wep1=choose("MK3 Iron Armour","MK4 Maximus","MK5 Heresy"); wen8=choose(1,2,3); } //Damaged Dreadnought -else if (ruins_type=7){ - wep1=("Contemptor Dreadnought"); - wen1=1 +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 + wen2=1; + wep3="Contemptor CCW"; + wen3=3; } From fbee0f46a45720e874398fb05b6ca5a25cb27537 Mon Sep 17 00:00:00 2001 From: Nelsonh <81228864+OH296@users.noreply.github.com> Date: Thu, 6 Nov 2025 23:48:59 +0000 Subject: [PATCH 3/6] Update scripts/scr_weapon/scr_weapon.gml Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- scripts/scr_weapon/scr_weapon.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 46ede9fdd4..8dd3cee9d9 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -1263,13 +1263,13 @@ global.weapons = { "tags": ["heavy_ranged", "dreadnought"] }, "Kheres Assault Cannon": { - "abbreviation": "AssCann", + "abbreviation": "KhrAssCnn", "attack": { "standard": 280, "master_crafted": 300, "artifact": 320 }, - "description": "AForged 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..", + "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, From 0a9f2d63166c5e3769b5ef95d46fa60f20cd6922 Mon Sep 17 00:00:00 2001 From: Werwolf Date: Sat, 8 Nov 2025 13:30:50 +0100 Subject: [PATCH 4/6] No buy option --- objects/obj_shop/Create_0.gml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index 147ff36c29..b5fab365a0 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -675,16 +675,19 @@ 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; From 33859804a3096fa9f7b413c2c03db5dd43df8656 Mon Sep 17 00:00:00 2001 From: Werwolf Date: Tue, 11 Nov 2025 11:42:08 +0100 Subject: [PATCH 5/6] Plasma pistol FIX --- scripts/scr_weapon/scr_weapon.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2a73e3dc22..2d93bbd3cb 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -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, @@ -2090,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 "range": 18, "spli": 30, "arp": 0, From ef8178779246a3b8f4eb9883b1c0d16ac14a84ca Mon Sep 17 00:00:00 2001 From: Werwolf Date: Tue, 11 Nov 2025 14:55:56 +0100 Subject: [PATCH 6/6] Ryza Plsama gun fix --- scripts/scr_weapon/scr_weapon.gml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/scr_weapon/scr_weapon.gml b/scripts/scr_weapon/scr_weapon.gml index 2d93bbd3cb..54a8377467 100644 --- a/scripts/scr_weapon/scr_weapon.gml +++ b/scripts/scr_weapon/scr_weapon.gml @@ -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,