Lyzzy/game
1
0
Fork 0
forked from InfoProjekt/game
Code Pull requests Activity

Compare commits

base: Lyzzy:4d228bf6e0776572262c3b91a6ffe82a06eff84f
Branches Tags
Lyzzy:main
Lyzzy:lyzzy-patch-3
Lyzzy:lyzzy-patch-2
Lyzzy:lyzzy-patch-1
Lyzzy:Development
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha
...
compare: Lyzzy:1f38a04004390716da2bc847176792e1a6962d8f
Branches Tags
Lyzzy:main
Lyzzy:lyzzy-patch-3
Lyzzy:lyzzy-patch-2
Lyzzy:lyzzy-patch-1
Lyzzy:Development
InfoProjekt:Development
InfoProjekt:main
InfoProjekt:Alpha

5 commits
4d228bf6e0 ... 1f38a04004

Author SHA1 Message Date
Lyzzy
1f38a04004 Merge pull request 'Development' (#9) from InfoProjekt/game:Development into main 
Reviewed-on: #9
 2024-03-09 09:06:05 +00:00
Spafi
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
Spafi
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
2 changed files with 27 additions and 8 deletions
Show stats Expand all files Collapse all files

4
classes.py
View file

@ -243,8 +243,8 @@ class Room(GameObjects):
self.locked = True
else:
self.locked = False
[self.objects[3].append(wall) for wall in self.genWalls(WIDTH, HEIGHT)]
[self.objects[4].append(wall) for wall in self.genWalls(WIDTH, HEIGHT)]
def genWalls(self, WIDTH, HEIGHT):
walls = []
walls.append(Obstacle('wall_l', 'wall', None, True, 32, 32, True, WIDTH=4, HEIGHT=HEIGHT))

31
viecher.py
View file

@ -150,6 +150,7 @@ class MainCharacter(Fighter):
if touches is not None and not isinstance(touches, Weapons):
if isinstance(touches, Obstacle):
if not touches.collision:
print(touches.name)
return
if touches.type == 'wall':
if touches.name == 'wall_l':
@ -162,18 +163,18 @@ class MainCharacter(Fighter):
self.y -= (2 + self.rect.height - (touches.rect.y - self.y))
return
elif isinstance(touches, NPC):
if keys[pg.K_SPACE]:
if keys[pg.K_f]:
touches.talk(objects)
return
else:
return
if self.x <= touches.rect.x: self.x -= (self.rect.width - (touches.rect.x - self.x))
elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x))
elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x - touches.rect.width * 0.66))
#if self.y <= touches.y: pass
#elif self.y > touches.y: pass
self.x -= moveto[0] * 2 / fps
self.y -= moveto[1] * 2 / fps
#self.x -= moveto[0] * 2 / fps
#self.y -= moveto[1] * 2 / fps
"""
if self.x <= 32:
@ -188,7 +189,7 @@ class MainCharacter(Fighter):
def attack(self, obj, mouse):
if self.lastAttack + self.attack_speed * 1000 < pg.time.get_ticks():
moveto = mouse- vec(self.x, self.y)
moveto = mouse - vec(self.x, self.y)
if self.book.current_sp == 'fireball':
weapon = Fireball('fb1', 100, self.x, self.y, moveto, 5)
elif self.book.current_sp == 'windslash':
@ -201,7 +202,7 @@ class MainCharacter(Fighter):
def update(self, keys, mouse, objects):
if not self.talking:
self.walk(keys, objects)
if keys[pg.K_f]:
if pg.mouse.get_pressed()[0]:
self.attack(objects, vec(mouse))
self.speech.update(self)
if self.health.health <= 0:
@ -317,6 +318,7 @@ class Book():
def update(self):
pass
class Mobs(Fighter):
def __init__(self, name, ms, sprite, x, y, health, damage, level, asp, atr, drops) -> None:
super().__init__(name, ms, sprite, x, y, health, damage, level, asp, atr)
@ -330,6 +332,23 @@ class Mobs(Fighter):
moveto.scale_to_length(self.speed)
self.x += moveto[0] / fps
self.y += moveto[1] / fps
touches = pg.sprite.spritecollideany(self, obj[4])
if touches is not None and not isinstance(touches, Weapons):
if isinstance(touches, Obstacle):
if not touches.collision:
return
if touches.type == 'wall':
if touches.name == 'wall_l':
self.x += (2 + (self.x - touches.rect.x))
elif touches.name == 'wall_r':
self.x -= (2 + self.rect.width - (touches.rect.x - self.x))
if touches.name == 'wall_t':
self.y += (2 + (self.y - touches.rect.y))
elif touches.name == 'wall_b':
self.y -= (2 + self.rect.height - (touches.rect.y - self.y))
if self.x <= touches.rect.x: self.x -= (self.rect.width - (touches.rect.x - self.x))
elif self.x > touches.rect.x: self.x += (self.rect.width - (self.x - touches.rect.x - touches.rect.width * 0.66))
else:
self.attack(moveto, obj)