Compare commits

..

201 commits

Author SHA1 Message Date
cfc8643907 Merge pull request 'Fixed fairy and added boss health bar' (#92) from Development into main
Reviewed-on: InfoProjekt/game#92
2024-03-13 10:52:10 +00:00
dff3b582d7 Merge pull request 'Implemented Boss bar and fixed fairy' (#87) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#87
2024-03-13 09:43:47 +00: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
d01e511739 Merge pull request '0.1 Merge' (#85) from Development into main
Reviewed-on: InfoProjekt/game#85
2024-03-12 21:02:50 +00: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
45c18a7713 changed will to live (level) back to non dev
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-12 21:00:05 +00:00
e383c8afed Merge pull request 'changed to normal version again (no dev shortcuts)' (#84) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#84
2024-03-12 20:51:23 +00:00
SpagettiFisch
64a3381eb9 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-12 21:50:04 +01: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
3448ec4120 Update classes.py
sound effects für reddy, zombie, skelett, oldman attack, hurt sound effect für oldman, Tür und Portal sounds
2024-03-12 17:52:27 +00:00
c81b3fa355 Upload files to "audio/soundeffects" 2024-03-12 16:48:24 +00:00
4d90ac3e38 Upload files to "audio/soundeffects" 2024-03-12 16:47:40 +00:00
dfc2ea8086 Upload files to "audio/soundeffects" 2024-03-12 16:46:44 +00:00
b124f8817c Upload files to "art/images/people" 2024-03-12 16:18:45 +00:00
d4da02ee8d Delete art/images/people/fairy.png 2024-03-12 16:18:31 +00:00
7a85a049de Delete audio/soundeffects/altefrauspeak.mp3 2024-03-12 15:57:10 +00:00
5db4df24a0 Delete audio/soundeffects/dorfaeltesterspeak.mp3 2024-03-12 15:57:04 +00:00
2f8e393c1e Delete viecher.py
nichts mehr drin
2024-03-12 15:56:39 +00:00
08edd05403 Merge pull request 'room update and boss' (#83) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#83
2024-03-12 11:52:26 +00: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
a13042ffdd Upload files to "art/images/weapons" 2024-03-11 21:49:24 +00:00
f482a2445c Delete audio/soundeffects/fireball.mp3 2024-03-11 21:44:35 +00:00
df7aff13df Upload files to "audio/soundeffects" 2024-03-11 21:44:26 +00:00
e5adb43ec6 Delete audio/soundeffects/fireball.mp3 2024-03-11 21:44:05 +00:00
6d68ec88e0 Upload files to "audio/soundeffects" 2024-03-11 21:43:51 +00:00
f458a4e89b Delete audio/soundeffects/fireball.mp3 2024-03-11 21:43:30 +00:00
c9c87da15a Delete audio/soundeffects/door.mp3 2024-03-11 21:43:27 +00:00
37aee3dfff Upload files to "audio/soundeffects" 2024-03-11 21:43:13 +00:00
38ddb5fbd6 Delete audio/soundeffects/door.mp3 2024-03-11 21:42:38 +00:00
8198079512 Delete audio/soundeffects/fireball.mp3 2024-03-11 21:42:34 +00:00
6ee5cba861 Upload files to "audio/soundeffects" 2024-03-11 21:42:12 +00:00
89255505ec Upload files to "art/images/people" 2024-03-11 21:05:33 +00:00
a35dcfb823 Update main.py 2024-03-11 19:47:09 +00:00
d08274c2f6 Upload files to "audio/soundeffects" 2024-03-11 19:27:59 +00:00
6601e00318 Upload files to "audio/soundeffects" 2024-03-11 19:22:27 +00:00
b2ac429eaa Delete audio/soundeffects/a 2024-03-11 19:17:12 +00:00
98b8a2bcb6 Upload files to "audio/soundeffects" 2024-03-11 19:17:07 +00:00
a7dd1dbf27 Upload files to "audio/music" 2024-03-11 19:09:46 +00:00
9e9ab2156a Delete audio/music/a 2024-03-11 19:07:23 +00:00
3e655a09f3 Upload files to "audio/music" 2024-03-11 19:07:13 +00:00
585d19fb37 Delete audio/soundeffects/fireball.mp3 2024-03-11 18:58:17 +00:00
f755bef435 Upload files to "audio/soundeffects" 2024-03-11 18:58:10 +00:00
065036d430 Add audio/soundeffects/a 2024-03-11 18:56:13 +00:00
46c05a8de5 Delete audio/soundeffects 2024-03-11 18:55:56 +00:00
643e74ab58 Add audio/soundeffects 2024-03-11 18:55:35 +00:00
72f0050055 Add audio/music/a 2024-03-11 18:55:05 +00:00
0dda6fd38c Delete music /a 2024-03-11 18:50:56 +00:00
19f5027b60 Add music /a 2024-03-11 18:49:44 +00:00
SpagettiFisch
74abed824d Merge branch 'main' of https://git.spafi.eu/Spafi/game 2024-03-11 11:46:35 +01:00
073062ce0c Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main
Reviewed-on: Spafi/game#8
2024-03-11 10:46:24 +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
aa83465577 Upload files to "art/images/people" 2024-03-11 10:39:37 +00:00
80ec47143e Merge pull request 'Update viecher.py' (#82) from jaffa-patch-1 into Development
Reviewed-on: InfoProjekt/game#82
2024-03-11 06:56:30 +00:00
a9770aff7e Update viecher.py
added animations for old man walking, old man attacking and zombie attacking
2024-03-10 23:47:22 +00:00
cc24152e7f Upload files to "art/images/people" 2024-03-10 23:37:57 +00:00
01d91e68c7 Merge pull request 'fied a bug were the game would crash during door creation' (#81) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#81
2024-03-10 22:07:53 +00: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
8dd5ad2dc6 Merge pull request 'game icon and room update' (#80) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#80
2024-03-10 22:03:06 +00: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
SpagettiFisch
229435f682 added room constallations
now with useless doors

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 22:58:58 +01:00
67ba9a62a1 Merge pull request 'Development' (#7) from InfoProjekt/game:Development into main
Reviewed-on: Spafi/game#7
2024-03-10 21:29:19 +00:00
73508253c4 Merge pull request 'storyline' (#79) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#79
2024-03-10 18:02:21 +00:00
f86f2e5dce added last part of tutorial 2024-03-10 18:42:40 +01:00
fc3773150a - 2024-03-10 16:19:57 +01:00
04547161a3 picture 2024-03-10 16:05:15 +01:00
93bbb0eb84 Stoorryy 2024-03-10 16:05:09 +01:00
4e976c3895 wuhu 2024-03-10 15:14:21 +01:00
e540693def story yea yea 2024-03-10 15:06:44 +01:00
248fc2a112 fix fix 2024-03-10 14:30:20 +01:00
726c5ee2a2 storyline 2024-03-10 14:23:22 +01:00
bb8ec349dd Merge branch 'main' of https://git.spafi.eu/Lyzzy/game 2024-03-10 13:04:29 +01:00
4d40e44e2d starting to add some storyline, added Rat 2024-03-10 12:58:59 +01:00
2a2d7b2765 Merge pull request 'Development' (#11) from InfoProjekt/game:Development into main
Reviewed-on: #11
2024-03-10 11:51:09 +00:00
4a47efe94d Merge pull request 'changed NPC talk key to f and resolved merge conflicts' (#77) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#77
2024-03-10 11:46:45 +00:00
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:09 +01:00
01c3aeae4a Merge pull request 'Development' (#10) from InfoProjekt/game:Development into main
Reviewed-on: #10
2024-03-10 09:32:18 +00:00
3232096d66 Merge pull request 'changed stuff' (#76) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#76
2024-03-10 08:27:07 +00:00
e8d81dfb11 Merge pull request 'InfoProjekt-Development3' (#6) from InfoProjekt-Development3 into main
Reviewed-on: Spafi/game#6
2024-03-10 08:26:52 +00:00
SpagettiFisch
0032f8b2e1 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game into InfoProjekt-Development3
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:23:59 +01:00
SpagettiFisch
b1b7b21aa2 changed stuff
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 09:17:22 +01:00
523b34615b Merge pull request 'Changed Book and fixed NPC convo' (#75) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#75
2024-03-10 08:16:42 +00: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
2970e5cecd fixed Convo 2024-03-09 12:03:59 +01:00
614654692f changed Book and Convo, renamed Speech 2024-03-09 11:11:28 +01:00
1f38a04004 Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main
Reviewed-on: #9
2024-03-09 09:06:05 +00:00
d85c6ec22c Merge pull request 'fixed wall colision' (#74) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#74
2024-03-08 07:36:57 +00:00
SpagettiFisch
bd5ff8b3fe fixed wall colision
added object collision for mobs

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-08 08:36:13 +01:00
091726b8ca Merge pull request 'attack now with left mouse click' (#73) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#73
2024-03-07 20:05:46 +00:00
SpagettiFisch
31a9742a9c attack now with left mouse click
emter conversaton now with f
no change to leave conversation

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 20:50:09 +01:00
4d228bf6e0 test2 2024-03-07 16:44:38 +01:00
956c25769c test 2024-03-07 16:41:11 +01:00
569b3394a0 Merge pull request 'Development' (#8) from InfoProjekt/game:Development into main
Reviewed-on: #8
2024-03-07 15:35:48 +00:00
9396218a11 Merge pull request 'main' (#72) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#72
2024-03-07 14:27:03 +00:00
321dac7cca wrong location
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:57 +00:00
abfa24ced8 wrong location
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:52 +00:00
11c7a9037b wrong location
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:45 +00:00
9c36e8d570 wrong location
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-03-07 14:26:36 +00: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
73165bd33e speech and fireplace 2024-03-07 12:52:41 +00: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
1d03d60ac2 Merge pull request 'new river sprite file added' (#67) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#67
2024-03-07 08:51:52 +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
a41ee41fba Merge pull request 'main' (#66) from jaffa/game:main into Development
Reviewed-on: InfoProjekt/game#66
2024-03-07 08:24:16 +00:00
47c93f61dc Upload files to "art/sprite files" 2024-03-07 08:18:47 +00:00
1fd852e31e Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main
Reviewed-on: jaffa/game#1
2024-03-07 08:13:31 +00:00
f21d980352 Merge pull request 'doubled image size' (#65) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#65
2024-03-07 06:51:08 +00:00
SpagettiFisch
1b6ccb17b0 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game 2024-03-07 07:49:49 +01:00
SpagettiFisch
6034a8382f changed image size
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-07 07:49:16 +01:00
SpagettiFisch
746982641a Merge https://git.spafi.eu/InfoProjekt/game 2024-03-07 07:46:26 +01:00
b3c7d87926 Merge pull request 'Added Label class' (#64) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#64
2024-03-07 06:45:57 +00: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
96c0a691b7 empty image cuz im stupid 2024-03-06 17:36:57 +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
e2ec301fce Merge pull request 'Development' (#6) from InfoProjekt/game:Development into main
Reviewed-on: #6
2024-03-06 15:44:25 +00:00
55b50531f9 Merge pull request 'wind slash spell' (#63) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#63
2024-03-06 14:29:34 +00:00
SpagettiFisch
c9a98fb94c added new icons for spell selection inside the book
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-06 14:27:06 +01: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
0564d778a1 Merge pull request 'updated the button class -> can now take any arguments for the onClick Function' (#62) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#62
2024-03-06 11:12:00 +00: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
96b15fd425 Merge pull request 'manual merge of lyzzys updates into Development' (#60) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#60
2024-03-06 06:45:56 +00: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
44793f22a5 Merge pull request 'Collisions fixed' (#58) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#58
2024-03-04 16:18:33 +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
SpagettiFisch
0cd9444222 Merge branch 'Development' of https://git.spafi.eu/InfoProjekt/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:36:15 +01:00
SpagettiFisch
d86f8c360b fixed bug which stopped movement if colliding with projectiles
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-03 13:31:01 +01:00
6fce7e0fd2 Merge pull request 'Development' (#57) from Development into main
Reviewed-on: InfoProjekt/game#57
2024-03-03 12:28:45 +00:00
cb9a7e6ff5 Merge pull request 'mobs can die, main can attack, book object added to main, npc object added' (#56) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#56
2024-03-03 12:21:58 +00: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
5625db18c7 Buch and Feuer added
changable
2024-03-01 21:47:51 +00:00
8b2dab980b Schaden Gegner, Buch, Angriff 2024-03-01 21:46:15 +00:00
2ef0948274 Merge pull request 'Development' (#5) from InfoProjekt/game:Development into main
Reviewed-on: #5
2024-03-01 11:25:20 +00:00
6ed85baed0 Merge pull request 'added some missing spaces lol' (#55) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#55
2024-02-29 13:38:47 +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
9c36772aa7 Merge pull request 'Development' (#4) from InfoProjekt/game:Development into main
Reviewed-on: #4
2024-02-29 08:09:19 +00:00
886059527b Merge pull request 'main' (#54) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#54
2024-02-26 11:29:29 +00:00
SpagettiFisch
c741c8199a Merge branch 'main' of https://git.spafi.eu/Spafi/game 2024-02-26 12:25:34 +01:00
7725bea20c art/sprite files /oldmanwalk.png gelöscht
deleted a kinda corrupted file

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-02-26 11:25:28 +00:00
15e2715207 art/sprite files /oldmanattack.png gelöscht
deleted kinda corrupted file

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-02-26 11:25:15 +00:00
SpagettiFisch
a9e99da219 fixed arrow oriantation
randomised skeletton move speed
changed Iframes to 250 ms
2024-02-26 12:21:45 +01:00
162542f198 Merge pull request 'Development' (#3) from InfoProjekt/game:Development into main
Reviewed-on: Spafi/game#3
2024-02-26 07:50:43 +00:00
SpagettiFisch
2e36e11fa7 Merge branch 'InfoProjekt-Development1' 2024-02-26 08:47:47 +01:00
SpagettiFisch
15d39949b4 pull from main repository 2024-02-26 08:23:50 +01:00
85464d1637 Merge pull request 'Leben und Sterben hinzugefügt' (#53) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#53
2024-02-26 07:05:23 +00:00
69cc080ea9 Label und Oldman added 2024-02-25 10:14:07 +00:00
d731f4f63d Dateien nach "/" hochladen 2024-02-25 10:11:37 +00:00
2d3161482f Dateien nach "art/images" hochladen 2024-02-25 00:35:57 +00:00
f9ede25093 Dateien nach "art/images" hochladen 2024-02-25 00:35:29 +00:00
e80ce5ad0d Dateien nach "/" hochladen 2024-02-25 00:26:31 +00:00
SpagettiFisch
1856b2b08a Merge branch 'InfoProjekt-Development' 2024-02-23 10:46:14 +01:00
SpagettiFisch
4a88bb98d5 removed one empty line 2024-02-23 10:45:54 +01:00
b31a12b43b Merge pull request 'Skeleton, Pfeile und Movement' (#52) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#52
Comments werden eh überbewertet ngl
2024-02-22 21:13:15 +00:00
ef9e7a6ef1 Merge pull request 'Dateien nach "/" hochladen' (#3) from lyzzy-patch-1 into main
Reviewed-on: #3
2024-02-22 20:35:41 +00:00
4b12f09ebd Dateien nach "/" hochladen 2024-02-22 20:34:45 +00: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
66afe87660 Merge pull request 'Development' (#2) from InfoProjekt/game:Development into main
Reviewed-on: #2
2024-02-21 15:16:32 +00:00
1663a85955 Merge pull request 'Development' (#37) from jaffa/game:Development into Development
Reviewed-on: InfoProjekt/game#37
2024-02-20 10:32:56 +00:00
c5cc9e6acc Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main
Reviewed-on: #1
2024-02-17 13:23:41 +00:00
b55b145346 oldmanattack 2024-02-17 09:35:43 +00:00
13daa19bbb Delete art/sprite files /a 2024-02-17 09:33:57 +00:00
5db6b8dac1 oldmanwalk 2024-02-17 09:33:38 +00:00
fc3a9afd2d Add art/sprite files /a 2024-02-17 09:32:59 +00:00
b921da8a9a Merge pull request 'First movement and game object managing/handling' (#36) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#36
2024-02-16 17:09:44 +00: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
4e1674d6f3 added new classes to READ.ME
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-16 18:03:05 +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
44973edb66 Merge pull request 'edited file structure' (#35) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#35
2024-02-15 09:16:17 +00:00
SpagettiFisch
ea6d64b087 edited file structure
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-15 09:50:02 +01:00
a9f5335edc Merge pull request 'main' (#34) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#34
2024-02-14 08:02:18 +00:00
SpagettiFisch
9d63d09357 added a read.me 2024-02-14 09:00:30 +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
aea443cdb4 Merge pull request 'main' (#32) from Spafi/game:main into Development
Reviewed-on: InfoProjekt/game#32
2024-02-13 10:30:16 +00:00
SpagettiFisch
51a287ba66 startscreen added
also some buttons added to be completed
button class initalized

Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-02-13 10:21:42 +01:00
418ae5ee7b Merge pull request 'Development' (#1) from InfoProjekt/game:Development into main
Reviewed-on: Spafi/game#1
2024-02-13 07:35:47 +00:00
SpagettiFisch
124719c0f9 first config file
first 60 fps purple screen created, size depends on config
2024-02-12 13:36:26 +01:00
33a7fdd683 Merge pull request 'storyline.txt aktualisiert' (#30) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#30
2024-02-11 12:59:22 +00:00
1eb858bc30 storyline.txt aktualisiert 2024-02-05 21:46:16 +00:00
69c55f5dd2 Tileset nach "/art" hochgeladen
Erstes Tileset mit mehreren Ansätzen erstellt. Burgwand, Ziegelsteinwände, verschiedene Erd- und Grasvarianten.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-01-31 17:26:25 +00:00
27327ac7da Mauertexturen nach "/art" hochladen
Den Rest davon noch mit hochladen

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-01-31 07:05:18 +00:00
7e066fbb10 Mauertexturen nach "/art" hochladen
Die ersten Texturen für Mauern hochladen.

Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-01-31 07:04:24 +00:00
d555c3930c Dateien nach "/" hochladen
Signed-off-by: Spafi <spafi@noreply.git.spafi.eu>
2024-01-18 10:00:14 +00:00
a11182d9f6 Merge pull request 'storyline.txt aktualisiert' (#27) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#27
2024-01-18 09:51:20 +00:00
76e3f0c2b8 storyline.txt aktualisiert
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
2024-01-18 09:50:31 +00:00
634fffde4b Merge pull request 'main' (#26) from Lyzzy/game:main into Development
Reviewed-on: InfoProjekt/game#26
2024-01-18 09:40:01 +00:00
08193cda28 storyline aktualisiert 2024-01-18 09:38:25 +00:00
125b0dc0a7 storyline aktualisiert
Signed-off-by: Lyzzy <lyzzbackup@gmail.com>
2024-01-18 08:51:13 +00:00
6bca46bb56 storyline hinzugefügt 2024-01-18 08:42:49 +00:00
141 changed files with 1722 additions and 27 deletions

BIN
.idea/InfoProjekt.xlsx generated Normal file

Binary file not shown.

45
.idea/ideas.txt generated Normal file
View file

@ -0,0 +1,45 @@
Anmerkungen in Klammern
? - unsicher
name? - Name noch unklar, bzw. steht zur Diskussion
! - festgelegt / Einigung
Game:
Rogue-like Game mit Story
Pixel
viele Gegner:
Skelette Schwert
Zombies Knüppel
Ratten -
Kröten(?) -
Gläubige(?) Bogen / Schwert
Story:
Theme
mittelalterlich(?)
fairy-tale-like(?)
medieval(!)
Homeless guy in Berlin (oder so) im Winter in einer Stadtbibliothek, weil warm und Shelter.
er hasst eigentlich Bücher, aber aus Langeweile durchstöbert er die Bibo
findet cool aussehendes antikes/magisches Buch, nimmt es aus dem Regal, blättert es auf und wird ohnmächtig
-> Erwacht als magische Person in magischer Welt wieder
Buch dient als Skillbaum (verschiedene Kapitel)
Kampfmagier (name?)
Heilender Magier -> Priester(name?)
Elementmagier(?)
Hexenkraft / Hexenwerke / Hexenmagie / Flüche (?)
Kampf
Faust
Zauberstab - range und strength von Skills und Level(?) abhängig
NPCS
Priester / Mönch (eher Mönch)
Henker
armer Bauer
"Hexe"
Patrice, fragt nach Lightning Anschluss -> Lightning Spell freigeschaltet
Ziel(e)
-> Zurückkommen
-> Happy werden (?)

51
.idea/storyline.txt generated Normal file
View file

@ -0,0 +1,51 @@
Szene 1 - Startszene:
Screen - Berlin, 1983, Winter
Draußen in Stadt mit Häusern, kalt und schneeig,
"*Brrr* I'm freezing. I guess I have to warm up myself in the library."
-> bis in der library am Feuer oder so weiterhin frieren
irgendwo info wasd to move around
wenn am Feuer:
"Now I'm feeling better. The winter days are so boring. Maybe I find a way to intertain myself in here?"
Wenn iwie am richtigen Buch, was iwie hervorsticht
"I really hate reading books, but this one looks interesting. Maybe I should have a look inside."
anklicken?
Animation er nimmt Buch (und klappt auf?)
Wow * blackscreen Ende Szene 1
-----------------------------------------
Szene 2 - Aufwachen in einer neuen Welt:
Zerfallene Bibo, selber Ort parallel Universe
"Huh where am I? What happened??"
geht aus Haus raus, wird von Monstern angegriffen,
wenn 1 Hit kommt ältere Dame, tötet/verjagt Monster und Gespräch.
Faselt irgendwie hä warum du nicht dich verteidigen oh du cooles Buch du auserwählter oder so.
Sagt soll zum Dorf gehen wegen Baum und gibt ihm noch irgendwas, muss aber selbst woanders hin.
und Achtung vor Monstern!
------------------------------------------
auf Weg dann neue Welle Monster, lernt sich iwie zu verteidigen(Buch)
------------------------------------------
Im Dorf beim Dorfältesten melden,
Hallo du uns helfen musst wegen Böse bitte bitte, wir dir auch mit Unterkunft und Essen und so helfen.
Innerer Konflikt weil ihm in altem Leben auch nicht von Allgemeinheit geholfen, und er siehts nicht ein...
------------------------------------------
erst durch erneuter Begegnung mit alter Dame wegen nem Happening einsicht...
------------------------------------------
dann Kämpfi gegen böse um zum Boss zu kommen und boss kämpfi...
------------------------------------------
am Ende er als Held gefeiert
und irgendwie Auswahl, ob da bleiben oder Weg zurück suchen aber im alten Leben was ändern

53
README.md Normal file
View file

@ -0,0 +1,53 @@
Brief Explanation of all files and classes and pygame
Button CLass:
Button(position_x, position_y, width, height, font key phrase/word (see dictionary), the function which should be executed, and if the function should be executed while holding the button or only once per press)
fonts = {
'medieval': 'medieval.ttf',
'minecraft': 'Minecraft Evenings.otf',
'3dpixel': '3D-Pixel.ttf',
'8bit': '8bitlim.ttf',
'8bito': '8blimro.ttf',
'arcade': 'ARCADECLASSIC.ttf',
'modern_game': 'astron boy video.otf',
'modern': 'astron boy.otf',
'wonder': 'Beyond Wonderland.ttf',
'curved': 'Digitag.ttf',
'simple': 'DisposableDroidBB.ttf',
'rounded': 'dpcomic.ttf',
'playfull': 'Endalian Script.ttf',
'blocky': 'FREAKSOFNATURE.ttf',
'catchy': 'Future TimeSplitters.otf',
'simple_wide': 'Halo3.ttf',
'simple_fat': 'INVASION2000.ttf',
'very_gamy': 'ka1.ttf',
'simple_round': 'Karma Suture.otf',
'mono': 'manaspc.ttf',
'damaged': 'Merchant Copy.ttf',
'big_natural': 'MorialCitadel.TTF',
'spacy': 'nasalization-rg.otf',
'sci-fi': 'neuropol.otf',
'hollow_big_edge': 'papercut.ttf',
'space_shuttle': 'pdark.ttf',
'thin': 'PixelFJVerdana12pt.ttf',
'random': 'Seattle Avenue.ttf',
'pixel': 'yoster.ttf'
}
Pygame window: (0, 0) is in the top left corner, the height and width are stored in HEIGHT and WIDTH
GameObjects for rooms, scenes and maybe MorialCitadel
Scene:
type - normal, dungeon, cutscene
objects - contain rooms, npcs, mobs, the character etc.
Room:
type - normal, shop, special (?), boss
objects - npcs, mobs, the character etc.
exits - position of exits --> [top:bool, right:bool, down:bool, left:bool]; 1 to 4 exits per room
locked - bool if the room is unlocked; locked upon first entering unless all mobs are dead

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
art/image files/dooor.kra Normal file

Binary file not shown.

BIN
art/image files/door.kra Normal file

Binary file not shown.

BIN
art/image files/door.kra~ Normal file

Binary file not shown.

BIN
art/image files/exit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 738 B

BIN
art/image files/field.kra Normal file

Binary file not shown.

BIN
art/image files/field.kra~ Normal file

Binary file not shown.

BIN
art/image files/field.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 544 B

BIN
art/image files/mauer.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 629 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 724 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 706 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 694 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 731 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 657 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 974 B

BIN
art/image files/options.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 808 B

BIN
art/image files/set1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 771 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 954 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 159 B

BIN
art/images/box/empty.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

BIN
art/images/box/label.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

BIN
art/images/box/textbox.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 644 B

BIN
art/images/box/thinks.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

BIN
art/images/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 488 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 450 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 433 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 462 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 438 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 441 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 380 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 581 B

BIN
art/images/people/fairy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 762 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 477 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 674 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
art/images/people/rat.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

BIN
art/images/people/reddy.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 654 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 505 B

BIN
art/images/people/vivi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 255 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 326 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/soundeffects/door.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
audio/soundeffects/wind.mp3 Normal file

Binary file not shown.

Binary file not shown.

1123
classes.py Normal file

File diff suppressed because it is too large Load diff

7
config.json Normal file
View file

@ -0,0 +1,7 @@
{
"screen":
{
"res":[1280, 720],
"fullscreen": false
}
}

BIN
fonts/3D-Pixel.ttf Normal file

Binary file not shown.

BIN
fonts/8bitlim.ttf Normal file

Binary file not shown.

BIN
fonts/8bitlimo.ttf Normal file

Binary file not shown.

BIN
fonts/8bitlimr.ttf Normal file

Binary file not shown.

BIN
fonts/8blimro.ttf Normal file

Binary file not shown.

BIN
fonts/ARCADECLASSIC.TTF Normal file

Binary file not shown.

BIN
fonts/Beyond Wonderland.ttf Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more