ayte/Overflown
ayte/Overflown
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ajout d'hitbox basique

Browse Source
This commit is contained in:
theo@manjaro 2021-08-08 19:55:21 +02:00
parent 63b10f7aad
commit 00197ad287
5 changed files with 137 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gamedata/game.py
View File

@ -74,11 +74,15 @@ class Game():
self.pygame = pygame
self.math = math
self.elapsedtime = 0
self.globals = {} # Un dico pour ranger toute les valeurs globales, pour communiquer entre objets par exemples
self.globals["camerax"] = 0
self.globals["cameray"] = 0
self.globals["scamerax"] = 3
self.globals["scameray"] = 0
self.globals["players"] = []
self.globals["hitpose"] = False
self.scaleCamera()
settings = {"sfx":1,"bgm":1}
@ -114,6 +118,7 @@ class Game():
def game_loop(self):
self.dt = time.time()-self.pasttime
self.elapsedtime += self.dt
self.pasttime = time.time()
self.check_events() # Détecte les entrées clavier

39
gamedata/objects/combat/hitbox.py Normal file
View File

@ -0,0 +1,39 @@
from gamedata.objects.base import BaseObject
class Hitbox(BaseObject):
def __init__(self,x,y,game,w=16,h=16,teamid=-1,kbmod=1,dmg=2,vkbmod=1,hkbmod=1,anchor = [0,0]):
super().__init__(x,y,game,w,h)
self.teamid = teamid
self.kbmod = kbmod # Global knockback multiplier
self.vkbmod = vkbmod # Vertical knockback multiplier
self.hkbmod = hkbmod # Horizontal knockback multiplier
self.dmg = dmg # Percentages that will be added
self.anchor = anchor # Rect that will be used as an origin
self.hitted = {} # Storing wich player it has touched
self.hitmargin = 0.5 # Time interval between two hits
def genkb(self,damage):
return 20+damage/5
def step(self):
if not self.game.globals["hitpose"]:
for player in self.game.globals["players"]:
if player.teamid!=self.teamid:
if player.rect.colliderect(self.rect):
if not player.playerid in self.hitted.keys():
self.hitted[player.playerid] = 0
if self.game.elapsedtime - self.hitted[player.playerid] >= self.hitmargin:
kb = self.genkb(player.damage)
player.horkb = kb*self.kbmod*self.hkbmod*player.multkb
player.verkb = kb*self.kbmod*self.vkbmod*player.multkb
player.hitpose = True
player.hitposetimer.reset()
self.hitted[player.playerid] = self.game.elapsedtime
def draw(self):
self.game.pygame.draw.rect(self.game.window,[100,100,255,50],(self.rect[0]-self.game.globals["camerax"],self.rect[1]-self.game.globals["cameray"],self.rect[2],self.rect[3]))

17
gamedata/objects/combat/manager.py Normal file
View File

@ -0,0 +1,17 @@
from gamedata.objects.base import BaseObject
class FightManager(BaseObject):
def __init__(self,game):
super().__init__(0,0,game)
def step(self):
self.game.globals["players"] = self.game.gameloop.findname("Player")
self.game.globals["hitpose"] = False # Manage hitpose game-wise
for player in self.game.globals["players"]:
if player.hitpose:
self.game.globals["hitpose"] = True
break
def draw(self):
pass

106
gamedata/objects/combat/player.py
View File

@ -12,12 +12,27 @@ class Player(Movable):
self.speed = 200
self.controlled = True
self.fastfallmargin = 2
self.playerid = 0
self.teamid = self.playerid
self.hitpose = False
self.hitposeduration = 0.5
self.hitposeduration = 0.01
self.hitposetimer = game.lib.Timer(self.hitposeduration)
self.damage = 0
self.horkb = 0
self.verkb = 0
self.reducekb = 50
self.multkb = 1
self.attackstate = None
self.stepsize = 20
self.gravity = 15
@ -28,45 +43,64 @@ class Player(Movable):
def step(self):
if not self.hitpose:
keys = self.game.inputs["keys"]
self.horspd=(keys["right"]["pressed"]-keys["left"]["pressed"])*self.game.dt*self.speed
if not self.game.globals["hitpose"]:
keys = self.game.inputs["keys"]
if self.controlled:
self.horspd=(keys["right"]["pressed"]-keys["left"]["pressed"])*self.game.dt*self.speed
if self.attackstate:
self.attackstate(self)
# Si je suis sur le sol
self.onground = False
self.onceilling = False
if self.checkcollisions(0,1):
self.onground = True
self.verspd=min(0,self.verspd)
else:
self.verspd+=self.gravity*self.game.dt
self.verspd= min(self.maxgravity,self.verspd)
if self.checkcollisions(0,-1):
self.onceilling = True
self.verspd= max(0,self.verspd) # Se cogne au plafond BONK
# Si je suis sur le sol
self.onground = False
if self.checkcollisions(0,1):
self.onground = True
self.verspd=min(0,self.verspd)
else:
self.verspd+=self.gravity*self.game.dt
self.verspd= min(self.maxgravity,self.verspd)
if self.checkcollisions(0,-1):
self.verspd= max(0,self.verspd) # Se cogne au plafond BONK
# Adding knockback
self.horspd+=self.horkb
self.verspd+=self.verkb
self.jumped = False
if self.onground:
if 0<keys["up"]["timer"]<=3:
self.verspd= self.jump
self.jumped = True
if self.verspd==0:
self.move(0,-self.stepsize)
super().step()
self.move(0,self.stepsize)
else:
super().step()
self.jumped = False
if self.onground:
if 0<keys["up"]["timer"]<=3:
self.verspd= self.jump
self.jumped = True
if self.verspd==0:
self.move(0,-self.stepsize)
super().step()
self.move(0,self.stepsize)
else:
super().step()
# Je passe en dessous des semi-plateformes
if keys["down"]["timer"]==1:
falled = False
if not self.checkcollisions(0,1,semi=False):
semi = self.checkcollisions(0,1,classic=False)
if semi!=self.checkcollisions(0,0,classic=False) and semi:
self.rect.bottom = semi.top+1
falled = True
if not falled:
if 0<self.verspd <= self.fastfallmargin or (abs(self.verspd)<abs(self.currentspdv) and abs(self.verspd)<=self.fastfallmargin/1.8):
self.verspd = self.maxgravity/4
# Reducing the knockback
if self.horkb>0:
self.horkb = max(0,self.horkb-self.reducekb)*self.game.dt
if self.horkb<0:
self.horkb = min(0,self.horkb+self.reducekb)*self.game.dt
if self.verkb>0:
self.verkb = max(0,self.verkb-self.reducekb)*self.game.dt
if self.verkb<0:
self.verkb = min(0,self.verkb+self.reducekb)*self.game.dt
else:
# Je passe en dessous des semi-plateformes
if keys["down"]["timer"]==1:
falled = False
if not self.checkcollisions(0,1,semi=False):
semi = self.checkcollisions(0,1,classic=False)
if semi!=self.checkcollisions(0,0,classic=False) and semi:
self.rect.bottom = semi.top+1
falled = True
if not falled:
if 0<self.verspd <= self.fastfallmargin or (abs(self.verspd)<abs(self.currentspdv) and abs(self.verspd)<=self.fastfallmargin/1.8):
self.verspd = self.maxgravity/4
else: # If I'm in hitpose
if self.hitposetimer.tick(self.game.dt):
self.hitpose = False

6
gamedata/scenes.py
View File

@ -5,6 +5,8 @@ from gamedata.objects.menu.optionmenu import OptionMenu
from gamedata.objects.sliders.bgmslider import BGMSlider
from gamedata.objects.sliders.sfxslider import SFXSlider
from gamedata.objects.combat.player import Player
from gamedata.objects.combat.manager import FightManager
from gamedata.objects.combat.hitbox import Hitbox
from gamedata.objects.combat.tileset import TilesetRenderer
def main(game):
@ -19,8 +21,12 @@ def fight(game):
game.scaleCamera(416,234)
game.gameloop.reinit()
mapname = game.lib.choice(list(game.levels_lib.keys()))
manager = FightManager(game)
game.gameloop.summon(manager)
tileset = TilesetRenderer(0,0,game,mapname)
game.gameloop.summon(tileset)
box = Hitbox(100,80,game)
game.gameloop.summon(box)
p1 = Player(game)
game.gameloop.summon(p1)