Skip to content

Fix/infinite hp #43

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
Oct 29, 2024
Merged

Fix/infinite hp #43

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_p_assra/Alarm_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ for (o=1;o<=20;o++){

if (obj_fleet.capital+obj_fleet.frigate+obj_fleet.escort>0) then obj_controller.gene_seed+=seed_max;
}else if (apothecary>0){
unit.update_health(unit.hp()+irandom(10)+2);
unit.add_or_sub_health(irandom_range(9,14));
apothecary-=0.5;
}
}
Expand Down
10 changes: 5 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 @@ -827,7 +827,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={})
var new_health;
if (apoth){
if (base_group == "astartes"){
if (gene_seed_mutations[$ "ossmodula"]==1){
if (gene_seed_mutations[$ "ossmodula"]){
health_portion=6;
}else{
health_portion=4;
Expand All @@ -838,7 +838,7 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={})
} else {
if (base_group == "astartes"){
health_portion = 8;
if (gene_seed_mutations[$ "ossmodula"]==1){
if (gene_seed_mutations[$ "ossmodula"]){
health_portion = 10;
}
}
Expand All @@ -847,9 +847,9 @@ function TTRPG_stats(faction, comp, mar, class = "marine", other_spawn_data={})
if (new_health>m_health) then new_health=m_health;
update_health(new_health);
}
static update_health = function(new_health){
unit_health = new_health;
};
static update_health = function(new_health){
unit_health = min(new_health, max_health());
};

static hp_portion = function(){
return (hp()/max_health());
Expand Down