Skip to content

feat: ship-stats #516

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

Draft
Blogaugis wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: ship-stats #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36b20a7
feat: ship-stats
Blogaugis Feb 25, 2025
f9c3bc6
Rename Q-ship to Armed Freighter
Blogaugis Feb 26, 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
22 changes: 22 additions & 0 deletions objects/obj_al_ship/Alarm_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,28 @@ if (class=="Iconoclast"){
weapon_dam[1]=8;
weapon_range[1]=300;
weapon_cooldown[1]=30;
}else
if (class=="Armed Freighter"){
sprite_index=spr_ship_stri;
ship_size=2;
name="";
hp=300;
maxhp=300;
conditions="";
shields=100;
maxshields=100;
leadership=80;
armour_front=3;
armour_other=2;
weapons=1;
turrets=2;
capacity=150;
carrying=0;
weapon[1]="Weapons Battery";
weapon_facing[1]="most";
weapon_dam[1]=8;
weapon_range[1]=300;
weapon_cooldown[1]=30;
}
// Tyranids
if (class=="Leviathan"){
Expand Down
1 change: 1 addition & 0 deletions objects/obj_bomb_select/Mouse_56.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ if (__b__){
if (ship_all[i]==1){
if (obj_ini.ship_class[ship_ide[i]]=="Battle Barge") then bomb_score+=3;
if (obj_ini.ship_class[ship_ide[i]]=="Strike Cruiser") then bomb_score+=1;
// if (obj_ini.ship_class[ship_ide[i]]=="Armed Freighter") then bomb_score+=1;
}
}

Expand Down
8 changes: 8 additions & 0 deletions objects/obj_p_ship/Alarm_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,14 @@ if (class="Gloriana"){
weapon_cooldown[2]=60;
}

if (class="Armed Freighter"){turrets=2;
weapons=1;shield_size=1;sprite_index=spr_ship_stri;
weapon_facing[1]="most";
weapon_dam[1]=8;
weapon_range[1]=300;
weapon_cooldown[1]=30;
}

if (class="Gladius"){turrets=1;
weapons=2;shield_size=1;sprite_index=spr_ship_glad;
weapon_facing[1]="most";
Expand Down
4 changes: 2 additions & 2 deletions objects/obj_p_ship/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (hp<=0) and (x>-5000){
obj_fleet.capital-=1;
obj_fleet.capital_lost+=1;
}
if (class="Strike Cruiser"){
if (class="Strike Cruiser") or (class="Armed Freighter"){
obj_fleet.frigate-=1;
obj_fleet.frigate_lost+=1;
}
Expand Down Expand Up @@ -86,7 +86,7 @@ if (hp>0) and (instance_exists(target)){
o_dist=64;
action="broadside";
}
else if (class="Battle Barge") or (class="Strike Cruiser"){
else if (class="Battle Barge") or (class="Strike Cruiser") or (class="Armed Freighter"){
o_dist=300;
action="attack";
}
Expand Down
5 changes: 5 additions & 0 deletions objects/obj_shop/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,11 @@ if (shop = "warships") {
item_cost[i] = 0;
}
i += 1;
item[i] = "Armed Freighter";
item_stocked[i] = scr_ship_count(item[i]);
nobuy[i] = 1;
// forge_cost[i] = 10000;
i += 1;
item[i] = "Gladius";
item_stocked[i] = scr_ship_count(item[i]);
item_cost[i] = 2250;
Expand Down