diff options
author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-03-09 13:49:03 -0500 |
---|---|---|
committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2021-03-09 13:49:03 -0500 |
commit | aac3b1bc1ba48b6e50f661b97326ef191cce3e6c (patch) | |
tree | dff16d2e26332a09576ff4965d0126070efa1b63 /src/sprite.h | |
parent | 032f60bc2686364f4df5bfb6c9faf86b84de31a6 (diff) | |
download | tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.tar.gz tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.tar.bz2 tanetane-aac3b1bc1ba48b6e50f661b97326ef191cce3e6c.zip |
switch_claus starts talking when he gets ya
Kumatora, Duster, and Boney had to be given hitboxes, but they are not considered solid. #10
Diffstat (limited to 'src/sprite.h')
-rw-r--r-- | src/sprite.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/sprite.h b/src/sprite.h index 10dd3a8..f631652 100644 --- a/src/sprite.h +++ b/src/sprite.h | |||
@@ -81,6 +81,7 @@ public: | |||
81 | vec2i collisionSize; | 81 | vec2i collisionSize; |
82 | std::string interactionScript; | 82 | std::string interactionScript; |
83 | std::string walkthroughScript; | 83 | std::string walkthroughScript; |
84 | std::string bumpPlayerScript; | ||
84 | std::string enclosureZone; | 85 | std::string enclosureZone; |
85 | 86 | ||
86 | // Animation (internals) | 87 | // Animation (internals) |
@@ -109,6 +110,7 @@ public: | |||
109 | bool orientable = false; | 110 | bool orientable = false; |
110 | int movementSpeed = 0; // 1 is slow (good for NPCs), 2 is Lucas's default walking speed | 111 | int movementSpeed = 0; // 1 is slow (good for NPCs), 2 is Lucas's default walking speed |
111 | std::vector<int> followers; | 112 | std::vector<int> followers; |
113 | int leaderId = -1; | ||
112 | std::deque<Movement> trail; | 114 | std::deque<Movement> trail; |
113 | bool trailsAreHalved = false; | 115 | bool trailsAreHalved = false; |
114 | CharacterState characterState = CharacterState::Still; | 116 | CharacterState characterState = CharacterState::Still; |