Changed Item tooltips to look better and overhauled item logic
This commit is contained in:
		
							parent
							
								
									495f78a766
								
							
						
					
					
						commit
						e241c76d89
					
				
							
								
								
									
										
											BIN
										
									
								
								Content/Assets/Characters/Merchant/AMerchant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Assets/Characters/Merchant/AMerchant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Combat_UI/CombatCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Game_UI/WBP_ItemDisplay.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Game_UI/WBP_PlayerInventory.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Inventory_UI/WBP_ItemDisplay.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Items/BP_BuffJelly.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Items/BP_BuffJelly.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Items/BP_HealingJelly.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Items/BP_HealingJelly.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Player/BP_MyTempCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Player/BP_MyTempCharacter.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Content/Dialogue/SM_Merchant_Blueprint.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Content/Dialogue/SM_Merchant_Blueprint.uasset
									 (Stored with Git LFS)
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -7,7 +7,7 @@ | ||||
| UBaseItem::UBaseItem() | ||||
| { | ||||
| 	ItemDisplayName = FText::FromString("ItemName"); | ||||
| 	ItemUseAction = FText::FromString("UseAction"); | ||||
| 	// ItemUseAction = FText::FromString("UseAction");
 | ||||
| } | ||||
| 
 | ||||
| void UBaseItem::Use(ATempCharacter* Character) | ||||
|  | ||||
| @ -42,9 +42,9 @@ public: | ||||
| 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") | ||||
| 	FText ItemDisplayName; | ||||
| 
 | ||||
| 	//The description of the item
 | ||||
| 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") | ||||
| 	FText ItemDescription; | ||||
| 	// //The description of the item
 | ||||
| 	// UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item")
 | ||||
| 	// FText ItemDescription;
 | ||||
| 
 | ||||
| 	//The cost of the item
 | ||||
| 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite, Category = "Item") | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user