Skip to content
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

feat: Remove "Power Weapon" from the player side #411

Merged
merged 1 commit into from
Jan 12, 2025
Merged

feat: Remove "Power Weapon" from the player side #411

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: 1 addition & 3 deletions objects/obj_controller/Alarm_5.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,9 +488,7 @@ if (training_techmarine>0){
obj_ini.loc[0][g1]="Terra";
unit.planet_location=4;
unit.ship_location=-1;
if (unit.weapon_one()!="Power Weapon"){
unit.update_weapon_one("");
}
unit.update_weapon_one("");
unit.update_weapon_two("");
unit.update_gear("");
unit.update_mobility_item("");
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_initialize_custom/scr_initialize_custom.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3306,7 +3306,7 @@ function scr_initialize_custom() {
scr_add_item("Bolt Pistol", 80);
scr_add_item("Heavy Bolter", 40);
scr_add_item("Lascannon", 40);
scr_add_item("Power Weapon", 12);
scr_add_item("Power Sword", 12);
scr_add_item("Rosarius", 4);
}
if (!scr_has_disadv("Sieged")) {
Expand Down
1 change: 0 additions & 1 deletion scripts/scr_ui_display_weapons/scr_ui_display_weapons.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ function scr_ui_display_weapons(left_or_right, current_armor, equiped_weapon, cu
"Force Staff":spr_weapon_frcstaff,
"Force Sword":spr_weapon_powswo,
"Force Axe":spr_weapon_powaxe,
"Power Weapon":spr_weapon_powswo,
"Relic Blade":spr_weapon_relic_blade,
"Eviscerator":spr_weapon_evisc,
"Power Mace":spr_weapon_powmace,
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_weapon/scr_weapon.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ global.weapons = {
"master_crafted": 1.1,
"artifact": 1.1
},
"description": "An makeshift power weapon made by Astartes during long term deployment behind enemy lines or when cut from supply lines for long periods of time.",
// "description": "An makeshift power weapon made by Astartes during long term deployment behind enemy lines or when cut from supply lines for long periods of time.",
"melee_hands": 1.1,
"ranged_hands": 0,
"ammo": 0,
Expand Down
Loading