evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32 from WasabiRaptor/Perfectly-Generic-Item-fixes

Browse Source 
Perfectly Generic Item Improvements
This commit is contained in:
Kae 2024-03-09 10:23:15 +11:00 committed by GitHub
commit 74072959c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/game/StarCommandProcessor.cpp
View File

@ -296,7 +296,7 @@ String CommandProcessor::spawnItem(ConnectionId connectionId, String const& argu
bool done = m_universe->executeForClient(connectionId, [&](WorldServer* world, PlayerPtr const& player) { bool done = m_universe->executeForClient(connectionId, [&](WorldServer* world, PlayerPtr const& player) {
auto itemDatabase = Root::singleton().itemDatabase(); auto itemDatabase = Root::singleton().itemDatabase();
world->addEntity(ItemDrop::createRandomizedDrop(itemDatabase->item(ItemDescriptor(kind, amount, parameters), level, seed), player->aimPosition())); world->addEntity(ItemDrop::createRandomizedDrop(itemDatabase->item(ItemDescriptor(kind, amount, parameters), level, seed, true), player->aimPosition()));
}); });
return done ? "" : "Invalid client state"; return done ? "" : "Invalid client state";

30
source/game/StarItemDatabase.cpp
View File

@ -232,11 +232,11 @@ ItemPtr ItemDatabase::itemShared(ItemDescriptor descriptor, Maybe<float> level,
} }
} }
ItemPtr ItemDatabase::item(ItemDescriptor descriptor, Maybe<float> level, Maybe<uint64_t> seed) const { ItemPtr ItemDatabase::item(ItemDescriptor descriptor, Maybe<float> level, Maybe<uint64_t> seed, bool ignoreInvalid) const {
if (!descriptor) if (!descriptor)
return {}; return {};
else else
return tryCreateItem(descriptor, level, seed); return tryCreateItem(descriptor, level, seed, ignoreInvalid);
} }
bool ItemDatabase::hasRecipeToMake(ItemDescriptor const& item) const { bool ItemDatabase::hasRecipeToMake(ItemDescriptor const& item) const {
@ -499,14 +499,32 @@ ItemPtr ItemDatabase::createItem(ItemType type, ItemConfig const& config) {
} }
} }
ItemPtr ItemDatabase::tryCreateItem(ItemDescriptor const& descriptor, Maybe<float> level, Maybe<uint64_t> seed) const { ItemPtr ItemDatabase::tryCreateItem(ItemDescriptor const& descriptor, Maybe<float> level, Maybe<uint64_t> seed, bool ignoreInvalid) const {
ItemPtr result; ItemPtr result;
String name = descriptor.name();
Json parameters = descriptor.parameters();
try { try {
result = createItem(m_items.get(descriptor.name()).type, itemConfig(descriptor.name(), descriptor.parameters(), level, seed)); if ((name == "perfectlygenericitem") && parameters.contains("genericItemStorage")) {
Json storage = parameters.get("genericItemStorage");
name = storage.getString("name");
parameters = storage.get("parameters");
}
result = createItem(m_items.get(name).type, itemConfig(name, parameters, level, seed));
} }
catch (std::exception const& e) { catch (std::exception const& e) {
Logger::error("Could not instantiate item '{}'. {}", descriptor, outputException(e, false)); if (descriptor.name() == "perfectlygenericitem") {
result = createItem(m_items.get("perfectlygenericitem").type, itemConfig("perfectlygenericitem", JsonObject(), {}, {})); Logger::error("Could not re-instantiate item '{}'. {}", descriptor, outputException(e, false));
result = createItem(m_items.get("perfectlygenericitem").type, itemConfig("perfectlygenericitem", descriptor.parameters(), level, seed));
} else if (!ignoreInvalid) {
Logger::error("Could not instantiate item '{}'. {}", descriptor, outputException(e, false));
result = createItem(m_items.get("perfectlygenericitem").type, itemConfig("perfectlygenericitem", JsonObject({
{"genericItemStorage", descriptor.toJson()},
{"shortdescription", descriptor.name()},
{"description", "Reinstall the parent mod to return this item to normal\n^red;(to retain data, do not place as object)"}
}), {}, {}));
} else
throw e;
} }
result->setCount(descriptor.count()); result->setCount(descriptor.count());

4
source/game/StarItemDatabase.hpp
View File

@ -117,7 +117,7 @@ public:
// The returned item pointer will be shared. Either call ->clone() or use item() instead for a copy. // The returned item pointer will be shared. Either call ->clone() or use item() instead for a copy.
ItemPtr itemShared(ItemDescriptor descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}) const; ItemPtr itemShared(ItemDescriptor descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}) const;
// Same as itemShared, but makes a copy instead. Does not cache. // Same as itemShared, but makes a copy instead. Does not cache.
ItemPtr item(ItemDescriptor descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}) const; ItemPtr item(ItemDescriptor descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}, bool ignoreInvalid = false) const;
bool hasRecipeToMake(ItemDescriptor const& item) const; bool hasRecipeToMake(ItemDescriptor const& item) const;
@ -159,7 +159,7 @@ private:
}; };
static ItemPtr createItem(ItemType type, ItemConfig const& config); static ItemPtr createItem(ItemType type, ItemConfig const& config);
ItemPtr tryCreateItem(ItemDescriptor const& descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}) const; ItemPtr tryCreateItem(ItemDescriptor const& descriptor, Maybe<float> level = {}, Maybe<uint64_t> seed = {}, bool ignoreInvalid = false) const;
ItemData const& itemData(String const& name) const; ItemData const& itemData(String const& name) const;
ItemRecipe makeRecipe(List<ItemDescriptor> inputs, ItemDescriptor output, float duration, StringSet groups) const; ItemRecipe makeRecipe(List<ItemDescriptor> inputs, ItemDescriptor output, float duration, StringSet groups) const;