Skip to content

Weapons Editor Dialog and Table Viewer #6169

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Weapons Editor Dialog and Table Viewer #6169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
744c947
Add Weapons Dialog
TheForce172 May 22, 2024
32fecda
Add TBL Viewer
TheForce172 May 26, 2024
0b24125
Add Comments
TheForce172 May 26, 2024
144822c
Appease GCC / Clang
TheForce172 May 27, 2024
d86bee5
Merge branch 'master' into feature/weaponsDialog
TheForce172 Jun 21, 2024
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
25 changes: 25 additions & 0 deletions code/ship/ship.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17990,6 +17990,31 @@ int get_max_ammo_count_for_primary_bank(int ship_class, int bank, int ammo_type)
return (int)std::lround(capacity / size);
}

/**
* The same as above, but for a specific turret's bank.
*/
int get_max_ammo_count_for_primary_turret_bank(ship_weapon* swp, int bank, int ammo_type)
{
float capacity, size;

Assertion(bank < MAX_SHIP_PRIMARY_BANKS,
"Invalid primary bank of %d (max is %d); get a coder!\n",
bank,
MAX_SHIP_PRIMARY_BANKS - 1);
Assertion(ammo_type < weapon_info_size(),
"Invalid ammo_type of %d is >= Weapon_info.size() (%d); get a coder!\n",
ammo_type,
weapon_info_size());

if (!swp || bank < 0 || ammo_type < 0 || !(Weapon_info[ammo_type].wi_flags[Weapon::Info_Flags::Ballistic])) {
return 0;
} else {
capacity = (float)swp->primary_bank_capacity[bank];
size = (float)Weapon_info[ammo_type].cargo_size;
return (int)(capacity / size);
}
}

/**
* Determine the number of secondary ammo units (missile/bomb) allowed max for a ship
*/
Expand Down
2 changes: 2 additions & 0 deletions code/ship/ship.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1915,6 +1915,8 @@ float ship_get_secondary_weapon_range(ship *shipp);

// Goober5000
int get_max_ammo_count_for_primary_bank(int ship_class, int bank, int ammo_type);
int get_max_ammo_count_for_primary_turret_bank(ship_weapon* swp, int bank, int ammo_type);


int get_max_ammo_count_for_bank(int ship_class, int bank, int ammo_type);
int get_max_ammo_count_for_turret_bank(ship_weapon *swp, int bank, int ammo_type);
Expand Down
15 changes: 15 additions & 0 deletions qtfred/source_groups.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ add_file_folder("Source/Mission/Dialogs/ShipEditor"
src/mission/dialogs/ShipEditor/ShipTextureReplacementDialogModel.cpp
src/mission/dialogs/ShipEditor/ShipTBLViewerModel.cpp
src/mission/dialogs/ShipEditor/ShipTBLViewerModel.h
src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.cpp
src/mission/dialogs/ShipEditor/ShipWeaponsDialogModel.h
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.cpp
src/mission/dialogs/ShipEditor/WeaponsTBLViewerModel.h
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.cpp
src/mission/dialogs/ShipEditor/ShipPathsDialogModel.h
)
Expand Down Expand Up @@ -154,6 +158,12 @@ add_file_folder("Source/UI/Dialogs/ShipEditor"
src/ui/dialogs/ShipEditor/ShipTextureReplacementDialog.cpp
src/ui/dialogs/ShipEditor/ShipTBLViewer.h
src/ui/dialogs/ShipEditor/ShipTBLViewer.cpp
src/ui/dialogs/ShipEditor/ShipWeaponsDialog.cpp
src/ui/dialogs/ShipEditor/ShipWeaponsDialog.h
src/ui/dialogs/ShipEditor/BankModel.cpp
src/ui/dialogs/ShipEditor/BankModel.h
src/ui/dialogs/ShipEditor/WeaponsTBLViewer.cpp
src/ui/dialogs/ShipEditor/WeaponsTBLViewer.h
src/ui/dialogs/ShipEditor/ShipPathsDialog.h
src/ui/dialogs/ShipEditor/ShipPathsDialog.cpp
)
Expand All @@ -174,6 +184,10 @@ add_file_folder("Source/UI/Widgets"
src/ui/widgets/sexp_tree.h
src/ui/widgets/ShipFlagCheckbox.h
src/ui/widgets/ShipFlagCheckbox.cpp
src/ui/widgets/weaponList.cpp
src/ui/widgets/weaponList.h
src/ui/widgets/bankTree.cpp
src/ui/widgets/bankTree.h
)

add_file_folder("UI"
Expand Down Expand Up @@ -205,6 +219,7 @@ add_file_folder("UI"
ui/PlayerOrdersDialog.ui
ui/ShipTextureReplacementDialog.ui
ui/ShipTBLViewer.ui
ui/ShipWeaponsDialog.ui
ui/ShipPathsDialog.ui
)

Expand Down
Loading
Loading