 |
Issue 0002376 Notes Source changes: 1. Corrected problem with "startingItem" and "startingitem" case difference. ("shopitem" also now allowed, though it doesn't appear in maps to date.) 2. Added inv_map_start items to the shop's starting item list for display. (Previously ignored.) Now--except for special items--the shop's starting items + purchased items match what you get at spawn time. 3. Added triangle and snake lockpicks to the shop inventory definitions, since these can be provided individually. If a lockpick_set is present, individual lockpicks are not shown in the buy and starting lists. 4. Added shop images for triangle and snake lockpicks. (dds, mtr, and def additions) 5. Added flashmine to the shop inventory definitions. (Previously ignored.) 6. Added a shop image for the flashmine. (dds, mtr, and def additions) 7. Added max ammo checks to the shop, on both the buy and starting lists. (If the atdm:shop entity had 100 water arrows as a startingItem, the shop would show 100, but at spawn time you were given 50, the max allowed.) 8. Added a "stackable" flag to the shop item definitions (tdm_shopitems.def) so that stackability is known at shop time. Testing: 1. Tested 21 maps at all difficulties to ensure the starting/buy lists are correct and you have the right items/quantities at spawn time. Checked 1.02 starting item quantities vs. what the new code gives. Re-checked 6 maps in all difficulties in 1.03. 2. Tested all combinations of lockpick_set, triangle, and snake lockpicks to ensure you have the correct lockpicks at spawn time. TODO: 1. Due to max_ammo processing, there's a delay (<10s) while waiting for the Shop screen to display. The delay is due to calls to FindEntityDefDict(). 2. The 1.03 code allows multiple atdm:shop entities. If the same item appears in multiple shops, you get a list entry from each shop. These should be combined into single entries. Also, the gold amounts from the last-read shop are what's used on the shop screen, ignoring gold amounts from previous shops. There might be other issues. 3. If you're highlighting an item on the For Sale list, and you move the cursor to the left and leave the item, it remains highlighted until you put the cursor on another For Sale item. If you just continue left and highlight something on the Starting Items list, the For Sale item remains highlighted. Ditto if you're on the Starting Items list and exit to the left. Exiting in any other direction works fine. 4. In the 2 shop prefabs, HealthPotionsEasy and HealthPotionsHard are both present in Easy difficulty, and there's no health potion object for Hard. Files changed: rev 4236: Inventory.cpp Inventory.h shop.cpp shop.h rev 11121: dds/guis/assets/purchase_menu/flashmine_image.dds dds/guis/assets/purchase_menu/lockpick_triangle_image.dds dds/guis/assets/purchase_menu/lockpick_snake_image.dds rev 11122: def/tdm_shopitems.def rev 11123: materials/tdm_gui_purchase_menu.mtr |
 |
"1. Due to max_ammo processing, there's a delay (<10s) while waiting for the Shop screen to display. The delay is due to calls to FindEntityDefDict()." That would be a candidate for optimizing, I guess. |
|
|
Added a workaround hard-coded limit of 50 for arrows to avoid the delay. Shop displays in less than 2 seconds now. Code revision 4356. |
- Anonymous
