cleanup comments
This commit is contained in:
parent
e9afca5e75
commit
500b875f58
@ -17,7 +17,6 @@ export const giveKeyChainTriggeredItemsController: RequestHandler = async (req,
|
|||||||
}
|
}
|
||||||
// items were added: update quest stage's i (item was given)
|
// items were added: update quest stage's i (item was given)
|
||||||
const quest = inventory.QuestKeys.find(quest => quest.ItemType === keyChainTriggeredItemsRequest.KeyChain);
|
const quest = inventory.QuestKeys.find(quest => quest.ItemType === keyChainTriggeredItemsRequest.KeyChain);
|
||||||
console.log(`quest: ${JSON.stringify(quest)}`);
|
|
||||||
|
|
||||||
if (!quest) {
|
if (!quest) {
|
||||||
throw new Error(`Quest ${keyChainTriggeredItemsRequest.KeyChain} not found in QuestKeys`);
|
throw new Error(`Quest ${keyChainTriggeredItemsRequest.KeyChain} not found in QuestKeys`);
|
||||||
|
@ -22,8 +22,6 @@ export const inventorySlotsController: RequestHandler = async (req, res) => {
|
|||||||
const accountId = await getAccountIdForRequest(req);
|
const accountId = await getAccountIdForRequest(req);
|
||||||
//const body = JSON.parse(req.body as string) as IInventorySlotsRequest;
|
//const body = JSON.parse(req.body as string) as IInventorySlotsRequest;
|
||||||
|
|
||||||
//console.log(body);
|
|
||||||
|
|
||||||
//TODO: check which slot was purchased because pvpBonus is also possible
|
//TODO: check which slot was purchased because pvpBonus is also possible
|
||||||
|
|
||||||
const inventory = await getInventory(accountId);
|
const inventory = await getInventory(accountId);
|
||||||
@ -31,7 +29,5 @@ export const inventorySlotsController: RequestHandler = async (req, res) => {
|
|||||||
updateSlots(inventory, InventorySlot.PVE_LOADOUTS, 1, 1);
|
updateSlots(inventory, InventorySlot.PVE_LOADOUTS, 1, 1);
|
||||||
await inventory.save();
|
await inventory.save();
|
||||||
|
|
||||||
//console.log({ InventoryChanges: currencyChanges }, " added loadout changes:");
|
|
||||||
|
|
||||||
res.json({ InventoryChanges: currencyChanges });
|
res.json({ InventoryChanges: currencyChanges });
|
||||||
};
|
};
|
||||||
|
@ -25,11 +25,10 @@ export const updateQuestController: RequestHandler = async (req, res) => {
|
|||||||
const questKeyName = updateQuestRequest.QuestKeys[0].ItemType;
|
const questKeyName = updateQuestRequest.QuestKeys[0].ItemType;
|
||||||
const questCompletionItems = getQuestCompletionItems(questKeyName);
|
const questCompletionItems = getQuestCompletionItems(questKeyName);
|
||||||
|
|
||||||
console.log(questCompletionItems, "quest completion items");
|
logger.debug(`quest completion items { ${questCompletionItems.map(item => item.ItemType).join(", ")} }`);
|
||||||
|
|
||||||
const inventoryChanges = {};
|
const inventoryChanges = {};
|
||||||
for (const item of questCompletionItems) {
|
for (const item of questCompletionItems) {
|
||||||
console.log(item, "item");
|
|
||||||
const inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount);
|
const inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount);
|
||||||
combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
|
combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
|
||||||
}
|
}
|
||||||
|
@ -179,7 +179,7 @@ export const addMissionInventoryUpdates = (
|
|||||||
return inventoryChanges;
|
return inventoryChanges;
|
||||||
};
|
};
|
||||||
|
|
||||||
//return partial missioninventoryupdate response
|
//TODO: return type of partial missioninventoryupdate response
|
||||||
export const addMissionRewards = async (
|
export const addMissionRewards = async (
|
||||||
inventory: TInventoryDatabaseDocument,
|
inventory: TInventoryDatabaseDocument,
|
||||||
{ RewardInfo: rewardInfo, LevelKeyName: levelKeyName, Missions: missions }: IMissionInventoryUpdateRequest
|
{ RewardInfo: rewardInfo, LevelKeyName: levelKeyName, Missions: missions }: IMissionInventoryUpdateRequest
|
||||||
@ -197,10 +197,10 @@ export const addMissionRewards = async (
|
|||||||
const inventoryChanges: IInventoryChanges = {};
|
const inventoryChanges: IInventoryChanges = {};
|
||||||
|
|
||||||
let missionCompletionCredits = 0;
|
let missionCompletionCredits = 0;
|
||||||
//inventory change is what the client does not know the server updated, although credit updates seem to be taken from totalCredits
|
//inventory change is what the client has not rewarded itself, credit updates seem to be taken from totalCredits
|
||||||
if (levelKeyName) {
|
if (levelKeyName) {
|
||||||
const fixedLevelRewards = getLevelKeyRewards(levelKeyName);
|
const fixedLevelRewards = getLevelKeyRewards(levelKeyName);
|
||||||
console.log("fixedLevelRewards", fixedLevelRewards);
|
//logger.debug(`fixedLevelRewards ${fixedLevelRewards}`);
|
||||||
for (const reward of fixedLevelRewards) {
|
for (const reward of fixedLevelRewards) {
|
||||||
if (reward.rewardType == "RT_CREDITS") {
|
if (reward.rewardType == "RT_CREDITS") {
|
||||||
inventory.RegularCredits += reward.amount;
|
inventory.RegularCredits += reward.amount;
|
||||||
@ -215,13 +215,12 @@ export const addMissionRewards = async (
|
|||||||
const levelCreditReward = getLevelCreditRewards(missions?.Tag);
|
const levelCreditReward = getLevelCreditRewards(missions?.Tag);
|
||||||
missionCompletionCredits += levelCreditReward;
|
missionCompletionCredits += levelCreditReward;
|
||||||
inventory.RegularCredits += levelCreditReward;
|
inventory.RegularCredits += levelCreditReward;
|
||||||
console.log("levelCreditReward", levelCreditReward);
|
logger.debug(`levelCreditReward ${levelCreditReward}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO: resolve issue with creditbundles
|
//TODO: resolve issue with creditbundles
|
||||||
for (const reward of MissionRewards) {
|
for (const reward of MissionRewards) {
|
||||||
//TODO: additem should take in storeItems
|
//TODO: additem should take in storeItems
|
||||||
console.log("adding item", reward.StoreItem);
|
|
||||||
const inventoryChange = await addItem(inventory, reward.StoreItem.replace("StoreItems/", ""), reward.ItemCount);
|
const inventoryChange = await addItem(inventory, reward.StoreItem.replace("StoreItems/", ""), reward.ItemCount);
|
||||||
//TODO: combineInventoryChanges improve type safety, merging 2 of the same item?
|
//TODO: combineInventoryChanges improve type safety, merging 2 of the same item?
|
||||||
//TODO: check for the case when two of the same item are added, combineInventoryChanges should merge them
|
//TODO: check for the case when two of the same item are added, combineInventoryChanges should merge them
|
||||||
@ -229,8 +228,6 @@ export const addMissionRewards = async (
|
|||||||
combineInventoryChanges(inventoryChanges, inventoryChange.InventoryChanges);
|
combineInventoryChanges(inventoryChanges, inventoryChange.InventoryChanges);
|
||||||
}
|
}
|
||||||
|
|
||||||
console.log(inventory.RegularCredits);
|
|
||||||
console.log("inventoryChanges", inventoryChanges);
|
|
||||||
return { inventoryChanges, MissionRewards, missionCompletionCredits };
|
return { inventoryChanges, MissionRewards, missionCompletionCredits };
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -246,15 +243,6 @@ export const calculateFinalCredits = (
|
|||||||
) => {
|
) => {
|
||||||
const hasDailyCreditBonus = true;
|
const hasDailyCreditBonus = true;
|
||||||
const totalCredits = missionDropCredits + missionCompletionCredits + rngRewardCredits;
|
const totalCredits = missionDropCredits + missionCompletionCredits + rngRewardCredits;
|
||||||
console.log(
|
|
||||||
"missionDropCredits",
|
|
||||||
missionDropCredits,
|
|
||||||
"missionCompletionCredits",
|
|
||||||
missionCompletionCredits,
|
|
||||||
"rngRewardCredits",
|
|
||||||
rngRewardCredits
|
|
||||||
);
|
|
||||||
console.log("totalCredits", totalCredits);
|
|
||||||
|
|
||||||
const finalCredits = {
|
const finalCredits = {
|
||||||
MissionCredits: [missionDropCredits, missionDropCredits],
|
MissionCredits: [missionDropCredits, missionDropCredits],
|
||||||
|
@ -12,7 +12,6 @@ export const updateQuestKey = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
const questKeyIndex = inventory.QuestKeys.findIndex(questKey => questKey.ItemType === questKeyUpdate[0].ItemType);
|
const questKeyIndex = inventory.QuestKeys.findIndex(questKey => questKey.ItemType === questKeyUpdate[0].ItemType);
|
||||||
console.log("quest key index", questKeyIndex);
|
|
||||||
|
|
||||||
if (questKeyIndex === -1) {
|
if (questKeyIndex === -1) {
|
||||||
throw new Error(`quest key ${questKeyUpdate[0].ItemType} not found`);
|
throw new Error(`quest key ${questKeyUpdate[0].ItemType} not found`);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user