X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=tabakrolletjie%2Flights.py;h=498c0b09c644c5de9bda9a2be4a3dabfb7c7a7ef;hb=f6c5565852c9374631917d535799887a8dd297e3;hp=27f349e65ec5c586738acdcaad946bd020ee6fa7;hpb=693cbe7873f08eaa96ec6a0edd8bba08870307bf;p=tabakrolletjie.git diff --git a/tabakrolletjie/lights.py b/tabakrolletjie/lights.py index 27f349e..498c0b0 100644 --- a/tabakrolletjie/lights.py +++ b/tabakrolletjie/lights.py @@ -11,7 +11,9 @@ import pygame.locals as pgl import pygame.rect import pygame.transform -from .constants import LIGHT_CATEGORY, FITTINGS_CATEGORY, COLOURS +from .constants import ( + LIGHT_CATEGORY, FITTINGS_CATEGORY, OBSTACLE_CATEGORY, TURNIP_CATEGORY, + COLOURS) from .rays import RayPolyManager from .utils import DetailedTimer from .loader import loader @@ -29,6 +31,16 @@ FITTINGS_FILTER = pymunk.ShapeFilter( # Just match lights, nothing else LIT_BY_FILTER = pymunk.ShapeFilter(mask=LIGHT_CATEGORY) +SPACE_FOR_LIGHT_FILTER = pymunk.ShapeFilter( + mask=FITTINGS_CATEGORY | OBSTACLE_CATEGORY | TURNIP_CATEGORY) + + +def check_space_for_light(space, pos, max_distance): + point_info = space.point_query_nearest( + pos, max_distance, SPACE_FOR_LIGHT_FILTER) + if point_info is not None: + return True + return False class LightManager(object): @@ -36,6 +48,7 @@ class LightManager(object): def __init__(self, space, gamestate): self._space = space + self._battery_dead = False self._lights = [ BaseLight.load(cfg) for cfg in gamestate.station["lights"]] for light in self._lights: @@ -46,7 +59,20 @@ class LightManager(object): self._lights.append(light) light.add(self._space) + def battery_dead(self): + self._battery_dead = True + for light in self._lights: + light.off() + + def serialize_lights(self): + result = [] + for light in self._lights: + result.append(light.serialize()) + return result + def toggle_nearest(self, *args, **kw): + if self._battery_dead: + return light = self.nearest(*args, **kw) if light: light.toggle() @@ -66,7 +92,7 @@ class LightManager(object): surface = pygame.display.get_surface() pos = pymunk.pygame_util.from_pygame(pos, surface) point_info_list = self._space.point_query( - pos, max_distance, pymunk.ShapeFilter(mask=LIGHT_CATEGORY)) + pos, max_distance, LIT_BY_FILTER) lights = [p.shape.body.light for p in point_info_list] return [ light for light in lights @@ -120,11 +146,16 @@ class BaseLight(object): def __init__( self, colours, position, intensity=1.0, radius_limits=None, - direction=None, spread=None): + direction=None, spread=None, on=True, start_colour=None): self.colour_cycle = colours self.colour_pos = 0 self.colour = colours[0] - self.on = True + if start_colour and start_colour in colours: + self.colour_pos = colours.index(start_colour) + self.colour = start_colour + self.on = on + if not on and len(colours) > 1: + self.colour_pos = -1 self.intensity = intensity self.body = pymunk.Body(0, 0, pymunk.body.Body.STATIC) self.body.light = self @@ -137,6 +168,18 @@ class BaseLight(object): self._fitting_image = None self._colour_mult_image = None + def serialize(self): + result = self.ray_manager.serialize() + result.update({ + "type": self.__class__.__name__.lower(), + "colours": self.colour_cycle, + "position": self.position, + "intensity": self.intensity, + "on": self.on, + "start_colour": self.colour, + }) + return result + @property def position(self): return self.ray_manager.position @@ -237,7 +280,10 @@ class BaseLight(object): return 5 * area * self.intensity / 6400 # 80x80 unit area def base_damage(self): - return 5 * self.intensity + return 10 * self.intensity + + def off(self): + self.on = False def toggle(self): self.colour_pos += 1 @@ -276,6 +322,13 @@ class PulsatingLamp(BaseLight): "intensity_velocity", self.DEFAULT_INTENSITY_VELOCITY) super(PulsatingLamp, self).__init__(**kw) + def serialize(self): + result = super(PulsatingLamp, self).serialize() + result["pulse_velocity"] = self.pulse_velocity + result["intensity_range"] = self.intensity_range + result["intensity_velocity"] = self.intensity_velocity + return result + def _update_range(self, value, velocity, value_range): value += velocity if value < value_range[0]: @@ -301,6 +354,11 @@ class SpotLight(BaseLight): self.angular_velocity = kw.pop("angular_velocity", None) super(SpotLight, self).__init__(**kw) + def serialize(self): + result = super(SpotLight, self).serialize() + result["angular_velocity"] = self.angular_velocity + return result + def fitting_image(self): fitting_image = super(SpotLight, self).fitting_image() rot_fitting_image = pygame.transform.rotozoom(