Skip to content

Commit

Permalink
Item.h: Added Ada's files
Browse files Browse the repository at this point in the history
  • Loading branch information
nipkownix committed Dec 16, 2022
1 parent e4d3f82 commit 4128409
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 4 deletions.
12 changes: 12 additions & 0 deletions dllmain/GameFlags.cpp
Expand Up @@ -1510,6 +1510,18 @@ const char* EItemId_Names[] = {
"File_30",
"File_31",
"Tactical Vest",
"aaa", // Gets added to key items, freezes the game when you examine it?
"PunisherKeyItem", // Same
"HandgunKeyItem", // Same
"ShotgunKeyItem", // Same
"MineThrowerKeyItem", // Same
"HandcannonKeyItem", // Same
"MineThrowerwScopeKeyItem", // Same
"Mission Directives 1",
"Mission Directives 2",
"Mission Directives 3",
"Mission Directives 4",
"Mission Directives 5",
"Any"
};

Expand Down
16 changes: 14 additions & 2 deletions dllmain/SDK/item.h
Expand Up @@ -259,8 +259,20 @@ enum class EItemId
File_29 = 251,
File_30 = 252,
File_31 = 253,
Assault_Jacket = 254,
Any = 255,
Assault_Jacket = 254, // items below here have guessed names (cut from RE4VR?)
aaa = 255,
PunisherKeyItem = 256,
HandgunKeyItem = 257,
ShotgunKeyItem = 258,
MineThrowerKeyItem = 259,
HandcannonKeyItem = 260,
MineThrowerwScopeKeyItem = 261,
Mission_Directives_1 = 262,
Mission_Directives_2 = 263,
Mission_Directives_3 = 264,
Mission_Directives_4 = 265,
Mission_Directives_5 = 266,
Any = 267
};
extern const char* EItemId_Names[]; // GameFlags.cpp

Expand Down
18 changes: 16 additions & 2 deletions dllmain/Trainer.cpp
Expand Up @@ -1435,7 +1435,16 @@ void InvItemAdder_SetPopUp(const char* popupname)
EItemId::S_Field_Thermo,
EItemId::Mine_SC,

EItemId::Krauser_Knife, // gets added to key items, but freezes game when examining
// These get added to key items, but freeze game when examining
EItemId::Krauser_Knife,
EItemId::aaa,
EItemId::PunisherKeyItem,
EItemId::HandgunKeyItem,
EItemId::ShotgunKeyItem,
EItemId::MineThrowerKeyItem,
EItemId::HandcannonKeyItem,
EItemId::MineThrowerwScopeKeyItem,

EItemId::Ada_New_Weapon, // gets added to key items as "Killer7 w/ Silencer", no icon, examine shows the model, but it's otherwise pretty useless
// maybe this can be made equippable if "piece_info" data is added for it though...

Expand Down Expand Up @@ -2840,7 +2849,12 @@ void Trainer_RenderUI(int columnCount)

bool stackable = curInfo.maxNum_4 > 1;

std::string name = std::string(ITEM_TYPE_Names[curInfo.type_2]) + ": " + EItemId_Names[int(item_id)];
std::string name;

if (EItemId_Names[int(item_id)])
name = std::string(ITEM_TYPE_Names[curInfo.type_2]) + ": " + EItemId_Names[int(item_id)];
else
name = std::string(ITEM_TYPE_Names[curInfo.type_2]) + ": " + std::to_string(int(item_id)) + " (missing name)";

if (stackable)
name += " (" + std::to_string(itmPtr->num_2) + ")";
Expand Down

0 comments on commit 4128409

Please sign in to comment.