Skip to content
Merged
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
8 changes: 8 additions & 0 deletions ChapterMaster.yyp
Original file line number Diff line number Diff line change
Expand Up @@ -1660,9 +1660,12 @@
{"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},},
{"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},},
{"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},
{"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},},
{"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},
{"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},
{"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},},
{"id":{"name":"spr_weapon_phobos_bolt_pistol","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},},
{"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},},
{"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},},
{"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},
{"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},},
Expand Down Expand Up @@ -1693,6 +1696,11 @@
{"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},},
{"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},},
{"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},},
{"id":{"name":"spr_weapon_tigris_combi","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},},
{"id":{"name":"spr_weapon_volkite_caliver","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},},
{"id":{"name":"spr_weapon_volkite_charger","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},},
{"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},},
{"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},},
{"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},},
{"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},},
{"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},},
Expand Down
97 changes: 97 additions & 0 deletions scripts/scr_culture_visuals/scr_culture_visuals.gml
Original file line number Diff line number Diff line change
Expand Up @@ -1254,6 +1254,103 @@ function format_weapon_visuals(weapon_name){
return return_options;
}
global.weapon_visual_data = {
//30k weapons
//Volkitepack
"Volkite Charger": {
base: {
weapon_data: {
display_type: "normal_ranged",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_volkite_charger,
}]
},

"Volkite Serpenta": {
base: {
weapon_data: {
display_type: "normal_ranged",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_volkite_serpenta,
}]
},

"Volkite Caliver": {
base: {
weapon_data: {
display_type: "ranged_twohand",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_volkite_caliver,
}]
},

"Volkite Culverin": {
base: {
weapon_data: {
display_type: "ranged_twohand",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_volkite_culverin,
}]
},
//Bolter Pack
"Phobos pattern Bolter": {
base: {
weapon_data: {
display_type: "normal_ranged",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_phobos_bolter,
}]
},
"Phobos pattern Bolt Pistol": {
base: {
weapon_data: {
display_type: "normal_ranged",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_phobos_bolt_pistol,
}]
},
"Mars pattern Heavy Bolter": {
base: {
weapon_data: {
display_type: "ranged_twohand",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_mars_hbolt,
}]
},
"Tigris pattern Combi Bolter": {
base: {
weapon_data: {
display_type: "normal_ranged",
new_weapon_draw: true
},
},
variants: [{
sprite: spr_weapon_tigris_combi,
}]
},


Comment thread
EttyKitty marked this conversation as resolved.
//40k weapons
"Assault Cannon": {
base : {
weapon_data:{
Expand Down
138 changes: 138 additions & 0 deletions scripts/scr_weapon/scr_weapon.gml
Original file line number Diff line number Diff line change
@@ -1,4 +1,142 @@
global.weapons = {
//30k Weapons
//Volkite Pack
"Volkite Culverin": {
"abbreviation": "VolkCul",
"attack": {
"standard": 700,
"master_crafted": 720,
"artifact": 740
},
"description": "Ancient thermal ray weapon, heaviest man portable variant of its class.",
"melee_hands": 1,
"ranged_hands": 2.2,
"ammo": 4,
"range": 22,
"spli": 12,
"arp": 0,
"tags": ["Volkite", "energy"]
},

"Volkite Caliver": {
"abbreviation": "VolkCal",
"attack": {
"standard": 550,
"master_crafted": 570,
"artifact": 590
},
"description": "Ancient thermal ray weapon, an uncommon sight during ancient times, now a precious relic for every chapter that can claim one.",
"melee_hands": 1,
"ranged_hands": 2,
"ammo": 6,
"range": 16,
"spli": 10,
"arp": 0,
"tags": ["Volkite", "energy"]
},

"Volkite Charger": {
"abbreviation": "VolkCharg",
"attack": {
"standard": 400,
"master_crafted": 420,
"artifact": 440
},
"description": "Ancient thermal ray weapon, smaller, yet still deadly brother of caliver.",
"melee_hands": 1,
"ranged_hands": 2,
"ammo": 10,
"range": 10,
"spli": 6,
"arp": 0,
"tags": ["Volkite", "energy"]
},

"Volkite Serpenta": {
"abbreviation": "VolkSerp",
"attack": {
"standard": 250,
"master_crafted": 270,
"artifact": 290
},
"description": "Ancient one handed thermal ray weapon, preferred by melee specialists, and officers .",
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 10,
"range": 3,
"spli": 4,
"arp": 0,
"tags": ["Volkite", "energy"]

},
//Bolt Pack
"Phobos pattern Bolt Pistol": {
"abbreviation": "PhBltPis",
"attack": {
"standard": 38,
"master_crafted": 43,
"artifact": 48
},
"description":"Once primary personal weapon of ancient astartes legions, now an uncommon sight on the battlefield.This weapon was hand-crafted by the Fabricators of Mars at the very birth of the Imperium during the Great Crusade.",
"melee_hands": 0,
"ranged_hands": 1,
"ammo": 20,
"range": 3.5,
"spli": 2,
"arp": 0,
"tags": ["bolt", "pistol"]
},

"Phobos pattern Bolter": {
"abbreviation": "PhBltr",
"attack": {
"standard": 75,
"master_crafted": 80,
"artifact": 85
},
"description": "Ancient pattern of boltgun made during times of the Great Crusade for the Astartes Legions. It uses different ammunition, has larger magazine and is slightly bigger than its modern counterparts.",
"melee_hands": 1,
"ranged_hands": 2,
"ammo": 20,
"range": 13,
"spli": 3,
"arp": 0,
"tags": ["bolt"]
},

"Mars pattern Heavy Bolter": {
"abbreviation": "MarsHvyBltr",
"attack": {
"standard": 400,
"master_crafted": 430,
"artifact": 460
},
"description": " Rare variant of heavy bolter, uncommon even during times of it's production. Made in forges of Mars itself, it's more lightweight and compact in comparison to modern patterns.",
"melee_hands": 1,
"ranged_hands": 2,
"ammo": 12,
"range": 17,
"spli": 9,
"arp": 1,
"tags": ["heavy_ranged", "bolt"]
},
"Tigris pattern Combi Bolter": {
"abbreviation": "TigComBltr",
"attack": {
"standard": 100,
"master_crafted": 120,
"artifact": 140
},
"description": "Once primary weapon of ancient terminator squads, now precious relic of any chapter that still can field it.",
"melee_hands": 1.1,
"ranged_hands": 1.1,
"ammo": 14,
"range": 19,
"spli": 11,
"arp": 1,
"tags": ["heavy_ranged", "bolt"]
},
//40K Weapons
"Storm Shield": {
"description": "Protects twice as well when boarding. A powered shield that must be held with a hand. While powered by the marines armour it shimmers with blue energy.",
"abbreviation": "StrmShld",
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.
92 changes: 92 additions & 0 deletions sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy

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.
Loading