204 Commits

Author SHA1 Message Date
1f939e4437 Fix collision bug and setup editor with proper camera pan to starting position.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-07 18:55:20 -07:00
a8da629107 Perplexing tile multiplier code caused random bug
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-07 17:34:32 -07:00
8a300c001b Add a display for what layers exist on the map, as well as editing coords.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-07 14:58:08 -07:00
06f2ff36c8 No more blue. Finish cutscene transition to player control
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 20:22:45 -07:00
d67ffa3e7f Cutscene display text sizing corrected
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 20:16:37 -07:00
f74aa855c0 Intro cutscene layout flags
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 19:52:17 -07:00
1fd6c6507c Fix money not being saved and implement new tree tilesets
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 19:09:23 -07:00
823fb72d34 Add road tiles
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 16:52:13 -07:00
5c307dd296 House collision shenanigans
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 16:21:58 -07:00
b33359a22f Fixed segfault issues with loading in a 6-layer map
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 15:28:52 -07:00
fde2f8948d Add new map layer for supporting ground tiles
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 15:20:01 -07:00
0c3c453b23 Overwrite objects that overlap each other
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 14:31:18 -07:00
1b803a151d New game detecting
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 14:01:02 -07:00
42a1b53592 Fix centering of camera and a bug that occurs when unequipping items from the equip menu while the inventory cursor is hovering over the last inventory item slot
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 04:11:29 -07:00
c9be7c5c6a Loading files menu transitions to game after loading
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-05 04:01:44 -07:00
61f57f5fd8 Display file save time
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-03 22:17:29 -07:00
e1f7312c07 Load and read data from save file for load file screen
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-03 21:55:07 -07:00
d1d27b8a41 Saving/loading files works fine and handling objects
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-02 00:44:46 -07:00
c57aea3cf6 Potential to read from save file now.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-01 23:14:15 -07:00
d9c9a6e276 Save game flag data and map info
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-01 20:33:26 -05:00
f1b88ee013 Saving of game data prototype
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-11-01 19:12:26 -05:00
395fe517b6 Fix distance checking for object interactions. Fixed smooth move controls bug
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-30 23:38:39 -05:00
adb5d9aceb Add simple object to object collision
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-30 23:31:34 -05:00
ed6f4c7f4d Update display names for target select when using consumables. Properly dispose of consumables for items that use a special battle move.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-30 22:40:27 -05:00
9d2cdaf3d1 Consume items that don't use the consumable battle move type upon use.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-30 22:29:05 -05:00
169478fdfe Fix bugs with battle move bar displays
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-30 21:49:48 -05:00
c3e3ececcc Player animations more or less under control now. Moved to a toggle animation speed system instead
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-28 01:06:41 -05:00
173cc0410d Switch to new sub animation system for movements
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-27 22:35:25 -05:00
12bf5a5876 Setup subanimation system
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-27 21:38:54 -05:00
c0f1ac72d4 Remove redundant CURRENT_MAP calls
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-27 03:58:35 -05:00
345217571a Dynamic Map transitions now completed
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-27 03:56:42 -05:00
cc5ab9ff7a Implement map teleport triggers on map
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-27 02:30:27 -05:00
f1c347207a Organize cutscenes and add map transition cutscene triggers
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-26 22:41:36 -05:00
23f0a7b5d2 Loading and creating new maps
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-26 01:05:31 -05:00
b53ceaab97 Corrected major memory leak while loading maps and entities
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-26 00:51:35 -05:00
b85db76ee5 Trigger implementation
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-25 22:30:09 -05:00
23d50ad3c2 Load/Saving of triggers is a go
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-25 00:20:05 -05:00
4d7118f065 Update wrap function! Much cleaner.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-24 21:48:51 -05:00
ebbfafbebc More tests added
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-24 21:22:33 -05:00
3d5d1a126e Shop sell features implemented
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-24 00:34:30 -05:00
ddb9c04e86 Writing more tests...
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 07:50:26 -05:00
fbd730b0e6 Add some basic initialization tests
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 06:05:11 -05:00
88efa7764e Test Suite first test in action
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 04:57:16 -05:00
56ca9470ee Complete refactor and separation of SeasonI class from main.cpp
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 04:06:11 -05:00
5827bcb8a6 Test suite setup preparation
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 02:47:09 -05:00
7cda0fe1c7 Fun little fix for incorrect stats_t struct ordering
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 00:44:45 -05:00
7e26720c08 Shopping completed trigger added.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 00:15:41 -05:00
9535d6fa54 Refactor shopkeeper menu and add money box to overworld menu.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-23 00:10:07 -05:00
c8083c3485 Draw a money box displaying the player's money holding value.
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-22 23:59:18 -05:00
97679dd678 Basic shop item display
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2022-10-22 23:13:06 -05:00