diff --git a/objects/obj_shop/Create_0.gml b/objects/obj_shop/Create_0.gml index f810c68201..b16fa72ded 100644 --- a/objects/obj_shop/Create_0.gml +++ b/objects/obj_shop/Create_0.gml @@ -1581,7 +1581,7 @@ if (shop == "production"){ item_stocked[i] = 0; forge_cost[i] = 3000; tooltip_overide[i] = "This research uncovers the lost techniques of Advanced Ceramite Bonding, allowing us to create superior armors. It fortifies our war plate, offering unparalleled protection against enemy fire. This dramatically enhances the survivability of our units as well as unlocking new armor capabilities.\n\nUnlocks: MK3 Iron Armour.\nRequired for: MK8 Errant, Artificer Armour, Terminator Armour, Tartaros."; - } else if (research.armour[1].armour[0] >= 2){ + } else if (research.armour[1].armour[0] == 2){ i++; item[i] = ["research","Ceremite Void Hardening", ["armour", "armour"]]; item_stocked[i] = 0; @@ -1595,7 +1595,7 @@ if (shop == "production"){ forge_cost[i] = 3000; tooltip_overide[i] = "This research unlocks the knowledge to fabricate the Mk VIII 'Errant' pattern Power Armour, a refinement of the ubiquitous Aquila armour, often favored by veteran Astartes and officers due to its unparalleled protection. It features improved plating around the torso and neck, enhancing its resilience against both ranged and melee attacks. This technology marks the pinnacle of power armour technology and a significant step in the path to becoming a battle-hardened Astartes.\n\nUnlocks: MK8 Errant.\nRequired for: Artificer Armour."; } - if (research.armour[1].stealth[0] >0 && research.armour[1].armour[0] >1){ + if (research.armour[1].stealth[0] == 1 && research.armour[1].armour[0] == 1){ i++; item[i] = ["research","Enhanced Nerve Interfacing", ["armour", "armour"]]; item_stocked[i] = 0; diff --git a/scripts/scr_equipment_struct/scr_equipment_struct.gml b/scripts/scr_equipment_struct/scr_equipment_struct.gml index 72e92c728d..a197ad3d31 100644 --- a/scripts/scr_equipment_struct/scr_equipment_struct.gml +++ b/scripts/scr_equipment_struct/scr_equipment_struct.gml @@ -287,9 +287,9 @@ function EquipmentStruct(item_data, core_type,quality="none") constructor{ } } if (obj_controller.stc_bonus[2]>0 && obj_controller.stc_bonus[2]<3){ - if (obj_controller.stc_bonus[1]==1 && has_tag("fist")){ + if (obj_controller.stc_bonus[2]==1 && has_tag("fist")){ attack*=1.1; - } else if (obj_controller.stc_bonus[1]==2 && has_tag("Plasma")){ + } else if (obj_controller.stc_bonus[2]==2 && has_tag("plasma")){ attack*=1.1; } } diff --git a/scripts/scr_ui_advisors/scr_ui_advisors.gml b/scripts/scr_ui_advisors/scr_ui_advisors.gml index af303ff1c6..2389abb788 100644 --- a/scripts/scr_ui_advisors/scr_ui_advisors.gml +++ b/scripts/scr_ui_advisors/scr_ui_advisors.gml @@ -79,7 +79,6 @@ function scr_ui_advisors() { blurp += _recruit_rates[training_chaplain]; if (training_chaplain>0 && training_chaplain <=6) { var training_points_values = ARR_chaplain_training_tiers; - blurp += _recruit_rates[training_chaplain]; eta = floor((47 - chaplain_points) / training_points_values[training_chaplain]) + 1; } // @@ -705,4 +704,4 @@ function scr_ui_advisors() { draw_set_color(c_gray); draw_text(xx + 800, yy + 74, string_hash_to_newline(string(global.chapter_name) + " Chapter Organization")); } -} \ No newline at end of file +} diff --git a/scripts/scr_unit_traits/scr_unit_traits.gml b/scripts/scr_unit_traits/scr_unit_traits.gml index 1197db0002..ad6409ed2b 100644 --- a/scripts/scr_unit_traits/scr_unit_traits.gml +++ b/scripts/scr_unit_traits/scr_unit_traits.gml @@ -165,7 +165,7 @@ global.trait_list = { }, "zealous_faith":{ strength:[1,1,"max"], - texhnology:-2, + technology:-2, wisdom:3, intelligence:-2, piety:[5,2,"max"],