feat(SpecialAmmo): Added special ammo options

- Removed frame flags #108
This commit is contained in:
Yimura
2022-03-16 19:16:52 +01:00
parent 046759a8cc
commit b644c89e1f
8 changed files with 83 additions and 88 deletions

View File

@ -47,25 +47,6 @@ namespace big
ImGui::TreePop();
}
if (ImGui::TreeNode("Frame Flags"))
{
ImGui::BeginGroup();
ImGui::Checkbox("Explosive Ammo", &g->self.frame_flags.explosive_ammo);
ImGui::Checkbox("Fire Ammo", &g->self.frame_flags.fire_ammo);
ImGui::EndGroup();
ImGui::SameLine();
ImGui::BeginGroup();
ImGui::Checkbox("Explosive Melee", &g->self.frame_flags.explosive_melee);
ImGui::Checkbox("Super Jump", &g->self.frame_flags.super_jump);
ImGui::EndGroup();
ImGui::TreePop();
}
if (ImGui::TreeNode("Player Model"))
{
static char model[32];

View File

@ -2,6 +2,7 @@
#include "fiber_pool.hpp"
#include "gta/Weapons.h"
#include "script.hpp"
#include "core/data/special_ammo_types.hpp"
#include "views/view.hpp"
namespace big
@ -46,7 +47,30 @@ namespace big
ImGui::TreePop();
}
if (ImGui::TreeNode("Ammo Special"))
{
ImGui::Checkbox("Enable Special Ammo", &g->weapons.ammo_special.toggle);
eAmmoSpecialType selected = g->weapons.ammo_special.type;
if (ImGui::BeginCombo("Ammo Special", SPECIAL_AMMOS[(int)selected].name))
{
for (const auto& special_ammo : SPECIAL_AMMOS)
{
if (ImGui::Selectable(special_ammo.name, special_ammo.type == selected))
g->weapons.ammo_special.type = special_ammo.type;
if (special_ammo.type == selected)
ImGui::SetItemDefaultFocus();
}
ImGui::EndCombo();
}
ImGui::TreePop();
}
if (ImGui::TreeNode("Custom Weapons"))
{
CustomWeapon selected = g->weapons.custom_weapon;
@ -69,16 +93,6 @@ namespace big
switch (selected)
{
case CustomWeapon::NONE:
break;
case CustomWeapon::CAGE_GUN:
break;
case CustomWeapon::DELETE_GUN:
break;
case CustomWeapon::GRAVITY_GUN:
break;
case CustomWeapon::REPAIR_GUN:
break;
case CustomWeapon::VEHICLE_GUN:
ImGui::Text("Shooting Model:");
ImGui::InputText("##vehicle_gun_model", g->weapons.vehicle_gun_model, 12);