From ea957fac37307ad6189a6f71b59fd9c7a00ed576 Mon Sep 17 00:00:00 2001 From: Weranda Date: Thu, 30 Mar 2023 19:54:48 +0200 Subject: [PATCH] =?UTF-8?q?dodanie=20mob=C3=B3w=20na=20mapie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- __pycache__/agent.cpython-310.pyc | Bin 1573 -> 1602 bytes __pycache__/archer_ork.cpython-310.pyc | Bin 0 -> 989 bytes __pycache__/config.cpython-310.pyc | Bin 260 -> 290 bytes __pycache__/infantry_ork.cpython-310.pyc | Bin 0 -> 1000 bytes __pycache__/infantry_ork2.cpython-310.pyc | Bin 0 -> 1006 bytes __pycache__/map_add_ons.cpython-310.pyc | Bin 914 -> 944 bytes __pycache__/sauron.cpython-310.pyc | Bin 0 -> 964 bytes agent.py | 2 +- archer_ork.py | 28 ++++++++++++++++++++++ infantry_ork.py | 28 ++++++++++++++++++++++ infantry_ork2.py | 28 ++++++++++++++++++++++ main.py | 21 +++++++--------- sauron.py | 28 ++++++++++++++++++++++ 13 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 __pycache__/archer_ork.cpython-310.pyc create mode 100644 __pycache__/infantry_ork.cpython-310.pyc create mode 100644 __pycache__/infantry_ork2.cpython-310.pyc create mode 100644 __pycache__/sauron.cpython-310.pyc create mode 100644 archer_ork.py create mode 100644 infantry_ork.py create mode 100644 infantry_ork2.py create mode 100644 sauron.py diff --git a/__pycache__/agent.cpython-310.pyc b/__pycache__/agent.cpython-310.pyc index f031cfc0678aa3ed982c7cfdaf6807632fc5158e..8c9f5e992d66e8ce7718bca4c9a918fcc644b04a 100644 GIT binary patch delta 411 zcmZ3=bBKpGpO=@50SFvUtEODp$a{g2ml4R*l)A-|o|v0@Yw|0`6REdYb5hGvb2M3Q zu@tA~q!qCNRTS}o2!0^3lA%Z*Nd2-&wu%WYPAw{qF|jZ=GL7-iOLZyAEK7|ED9tIz zEQu*DDNV^tj0yJCO)pA}aW6{L4fc#lOi#@#(JQDd;+g!5X}z`#++-n`@kPQwmL_A7 z97q6U5rj}!e1(~@o)gHw#hjg5d5b$ewIsfvD7CmaHRTqYcf60QTSyU_al9ba?B4M~ zp6(tYw^+R6Lj%A*09yglJ|&o)M8`{K~^gQ2`wNl76B4mjFW>|z2td7 r5=tNfB#Wd2>{x}#dsr29!0u#A&d*EBOfLe3cM&&;V8*I}lT8Ky3esOX delta 406 zcmX@avy_K7pO=@50SL}^sHR-s$a{g2HwDPkl)A-|o|u~&HTf0e36ChYjMT)Ok_=6j zTP($?IcY^~KqW=IAc7A_tYj#X1yaA{vaDiUQj4=o@(W^uJ>vs{{JmVgLt+xsQ}asn z3Mz}ZCyO($*OrFs6@(d3Bm`t>G8V~z1VBbX2)V@{nHlRjfc#s`*{PMcxYJWh;tPsW zi;GiJZn1gC`?$J=6rmZ%15(ZI9UtWB?h$f}#XCMU0PIGv6(CJ6{^5R_Okk^Su>egi zMz#=SwLFl}0^(v3Ai>2rxq#J6o*N{g03txLNIJldm79E%RnY_NPPXLyytK^pB2JJp jP`DN`W77Z>yTxIXo1apelWNBZp()M+12?zMI%Eag!W?m(?H8%2{r za^4ya;wHJ;g93#vw@C!nTtm~i!#-EFFw3YMilpFD*|Eq+Lzsu-a?!qC zPCiuy(tgfHndTm)Uq)eey;5c>kG%j7AgO@oR^DZ)|FDBR uqqHWd(C%N*q3P4XAJitl>> literal 0 HcmV?d00001 diff --git a/__pycache__/config.cpython-310.pyc b/__pycache__/config.cpython-310.pyc index 8a7847d54348935c905289dc78d4bfa5eebd5c09..3e5759b7151885a328750c4f16c51ded8239b855 100644 GIT binary patch delta 149 zcmZo+TExVa&&$ij00dgoCvw%+M{&9ZIr_Q=Ifl4Kv4(rPgm^@;dANGIdxYHL4Ds}F zjSu#W0?Ih~I68X+6?k}txUOUQeBEN%Ti+k tN^=S_OJa&kN>efuV}d<((~A;g+=~)*gFR!C^YhX&)Ab4}Z%uq50|4PkEy@4@ delta 108 zcmZ3))WXD-&&$ij00d_{CUVt=-Qsi$a`bf#atv|3#TxGE65?@-&BN8x-6P}{XNaed zYkaV06i~*=$I;n4iZ$HBGsJZzLlHMnKbZI>pJf%}l3JWyl3x%L>=_>rNaR;6H z#y&{<$aml)@Cp3N)4l>voHHis=zjj4edqIC&c)hV1Howjy2D->2>sT|>M%js2Py9Y zFvM_%d_9v4pP(be3}&7qW^$C0)c9`rCc^{dSr=f9`W{yJUZm;jAfW7nlpO$$e9Vwf z7-r-g`35t<-BfNbABMRUGg^qxk-o&$&|J#_Ncj_Bj^~J?IZ9Eg8IeY6rq;rq>ou|@ z7|n^SbwH!e-1x`pvIcsi!X|jQi#3Lq+P?+b`l1cKEe77OvLTJdCg=^2W=tw87r48) z2DrhDDu&iO%v@rKr}@@WN8ASPfNVo-l-4U&XBO;SX9zO2`)4=0duJ@=Q4;P!uDg?j zN25Z9-ANvMzXFoFX=M%>i|EHxCzsrgXl@{q2!_r9z1?@|6y>P^A{pH z<-xmYHc4bq$|+02V9?u*MHn23aCguPl9k5lPG-V|lWHL4Z2%iL@Fs4M2DagAkxkqo zZR}zfR^TINTdRH9y((QFE(&$bq4-e82BqVIO*741O216Q>~g1yRb71rZb4W9FRyCq zQvYcOxkk0(S)vZQvZEp&Cb7^jRWvnd`;{|vHH1D$IZrP`Khtee>asb=!8_zHM#1yW literal 0 HcmV?d00001 diff --git a/__pycache__/infantry_ork2.cpython-310.pyc b/__pycache__/infantry_ork2.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c9f3552888a209be2fedeb972413205b1730e864 GIT binary patch literal 1006 zcmY*Y-EPw`6t!b<RNu zh8ej)p1}-QZmLE%8w8mYQ<{s5Kr^l3mtJ2xC6Ecu~AYjS(RBZbB7^F)$X0&ZSS75gokmk3(4+` zV;&B38Fbp?ENYRKal z=B;;oZ(j9Ijz7|)BmHtEwf)KX&l*UrI1(!6; zQ%IXnl@oyyJe0~T(MtIlPvJ3`1y2XU*14}}SOxfj#69T#?1#_&(}Ih_fBfue=ZSxm z@qH1WasR_49mmoy?$7aAPo8s$jK5>?R34)bgfM?(LvqOL*vFYTf0A@oMdd2to`rG6@fE}VlLyhZ*3 D;ivT+ literal 0 HcmV?d00001 diff --git a/__pycache__/map_add_ons.cpython-310.pyc b/__pycache__/map_add_ons.cpython-310.pyc index 447c7ff333d07f4897df674b05f063fc116fea8d..2e6e836e138a3175fdd6920c8bdba971f85d184d 100644 GIT binary patch delta 76 zcmbQlzJZ-9pO=@50SL6FZ{%uaGI2__iU}=FEh>&Nu`o9>jq%S*bt%d$ON|LA%_+z% ei775AP037*3HH=YFG`GYFG|!6_ME(w=`8?Bkr>qg delta 46 zcmdnMK8c+xpO=@50SL}^Y~*TX5>v^tig8IT&MwI>hza(L4+!%2a`g_Ge3_OT~o&g?#C-5y-dj+mIPMN5q^ZEOH&hd#)oN8^&MKFH+x=ZgE2>sS#b(kOyz{EWO ziYP8npl4Fx6Lf^ALCp(9O@?xk8{dq;q}WG&>k^{Tu#XkKpJ=)|2#5nP(F0&8z!U|9 zVoEMhU{C|nO=bIW&8sre<*$b3+FpT)p8zvFLlK&x9Oar3Y2;>Z&Fz_9BMXAjjL23G zROHNzf2=KApxp*Lkm1eOC|>CNE~xeS2IO`rWW&m)H0E2NU9e6{nkWyrH@^nBNsXq4 z);(%2Fx1oh`a)OS2JV1uLv56|8`h>4cy3SxXS9dsy}kW&nzJN}_eFEuy-At&$>jl@ zjq8*43CEgi=o|le!!DbM9c8BRn5j-&6p@(lOfsSDlvnix=E<~i+Div?wFyv86lG;5 zqe!(+25$}{e-Ioh{8izpvc6Y2f-VKfFI4MuWFUsx5h3 zic!VK$`VOju)tn=Rm-pWC{7^hW06Va2_~bYDk}boO_h^^;w+KMY|tv$87ts}n}QW1 zZtK%_HLL@CNBkyCf1W2#!w-US5k7qK_`##_xMZ(+cE-YYbur0gC}d5uIP?d*DUZV= z9`E{t@T#Lz?!g`{FmW5e#xCB%E^)C9PnT@r9@)Si_Fx4ba=yO2d3#qa8p6v#ze;E_ z^vjK+aYgGwb1#ZM*Kx7*G*z0{U4dIrki%cqTw9^PmxDZ`S?OE64O-brRgSWh>%Wk9 dH0b!1J#+`S-bgvmmZe|l>mYQi9OU2~@)tzA=FR{B literal 0 HcmV?d00001 diff --git a/agent.py b/agent.py index 5834856..52a2876 100644 --- a/agent.py +++ b/agent.py @@ -28,7 +28,7 @@ class Agent(pygame.sprite.Sprite): self.rect.x = self.x self.rect.y = self.y - self.health = 100 + self.level = 1 def update(self): self.movement() diff --git a/archer_ork.py b/archer_ork.py new file mode 100644 index 0000000..8b886fb --- /dev/null +++ b/archer_ork.py @@ -0,0 +1,28 @@ +import pygame +from config import * + +class Archer_ork(pygame.sprite.Sprite): + + + def __init__(self, game, x, y): + self.game = game + self.groups = self.game.all_sprites + pygame.sprite.Sprite.__init__(self, self.groups) + + self.x = x * TILE_SIZE + self.y = y * TILE_SIZE + self.width = TILE_SIZE + self.height = TILE_SIZE + + self.ARCHER_ORK_IMG = pygame.image.load("./zdjecia/ork_lucznik.png") + self.ARCHER_ORK = pygame.transform.scale(self.ARCHER_ORK_IMG,(64,64)) + + self.image = pygame.Surface([self.width, self.height]) + self.image.blit(self.ARCHER_ORK, (0,0)) + self.image.set_colorkey((0, 0, 0)) + + self.rect = self.image.get_rect() + self.rect.x = self.x + self.rect.y = self.y + + self.level = 1 \ No newline at end of file diff --git a/infantry_ork.py b/infantry_ork.py new file mode 100644 index 0000000..11a77a6 --- /dev/null +++ b/infantry_ork.py @@ -0,0 +1,28 @@ +import pygame +from config import * + +class Infantry_ork(pygame.sprite.Sprite): + + + def __init__(self, game, x, y): + self.game = game + self.groups = self.game.all_sprites + pygame.sprite.Sprite.__init__(self, self.groups) + + self.x = x * TILE_SIZE + self.y = y * TILE_SIZE + self.width = TILE_SIZE + self.height = TILE_SIZE + + self.INFANTRY_ORK_IMG = pygame.image.load("./zdjecia/ork-piechota.png") + self.INFANTRY_ORK = pygame.transform.scale(self.INFANTRY_ORK_IMG,(64,64)) + + self.image = pygame.Surface([self.width, self.height]) + self.image.blit(self.INFANTRY_ORK, (0,0)) + self.image.set_colorkey((0, 0, 0)) + + self.rect = self.image.get_rect() + self.rect.x = self.x + self.rect.y = self.y + + self.level = 2 \ No newline at end of file diff --git a/infantry_ork2.py b/infantry_ork2.py new file mode 100644 index 0000000..2e77bf0 --- /dev/null +++ b/infantry_ork2.py @@ -0,0 +1,28 @@ +import pygame +from config import * + +class Infantry_ork2(pygame.sprite.Sprite): + + + def __init__(self, game, x, y): + self.game = game + self.groups = self.game.all_sprites + pygame.sprite.Sprite.__init__(self, self.groups) + + self.x = x * TILE_SIZE + self.y = y * TILE_SIZE + self.width = TILE_SIZE + self.height = TILE_SIZE + + self.INFANTRY_ORK2_IMG = pygame.image.load("./zdjecia/ork-piechota2.png") + self.INFANTRY_ORK2 = pygame.transform.scale(self.INFANTRY_ORK2_IMG,(64,64)) + + self.image = pygame.Surface([self.width, self.height]) + self.image.blit(self.INFANTRY_ORK2, (0,0)) + self.image.set_colorkey((0, 0, 0)) + + self.rect = self.image.get_rect() + self.rect.x = self.x + self.rect.y = self.y + + self.level = 3 \ No newline at end of file diff --git a/main.py b/main.py index a36410b..e846585 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,10 @@ import pygame from config import * from agent import * from map_add_ons import * +from archer_ork import * +from infantry_ork import * +from infantry_ork2 import * +from sauron import * class Game: @@ -10,19 +14,8 @@ class Game: self.SCREEN = pygame.display.set_mode((WIDTH, HEIGHT)) self.running = True self.clock = pygame.time.Clock() - - # te wszystkie obrazki trzeba dać w oddzielnej klasie dla potworków jak coś później - #self.ARCHER_ORK_IMG = pygame.image.load("./zdjecia/ork_lucznik.png") - #self.INFATRY_ORK_IMG = pygame.image.load("./zdjecia/ork-piechota.png") - #self.INFANTRY_ORK2_IMG = pygame.image.load("./zdjecia/ork-piechota2.png") - #self.SAURON_IMG = pygame.image.load("./zdjecia/sauron.png") + self.BACKGROUND_IMG= pygame.image.load("./zdjecia/podloze.jpg") - - - #self.ARCHER_ORK = pygame.transform.scale(self.ARCHER_ORK_IMG,(64,64)) - #self.INFATRY_ORK = pygame.transform.scale(self.INFATRY_ORK_IMG,(64,64)) - #self.INFANTRY_ORK2 = pygame.transform.scale(self.INFANTRY_ORK2_IMG,(64,64)) - #self.SAURON = pygame.transform.scale(self.SAURON_png,(64,64)) self.BACKGROUND = pygame.transform.scale(self.BACKGROUND_IMG,(64,64)) #self.ORK_LIST = [self.ARCHER_ORK,self.INFANTRY_ORK2, self.INFATRY_ORK] @@ -33,6 +26,10 @@ class Game: self.all_sprites = pygame.sprite.LayeredUpdates() self.rock_sprites = pygame.sprite.Group() self.agent = Agent(self,1,1) + self.archer_ork = Archer_ork(self,10,10) + self.infantry_ork = Infantry_ork(self,5,10) + self.infantry_ork2 = Infantry_ork2(self,6,9) + self.sauron = Sauron(self, 1, 10) for y in range(5): self.rock = Rocks(self,3,y) diff --git a/sauron.py b/sauron.py new file mode 100644 index 0000000..bd22ae0 --- /dev/null +++ b/sauron.py @@ -0,0 +1,28 @@ +import pygame +from config import * + +class Sauron(pygame.sprite.Sprite): + + + def __init__(self, game, x, y): + self.game = game + self.groups = self.game.all_sprites + pygame.sprite.Sprite.__init__(self, self.groups) + + self.x = x * TILE_SIZE + self.y = y * TILE_SIZE + self.width = TILE_SIZE + self.height = TILE_SIZE + + self.SAURON_IMG = pygame.image.load("./zdjecia/sauron.png") + self.SAURON = pygame.transform.scale(self.SAURON_IMG,(64,64)) + + self.image = pygame.Surface([self.width, self.height]) + self.image.blit(self.SAURON, (0,0)) + self.image.set_colorkey((0, 0, 0)) + + self.rect = self.image.get_rect() + self.rect.x = self.x + self.rect.y = self.y + + self.level = 4 \ No newline at end of file