feat: Ship Structs and Tyranid hive fleets

ChapterMaster.yyp

@@ -579,7 +579,7 @@
   "isEcma":false,
   "LibraryEmitters":[],
   "MetaData":{
-    "IDEVersion":"2024.1400.0.901",
+    "IDEVersion":"2024.1400.0.904",
   },
   "name":"ChapterMaster",
   "resources":[
@@ -753,8 +753,8 @@
     {"id":{"name":"scr_array_functions","path":"scripts/scr_array_functions/scr_array_functions.yy",},},
     {"id":{"name":"scr_arti_descr","path":"scripts/scr_arti_descr/scr_arti_descr.yy",},},
     {"id":{"name":"scr_audience","path":"scripts/scr_audience/scr_audience.yy",},},
+    {"id":{"name":"scr_automated_ship_combat_functions","path":"scripts/scr_automated_ship_combat_functions/scr_automated_ship_combat_functions.yy",},},
     {"id":{"name":"scr_battle_allies","path":"scripts/scr_battle_allies/scr_battle_allies.yy",},},
-    {"id":{"name":"scr_battle_sort","path":"scripts/scr_battle_sort/scr_battle_sort.yy",},},
     {"id":{"name":"scr_bionics_count","path":"scripts/scr_bionics_count/scr_bionics_count.yy",},},
     {"id":{"name":"scr_boarding_actions","path":"scripts/scr_boarding_actions/scr_boarding_actions.yy",},},
     {"id":{"name":"scr_bolt","path":"scripts/scr_bolt/scr_bolt.yy",},},
@@ -787,9 +787,9 @@
     {"id":{"name":"scr_crusade","path":"scripts/scr_crusade/scr_crusade.yy",},},
     {"id":{"name":"scr_culture_visuals","path":"scripts/scr_culture_visuals/scr_culture_visuals.yy",},},
     {"id":{"name":"scr_DataSlate","path":"scripts/scr_DataSlate/scr_DataSlate.yy",},},
-    {"id":{"name":"scr_dead_marines","path":"scripts/scr_dead_marines/scr_dead_marines.yy",},},
     {"id":{"name":"scr_demand","path":"scripts/scr_demand/scr_demand.yy",},},
     {"id":{"name":"scr_destroy_planet","path":"scripts/scr_destroy_planet/scr_destroy_planet.yy",},},
+    {"id":{"name":"scr_destroy_vehicle","path":"scripts/scr_destroy_vehicle/scr_destroy_vehicle.yy",},},
     {"id":{"name":"scr_dialogue","path":"scripts/scr_dialogue/scr_dialogue.yy",},},
     {"id":{"name":"scr_diplomacy_helpers","path":"scripts/scr_diplomacy_helpers/scr_diplomacy_helpers.yy",},},
     {"id":{"name":"scr_display_number","path":"scripts/scr_display_number/scr_display_number.yy",},},
@@ -805,11 +805,14 @@
     {"id":{"name":"scr_drop_fiddle","path":"scripts/scr_drop_fiddle/scr_drop_fiddle.yy",},},
     {"id":{"name":"scr_drop_select_function","path":"scripts/scr_drop_select_function/scr_drop_select_function.yy",},},
     {"id":{"name":"scr_en_weapon","path":"scripts/scr_en_weapon/scr_en_weapon.yy",},},
+    {"id":{"name":"scr_end_turn_audiences_and_final","path":"scripts/scr_end_turn_audiences_and_final/scr_end_turn_audiences_and_final.yy",},},
+    {"id":{"name":"scr_end_turn_combat_helpers","path":"scripts/scr_end_turn_combat_helpers/scr_end_turn_combat_helpers.yy",},},
     {"id":{"name":"scr_enemy_ai_a","path":"scripts/scr_enemy_ai_a/scr_enemy_ai_a.yy",},},
     {"id":{"name":"scr_enemy_ai_b","path":"scripts/scr_enemy_ai_b/scr_enemy_ai_b.yy",},},
     {"id":{"name":"scr_enemy_ai_c","path":"scripts/scr_enemy_ai_c/scr_enemy_ai_c.yy",},},
     {"id":{"name":"scr_enemy_ai_d","path":"scripts/scr_enemy_ai_d/scr_enemy_ai_d.yy",},},
     {"id":{"name":"scr_enemy_ai_e","path":"scripts/scr_enemy_ai_e/scr_enemy_ai_e.yy",},},
+    {"id":{"name":"scr_enemy_fleet_spawn_combat","path":"scripts/scr_enemy_fleet_spawn_combat/scr_enemy_fleet_spawn_combat.yy",},},
     {"id":{"name":"scr_equipment_struct","path":"scripts/scr_equipment_struct/scr_equipment_struct.yy",},},
     {"id":{"name":"scr_event_code","path":"scripts/scr_event_code/scr_event_code.yy",},},
     {"id":{"name":"scr_event_dudes","path":"scripts/scr_event_dudes/scr_event_dudes.yy",},},
@@ -877,6 +880,7 @@
     {"id":{"name":"scr_pen_And_paper","path":"scripts/scr_pen_And_paper/scr_pen_And_paper.yy",},},
     {"id":{"name":"scr_perils_table","path":"scripts/scr_perils_table/scr_perils_table.yy",},},
     {"id":{"name":"scr_planet_heresy","path":"scripts/scr_planet_heresy/scr_planet_heresy.yy",},},
+    {"id":{"name":"scr_planet_setup_functions","path":"scripts/scr_planet_setup_functions/scr_planet_setup_functions.yy",},},
     {"id":{"name":"scr_planetary_feature","path":"scripts/scr_planetary_feature/scr_planetary_feature.yy",},},
     {"id":{"name":"scr_PlanetData","path":"scripts/scr_PlanetData/scr_PlanetData.yy",},},
     {"id":{"name":"scr_player_combat_weapon_stacks","path":"scripts/scr_player_combat_weapon_stacks/scr_player_combat_weapon_stacks.yy",},},
@@ -913,8 +917,11 @@
     {"id":{"name":"scr_serialization_functions","path":"scripts/scr_serialization_functions/scr_serialization_functions.yy",},},
     {"id":{"name":"scr_shader_initialize","path":"scripts/scr_shader_initialize/scr_shader_initialize.yy",},},
     {"id":{"name":"scr_ship_battle","path":"scripts/scr_ship_battle/scr_ship_battle.yy",},},
+    {"id":{"name":"scr_ship_combat_data","path":"scripts/scr_ship_combat_data/scr_ship_combat_data.yy",},},
     {"id":{"name":"scr_ship_count","path":"scripts/scr_ship_count/scr_ship_count.yy",},},
     {"id":{"name":"scr_ship_occupants","path":"scripts/scr_ship_occupants/scr_ship_occupants.yy",},},
+    {"id":{"name":"scr_ship_weapon_struct","path":"scripts/scr_ship_weapon_struct/scr_ship_weapon_struct.yy",},},
+    {"id":{"name":"scr_ShipStruct","path":"scripts/scr_ShipStruct/scr_ShipStruct.yy",},},
     {"id":{"name":"scr_shoot","path":"scripts/scr_shoot/scr_shoot.yy",},},
     {"id":{"name":"scr_special_view","path":"scripts/scr_special_view/scr_special_view.yy",},},
     {"id":{"name":"scr_specialist_point_handler","path":"scripts/scr_specialist_point_handler/scr_specialist_point_handler.yy",},},
@@ -931,6 +938,7 @@
     {"id":{"name":"scr_struct_functions","path":"scripts/scr_struct_functions/scr_struct_functions.yy",},},
     {"id":{"name":"scr_system_search_helpers","path":"scripts/scr_system_search_helpers/scr_system_search_helpers.yy",},},
     {"id":{"name":"scr_system_spawn_functions","path":"scripts/scr_system_spawn_functions/scr_system_spawn_functions.yy",},},
+    {"id":{"name":"scr_system_spawn","path":"scripts/scr_system_spawn/scr_system_spawn.yy",},},
     {"id":{"name":"scr_Table","path":"scripts/scr_Table/scr_Table.yy",},},
     {"id":{"name":"scr_target","path":"scripts/scr_target/scr_target.yy",},},
     {"id":{"name":"scr_text_hit","path":"scripts/scr_text_hit/scr_text_hit.yy",},},
@@ -940,6 +948,8 @@
     {"id":{"name":"scr_trade","path":"scripts/scr_trade/scr_trade.yy",},},
     {"id":{"name":"scr_transfer_marines","path":"scripts/scr_transfer_marines/scr_transfer_marines.yy",},},
     {"id":{"name":"scr_turn_first","path":"scripts/scr_turn_first/scr_turn_first.yy",},},
+    {"id":{"name":"scr_tyranid_fleet_functions","path":"scripts/scr_tyranid_fleet_functions/scr_tyranid_fleet_functions.yy",},},
+    {"id":{"name":"scr_tyranid_planet_functions","path":"scripts/scr_tyranid_planet_functions/scr_tyranid_planet_functions.yy",},},
     {"id":{"name":"scr_ui_advisors","path":"scripts/scr_ui_advisors/scr_ui_advisors.yy",},},
     {"id":{"name":"scr_ui_diplomacy","path":"scripts/scr_ui_diplomacy/scr_ui_diplomacy.yy",},},
     {"id":{"name":"scr_ui_display_weapons","path":"scripts/scr_ui_display_weapons/scr_ui_display_weapons.yy",},},
@@ -1621,6 +1631,7 @@
     {"id":{"name":"spr_ship_razorfiend","path":"sprites/spr_ship_razorfiend/spr_ship_razorfiend.yy",},},
     {"id":{"name":"spr_ship_reaper","path":"sprites/spr_ship_reaper/spr_ship_reaper.yy",},},
     {"id":{"name":"spr_ship_shadow","path":"sprites/spr_ship_shadow/spr_ship_shadow.yy",},},
+    {"id":{"name":"spr_ship_shields","path":"sprites/spr_ship_shields/spr_ship_shields.yy",},},
     {"id":{"name":"spr_ship_shroud","path":"sprites/spr_ship_shroud/spr_ship_shroud.yy",},},
     {"id":{"name":"spr_ship_slam","path":"sprites/spr_ship_slam/spr_ship_slam.yy",},},
     {"id":{"name":"spr_ship_song","path":"sprites/spr_ship_song/spr_ship_song.yy",},},

datafiles/data/traits.json

@@ -464,7 +464,7 @@
     },
     "perfectionist": {
         "display_name": "Perfectionist",
-        "flavour_text": "Obsessed with doing things correctly",
+        "flavour_text": "Obsessed with doing things correctly and Training to perfection",
         "wisdom": [
             2,
             2,
@@ -487,7 +487,8 @@
         "piety": [
             2,
             1
-        ]
+        ],
+        "effect": "When captaining a ship weapons have a 10% increased reload time"
     },
     "guardian": {
         "display_name": "Guardian",

objects/obj_al_in/Step_0.gml

@@ -8,21 +8,21 @@ if (owner == eFACTION.Chaos) then sprite_index = spr_ship_dreadclaw;
 image_angle = direction;
 if (cooldown1 > 0) then cooldown1 -= 1;
 
-var dist, range;
+var target_distance, range;
 if (instance_exists(target)) {
 
-    dist = point_distance(x, y, target.x, target.y);
+    target_distance = point_distance(x, y, target.x, target.y);
     range = 100 + max(sprite_get_width(target.sprite_index), sprite_get_height(target.sprite_index));
 
     if (action == "close") {
         speed = 4;
         direction = turn_towards_point(direction, x, y, target.x, target.y, 6);
     }
-    if (dist < range) and(dist > 100) and(action = "close") then action = "shoot";
-    if (action == "shoot") and(dist > range) then action = "close";
-    if (dist < 80) and(action = "shoot") then action = "bank";
+    if (target_distance < range) and(target_distance > 100) and(action = "close") then action = "shoot";
+    if (action == "shoot") and(target_distance > range) then action = "close";
+    if (target_distance < 80) and(action = "shoot") then action = "bank";
     if (action == "bank") then direction = turn_towards_point(direction, x, y, room_width, room_height / 2, 3);
-    if (action == "bank") and(dist > 300) then action = "close";
+    if (action == "bank") and(target_distance > 300) then action = "close";
 
     if (action == "shoot") and(cooldown1 <= 0) {
         var bull;
@@ -36,6 +36,7 @@ if (instance_exists(target)) {
         bull.image_xscale = 0.5;
         bull.image_yscale = 0.5;
         bull.dam = 3;
+        bull.explosion_sprite = spr_explosion;  
         if (owner == 7) then bull.dam = 2;
     }
 } else if (!instance_exists(target)) or (target.x <= -4000) {

objects/obj_al_round/Collision_obj_en_ship.gml

@@ -1,20 +1 @@
-// Handles damage allocation on space combat against ships based on shields and hp
-var arm = other.armour_front;
-var t1 = 0;
-
-if (arm < dam) {
-    dam -= arm;
-    if (other.shields > 0) other.shields -= dam / 2;
-    else other.hp -= dam / 2;
-}
-
-if (arm > dam) {
-    if (other.shields > 0) other.shields -= 0.5;
-    if (other.shields <= 0) other.hp -= 0.5;
-}
-
-if (sprite_index == spr_torpedo) {
-    instance_create(x, y, obj_explosion);
-}
-
-instance_destroy();
+round_collision_with_ship();

objects/obj_al_round/Create_0.gml

@@ -1,2 +1,3 @@
 dam = 0;
-image_angle=direction;
+image_angle=direction;
+explosion_sprite = spr_explosion;

objects/obj_al_round/Step_0.gml

@@ -1,19 +1 @@
-image_angle = direction;
-
-if (x < -1000) 
-    or(x > room_width + 1000) 
-    or(y < -1000) 
-    or(y > room_height + 1000) 
-    then instance_destroy();
-
-var th, thd;
-if (dam <= 4) {
-    if (instance_exists(obj_p_th)) {
-        th = instance_nearest(x, y, obj_p_th);
-        thd = point_distance(x, y, th.x, th.y);
-        if (thd < 6) {
-            th.hp -= (self.dam - 1);
-            instance_destroy();
-        }
-    }
-}
+round_step_logic();