MH261677
4fa9ca74dd
Updated Interaction.cpp
...
Fixed the game crashing if there isnt any WBP inputted in tempchar
2023-01-15 16:13:11 +00:00
MH261677
43db88c107
Updated BP_GoldCount
...
Made it so it shows the gold count now that you can set in the BP_TempCharacter
2023-01-14 22:05:20 +00:00
MH261677
29c3fdcf09
Updated Interaction, TempCharacter.cpp
...
Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant
2023-01-14 20:35:49 +00:00
MH261677
cd745b086b
Updated BaseItem, InventoryComponent.cpp
...
Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances.
2023-01-12 15:21:32 +00:00
MH261677
3710f33e74
Updated Inventory System
...
Done it so the items from the inventory now get removed when used instead of one item never being able to be removed
2023-01-12 13:56:30 +00:00
MH261677
c107c9a490
Updated Merchant
...
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
2023-01-12 13:05:43 +00:00
320a74d4bb
Added Stub for OnInteract Event
2023-01-06 13:55:38 +00:00
6096d5a783
Added Interactable Environment Actor Component Class
2023-01-06 13:43:39 +00:00
MARCEL HARA
87e0bb06de
Bugfix TimeToInit Combat to 0.1f
2022-11-29 17:38:02 +00:00
MARCEL HARA
2512a4950e
Updated TempCharacter.cpp
...
cleared unused header file
2022-11-29 16:40:50 +00:00
af1813fd9a
Merge branch 'merchant-system' into Turn-Base-System-V2
...
# Conflicts:
# Config/DefaultEngine.ini
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-29 15:53:39 +00:00
MH261677
7199ee76a3
Updated Items
...
Started to create item stacks and fix item not dissapearing bug
2022-11-29 15:44:00 +00:00
MH261677
ff733f2ab0
Revert "Updated BaseItem.h"
...
This reverts commit d365fa6327
.
2022-11-29 14:18:05 +00:00
MH261677
d365fa6327
Updated BaseItem.h
...
Changed it so no one can edit the original value ID of an item
2022-11-29 14:16:55 +00:00
MH261677
f52ea5efb8
Overhauled Items
...
Gave every single item a unique ID so no matter the item the ID will always be different
2022-11-29 14:15:20 +00:00
MH261677
3360ea2031
Updated TempCharacter,TempCharacter.cpp
...
Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp
2022-11-29 12:55:46 +00:00
MH261677
2a590c3e33
Updated InventoryComponent,TempCharacter
...
Commented InventoryComponent to understand logic easier and removed unused functions from TempCharacter
2022-11-29 12:43:58 +00:00
07e7f8c70f
Added NiagaraSystem for Gun Particle Effect
2022-11-29 01:54:45 +00:00
fdfe4a660c
Bugfix Movement Not being Reenabled on Combat End
2022-11-29 00:34:47 +00:00
1300c99a3f
Added HoldToInitCombat Actor Component for Manual Combat Init
2022-11-29 00:23:15 +00:00
MH261677
120da84a3e
Updated Interaction
...
Hard coded the 6 second wait timer after testing in engine
2022-11-28 23:21:36 +00:00
MH261677
8c69f58a97
Updated BP_OPENDIAL, Interaction.cpp
...
Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor.
2022-11-28 23:15:41 +00:00
MH261677
b5772a024c
Updated Interaction.cpp
...
Added a wait timer to close the widget once open automatically
2022-11-28 22:52:51 +00:00
06492d69d5
Updated TurnBaseCombat for Keyboard Hotkeys
...
Crit Feedback
2022-11-24 02:49:37 +00:00
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