Skip to content

fix: old methods for marine incapacitation increasing health #89

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
merged 1 commit into from
Nov 9, 2024
Merged

fix: old methods for marine incapacitation increasing health #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_pnunit/Alarm_4.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ for (var i=0;i<array_length(unit_struct);i++){
if (!is_struct(unit))then continue;
if (marine_type[i]!="") and (unit.hp()<-3000) and (obj_ncombat.defeat=0){
marine_dead[i]=0;
unit.add_or_sub_health(5000);
//unit.add_or_sub_health(5000);
}// For incapitated

if (ally[i]=false){
Expand Down
4 changes: 2 additions & 2 deletions scripts/scr_clean/scr_clean.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ function scr_clean(target_object, target_is_infantry, hostile_shots, hostile_dam
minus = round(minus * (1 - damage_resistance));
}
if (minus < 0 && hostile_weapon == "Fleshborer") minus = 1.5;
if (hostile_weapon == "Web Spinner") {
/* if (hostile_weapon == "Web Spinner") {
var webr = floor(random(100)) + 1;
var chunk = max(10, 62 - (marine_ac[marine_index] * 2));
minus = (webr <= chunk) ? 5000 : 0;
}
} */
marine.add_or_sub_health(-minus);

// Check if marine is dead
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_perils_table/scr_perils_table.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function scr_perils_table(peril_roll, unit, psy_discipline, power_name, unit_id,
}],
[31, function(peril_roll, unit, psy_discipline, power_name, unit_id, book_powers){
//TODO figure out a better way of making a marine unconcious/incapacitated
unit.add_or_sub_health(-5000);
//unit.add_or_sub_health(-5000);
var flavour_text2="Psychic backlash knocks him out entirely, incapacitating the marine.";
return flavour_text2;
}],
Expand Down