From a68bba70bb4b7921bec36f09d594ee40428f9b49 Mon Sep 17 00:00:00 2001 From: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com> Date: Thu, 7 Mar 2024 14:57:18 +0100 Subject: [PATCH] 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> --- art/images/{ => background}/fireplace.png | Bin art/images/{ => background}/river.png | Bin art/images/{ => background}/start.png | Bin art/images/{ => box}/empty.png | Bin art/images/{ => box}/fireball_icon.png | Bin art/images/{ => box}/label.png | Bin art/images/{ => box}/speech.png | Bin art/images/{ => box}/textbox.png | Bin art/images/{ => box}/windslash_icon.png | Bin art/images/{ => main_attributes}/book.png | Bin .../dreiviertelheart.png | Bin .../{ => main_attributes}/fullheart.png | Bin .../{ => main_attributes}/halfheart.png | Bin art/images/{ => main_attributes}/noheart.png | Bin .../{ => main_attributes}/viertelheart.png | Bin art/images/people/oldlady.png | Bin 0 -> 477 bytes art/images/{ => people}/oldman.png | Bin .../{sprite files => people}/oldmanattack.png | Bin .../{sprite files => people}/oldmanwalk.png | Bin art/images/people/rat.png | Bin 0 -> 197 bytes art/images/{ => people}/reddy.png | Bin art/images/people/skeleton.png | Bin 0 -> 505 bytes art/images/people/zombie.png | Bin 0 -> 588 bytes art/images/{ => weapons}/arrow.png | Bin art/images/weapons/empty.png | Bin 0 -> 68 bytes art/images/{ => weapons}/fireball.png | Bin art/images/{ => weapons}/windslash.png | Bin classes.py | 6 +-- main.py | 11 +++-- viecher.py | 39 ++++++++++-------- 30 files changed, 30 insertions(+), 26 deletions(-) rename art/images/{ => background}/fireplace.png (100%) rename art/images/{ => background}/river.png (100%) rename art/images/{ => background}/start.png (100%) rename art/images/{ => box}/empty.png (100%) rename art/images/{ => box}/fireball_icon.png (100%) rename art/images/{ => box}/label.png (100%) rename art/images/{ => box}/speech.png (100%) rename art/images/{ => box}/textbox.png (100%) rename art/images/{ => box}/windslash_icon.png (100%) rename art/images/{ => main_attributes}/book.png (100%) rename art/images/{ => main_attributes}/dreiviertelheart.png (100%) rename art/images/{ => main_attributes}/fullheart.png (100%) rename art/images/{ => main_attributes}/halfheart.png (100%) rename art/images/{ => main_attributes}/noheart.png (100%) rename art/images/{ => main_attributes}/viertelheart.png (100%) create mode 100644 art/images/people/oldlady.png rename art/images/{ => people}/oldman.png (100%) rename art/images/{sprite files => people}/oldmanattack.png (100%) rename art/images/{sprite files => people}/oldmanwalk.png (100%) create mode 100644 art/images/people/rat.png rename art/images/{ => people}/reddy.png (100%) create mode 100644 art/images/people/skeleton.png create mode 100644 art/images/people/zombie.png rename art/images/{ => weapons}/arrow.png (100%) create mode 100644 art/images/weapons/empty.png rename art/images/{ => weapons}/fireball.png (100%) rename art/images/{ => weapons}/windslash.png (100%) diff --git a/art/images/fireplace.png b/art/images/background/fireplace.png similarity index 100% rename from art/images/fireplace.png rename to art/images/background/fireplace.png diff --git a/art/images/river.png b/art/images/background/river.png similarity index 100% rename from art/images/river.png rename to art/images/background/river.png diff --git a/art/images/start.png b/art/images/background/start.png similarity index 100% rename from art/images/start.png rename to art/images/background/start.png diff --git a/art/images/empty.png b/art/images/box/empty.png similarity index 100% rename from art/images/empty.png rename to art/images/box/empty.png diff --git a/art/images/fireball_icon.png b/art/images/box/fireball_icon.png similarity index 100% rename from art/images/fireball_icon.png rename to art/images/box/fireball_icon.png diff --git a/art/images/label.png b/art/images/box/label.png similarity index 100% rename from art/images/label.png rename to art/images/box/label.png diff --git a/art/images/speech.png b/art/images/box/speech.png similarity index 100% rename from art/images/speech.png rename to art/images/box/speech.png diff --git a/art/images/textbox.png b/art/images/box/textbox.png similarity index 100% rename from art/images/textbox.png rename to art/images/box/textbox.png diff --git a/art/images/windslash_icon.png b/art/images/box/windslash_icon.png similarity index 100% rename from art/images/windslash_icon.png rename to art/images/box/windslash_icon.png diff --git a/art/images/book.png b/art/images/main_attributes/book.png similarity index 100% rename from art/images/book.png rename to art/images/main_attributes/book.png diff --git a/art/images/dreiviertelheart.png b/art/images/main_attributes/dreiviertelheart.png similarity index 100% rename from art/images/dreiviertelheart.png rename to art/images/main_attributes/dreiviertelheart.png diff --git a/art/images/fullheart.png b/art/images/main_attributes/fullheart.png similarity index 100% rename from art/images/fullheart.png rename to art/images/main_attributes/fullheart.png diff --git a/art/images/halfheart.png b/art/images/main_attributes/halfheart.png similarity index 100% rename from art/images/halfheart.png rename to art/images/main_attributes/halfheart.png diff --git a/art/images/noheart.png b/art/images/main_attributes/noheart.png similarity index 100% rename from art/images/noheart.png rename to art/images/main_attributes/noheart.png diff --git a/art/images/viertelheart.png b/art/images/main_attributes/viertelheart.png similarity index 100% rename from art/images/viertelheart.png rename to art/images/main_attributes/viertelheart.png diff --git a/art/images/people/oldlady.png b/art/images/people/oldlady.png new file mode 100644 index 0000000000000000000000000000000000000000..520f242e6a385fa48c773d61f8707f5c895f4a12 GIT binary patch literal 477 zcmV<30V4j1P)5MnVa zfJ_i20HP#GILGt6LX~kGvnYykofZI9nx+M@>$>?q2m-Fv_5g>rZF9l(c1`MaW$jcC zAn$s;o2x2TH00$T$IjOQi{Rm_PPzC_0vd}gW z!u3Tre^8RaN1+$aFGZv2;rmxkiC4SjA83Z51Y^- T+YAM{00000NkvXXu0mjfA?nji literal 0 HcmV?d00001 diff --git a/art/images/oldman.png b/art/images/people/oldman.png similarity index 100% rename from art/images/oldman.png rename to art/images/people/oldman.png diff --git a/art/images/sprite files/oldmanattack.png b/art/images/people/oldmanattack.png similarity index 100% rename from art/images/sprite files/oldmanattack.png rename to art/images/people/oldmanattack.png diff --git a/art/images/sprite files/oldmanwalk.png b/art/images/people/oldmanwalk.png similarity index 100% rename from art/images/sprite files/oldmanwalk.png rename to art/images/people/oldmanwalk.png diff --git a/art/images/people/rat.png b/art/images/people/rat.png new file mode 100644 index 0000000000000000000000000000000000000000..92342d3eb9230ba2c9f1fdb635f7893fb92312b3 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0zk~c!3HEhl+{lMQazq7jv*Ss$tep241!k7XI#$c z=;-+0v912+C)ONxet!PLw+>XaF^lUNSbV#7`0GK*|Kj;9*$F*g(@TnrnKxf#JRu+u zu{}?A6{EsggbP0l+XkKbq_^{ literal 0 HcmV?d00001 diff --git a/art/images/reddy.png b/art/images/people/reddy.png similarity index 100% rename from art/images/reddy.png rename to art/images/people/reddy.png diff --git a/art/images/people/skeleton.png b/art/images/people/skeleton.png new file mode 100644 index 0000000000000000000000000000000000000000..f7856f8d659d1a18c210e09e9d6222936207008a GIT binary patch literal 505 zcmV<9*@#)x8vc-WMa+@KBBnMXawBr^(q!50PJ?VD9u%` z*9+#S0_O9%a>nDa@cD2!?;q#YQ9AMcfWC4Xxfx8=Kp%7V!v^$+n z1pg=m$XXqX#GY8pl^Gn~hr^-VZZ~!1Z)FVlt`^m5HJ#vYB|wA0K%UR10`B)ab|tP0 z0Fb-cY;2x}&4M1@1_j?V}v|w$c zYok)BD8%o`#NlugwvKhC1<(ng8uu)$Rx7F3>*<}y@Bl%#p(}X?pay_)xt!=i)R_M{ zHxGhGqfrC^+nwLdet vUx8i=E3nch1PcA}#4cD9dZRh1O)})4m5lx zjnxpWE?AgR^#8ojQw-lpD{(WFrp!apgVO~d+pq4w3pPaCQ5nug4->2|0C@wXDY-tC z;qi@^3|CL@W$=iN0<*pJqw%`{99Ws||3NNz|Na9!96-(o0fJtDc^qa4azGFa1CS<= zhMT*uGRRt}F>vv+g7t%3gH1C?4(=bAW@H19ZC|})A0tf7!s$EV`Y;Rt*^UfAE&+kZ zCvGtWSGX};Is23Ws{vbEdjGF_x(n=l5HOPwVmS5W9Y$KHO(Z>*ZR{?9`H%nla}oJgckl~?^sk2)(FYU2=>=Fi02u%SFoT}5$-~7SUptCBH-e(_$Qd?HAGbc1~a avj6}fz$!2Sn0goh0000 None: + def __init__(self, x, y, width, height, text, font='simple', font_size=20, font_color = '#1e90ff', sprite = 'label.png') -> None: self.x = x self.y = y self.width = width @@ -285,5 +285,5 @@ class Obstacle(GameObjects): if not self.hidden: screen.blit(self.background, self.rect) else: - pygame.draw.rect(screen, (0,0,0), self.rect, 2) + pygame.draw.rect(screen, '#e7f8e0', self.rect, 2) diff --git a/main.py b/main.py index 52adb57..f471a37 100644 --- a/main.py +++ b/main.py @@ -30,11 +30,10 @@ def quitGame(): def genRooms(WIDTH, HEIGHT, type:str, objects:list): room_objects = [] #room_objects = [Obstacle('dirt', 'boulder', 'art/images/dirt2.png', False, 32, 32, WIDTH=WIDTH - 64, HEIGHT=HEIGHT - 64)] - room_objects.append(Obstacle('river', 'water', 'art/images/river.png', True, random.randint(32, round(WIDTH * 0.75)), 32, WIDTH=96, HEIGHT=round(HEIGHT * 0.66))) + room_objects.append(Obstacle('river', 'water', 'art/images/background/river.png', True, random.randint(32, round(WIDTH * 0.75)), 32, WIDTH=96, HEIGHT=round(HEIGHT * 0.66))) room_backgrounds = [f'art/images/background/{type}{i}.png' for i in range(1)] - print(objects) rooms = [ - Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) + Room(type, 'normal', room_backgrounds[random.randint(0, 0)], [objects[0], objects[1], objects[2], objects[3], objects[4] + [room_objects[random.randint(0, 0)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) for j in range(random.randint(5, 10)) ] #rooms =Room(type, 'normal', room_backgrounds[random.randint(0, 4)], [objects[0], objects[1], objects[2], [room_objects[random.randint(0, len(room_objects) - 1)] for i in range(0, random.randint(0, 1))]], WIDTH - 64, HEIGHT - 64, [True, True, True, True], j) @@ -43,20 +42,20 @@ def genRooms(WIDTH, HEIGHT, type:str, objects:list): def play(screen, clock, running, background, isblack, WIDTH, HEIGHT): main = [MainCharacter('Herbert', 100, 'people/oldman.png', 500, 500, 20, 5, 1, 1, 50)] - mobs = [Skeleton(i, random.randint(40, 60), random.randint(50, WIDTH-50), random.randint(50, HEIGHT-50), 5, 1, 1, 1, 200) for i in range(0,random.randint(2, 8))]+[Zombie(i, random.randint(40, 60), random.randint(50, WIDTH-50), random.randint(50, HEIGHT-50), 5, 1, 1, 1, 100) for i in range(0,random.randint(2, 8))] + mobs = [Skeleton(i, random.randint(40, 60), random.randint(50, WIDTH - 50), random.randint(50, HEIGHT - 50), 5, 1, 1, 1, 200) for i in range(0,random.randint(2, 8))]+[Zombie(i, random.randint(40, 60), random.randint(50, WIDTH-50), random.randint(50, HEIGHT-50), 5, 1, 1, 1, 100) for i in range(0,random.randint(2, 8))] weapons = [] others = [Fire('f1', 0, 200, 300)] npcs = [NPC('name', 100, 'people/oldlady.png', 1, 200, 200)] objects = [main, mobs, npcs, weapons, others] level = [] - rooms = genRooms(WIDTH, HEIGHT, 'background/grass', objects) + rooms = genRooms(WIDTH, HEIGHT, 'grass', objects) level.append(Stage('blau', 'normal', None, [], WIDTH, HEIGHT, 'blue', rooms)) scene = Scene('test', 'normal', None, None, WIDTH, HEIGHT, level) freeze = False #Gameplay is freezed in certain situations while running: - screen.fill((0,0,0)) + screen.fill('#000000') events = pygame.event.get() for event in events: if event.type == pygame.QUIT: diff --git a/viecher.py b/viecher.py index 20f0be2..fdebe16 100644 --- a/viecher.py +++ b/viecher.py @@ -44,7 +44,7 @@ class Objects(): self.name = name self.speed = ms with open(f'art/images/{sprite}') as i: - self.sprite = pg.transform.scale2x(pg.transform.scale2x(pg.image.load(i))) + self.sprite = pg.transform.scale2x(pg.image.load(i)) self.x = x self.y = y self.hidden = False @@ -55,7 +55,7 @@ class Objects(): return self.rect.x, self.rect.y = self.x, self.y screen.blit(self.sprite, self.rect) - pg.draw.rect(screen, (0,0,0), self.rect, 2) + pg.draw.rect(screen, '#ef0120', self.rect, 2) class NPC(Objects): def __init__(self, name, ms, sprite, convo_act, x, y) -> None: @@ -110,7 +110,7 @@ class MainCharacter(Fighter): super().__init__(name, ms, sprite, x, y, health, damage, level, asp, atr) self.book = Book(0, 0, [], None, None) self.talking = False - self.level = Level(1000, 38, 150, 40, f'will to live: {level}%', 'simple', 20) + self.level = Level(1000, 38, 150, 40, f'will to live: {level}%', 'simple', 20, ) self.health = Hearts(health, sprite=['fullheart.png', 'fullheart.png', 'fullheart.png', 'fullheart.png', 'fullheart.png'], x=900, y= 50, hurtCooldown=self.hurtCooldown) self.speech = Speech(self.x+20, self.y-50, 150, 100, 'brr Im freezing') self.freezing = True @@ -123,7 +123,7 @@ class MainCharacter(Fighter): self.health.draw(screen) self.level.draw(screen) self.book.draw(screen) - pg.draw.rect(screen, (0,0,0), self.rect, 2) + pg.draw.rect(screen, '#e900fa', self.rect, 2) if self.speech.hidden == False: self.speech.draw(screen, self.x+20, self.y-100) @@ -146,7 +146,7 @@ class MainCharacter(Fighter): self.x += moveto[0] / fps self.y += moveto[1] / fps - touches = pg.sprite.spritecollideany(self, objects[1] + objects[2] + objects[3]) + touches = pg.sprite.spritecollideany(self, objects[2] + objects[4]) if touches is not None and not isinstance(touches, Weapons): if isinstance(touches, Obstacle): if not touches.collision: @@ -161,15 +161,20 @@ class MainCharacter(Fighter): elif touches.name == 'wall_b': self.y -= (2 + self.rect.height - (touches.rect.y - self.y)) return - + elif isinstance(touches, NPC): + if keys[pg.K_SPACE]: + 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)) #if self.y <= touches.y: pass #elif self.y > touches.y: pass self.x -= moveto[0] * 2 / fps self.y -= moveto[1] * 2 / fps - if isinstance(touches, NPC): - touches.talk(objects) + """ if self.x <= 32: self.x = 33 @@ -253,11 +258,11 @@ class Hearts(): class Level(Label): - def __init__(self, x, y, width, height, text, font, font_size) -> None: - super().__init__(x, y, width, height, text, font, font_size) + def __init__(self, x, y, width, height, text, font='simple', font_size=20, font_color='#1e90ff', sprite='label.png') -> None: + super().__init__(x, y, width, height, text, font, font_size, font_color, sprite) class Speech(Label): - def __init__(self, x, y, width, height, text, font='simple', font_size=15, font_color=(0,0,0), sprite='speech.png') -> None: + def __init__(self, x, y, width, height, text, font='simple', font_size=15, font_color='#000000', sprite='speech.png') -> None: super().__init__(x, y, width, height, text, font, font_size, font_color, sprite) def draw(self, screen, x, y): @@ -283,10 +288,10 @@ class Book(): self.rect = pg.Rect(self.x, self.y, self.sprite.get_width(), self.sprite.get_height()) self.sp_list = spells self.current_sp = current_spell - self.labels = [Label(100, 100, 500, 50, "Dear User, ", font_color=(0,0,0), sprite='empty.png'), - Label(100, 150, 500, 50, "this book will help you to survive.", font_color=(0,0,0), sprite='empty.png'), - Label(100, 200, 500, 50, "Click on a picture to choose your spell.", font_color=(0,0,0), sprite='empty.png'), - Label(100, 250, 500, 50, "Talk to fairies to unlock new spells!", font_color=(0,0,0), sprite='empty.png')] + self.labels = [Label(100, 100, 500, 50, "Dear User, ", font_color='#000000', sprite='empty.png'), + Label(100, 150, 500, 50, "this book will help you to survive.", font_color='#000000', sprite='empty.png'), + Label(100, 200, 500, 50, "Click on a picture to choose your spell.", font_color='#000000', sprite='empty.png'), + Label(100, 250, 500, 50, "Talk to fairies to unlock new spells!", font_color='#000000', sprite='empty.png')] self.buttons=[] self.buttons_height = 400 @@ -369,8 +374,8 @@ class Weapons(Objects): self.spawn_tick = pg.time.get_ticks() pos = vec(1,0) angle = pos.angle_to(moveto) - with open(f'art/images/{sprite}') as i: - self.sprite =pg.transform.scale2x(pg.transform.scale2x(pg.transform.rotate(pg.image.load(i), -angle))) + + self.sprite = pg.transform.rotate(self.sprite, -angle) def die(self, objects, kills): touches = pg.sprite.spritecollideany(self, objects[0] + objects[1])