Skip to content

Commit 4475ee6

Browse files
Werwolf-12EttyKitty
Werwolf-12
and
EttyKitty
authored
feat: New Volkite and Bolt weapons HH era (#878)
Co-authored-by: EttyKitty <20323032+EttyKitty@users.noreply.github.com>
1 parent 1058fc7 commit 4475ee6

File tree

27 files changed

+1074
-0
lines changed

27 files changed

+1074
-0
lines changed

‎ChapterMaster.yyp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1660,9 +1660,12 @@
16601660
{"id":{"name":"spr_weapon_lightning1","path":"sprites/spr_weapon_lightning1/spr_weapon_lightning1.yy",},},
16611661
{"id":{"name":"spr_weapon_lightning2","path":"sprites/spr_weapon_lightning2/spr_weapon_lightning2.yy",},},
16621662
{"id":{"name":"spr_weapon_mace_of_absolution","path":"sprites/spr_weapon_mace_of_absolution/spr_weapon_mace_of_absolution.yy",},},
1663+
{"id":{"name":"spr_weapon_mars_hbolt","path":"sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy",},},
16631664
{"id":{"name":"spr_weapon_melta","path":"sprites/spr_weapon_melta/spr_weapon_melta.yy",},},
16641665
{"id":{"name":"spr_weapon_missile","path":"sprites/spr_weapon_missile/spr_weapon_missile.yy",},},
16651666
{"id":{"name":"spr_weapon_mmelta","path":"sprites/spr_weapon_mmelta/spr_weapon_mmelta.yy",},},
1667+
{"id":{"name":"spr_weapon_phobos_bolt_pistol","path":"sprites/spr_weapon_phobos_bolt_pistol/spr_weapon_phobos_bolt_pistol.yy",},},
1668+
{"id":{"name":"spr_weapon_phobos_bolter","path":"sprites/spr_weapon_phobos_bolter/spr_weapon_phobos_bolter.yy",},},
16661669
{"id":{"name":"spr_weapon_plasc","path":"sprites/spr_weapon_plasc/spr_weapon_plasc.yy",},},
16671670
{"id":{"name":"spr_weapon_plasg","path":"sprites/spr_weapon_plasg/spr_weapon_plasg.yy",},},
16681671
{"id":{"name":"spr_weapon_plasma_cannon_term","path":"sprites/spr_weapon_plasma_cannon_term/spr_weapon_plasma_cannon_term.yy",},},
@@ -1693,6 +1696,11 @@
16931696
{"id":{"name":"spr_weapon_sword_oriental","path":"sprites/spr_weapon_sword_oriental/spr_weapon_sword_oriental.yy",},},
16941697
{"id":{"name":"spr_weapon_sword_turk","path":"sprites/spr_weapon_sword_turk/spr_weapon_sword_turk.yy",},},
16951698
{"id":{"name":"spr_weapon_thhammer","path":"sprites/spr_weapon_thhammer/spr_weapon_thhammer.yy",},},
1699+
{"id":{"name":"spr_weapon_tigris_combi","path":"sprites/spr_weapon_tigris_combi/spr_weapon_tigris_combi.yy",},},
1700+
{"id":{"name":"spr_weapon_volkite_caliver","path":"sprites/spr_weapon_volkite_caliver/spr_weapon_volkite_caliver.yy",},},
1701+
{"id":{"name":"spr_weapon_volkite_charger","path":"sprites/spr_weapon_volkite_charger/spr_weapon_volkite_charger.yy",},},
1702+
{"id":{"name":"spr_weapon_volkite_culverin","path":"sprites/spr_weapon_volkite_culverin/spr_weapon_volkite_culverin.yy",},},
1703+
{"id":{"name":"spr_weapon_volkite_serpenta","path":"sprites/spr_weapon_volkite_serpenta/spr_weapon_volkite_serpenta.yy",},},
16961704
{"id":{"name":"spr_weapon_xenophase_blade_var1","path":"sprites/spr_weapon_xenophase_blade_var1/spr_weapon_xenophase_blade_var1.yy",},},
16971705
{"id":{"name":"spr_weapoon_powso_flamberge","path":"sprites/spr_weapoon_powso_flamberge/spr_weapoon_powso_flamberge.yy",},},
16981706
{"id":{"name":"spr_welcome_bg","path":"sprites/spr_welcome_bg/spr_welcome_bg.yy",},},

‎scripts/scr_culture_visuals/scr_culture_visuals.gml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,6 +1254,103 @@ function format_weapon_visuals(weapon_name){
12541254
return return_options;
12551255
}
12561256
global.weapon_visual_data = {
1257+
//30k weapons
1258+
//Volkitepack
1259+
"Volkite Charger": {
1260+
base: {
1261+
weapon_data: {
1262+
display_type: "normal_ranged",
1263+
new_weapon_draw: true
1264+
},
1265+
},
1266+
variants: [{
1267+
sprite: spr_weapon_volkite_charger,
1268+
}]
1269+
},
1270+
1271+
"Volkite Serpenta": {
1272+
base: {
1273+
weapon_data: {
1274+
display_type: "normal_ranged",
1275+
new_weapon_draw: true
1276+
},
1277+
},
1278+
variants: [{
1279+
sprite: spr_weapon_volkite_serpenta,
1280+
}]
1281+
},
1282+
1283+
"Volkite Caliver": {
1284+
base: {
1285+
weapon_data: {
1286+
display_type: "ranged_twohand",
1287+
new_weapon_draw: true
1288+
},
1289+
},
1290+
variants: [{
1291+
sprite: spr_weapon_volkite_caliver,
1292+
}]
1293+
},
1294+
1295+
"Volkite Culverin": {
1296+
base: {
1297+
weapon_data: {
1298+
display_type: "ranged_twohand",
1299+
new_weapon_draw: true
1300+
},
1301+
},
1302+
variants: [{
1303+
sprite: spr_weapon_volkite_culverin,
1304+
}]
1305+
},
1306+
//Bolter Pack
1307+
"Phobos pattern Bolter": {
1308+
base: {
1309+
weapon_data: {
1310+
display_type: "normal_ranged",
1311+
new_weapon_draw: true
1312+
},
1313+
},
1314+
variants: [{
1315+
sprite: spr_weapon_phobos_bolter,
1316+
}]
1317+
},
1318+
"Phobos pattern Bolt Pistol": {
1319+
base: {
1320+
weapon_data: {
1321+
display_type: "normal_ranged",
1322+
new_weapon_draw: true
1323+
},
1324+
},
1325+
variants: [{
1326+
sprite: spr_weapon_phobos_bolt_pistol,
1327+
}]
1328+
},
1329+
"Mars pattern Heavy Bolter": {
1330+
base: {
1331+
weapon_data: {
1332+
display_type: "ranged_twohand",
1333+
new_weapon_draw: true
1334+
},
1335+
},
1336+
variants: [{
1337+
sprite: spr_weapon_mars_hbolt,
1338+
}]
1339+
},
1340+
"Tigris pattern Combi Bolter": {
1341+
base: {
1342+
weapon_data: {
1343+
display_type: "normal_ranged",
1344+
new_weapon_draw: true
1345+
},
1346+
},
1347+
variants: [{
1348+
sprite: spr_weapon_tigris_combi,
1349+
}]
1350+
},
1351+
1352+
1353+
//40k weapons
12571354
"Assault Cannon": {
12581355
base : {
12591356
weapon_data:{

‎scripts/scr_weapon/scr_weapon.gml‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,142 @@
11
global.weapons = {
2+
//30k Weapons
3+
//Volkite Pack
4+
"Volkite Culverin": {
5+
"abbreviation": "VolkCul",
6+
"attack": {
7+
"standard": 700,
8+
"master_crafted": 720,
9+
"artifact": 740
10+
},
11+
"description": "Ancient thermal ray weapon, heaviest man portable variant of its class.",
12+
"melee_hands": 1,
13+
"ranged_hands": 2.2,
14+
"ammo": 4,
15+
"range": 22,
16+
"spli": 12,
17+
"arp": 0,
18+
"tags": ["Volkite", "energy"]
19+
},
20+
21+
"Volkite Caliver": {
22+
"abbreviation": "VolkCal",
23+
"attack": {
24+
"standard": 550,
25+
"master_crafted": 570,
26+
"artifact": 590
27+
},
28+
"description": "Ancient thermal ray weapon, an uncommon sight during ancient times, now a precious relic for every chapter that can claim one.",
29+
"melee_hands": 1,
30+
"ranged_hands": 2,
31+
"ammo": 6,
32+
"range": 16,
33+
"spli": 10,
34+
"arp": 0,
35+
"tags": ["Volkite", "energy"]
36+
},
37+
38+
"Volkite Charger": {
39+
"abbreviation": "VolkCharg",
40+
"attack": {
41+
"standard": 400,
42+
"master_crafted": 420,
43+
"artifact": 440
44+
},
45+
"description": "Ancient thermal ray weapon, smaller, yet still deadly brother of caliver.",
46+
"melee_hands": 1,
47+
"ranged_hands": 2,
48+
"ammo": 10,
49+
"range": 10,
50+
"spli": 6,
51+
"arp": 0,
52+
"tags": ["Volkite", "energy"]
53+
},
54+
55+
"Volkite Serpenta": {
56+
"abbreviation": "VolkSerp",
57+
"attack": {
58+
"standard": 250,
59+
"master_crafted": 270,
60+
"artifact": 290
61+
},
62+
"description": "Ancient one handed thermal ray weapon, preferred by melee specialists, and officers .",
63+
"melee_hands": 0,
64+
"ranged_hands": 1,
65+
"ammo": 10,
66+
"range": 3,
67+
"spli": 4,
68+
"arp": 0,
69+
"tags": ["Volkite", "energy"]
70+
71+
},
72+
//Bolt Pack
73+
"Phobos pattern Bolt Pistol": {
74+
"abbreviation": "PhBltPis",
75+
"attack": {
76+
"standard": 38,
77+
"master_crafted": 43,
78+
"artifact": 48
79+
},
80+
"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.",
81+
"melee_hands": 0,
82+
"ranged_hands": 1,
83+
"ammo": 20,
84+
"range": 3.5,
85+
"spli": 2,
86+
"arp": 0,
87+
"tags": ["bolt", "pistol"]
88+
},
89+
90+
"Phobos pattern Bolter": {
91+
"abbreviation": "PhBltr",
92+
"attack": {
93+
"standard": 75,
94+
"master_crafted": 80,
95+
"artifact": 85
96+
},
97+
"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.",
98+
"melee_hands": 1,
99+
"ranged_hands": 2,
100+
"ammo": 20,
101+
"range": 13,
102+
"spli": 3,
103+
"arp": 0,
104+
"tags": ["bolt"]
105+
},
106+
107+
"Mars pattern Heavy Bolter": {
108+
"abbreviation": "MarsHvyBltr",
109+
"attack": {
110+
"standard": 400,
111+
"master_crafted": 430,
112+
"artifact": 460
113+
},
114+
"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.",
115+
"melee_hands": 1,
116+
"ranged_hands": 2,
117+
"ammo": 12,
118+
"range": 17,
119+
"spli": 9,
120+
"arp": 1,
121+
"tags": ["heavy_ranged", "bolt"]
122+
},
123+
"Tigris pattern Combi Bolter": {
124+
"abbreviation": "TigComBltr",
125+
"attack": {
126+
"standard": 100,
127+
"master_crafted": 120,
128+
"artifact": 140
129+
},
130+
"description": "Once primary weapon of ancient terminator squads, now precious relic of any chapter that still can field it.",
131+
"melee_hands": 1.1,
132+
"ranged_hands": 1.1,
133+
"ammo": 14,
134+
"range": 19,
135+
"spli": 11,
136+
"arp": 1,
137+
"tags": ["heavy_ranged", "bolt"]
138+
},
139+
//40K Weapons
2140
"Storm Shield": {
3141
"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.",
4142
"abbreviation": "StrmShld",

‎sprites/spr_weapon_mars_hbolt/473a7284-a688-484d-91d4-96d25b326cfd.png‎

7.33 KB
Loading

‎sprites/spr_weapon_mars_hbolt/layers/473a7284-a688-484d-91d4-96d25b326cfd/cb2bbe01-35ef-4dc1-b409-a1cbfe34ce5a.png‎

7.33 KB
Loading

‎sprites/spr_weapon_mars_hbolt/spr_weapon_mars_hbolt.yy‎

Lines changed: 92 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sprites/spr_weapon_phobos_bolt_pistol/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f.png‎

3.13 KB
Loading

‎sprites/spr_weapon_phobos_bolt_pistol/layers/7bf54d5b-eb4f-4225-8043-c7bbdfefe28f/874c87bf-544a-4c32-a371-509dc9981ec4.png‎

3.13 KB
Loading

0 commit comments

Comments
 (0)