Commit Graph

47 Commits

Author SHA1 Message Date
Xevion
963a06d227 organize imports, less of a clusterfuck 2020-04-21 00:51:07 -05:00
Xevion
c5944dbb16 cleanup Game init 2020-04-21 00:13:55 -05:00
Xevion
fa50a28411 fix debug messages not under a DEBUG mode check 2020-04-21 00:11:38 -05:00
Xevion
a6003aaf9e send size 8 dungeon instead (64 levels) 2020-04-20 22:10:36 -05:00
Xevion
48e48d4ae4 use Arial font for draw_text functions 2020-04-20 22:06:47 -05:00
d1dfd908b7 Merge branch 'master' into perf 2020-04-20 21:54:16 -05:00
Xevion
2feb1d98b3 add new debug config, create and implement FPSCounter class 2020-04-20 21:43:07 -05:00
294c86010b Merge branch 'master' into positions-fix 2020-04-20 19:03:12 -05:00
Xevion
b41ef318d6 fixed player placement 2020-04-20 16:53:49 -05:00
Xevion
b74b8f87c1 fix text rendering, get rid of unused wall and floor spriteLists 2020-04-20 16:18:51 -05:00
Xevion
a074706cd2 more attempts at fixing player placement 2020-04-20 16:15:53 -05:00
Cameron Smart
03d4cd7743 Fix formatting on condition main:212 2020-04-20 14:03:59 -07:00
Cameron Smart
6b74629a57 changed bullet speed and size, final format check 2020-04-20 13:50:05 -07:00
Cameron Smart
dff882770d removed whitespace and other formatting. 2020-04-20 13:45:49 -07:00
Lief9100
c051414870 remove config excess, add projectiles folder and temp classes 2020-04-20 12:59:41 -07:00
Lief9100
b06fcaf0f8 screen-projectile deletion fix, comment updates to note TEMP features 2020-04-20 12:57:23 -07:00
Lief9100
3034d96ab7 main.py busy edit, works but simplistic 2020-04-20 12:57:23 -07:00
Xevion
a5fee04bdc attempt to fix position text, minor docstring corrections 2020-04-20 04:52:07 -05:00
Xevion
6f1161ab75 place character randomly in one of the Dungeon levels, remove player_list and just use player, add Dungeon.levelList property function, add in generated level loading 2020-04-20 04:46:50 -05:00
Xevion
5cf2f5e7f7 add LEVEL_SIZE enum to Config, add position debug, add wall sprite list gatherer, add and use level position method, 2020-04-20 04:36:32 -05:00
Xevion
9dcf6cf054 make level rendering and dungeon rendering independent, remove complicated spritelist passing 2020-04-20 04:14:53 -05:00
Xevion
290942aa0d fixed last two check misses, added second line before Config class declaration, fixed extra space at end of comment 2020-04-20 01:36:06 -05:00
Xevion
abf80c1b0f general refactor/cleanup to get closer to PEP8 standards 2020-04-20 01:31:08 -05:00
6d57520dc7 Merge branch 'master' into refactor 2020-04-20 00:54:20 -05:00
Cameron Smart
1a28a3074e Removed more duplicate code. 2020-04-19 22:08:20 -07:00
Xevion
6b26ac5f0d just access the public sprite instead 2020-04-19 23:48:56 -05:00
Cameron Smart
c533661c05 removed duplicate code. 2020-04-19 21:48:40 -07:00
Xevion
54bf86f2c7 remove print, remove add_level and get_lists function, fix comment 2020-04-19 23:48:04 -05:00
Xevion
7d9efa4da1 create new sprites class for holding sprite paths 2020-04-19 23:45:01 -05:00
Xevion
d4b5a1b799 optimize imports and change to extend instead of double append in main.py 2020-04-19 23:35:22 -05:00
Cameron Smart
154a959e8a basic player idle animation. 2020-04-19 19:14:04 -07:00
Cameron Smart
f3c9e22102 Levels can be combined together in dungeon 2020-04-19 15:59:52 -07:00
Cameron Smart
61a2796129 Merge branch 'monster-generation' of https://github.com/n0remac/game-jam-2020 into monster-generation 2020-04-19 01:19:06 -07:00
Cameron Smart
9c81afa345 Added new monster sprites. 2020-04-19 01:10:30 -07:00
Cameron Smart
3b81bcfc65 Mobs now takes an x, y location and places the sprite there. 2020-04-19 01:07:53 -07:00
Cameron Smart
b4fb33f369 Added new monster sprites. 2020-04-19 00:14:21 -07:00
Lief9100
78e265401b removed player list & replaced with singular sprite 2020-04-18 23:56:20 -07:00
Cameron Smart
46c9270c19 Mobs now takes an x, y location and places the sprite there. 2020-04-18 22:47:27 -07:00
Lief9100
73b19aa14d moved player setup from main to mobs 2020-04-18 22:33:49 -07:00
Cameron Smart
fcad1beff8 load_file in map.py sets the tiles based on a json file 2020-04-18 18:12:16 -07:00
Xevion
3961414279 basic reformatting work for PEP8 guidelines 2020-04-18 01:36:13 -05:00
Xevion
d24e166e72 add file level docstrings to all files 2020-04-18 01:32:29 -05:00
Xevion
814996497e change all constants to use new config class, rename MyGame to just Game 2020-04-18 01:27:01 -05:00
Xevion
a22b472392 create new config class for organizing constants 2020-04-18 01:25:36 -05:00
Cameron Smart
87034ee989 Added floor, character sprite, and made scalable 2020-04-17 20:34:26 -07:00
Cameron Smart
99c0d9817d Added movement controls w/ nonstick keys 2020-04-17 14:46:15 -07:00
Cameron Smart
7e93802b4e Added Pipfile, main.py, and README.md 2020-04-17 12:03:25 -07:00