diff --git a/objects/obj_al_ship/Alarm_0.gml b/objects/obj_al_ship/Alarm_0.gml index e7bd72ed28..d679a801d8 100644 --- a/objects/obj_al_ship/Alarm_0.gml +++ b/objects/obj_al_ship/Alarm_0.gml @@ -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"){ diff --git a/objects/obj_bomb_select/Mouse_56.gml b/objects/obj_bomb_select/Mouse_56.gml index 716df9bf9f..b78c89e7fe 100644 --- a/objects/obj_bomb_select/Mouse_56.gml +++ b/objects/obj_bomb_select/Mouse_56.gml @@ -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; } } diff --git a/objects/obj_p_ship/Alarm_0.gml b/objects/obj_p_ship/Alarm_0.gml index 849cc3b355..0f4e15d270 100644 --- a/objects/obj_p_ship/Alarm_0.gml +++ b/objects/obj_p_ship/Alarm_0.gml @@ -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"; diff --git a/objects/obj_p_ship/Step_0.gml b/objects/obj_p_ship/Step_0.gml index e48c62af00..fb3186a3a6 100644 --- a/objects/obj_p_ship/Step_0.gml +++ b/objects/obj_p_ship/Step_0.gml @@ -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; } @@ -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"; } diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index b16fa72ded..e180de8c02 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -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;