Commit Graph

409 Commits

Author SHA1 Message Date
Linus Probert 5e0bbe423d Added nice info messages across the screen 2018-03-07 16:02:56 +01:00
Linus_Probert cc2b659020 Removes a memory leak 2018-03-06 13:50:43 +01:00
Linus_Probert bac0c62a10 Remove some memory leaks 2018-03-06 10:27:25 +01:00
Linus Probert c5abf71735 Fixed the builds. 2018-03-03 13:33:14 +01:00
Linus Probert e41e560219 Aggressive monster now path a lot better 2018-03-03 12:56:53 +01:00
Linus Probert 0b98cad726 Fix bug with player hit text and prevent fight pickups 2018-03-03 00:54:50 +01:00
Linus Probert f9a91c0922 Removes codacy issue 2018-03-02 17:07:15 +01:00
Linus Probert f7ec1195f4 Adds skill return countdown.
Also removes ability to wall-bonk exploit the countdowns.
2018-03-02 17:05:13 +01:00
Linus Probert b6c5edbd92 Adds swoosh sound to charge skill 2018-03-01 19:46:23 +01:00
Linus Probert b05f9333dc Adds "speed lines" to charge skill 2018-03-01 19:37:57 +01:00
Linus Probert 7e596a251e Adds the charge skill 2018-03-01 13:48:03 +01:00
Linus Probert 06cdebc3b3 Better flurry sounds 2018-03-01 06:47:16 +01:00
Linus Probert da2ec32981 Removes some duplicate code in player.c 2018-03-01 06:14:01 +01:00
Linus Probert c42e6fa621 Removed all the warnings from gcc 2018-03-01 06:04:12 +01:00
Linus Probert 2253479532 Adds skills, 'flurry' skill and sip_potion skill.
Removes shift-h sipping.
2018-02-28 22:31:38 +01:00
Linus_Probert 20cb94b529 Skill ideas. Not sure I like them. 2018-02-28 15:28:45 +01:00
Linus_Probert 727e1f5dd3 Minor message change 2018-02-28 09:32:37 +01:00
Linus Probert 22bed2948f Fixed CPack and made lua work from .pack file
Adds a custom searcher to the lua table package.searcher.
2018-02-27 19:59:51 +01:00
Linus Probert e161d6becb Just some code cleaning that i stumbled upon 2018-02-24 21:47:09 +01:00
Linus Probert ce2bb2ff43 Removed mingw warning. 2018-02-24 21:24:19 +01:00
Linus Probert 71c7345c78 Weight monster loot according to player health.
More health in flesh and more flesh sprites.
2018-02-24 21:15:13 +01:00
Linus Probert 462a22f7a0 Starts an idea for skills. Not sure I like it. 2018-02-24 07:13:28 +01:00
Linus Probert fbf746d270 Cleans up some more warnings (gcc) 2018-02-24 00:29:25 +01:00
Linus Probert 5d1bb383dc Missed one 2018-02-24 00:10:49 +01:00
Linus Probert 512cc4105c Removes some compiler (mingw) warnings. 2018-02-24 00:06:45 +01:00
Linus Probert 131c0caa4e Memory usage improvements
Adds a texturecache to prevent multiple loads of the same texture. Texture
dimension is now only intended for the actual texture dimension. Sprite
should hold the "rendering dimension". Music songs now load and unload
when switching songs. Standardized a lot of dimensions.
2018-02-23 23:58:29 +01:00
Linus Probert 052b03189e Read lua through physfs 2018-02-23 19:32:01 +01:00
Linus_Probert 3ef45df8cb Minor visual fix 2018-02-23 15:43:54 +01:00
Linus_Probert 753e9402bf Skillbar selection indication 2018-02-23 13:08:05 +01:00
Linus_Probert 9286fddd3c Adds: Flashing healthbar when low on health 2018-02-23 11:10:50 +01:00
Linus_Probert 738102b6e6 Adds basic skillbar rendering, now we need skills 2018-02-23 11:01:25 +01:00
Linus Probert ba9a92208d Forgot a change in the last commit 2018-02-22 19:18:38 +01:00
Linus Probert 2afb8090e3 Initial skillbar code 2018-02-22 15:42:43 +01:00
Linus Probert b209774f7b Optional physfs compile, removed deprectaions. 2018-02-22 13:02:40 +01:00
Linus Probert 2a3f5aaa6a Added physfs for file loading and safety. 2018-02-22 12:36:24 +01:00
Linus Probert 9fec8fcb1f Enabled conversion warnings in GCC 2018-02-22 09:44:27 +01:00
Linus Probert c02d674618 Conform to "standard" SDL2 including 2018-02-21 00:29:21 +01:00
Linus Probert 076d97f738 Removed debug output 2018-02-20 21:53:58 +01:00
Linus_Probert 94363a2e95 Added monster stats generation to lua. 2018-02-20 14:22:26 +01:00
Linus_Probert 548eecf3c0 Added some sound and music toggles 2018-02-20 10:45:54 +01:00
Linus_Probert 0adcbc1b11 Adds explosions of different kinds. 2018-02-19 15:55:37 +01:00
Linus_Probert 46e03af0b8 More defined turns 2018-02-19 15:09:04 +01:00
Linus Probert d5914071d4 New license. MIT -> GPLv3.0 2018-02-16 18:11:26 +01:00
Linus_Probert 5fce60b44d Player hit sound 2018-02-16 14:16:21 +01:00
Linus_Probert f758f162e9 Make codacy happy 2018-02-16 11:15:29 +01:00
Linus_Probert f9443b1468 Hopefully fixes the "exit under decor" problem for the last time. 2018-02-16 09:10:05 +01:00
Linus_Probert a26c7be122 Use the random generator instead of rand() 2018-02-15 14:45:20 +01:00
Linus_Probert f4867551a1 Added a lot of sound and music. 2018-02-15 14:00:59 +01:00
Linus Probert 2a24c6528e Added music 2018-02-15 00:02:23 +01:00
Linus Probert 9c10c76266 Codacy fix 2018-02-14 23:24:08 +01:00
Linus Probert 65806c1285 Fixed menu-mouse-click crash.
Not sure about this. Having click events on buttons that destroy the
actual button might seem pretty stupid. But I think I'd rather have that
then having to think about menu memory allocation maintenance
constantly.
2018-02-14 23:14:30 +01:00
Linus_Probert b502e78dd9 Introduced a mixer and one click sound. 2018-02-14 16:04:40 +01:00
Linus_Probert cfa522009e Adds functioning player death and introduces better XP threshholds.
I'm pretty sure I've done the XP thing before. Perhaps I never comitted
that code?
2018-02-14 11:00:34 +01:00
Linus_Probert a045ffc07c Fixes missing lights in coridors and exit under candle
Also some improvements to the in game menu handling.
2018-02-13 09:50:52 +01:00
Linus Probert dcafbbc6ac Implemented in game menu 2018-02-13 06:44:09 +01:00
Linus_Probert 9a887ab964 Fixed the lightmap bug where some tiles would stay too dark
Introduced a lightmap debug mode when doing this. It's super laggy. Use
with care.
2018-02-12 11:32:43 +01:00
Linus_Probert b2b0103b4f Introduced centralized keyboard handling 2018-02-12 10:55:36 +01:00
Linus_Probert 08207f5e35 Bloodspatter based on damage. 2018-02-09 13:55:57 +01:00
Linus_Probert 8def916504 Nicer menu background 2018-02-09 13:27:25 +01:00
Linus_Probert ee26110871 Keyboard menu navigation 2018-02-09 10:18:22 +01:00
Linus_Probert 3010dbb6fd Implicit free fix 2018-02-09 09:39:31 +01:00
Linus_Probert 064e3e0f87 Fixed menu, leaks and clickableness 2018-02-09 09:36:24 +01:00
Linus Probert fdfc6fcf77 The menu is working but it's a bit wonky still.
Starting the game seems to cause some missbehaviour.
2018-02-09 07:26:44 +01:00
Linus Probert 31e006b69f Working on menus. Still pretty broken game. 2018-02-09 06:53:06 +01:00
Linus_Probert 3fe549e6fe Started writing menus
Everything is pretty broken right now.
2018-02-08 17:01:38 +01:00
Linus_Probert 0b2a29fe3b Hilite current tile under mouse
This is intended for spell usage once I get that in.
2018-02-06 16:53:48 +01:00
Linus_Probert 22f6d36375 Refactored and fixed some Codacy issues 2018-02-06 09:11:04 +01:00
Linus_Probert 73e300e343 Prevent exit from spawning under collidable.
Removed "accidental" monster player hits
2018-02-05 16:15:45 +01:00
Linus Probert 27843ab05e Codacy complained about scoping. 2018-02-03 23:46:17 +01:00
Linus Probert 93c0623fe4 Implemented a simple particle engine. 2018-02-03 23:39:49 +01:00
Linus Probert 753448efdb Fixed an MSVC warning 2018-02-03 16:41:55 +01:00
Linus Probert e7e412cc33 Nicer gui and stored potions. 2018-02-03 13:02:39 +01:00
Linus Probert 5b8a8030bd Completed the button implementation 2018-02-02 17:05:41 +01:00
Linus_Probert c2266b892d Implemented a button. Not quite usable yet though. 2018-02-02 16:16:55 +01:00
Linus_Probert 0564f6c3a2 Info print from lua and new hash function in hashtable 2018-02-01 09:55:12 +01:00
Linus_Probert 9550840a7a Fixed compiler warnings 2018-02-01 09:04:19 +01:00
Linus Probert e9091346fd Adressed mingw warning 2018-01-31 21:03:25 +01:00
Linus Probert 6c1591a92d Some rewrites and lots of nice gui labels 2018-01-31 20:59:55 +01:00
Linus Probert a0b86eb06d Memory leaks and left over debug prints 2018-01-31 16:55:48 +01:00
Linus Probert 5dff9a9452 Added an XP bar. Need some text to go with it next 2018-01-31 13:52:11 +01:00
Linus Probert 6dc08b8a6b Simple calculation function added. 2018-01-31 10:49:13 +01:00
Linus Probert f3269436e0 Added a mousepointer for later use. 2018-01-31 09:15:33 +01:00
Linus Probert c19fb67279 WASD movement and more logical monsters in levels. 2018-01-30 21:05:33 +01:00
Linus_Probert b13479b5e1 Monster levels, player death and player levels 2018-01-30 15:16:14 +01:00
Linus_Probert 78fd6086f5 Reduced the scope of a variable. 2018-01-30 14:00:52 +01:00
Linus_Probert b3d48bd397 Items can now contain items. 2018-01-30 13:44:21 +01:00
Linus Probert 76ddc6c529 Codacy fixes 2018-01-29 18:30:14 +01:00
Linus_Probert 6e6a9641ae Monsters now drop both treasure and items. 2018-01-29 13:48:44 +01:00
Linus Probert 7b66b7726b Fixed some MSVC compiler warnings. 2018-01-27 23:14:39 +01:00
Linus_Probert ed63d7a67c Tweaked stats. 2018-01-25 16:42:57 +01:00
Linus_Probert 969af2f8c2 Better labels, more treasure 2018-01-25 10:45:05 +01:00
Linus_Probert 574e34ce4b Minor Win vs Linux bugg 2018-01-25 08:45:57 +01:00
Linus Probert cdefa1e737 Unused parameter warning removal 2018-01-24 21:24:42 +01:00
Linus Probert 22504419c7 Compile warning fixes 2018-01-24 21:20:24 +01:00
Linus Probert 417cb78f31 Added items, so far only health that always drops. 2018-01-24 21:14:34 +01:00
Linus Probert 2d05f10a44 Fixed MSVC build 2018-01-24 19:24:05 +01:00
Linus Probert 720ce7fc71 Tweaked the scaling slightly 2018-01-24 18:06:10 +01:00
Linus_Probert eea667f5f1 Timestamps on logs and stuff. 2018-01-24 09:35:21 +01:00
Linus_Probert 6853f860f6 Fixed the scaling which was borked 2018-01-24 08:52:50 +01:00
Linus Probert dda89f65e7 Fixed some messages with bad newlines and added crash notification. 2018-01-24 06:41:37 +01:00
Linus Probert 8d865e9d94 Removed some duplicate code and fixed appveyor issue. 2018-01-23 23:02:26 +01:00
Linus Probert 4088357584 Better info, debug, error and fatal printouts. 2018-01-23 22:54:02 +01:00
Linus Probert b96ba5a2e0 Fixed build for windows
Created m_sprintf to make msvc happy.
2018-01-23 21:03:43 +01:00
Linus_Probert 62b963e643 More codacy stuff 2018-01-23 14:45:05 +01:00
Linus_Probert d6e6e9449a Codacy fixes 2018-01-23 14:37:58 +01:00
Linus_Probert dc7927c6b0 Gui log is working 2018-01-23 14:11:03 +01:00
Linus_Probert 5a95808266 Prepared the gui frames. 2018-01-23 12:14:44 +01:00
Linus_Probert e61b20f024 Include CURRENT_LEVEL in lua script. 2018-01-22 10:12:44 +01:00
Linus Probert 38a584f418 Added labels to monsters 2018-01-17 09:32:49 +01:00
Linus Probert 439dff8840 Codacy warning 2017-12-22 21:33:00 +01:00
Linus Probert c0e22314b9 MinGW warning in gui. 2017-12-22 15:19:26 +01:00
Linus Probert c4b8766a01 Began designing/writing gui. Added states. 2017-12-22 15:15:40 +01:00
Linus Probert 60b374f84e Levele exit and next level load 2017-12-22 06:27:58 +01:00
Linus Probert 01a3aa59d5 More compiler preproc stuff 2017-12-21 12:41:08 +01:00
Linus Probert 618f28a519 Badges and mingw warnings 2017-12-21 12:35:52 +01:00
Linus Probert 433d907ae8 Problems with max and min in mingw 2017-12-21 12:26:57 +01:00
Linus Probert 3504dfc7d1 MinGW can't build with VS .lib files :P 2017-12-21 12:22:37 +01:00
Linus Probert 42aa1cbe86 Fixed some mingw warnings. 2017-12-21 11:57:12 +01:00
Linus Probert 7862b83cb6 Fixed conflicting mains for mingw build 2017-12-21 11:46:52 +01:00
Linus Probert ca7249e954 Log hits, kills and misses 2017-12-21 08:31:25 +01:00
Linus Probert 9250dad9ce Get screen resolution in Windows 2017-12-20 19:17:41 +01:00
Linus Probert d4fa9f89d6 Fixed a massive error in hashtable.
Compile on windows now works fine.
2017-12-20 18:56:28 +01:00
Linus Probert c128a5dc39 Cleaner sprite creation. 2017-12-19 23:30:58 +01:00
Linus Probert 025bd3eda2 Fixed some codacy stuff 2017-12-19 23:02:24 +01:00
Linus Probert 4bbe82a705 More windows stuff 2017-12-19 22:51:00 +01:00
Linus Probert faad866c8b Fixed a lot of stuff to help cross platform compilation 2017-12-19 21:00:02 +01:00
Linus Probert 7f6507d30c Fixed for windows 2017-12-19 19:42:05 +01:00
Linus Probert b269abd0f7 Moved hashtabl and linkedlist into source. 2017-12-19 09:06:21 +01:00
Linus Probert 64a9105d21 Action texts on player and some refactoring 2017-12-18 15:26:56 +01:00
Linus Probert 1c48f1dd9a Added enemy behaviour to lua and monster states. 2017-12-18 12:12:24 +01:00
Linus Probert 995a2f4475 Codacy warnings. 2017-12-18 10:03:58 +01:00
Linus Probert c88c64f4b8 Implemented stupid agressive and coward pathing. 2017-12-18 09:59:01 +01:00
Linus Probert 3a464d8ea6 Added some more undead and fixed the random function. 2017-12-18 09:11:00 +01:00
Linus Probert 6007976d23 Roaming monsters. 2017-12-17 13:43:41 +01:00
Linus Probert 7389c2d588 Hit and miss information. 2017-12-15 15:03:29 +01:00
Linus Probert 916193ecb3 Simple Player vs. Enemy hits 2017-12-15 08:08:45 +01:00
Linus Probert c4d142860c Moved 'clip' from texture to sprite. 2017-12-14 12:01:05 +01:00
Linus Probert 7625e02d21 Make codacy happy. 2017-12-13 23:27:20 +01:00
Linus Probert 00a2b54759 Lua bindings for monsters. Monsters in matrix.
So far I just add one black ant. More to come.
2017-12-13 23:20:54 +01:00
Linus Probert 95c9ed0a67 Made linked list stupid and naive. Prepared for monster lua 2017-12-13 20:31:04 +01:00
Linus Probert 17c3b817a0 Better hashtable destruction. Monsters prepared. 2017-12-13 14:30:12 +01:00
Linus Probert ac63f0b172 More monster and combat prep.
I need a hashtable next.
2017-12-12 11:20:08 +01:00
Linus Probert 9f71d23849 Prepared sprites for monster implementation.
Added a render function to texture
2017-12-11 08:23:30 +01:00
Linus Probert cdf4949eea Switched from 64 tile dimension to 32
64 didn't look very nice on a regular HD screen. Only on my tricky hiDPI
laptop.
2017-12-10 23:49:15 +01:00
Linus Probert a1c57b62d0 Lightsources and lightmaps 2017-12-10 19:51:24 +01:00
Linus Probert f4e24bc8d7 Fixed animated decorations in map 2017-12-08 14:40:33 +01:00
Linus Probert 698c92ae33 Added decorations in lua and core 2017-12-08 09:45:57 +01:00
Linus Probert 577165a0f6 Squelched a bug, fixed a memory leak and wrote a lot of ugly lua.
The lua is map-gen code. It's allowed to be ugly. That is why map-gen
code is in lua. Because it's quick to write and not as crucial if it
gets ugly.
2017-12-07 23:58:29 +01:00
Linus Probert 171f8c8b5e Nicer exits in rooms 2017-12-06 17:00:51 +01:00
Linus Probert e8ccda2faf Fixed map path and generation.
Also found an issue with collisions and room-switching. This has been
fixed also.
2017-12-06 11:44:17 +01:00
Linus Probert bdc5b6d629 Added a room matrix that deals with movement and collisions. 2017-12-05 15:03:20 +01:00
Linus Probert 50f516ad71 Implemented a simple timer 2017-12-05 08:30:08 +01:00
Linus Probert f5a23d6798 Nicer map creation with walls. 2017-12-05 08:13:28 +01:00
Linus Probert 0b376a4998 Camera and map following 2017-12-03 11:09:57 +01:00
Linus Probert 7362c2370f Generate maps using lua 2017-12-02 23:32:40 +01:00
Linus Probert 0cdd0f6d8d Extended linked list and re-thought the map structure 2017-12-02 16:24:31 +01:00
Linus Probert 23abb0f48c Added maps and a camera 2017-12-01 16:03:19 +01:00
Linus Probert 1714c5d732 Fixed a codacy issue 2017-12-01 00:01:51 +01:00
Linus Probert a7d5aa90e1 Initial commit 2017-11-30 21:06:54 +01:00