275 Commits

Author SHA1 Message Date
MH261677
5dce4dc603 Updated InventoryComponent
Added comment
2022-11-24 00:13:20 +00:00
MH261677
7140faf22b Updated EatableItems
Seperated Items into functional sub-variables that do other stuff instead of just healing the player no matte the item you make
2022-11-23 00:56:33 +00:00
MH261677
783e13075c Updated TempCharacter
Made the linetrace boolean a global in the headerfile for potential future enemy detection
2022-11-23 00:55:55 +00:00
MH261677
168a43d751 Updated BaseItem and ItemBPS
Gave both items booleans to make the code differentiate what the item does to the player.
2022-11-23 00:51:00 +00:00
c6cba80a07 Bugfix Debug Lines Marked Green on Missed Traces 2022-11-21 22:35:04 +00:00
22c13a8c25 Bugfix Movement Enabled During Combat in TBCv2 2022-11-21 22:34:33 +00:00
6a041e4621 Updated RTCombat for Shooting Accuracy via LineTrace 2022-11-21 20:59:29 +00:00
MH261677
49a24325ea Updated TempCharacter, WBPHealth
Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation.
2022-11-19 20:08:00 +00:00
MH261677
cb9c2bcb27 Updated BaseItem, TempCharacter
Removed more unused code to make the scripts more readable and optimized.
2022-11-18 19:25:10 +00:00
MH261677
ba2b6b599c Merge branch 'dev' into merchant-system 2022-11-18 19:20:20 +00:00
MH261677
7623976bd3 Updated TempCharacter
Cleaned Up Script 18/11/2022
2022-11-18 19:19:04 +00:00
MH261677
3572f066c1 Updated EatableItems
Deleted unused code
2022-11-18 18:19:14 +00:00
MH261677
811856b219 Updated InventoryComponent & TempCharacter
Made it so the buy system is universal meaning any devs will not have to keep adding more if statements just to set the items price. It can all be done in editor now and it all handles itself in the code.
2022-11-18 14:53:22 +00:00
MH261677
cee5188d47 Updated TempCharacter
Updated the buy function and made it more accessible to adding other items.
2022-11-18 13:28:22 +00:00
MH261677
900feee5a9 Updated InventoryComponent and Shop
Fixed InventoryComponent to now work with singular items so you can purchase items from the shop!
2022-11-18 13:07:44 +00:00
dabaf24c65 Updated RealTimeCombat Script for Action Points Regen 2022-11-17 04:52:23 +00:00
d73a0fbd83 Updated RealTimeCombat to Map Functions to Keys 2022-11-17 04:16:44 +00:00
55607a594a Updated RealTimeCombat to Disable Cursor in Combat 2022-11-17 03:48:56 +00:00
89e9e58453 Added Base Combat Script 2022-11-17 03:47:20 +00:00
5486fdc8ab Added Base TurnBaseCombat Script 2022-11-17 03:02:58 +00:00
9b9cc6f02b Merge branch 'merchant-system' into Turn-Base-System
# Conflicts:
#	Content/Blueprints/WBP_PlayerInventory.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset
2022-11-15 03:28:55 +00:00
MH261677
0c0876770b Updated Inventory System
Added BuffJelly
2022-11-15 03:27:44 +00:00
c852de30ec Updated TurnBaseCombat for Simple Combat AI 2022-11-15 02:02:59 +00:00
e57c99d103 Bugfix TurnBaseCombat Not Checking Resource Count 2022-11-15 01:21:47 +00:00
9d72f60208 Updated TurnBaseCombat for ResourceBar Functionality 2022-11-15 01:12:45 +00:00
MH261677
e602d83a31 Updated Inventory system for Items in UI
The Inventory System is working fully with the healing jelly working
2022-11-15 00:04:46 +00:00
a976775e61 Updated TurnBaseCombat for Enemy Death onHealthZero 2022-11-14 23:41:55 +00:00
521ab6c089 Updated TurnBaseCombat to End Combat onDeath 2022-11-14 23:29:16 +00:00
b20004e599 Updated TurnBaseCombat to Start Combat onCollision 2022-11-14 23:24:37 +00:00
d8dcef64e8 Merge branch 'merchant-system' into Turn-Base-System
# Conflicts:
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2022-11-14 22:41:33 +00:00
7be90cc087 Updated Combo List for New Combos 2022-11-14 22:40:22 +00:00
MH261677
593badeca9 Updated AllInventory BP's
Updated all the blueprints
2022-11-14 22:40:09 +00:00
f2857b3c57 Updated Combat_UI for Battle Log 2022-11-14 22:30:31 +00:00
MH261677
7a8dead59b Added Default Item to test
Added a default item to the inventory BP.
2022-11-14 20:28:34 +00:00
MH261677
83da7265d5 Added HealingJelly Item, Added PlayerInventory
Added healing jelly item blueprint and started working on the playerinventory UI
2022-11-14 19:22:50 +00:00
MH261677
a40aa57f70 Added all BP Items in the game and updated scripts
All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI
2022-11-14 17:42:26 +00:00
MH261677
785974e169 Updated TempCharacter
Commented the headerFile for tempcharacter.h
2022-11-14 16:58:20 +00:00
MH261677
83d4d16588 Updated BaseItem,Jelly1,Inventory Component,Temp
Updated all the scripts adding more functionality, Currently just added a very basic Use item and it giving the character health.
2022-11-14 16:52:57 +00:00
MH261677
8f0a770bfb Removed ItemPurchaseComponent script
Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently.
2022-11-14 16:52:04 +00:00
MH261677
7699a088ae Added Jelly1 and ItemPurchaseComponent class
Jelly1 is the test item i am creating and i also added a health variable for the temp character
2022-11-14 15:53:50 +00:00
MH261677
e070b32f0e Created BaseItem and InventoryComponent for Items
Created both the baseitem and inventorycomponent class to start adding in the custom items to the game.
2022-11-14 14:57:02 +00:00
b765f633d6 Bugfix Unreal Compliation Workaround for TQueues 2022-11-14 11:55:11 +00:00
bb544d2f35 Updated TurnBaseCombat for Comabat Log 2022-11-14 11:31:51 +00:00
e5af4538ea Updated TurnBaseCombat for Code Cleanup 2022-11-14 03:24:15 +00:00
7fb9935e70 Updated TurnBaseCombat to Show Cursor 2022-11-14 03:18:50 +00:00
ce4c2294c4 Updated TurnBaseCombat for Simple Opponent AI 2022-11-14 03:15:26 +00:00
329cf183b9 Updated TurnBaseCombat for Button Functionality 2022-11-14 03:05:25 +00:00
38ab749ecc Updated TurnBaseCombat for Combo String Validation 2022-11-14 01:11:37 +00:00
2a92b5577f Added Interfacing to Blueprint UI via Game State 2022-11-14 00:04:44 +00:00
df51750a5e Added Tag to Combat Test Character 2022-11-14 00:03:59 +00:00