Added expansion manager implementation
This commit is contained in:
17
game.py
17
game.py
@ -2,9 +2,16 @@ import logging
|
|||||||
import pygame
|
import pygame
|
||||||
import random
|
import random
|
||||||
import gameUtils
|
import gameUtils
|
||||||
|
import NoPELib
|
||||||
|
|
||||||
#Oh god here we go. I'm gonna screw up this entire thing
|
#Oh god here we go. I'm gonna screw up this entire thing
|
||||||
|
|
||||||
|
def transform(value, minA, maxA, minB, maxB):
|
||||||
|
"""
|
||||||
|
Translates `value` from `minA`-`maxA` to `minB`-`maxB`.
|
||||||
|
"""
|
||||||
|
return ((value - minA) / (maxA - minA)) * (maxB - minB) + minB
|
||||||
|
|
||||||
class Game(gameUtils.Game):
|
class Game(gameUtils.Game):
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
"""
|
"""
|
||||||
@ -18,8 +25,8 @@ class Game(gameUtils.Game):
|
|||||||
|
|
||||||
# Don't remove this. It does important things. :3
|
# Don't remove this. It does important things. :3
|
||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
self.em = NoPELib.ExpansionsManager(self.pm, includeExpansions=['ShockColar1'])
|
||||||
|
|
||||||
# TODO: Utilise self.pm (the player manager)
|
|
||||||
# TODO: Utilise the following new sounds:
|
# TODO: Utilise the following new sounds:
|
||||||
# gun-load: Should be played at the beginning of the game,
|
# gun-load: Should be played at the beginning of the game,
|
||||||
# and should have an animation accompanying it.
|
# and should have an animation accompanying it.
|
||||||
@ -94,7 +101,13 @@ class Game(gameUtils.Game):
|
|||||||
if random.randint(1,6) == 6:
|
if random.randint(1,6) == 6:
|
||||||
self.playSound(self.gunShot)
|
self.playSound(self.gunShot)
|
||||||
self.gun.playAnim('fire')
|
self.gun.playAnim('fire')
|
||||||
self.currentlyPlaying.punish(self.shockScale)
|
expansionIDs = self.em.lookupPlayer(self.currentlyPlaying.name)
|
||||||
|
shocker = self.em[expansionIDs[0]]
|
||||||
|
iMin, iMax = self.currentlyPlaying.expansions['ShockCollar1']['shcokRange']
|
||||||
|
v = round(transform(self.shockScale, 0, 1, iMin, iMax))
|
||||||
|
|
||||||
|
print(f'Shocking {self.currentlyPlaying.name} with intensity {v}')
|
||||||
|
shocker.step((False, 0.5, v))
|
||||||
print(f'{self.currentlyPlaying.name} is fucking dead.')
|
print(f'{self.currentlyPlaying.name} is fucking dead.')
|
||||||
return 0.04
|
return 0.04
|
||||||
#remember to add shock
|
#remember to add shock
|
||||||
|
|||||||
Reference in New Issue
Block a user