Mercurial > nagslang

changeset 318:26d1978fa1da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
BOX is no longer accurate
author Stefano Rivera <stefano@rivera.za.net>
date Fri, 06 Sep 2013 01:48:59 +0200
parents a5fe5a69689d
children 01e98732de46
files nagslang/constants.py nagslang/enemies.py nagslang/game_object.py
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/nagslang/constants.py	Fri Sep 06 01:44:23 2013 +0200
+++ b/nagslang/constants.py	Fri Sep 06 01:48:59 2013 +0200
@@ -19,19 +19,19 @@
 COLLISION_TYPE_PLAYER = 1
 COLLISION_TYPE_WALL = 2
 COLLISION_TYPE_SWITCH = 3
-COLLISION_TYPE_BOX = 4
+COLLISION_TYPE_FURNITURE = 4
 COLLISION_TYPE_ENEMY = 5
 COLLISION_TYPE_DOOR = 6
 COLLISION_TYPE_PROJECTILE = 7
 COLLISION_TYPE_WEREWOLF_ATTACK = 8
 
-SWITCH_PUSHERS = [COLLISION_TYPE_PLAYER, COLLISION_TYPE_BOX]
+SWITCH_PUSHERS = [COLLISION_TYPE_PLAYER, COLLISION_TYPE_FURNITURE]
 
 CALLBACK_COLLIDERS = [
     # Collisions between the player and shapes with these collision types will
     # fire callbacks on the game object associated with the shape.
     COLLISION_TYPE_SWITCH,
-    COLLISION_TYPE_BOX,
+    COLLISION_TYPE_FURNITURE,
     COLLISION_TYPE_ENEMY,
     COLLISION_TYPE_DOOR,
 ]
--- a/nagslang/enemies.py	Fri Sep 06 01:44:23 2013 +0200
+++ b/nagslang/enemies.py	Fri Sep 06 01:48:59 2013 +0200
@@ -4,7 +4,7 @@
 import pymunk.pygame_util
 
 from nagslang import render
-from nagslang.constants import (COLLISION_TYPE_ENEMY, COLLISION_TYPE_BOX,
+from nagslang.constants import (COLLISION_TYPE_ENEMY, COLLISION_TYPE_FURNITURE,
                                 ZORDER_MID)
 from nagslang.events import EnemyDeathEvent
 from nagslang.game_object import GameObject, SingleShapePhysicser, make_body
@@ -68,7 +68,7 @@
         self.shape = pymunk.Poly(
             body, [(-20, -20), (20, -20), (20, 20), (-20, 20)])
         self.shape.friction = 0.5
-        self.shape.collision_type = COLLISION_TYPE_BOX
+        self.shape.collision_type = COLLISION_TYPE_FURNITURE
         super(DeadEnemy, self).__init__(
             SingleShapePhysicser(space, self.shape),
             render.ImageRenderer(resources.get_image(
--- a/nagslang/game_object.py	Fri Sep 06 01:44:23 2013 +0200
+++ b/nagslang/game_object.py	Fri Sep 06 01:48:59 2013 +0200
@@ -9,9 +9,9 @@
 from nagslang import render
 from nagslang.mutators import FLIP_H
 from nagslang.constants import (
-    SWITCH_PUSHERS, COLLISION_TYPE_SWITCH, COLLISION_TYPE_BOX, ZORDER_LOW,
-    ZORDER_FLOOR, COLLISION_TYPE_DOOR, COLLISION_TYPE_PROJECTILE,
-    COLLISION_TYPE_WEREWOLF_ATTACK)
+    COLLISION_TYPE_DOOR, COLLISION_TYPE_FURNITURE, COLLISION_TYPE_PROJECTILE,
+    COLLISION_TYPE_SWITCH, COLLISION_TYPE_WEREWOLF_ATTACK,
+    SWITCH_PUSHERS, ZORDER_FLOOR, ZORDER_LOW)
 from nagslang.resources import resources
 from nagslang.events import DoorEvent
 
@@ -239,7 +239,7 @@
         self.shape = pymunk.Poly(
             body, [(-20, -20), (20, -20), (20, 20), (-20, 20)])
         self.shape.friction = 0.5
-        self.shape.collision_type = COLLISION_TYPE_BOX
+        self.shape.collision_type = COLLISION_TYPE_FURNITURE
         super(Box, self).__init__(
             SingleShapePhysicser(space, self.shape),
             render.ImageRenderer(resources.get_image('objects', 'crate.png')),