SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								baa592d921 
								
							 
						 
						
							
							
								
								the boss has now abilitys  
							
							... 
							
							
							
							they can heal and spawn adds and are probably doing it every time they can
the boss has only one ability atm (plus the add spawning)
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-29 09:38:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								690a00b718 
								
							 
						 
						
							
							
								
								Merge branch 'Development' of  https://git.spafi.eu/InfoProjekt/game  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-13 10:38:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								368b033aab 
								
							 
						 
						
							
							
								
								implemented boss health bar  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-13 10:37:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								57ffcf133c 
								
							 
						 
						
							
							
								
								changed will to live (level) back to non dev  
							
							... 
							
							
							
							Signed-off-by: Spafi <spafi@noreply.git.spafi.eu> 
							
						 
						
							2024-03-12 21:02:21 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								a72349f7df 
								
							 
						 
						
							
							
								
								changed to normal version again (no dev shortcuts)  
							
							... 
							
							
							
							changed font for Think (because the f looked like a p)
uploaded bossbar images
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-12 21:45:52 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								fb3ba25b89 
								
							 
						 
						
							
							
								
								managed the room thing, you can now actually switch rooms  
							
							... 
							
							
							
							the boss is killable
you get a tbc screen after killing the boss
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-12 12:50:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								04e0b68cd7 
								
							 
						 
						
							
							
								
								Merge branch 'Development' of  https://git.spafi.eu/InfoProjekt/game  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-12 07:41:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								d132757717 
								
							 
						 
						
							
							
								
								added new npc  
							
							... 
							
							
							
							started migrating object creation into the room classs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-12 07:39:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								a35dcfb823 
								
							 
						 
						
							
							
								
								Update main.py  
							
							
							
						 
						
							2024-03-11 19:47:09 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								76ef4f6559 
								
							 
						 
						
							
							
								
								doors can now be passed through  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-11 11:44:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								3883237f91 
								
							 
						 
						
							
							
								
								fied a bug were the game would crash during door creation  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-10 23:07:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								7709fd52f7 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://git.spafi.eu/Spafi/game  
							
							
							
						 
						
							2024-03-10 22:59:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								0f755996b6 
								
							 
						 
						
							
							
								
								added icon  
							
							... 
							
							
							
							added door sprite
addedd startscreen
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-10 22:59:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								fc3773150a 
								
							 
						 
						
							
							
								
								-  
							
							
							
						 
						
							2024-03-10 16:19:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								93bbb0eb84 
								
							 
						 
						
							
							
								
								Stoorryy  
							
							
							
						 
						
							2024-03-10 16:05:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								e540693def 
								
							 
						 
						
							
							
								
								story yea yea  
							
							
							
						 
						
							2024-03-10 15:06:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4d40e44e2d 
								
							 
						 
						
							
							
								
								starting to add some storyline, added Rat  
							
							
							
						 
						
							2024-03-10 12:58:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								3fe22ff6ac 
								
							 
						 
						
							
							
								
								updated convo, still weird tho  
							
							
							
						 
						
							2024-03-09 21:27:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								9147971be8 
								
							 
						 
						
							
							
								
								added house  
							
							
							
						 
						
							2024-03-09 20:14:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								52d3ec6e8d 
								
							 
						 
						
							
							
								
								fixed that herberts attributes stay the same  
							
							
							
						 
						
							2024-03-09 16:26:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								c17b65d2f3 
								
							 
						 
						
							
							
								
								added village somehow  
							
							
							
						 
						
							2024-03-09 15:54:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								67f1e081fa 
								
							 
						 
						
							
							
								
								added village  
							
							
							
						 
						
							2024-03-09 14:00:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								614654692f 
								
							 
						 
						
							
							
								
								changed Book and Convo, renamed Speech  
							
							
							
						 
						
							2024-03-09 11:11:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4d228bf6e0 
								
							 
						 
						
							
							
								
								test2  
							
							
							
						 
						
							2024-03-07 16:44:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								956c25769c 
								
							 
						 
						
							
							
								
								test  
							
							
							
						 
						
							2024-03-07 16:41:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								a68bba70bb 
								
							 
						 
						
							
							
								
								image files changed  
							
							... 
							
							
							
							new mob sprites
relocated all image files
disabled collision between player and npcs and mobs
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 14:57:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								b7fb7e1f1e 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://git.spafi.eu/Lyzzy/game  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 13:56:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								5010609378 
								
							 
						 
						
							
							
								
								relocated image files  
							
							... 
							
							
							
							changed room generation
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 13:55:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b368fe4665 
								
							 
						 
						
							
							
								
								zombie speech and fireplace  
							
							
							
						 
						
							2024-03-07 12:52:17 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								af5204857b 
								
							 
						 
						
							
							
								
								some fixes  
							
							... 
							
							
							
							forgot what i did 
							
						 
						
							2024-03-07 09:43:33 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								c3c44bbc71 
								
							 
						 
						
							
							
								
								new river sprite file added  
							
							... 
							
							
							
							new idea lol
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-07 09:50:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								41f8b76b90 
								
							 
						 
						
							
							
								
								added Label class  
							
							... 
							
							
							
							Label class in classes, added text to book, changed wind spell a bit but dunno if really good 
							
						 
						
							2024-03-06 17:40:02 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								25f04f994f 
								
							 
						 
						
							
							
								
								added Label class  
							
							... 
							
							
							
							added Label class in classes and added text to book, changed wind attack a bit but idk if good 
							
						 
						
							2024-03-06 17:35:27 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								501e84181f 
								
							 
						 
						
							
							
								
								added a new missile  
							
							... 
							
							
							
							new to character: wind slash attack
added projectile lifetime (in frames, maybe change to 5*fps later)
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-06 14:26:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								953edca694 
								
							 
						 
						
							
							
								
								updated the button class -> can now take any arguments for the onClick Function  
							
							... 
							
							
							
							changed all buttons according to this
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-06 12:10:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								ef3a617e4d 
								
							 
						 
						
							
							
								
								Merge branch 'main' of  https://git.spafi.eu/Spafi/game ; branch 'main' of  https://git.spafi.eu/Lyzzy/game  
							
							
							
						 
						
							2024-03-06 07:42:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								4cfb4b92f0 
								
							 
						 
						
							
							
								
								Dateien nach "/" hochladen  
							
							
							
						 
						
							2024-03-05 15:48:06 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								3ad2ad6478 
								
							 
						 
						
							
							
								
								optimized collision with npcs and mobs  
							
							... 
							
							
							
							added wall collision
enabled hitboxes for object and wall highlighting
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-03-04 17:15:19 +01:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								b29a279fb1 
								
							 
						 
						
							
							
								
								Gegner Schaden, Buch, Main Angriff, NPC  
							
							... 
							
							
							
							Dem Gegner kann jetzt durch Main Angriff Schaden zugefügt werden und er kann sterben
Das Buch kann durch Drücken von e geöffnet werden, das Spiel hält an
Der Main kann (nachdem mit NPC geredet) Feuerbälle mit f schießen (Schussrichtung adden!!)
Ein NPC wurde hinzugefügt, der steht. Main redet automatisch mit ihm wenn main reinläuft. Durch Leertaste wird Unterhaltung beendet. 
							
						 
						
							2024-03-01 21:56:14 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								f6827b5f05 
								
							 
						 
						
							
							
								
								revert  8b2dab980b 
							
							... 
							
							
							
							revert Schaden Gegner, Buch, Angriff 
							
						 
						
							2024-03-01 21:50:39 +00:00 
							
								 
							
						 
					 
				
					
						
							
						 
						
							
							
							
							
								
							
							
								8b2dab980b 
								
							 
						 
						
							
							
								
								Schaden Gegner, Buch, Angriff  
							
							
							
						 
						
							2024-03-01 21:46:15 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								218eb2ea7e 
								
							 
						 
						
							
							
								
								added some missing spaces lol  
							
							... 
							
							
							
							added character collisions (not great yet tho)
some simple background elements added and testet WIP 
							
						 
						
							2024-02-29 14:25:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								a9e99da219 
								
							 
						 
						
							
							
								
								fixed arrow oriantation  
							
							... 
							
							
							
							randomised skeletton move speed
changed Iframes to 250 ms 
							
						 
						
							2024-02-26 12:21:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								15d39949b4 
								
							 
						 
						
							
							
								
								pull from main repository  
							
							
							
						 
						
							2024-02-26 08:23:50 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								ed6c91fa8f 
								
							 
						 
						
							
							
								
								test for gameobjects (level, rooms and scenes) created  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-22 10:59:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								8f78002015 
								
							 
						 
						
							
							
								
								resorted the Scene class into a subclass of GameObjects  
							
							... 
							
							
							
							added the class Room to GameObjects
added a very simple start screen
WIP: disabled option button until option function is implemented
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-16 18:05:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								2e66145dcc 
								
							 
						 
						
							
							
								
								first movement (wasd) with character integrated  
							
							... 
							
							
							
							started a new class for scenes
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-16 17:34:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								ea6d64b087 
								
							 
						 
						
							
							
								
								edited file structure  
							
							... 
							
							
							
							Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-15 09:50:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								5123b19cb0 
								
							 
						 
						
							
							
								
								added a lot of new fonts  
							
							... 
							
							
							
							assigned all of them a easier and more understandable key phrase or key word
added the key word dictionary in classes.py
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> 
							
						 
						
							2024-02-14 08:49:47 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									SpagettiFisch 
								
							 
						 
						
							
							
							
							
								
							
							
								f8e491f2a5 
								
							 
						 
						
							
							
								
								added a medieval like font  
							
							... 
							
							
							
							added the textbox for the buttons (not just any blank color)
added function for exiting the game 
							
						 
						
							2024-02-13 12:32:23 +01:00