Skip to content

feat: Jump packs give a ranged melee attack #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EttyKitty merged 5 commits into from
Mar 11, 2025
Merged

feat: Jump packs give a ranged melee attack #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
820a6bb
Hot take on jump packs and hammer of wrath
EttyKitty Mar 6, 2025
131714e
feat: Jump Pack balance, melee profile
EttyKitty Mar 8, 2025
5083771
slight tweak to melee jump packs
OH296 Mar 9, 2025
c846c63
syntax tweaks
OH296 Mar 9, 2025
a403d67
Formatting, if we're here anyway
EttyKitty Mar 10, 2025
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
2 changes: 1 addition & 1 deletion objects/obj_enunit/Alarm_1.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ if __b__ {
}
if (dudes_mobi[g] = "Bike") then scr_en_weapon("Twin Linked Bolters", false, 1, dudes[g], g);
if (dudes_mobi[g] != "Bike") and(dudes_mobi[g] != "") {
if (string_count("Jump Pack", marine_mobi[g]) > 0) then scr_en_weapon("hammer_of_wrath", false, 1, dudes[g], g);
if (string_count("Jump Pack", marine_mobi[g]) > 0) then scr_en_weapon("Hammer of Wrath", false, 1, dudes[g], g);
Comment thread
EttyKitty marked this conversation as resolved.
}

if (dudes_mobi[g] = "Servo-arm") then scr_en_weapon("Servo-arm(M)", false, 1, dudes[g], g);
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_shop/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ if (research.armour[1].stealth[0] > 0 && research.armour[1].armour[0] > 1 && obj
item[i] = "Iron Halo";
item_stocked[i] = scr_item_count(item[i]);
forge_cost[i] = 2000;
item_cost[i] = 250;
item_cost[i] = 300;
if (rene = 1) {
nobuy[i] = 1;
item_cost[i] = 0;
Expand Down
8 changes: 4 additions & 4 deletions scripts/scr_flavor/scr_flavor.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ function scr_flavor(id_of_attacking_weapons, target, target_type, number_of_shot
}
}

} else if (weapon_name == "hammer_of_wrath") {
} else if (weapon_name == "Hammer of Wrath" || weapon_name == "Hammer of Wrath(M)") {
flavoured = true;
if (!character_shot) {
if (number_of_shots < 20) {
attack_message += $"{number_of_shots} Astartes with Jump Packs soar upwards, flames roaring. They plummet back down upon the enemy- ";
} else if (number_of_shots >= 20 && number_of_shots < 100) {
attack_message += $"Squads of Astartes ascend with roaring Jump Packs. They descend upon the enemy- ";
attack_message += $"Squads of {number_of_shots} Astartes ascend with roaring Jump Packs. They descend upon the enemy- ";
} else {
attack_message += $"A massive wave of Astartes rise, their Jump Packs a furious beast. They crash down, smashing their foe- ";
attack_message += $"A massive wave of {number_of_shots} Astartes rise, their Jump Packs a furious beast. They crash down, smashing their foe- ";
}
if (target.dudes_num[targeh] == 1) {
if (casulties == 0) {
Expand Down Expand Up @@ -410,7 +410,7 @@ function scr_flavor(id_of_attacking_weapons, target, target_type, number_of_shot
// }

var led = 0;
if (wep[id_of_attacking_weapons] == "hammer_of_wrath") then led = 2.1;
if (wep[id_of_attacking_weapons] == "Hammer of Wrath") then led = 2.1;
if (obj_ncombat.enemy <= 10) {
if (target_name = obj_controller.faction_leader[obj_ncombat.enemy]) { // Cleaning up the message for the enemy leader
leader_message = string_replace(leader_message, "a " + target_name, target_name);
Expand Down
28 changes: 23 additions & 5 deletions scripts/scr_marine_struct/scr_marine_struct.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,11 +1473,29 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={})

//TODO just did this so that we're not loosing featuring but this porbably needs a rethink
static hammer_of_wrath = function(){
var wrath = new EquipmentStruct({},"");
wrath.attack=(strength*2) +(0.5*weapon_skill);
wrath.name = "hammer_of_wrath";
wrath.range = 1;
wrath.ammo = -1;
var _melee_attack = melee_damage_data[0];
var _melee_weapon = melee_damage_data[3];

var wrath = new EquipmentStruct({
attack : _melee_attack * 0.75,
name : "Hammer of Wrath",
range : 2,
ammo : 6,
spli : _melee_weapon.spli,
arp : _melee_weapon.arp
},"weapon");

var wrath_melee = new EquipmentStruct({
attack : _melee_attack * 1.25,
name : "Hammer of Wrath(M)",
range : 1,
ammo : 8,
spli : _melee_weapon.spli,
arp : _melee_weapon.arp,
},"weapon");

wrath.second_profiles = [wrath_melee];

return wrath;
}

Expand Down
28 changes: 17 additions & 11 deletions scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
// Script assets have changed for v2.3.0 see
// https://help.yoyogames.com/hc/en-us/articles/360005277377 for more information

function add_second_profiles_to_stack (weapon,head_role=false, unit="none"){
if (array_length(weapon.second_profiles)>0){//for adding in intergrated weaponry
var secondary_profile;
for (var p=0;p<array_length(weapon.second_profiles);p++){

secondary_profile = gear_weapon_data("weapon",weapon.second_profiles[p],"all");
if (!is_struct(secondary_profile)) then continue;
var wep_index = find_stack_index(secondary_profile.name, head_role,unit);
if (wep_index>-1){
add_data_to_stack(wep_index,secondary_profile);
function add_second_profiles_to_stack(weapon, head_role = false, unit = "none") {
if (array_length(weapon.second_profiles) > 0) {
//for adding in intergrated weaponry
var _secondary_profile;
for (var p = 0; p < array_length(weapon.second_profiles); p++) {
if (is_string(weapon.second_profiles[p])) {
_secondary_profile = gear_weapon_data("weapon", weapon.second_profiles[p], "all");
} else {
_secondary_profile = weapon.second_profiles[p];
}
if (!is_struct(_secondary_profile)) {
continue;
}
var wep_index = find_stack_index(_secondary_profile.name, head_role, unit);
if (wep_index > -1) {
add_data_to_stack(wep_index, _secondary_profile);
}
}
}
Expand Down Expand Up @@ -148,7 +154,7 @@ function scr_player_combat_weapon_stacks() {
if (unit.mobility_item() != "Bike" && unit.mobility_item() != "") {
if (is_struct(mobi_item)){
if (mobi_item.has_tag("jump")) {
var stack_index = find_stack_index("hammer_of_wrath", head_role, unit);
var stack_index = find_stack_index("Hammer of Wrath", head_role, unit);
Comment thread
EttyKitty marked this conversation as resolved.
if (stack_index > -1){
add_data_to_stack(stack_index, unit.hammer_of_wrath(), false, head_role, unit);
ammo[stack_index] = -1;
Expand Down
23 changes: 7 additions & 16 deletions scripts/scr_weapon/scr_weapon.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2357,15 +2357,10 @@ global.gear = {
"abbreviation": "IrnHalo",
"description": "An ancient artifact, these powerful conversion field generators are granted to high ranking battle brothers or heroes of the chapter. Bearers are often looked to for guidance by their fellow Astartes.",
"damage_resistance_mod": {
"standard": 10, // Adjusted
"master_crafted": 15, // Adjusted
"artifact": 20 // Adjusted
"standard": 35, // Adjusted
"master_crafted": 40, // Adjusted
"artifact": 45 // Adjusted
},
"hp_mod": {
"standard": 20, // Adjusted
"master_crafted": 25, // Adjusted
"artifact": 30 // Adjusted
}
},
"Combat Shield": {
"description": "A lighter, more maneuverable version of a Storm Shield. Due to its flexibility, Combat Shields leave other hand of a Space Marine free to use other hand-to-hand weaponry.",
Expand Down Expand Up @@ -2460,16 +2455,12 @@ global.gear = {
},
"Jump Pack": {
"abbreviation": "JmpPck",
"special_properties": ["Hammer of Wrath"],
"description": "A back-mounted device containing jets powerful enough to lift an Astartes in Power Armor over great distances. Utilizing these, Assault Marines bring devastation to the foe.",
"hp_mod": {
"standard": 10,
"master_crafted": 15,
"artifact": 20
},
"damage_resistance_mod": {
"standard": 20,
"master_crafted": 25,
"artifact": 30
"standard": 25,
"master_crafted": 30,
"artifact": 35
},
"tags": ["jump"],
},
Expand Down