Skip to content

Commit

Permalink
redesign lobby weapon detail to use swarmopedia for stats
Browse files Browse the repository at this point in the history
I've been stepping over these changes to make the last week or so of bugfixes
  • Loading branch information
BenLubar committed Jul 12, 2024
1 parent 4823bd4 commit ace2202
Show file tree
Hide file tree
Showing 11 changed files with 846 additions and 662 deletions.
92 changes: 92 additions & 0 deletions reactivedrop/resource/swarmopedia.txt

Large diffs are not rendered by default.

20 changes: 11 additions & 9 deletions src/game/client/swarm/rd_collections.h
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ class CRD_Collection_Tab_Equipment : public TGD_Tab

void SetBriefing( IBriefing *pBriefing, int nLobbySlot );

RD_Swarmopedia::Collection *m_pCollection;
CASW_Marine_Profile *m_pProfile;
int m_nSkillValue[ASW_NUM_MARINE_SKILLS];
int m_nInventorySlot;
Expand Down Expand Up @@ -140,7 +139,9 @@ class CRD_Collection_Entry_Equipment : public TGD_Entry
void PostChildPaint() override;
void ApplyEntry() override;

const RD_Swarmopedia::Weapon *m_pWeapon;
int m_iEquipIndex;
bool m_bExtra;
CUtlString m_szWeaponClass;
ReactiveDropInventory::ItemInstance_t m_ItemInstance;
bool m_bNoDirectEquip;

Expand Down Expand Up @@ -173,8 +174,10 @@ class CRD_Collection_Panel_Equipment : public vgui::EditablePanel
BaseModUI::GenericPanelList *m_pGplFacts;
CNB_Button *m_pBtnEquip;

int m_iEquipIndex;
bool m_bExtra;
CUtlString m_szWeaponClass;
CRD_Collection_Tab_Equipment *m_pTab;
const RD_Swarmopedia::Weapon *m_pWeapon;
ReactiveDropInventory::ItemInstance_t m_ItemInstance;
};

Expand Down Expand Up @@ -250,8 +253,6 @@ class CRD_Collection_Tab_Swarmopedia : public TGD_Tab

TGD_Grid *CreateGrid() override;
TGD_Details *CreateDetails() override;

RD_Swarmopedia::Collection *m_pCollection;
};

class CRD_Collection_Details_Swarmopedia : public TGD_Details
Expand Down Expand Up @@ -283,11 +284,11 @@ class CRD_Collection_Entry_Swarmopedia : public TGD_Entry

void ApplySchemeSettings( vgui::IScheme *pScheme ) override;
void ApplyEntry() override;
const RD_Swarmopedia::Alien *GetAlien() const;

vgui::ImagePanel *m_pIcon;
vgui::Panel *m_pUnlockProgress;

const RD_Swarmopedia::Alien *m_pAlien;
CUtlString m_AlienID;
};

class CRD_Collection_Panel_Swarmopedia : public vgui::EditablePanel
Expand All @@ -300,12 +301,13 @@ class CRD_Collection_Panel_Swarmopedia : public vgui::EditablePanel
void PerformLayout() override;
void OnCommand( const char *command ) override;
void OnKeyCodePressed( vgui::KeyCode keycode ) override;
const RD_Swarmopedia::Alien *GetAlien() const;

CRD_Swarmopedia_Model_Panel *m_pModelPanel;
CNB_Button *m_pModelButton;
vgui::Label *m_pLblNoModel;
vgui::RichText *m_pContent;
vgui::MultiFontRichText *m_pContent;

const RD_Swarmopedia::Alien *m_pAlien;
CUtlString m_AlienID;
int m_iCurrentDisplay;
};
Loading

0 comments on commit ace2202

Please sign in to comment.