Skip to content

fix: small bug fixes and fix research tree #492

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
EttyKitty merged 1 commit into from
Feb 18, 2025
Merged

fix: small bug fixes and fix research tree #492

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
4 changes: 2 additions & 2 deletions objects/obj_shop/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions scripts/scr_equipment_struct/scr_equipment_struct.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
3 changes: 1 addition & 2 deletions scripts/scr_ui_advisors/scr_ui_advisors.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
//
Expand Down Expand Up @@ -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"));
}
}
}
2 changes: 1 addition & 1 deletion scripts/scr_unit_traits/scr_unit_traits.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down