smash_and_grab 0.0.5alpha → 0.0.6alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (67) hide show
  1. data/{CHANGELOG.txt → CHANGELOG.md} +0 -0
  2. data/Gemfile.lock +8 -4
  3. data/LICENSE.txt +20 -0
  4. data/README.md +30 -14
  5. data/Rakefile +2 -2
  6. data/config/lang/objects/entities/en.yml +134 -0
  7. data/config/lang/objects/static/en.yml +8 -0
  8. data/config/lang/objects/vehicles/en.yml +11 -0
  9. data/config/map/entities.yml +42 -38
  10. data/lib/smash_and_grab.rb +5 -0
  11. data/lib/smash_and_grab/abilities.rb +1 -1
  12. data/lib/smash_and_grab/abilities/ability.rb +45 -3
  13. data/lib/smash_and_grab/abilities/drop.rb +38 -0
  14. data/lib/smash_and_grab/abilities/melee.rb +4 -6
  15. data/lib/smash_and_grab/abilities/pick_up.rb +33 -0
  16. data/lib/smash_and_grab/abilities/ranged.rb +18 -12
  17. data/lib/smash_and_grab/abilities/sprint.rb +11 -7
  18. data/lib/smash_and_grab/chingu_ext/basic_game_object.rb +26 -0
  19. data/lib/smash_and_grab/game_window.rb +5 -1
  20. data/lib/smash_and_grab/gui/entity_panel.rb +26 -10
  21. data/lib/smash_and_grab/gui/entity_summary.rb +19 -11
  22. data/lib/smash_and_grab/gui/game_log.rb +6 -2
  23. data/lib/smash_and_grab/gui/info_panel.rb +7 -4
  24. data/lib/smash_and_grab/gui/object_panel.rb +6 -2
  25. data/lib/smash_and_grab/gui/scenario_panel.rb +4 -0
  26. data/lib/smash_and_grab/history/action_history.rb +1 -1
  27. data/lib/smash_and_grab/main.rb +7 -3
  28. data/lib/smash_and_grab/map/faction.rb +26 -8
  29. data/lib/smash_and_grab/map/map.rb +21 -12
  30. data/lib/smash_and_grab/map/tile.rb +29 -2
  31. data/lib/smash_and_grab/map/wall.rb +2 -2
  32. data/lib/smash_and_grab/mixins/has_contents.rb +38 -0
  33. data/lib/smash_and_grab/mixins/line_of_sight.rb +129 -0
  34. data/lib/smash_and_grab/mixins/pathfinding.rb +145 -0
  35. data/lib/smash_and_grab/mouse_selection.rb +107 -36
  36. data/lib/smash_and_grab/objects/entity.rb +311 -260
  37. data/lib/smash_and_grab/objects/floating_text.rb +0 -1
  38. data/lib/smash_and_grab/objects/static.rb +10 -3
  39. data/lib/smash_and_grab/objects/vehicle.rb +7 -2
  40. data/lib/smash_and_grab/objects/world_object.rb +10 -3
  41. data/lib/smash_and_grab/path.rb +38 -12
  42. data/lib/smash_and_grab/players/ai.rb +91 -0
  43. data/lib/smash_and_grab/players/human.rb +9 -0
  44. data/lib/smash_and_grab/players/player.rb +16 -65
  45. data/lib/smash_and_grab/players/remote.rb +9 -0
  46. data/lib/smash_and_grab/sprite_sheet.rb +9 -0
  47. data/lib/smash_and_grab/states/edit_level.rb +15 -4
  48. data/lib/smash_and_grab/states/main_menu.rb +16 -4
  49. data/lib/smash_and_grab/states/play_level.rb +88 -28
  50. data/lib/smash_and_grab/states/world.rb +17 -9
  51. data/lib/smash_and_grab/version.rb +1 -1
  52. data/lib/smash_and_grab/z_order.rb +6 -5
  53. data/media/images/path.png +0 -0
  54. data/media/images/tile_selection.png +0 -0
  55. data/media/images/tiles_selection.png +0 -0
  56. data/smash_and_grab.gemspec +2 -2
  57. data/tasks/create_portraits.rb +39 -0
  58. data/tasks/outline_images.rb +56 -0
  59. data/test/smash_and_grab/abilities/drop_test.rb +68 -0
  60. data/test/smash_and_grab/abilities/melee_test.rb +4 -4
  61. data/test/smash_and_grab/abilities/pick_up_test.rb +68 -0
  62. data/test/smash_and_grab/abilities/ranged_test.rb +105 -0
  63. data/test/smash_and_grab/abilities/sprint_test.rb +55 -25
  64. data/test/smash_and_grab/map/faction_test.rb +18 -16
  65. data/test/smash_and_grab/map/map_test.rb +9 -4
  66. metadata +51 -19
  67. data/lib/smash_and_grab/fidgit_ext/event.rb +0 -77
File without changes
data/Gemfile.lock CHANGED
@@ -1,10 +1,11 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- smash_and_grab (0.0.5alpha)
4
+ smash_and_grab (0.0.6alpha)
5
5
  chingu (~> 0.9rc7)
6
- fidgit (~> 0.1.10)
6
+ fidgit (~> 0.2.1)
7
7
  gosu (~> 0.7.41)
8
+ r18n-desktop (~> 0.4.14)
8
9
  texplay (~> 0.3)
9
10
 
10
11
  GEM
@@ -22,11 +23,11 @@ GEM
22
23
  faster_xml_simple (0.5.0)
23
24
  libxml-ruby (>= 0.3.8.4)
24
25
  ffi (1.0.9-x86-mingw32)
25
- fidgit (0.1.10)
26
+ fidgit (0.2.1)
26
27
  chingu (~> 0.9rc7)
27
28
  clipboard (~> 0.9.9)
28
29
  ffi (= 1.0.9)
29
- gosu (~> 0.7.33)
30
+ gosu (~> 0.7.41)
30
31
  gosu (0.7.41-x86-mingw32)
31
32
  httpclient (2.2.4)
32
33
  json (1.6.5)
@@ -38,6 +39,9 @@ GEM
38
39
  nokogiri (>= 1.4.0)
39
40
  nokogiri (1.5.0-x86-mingw32)
40
41
  ocra (1.3.0)
42
+ r18n-core (0.4.14)
43
+ r18n-desktop (0.4.14)
44
+ r18n-core (= 0.4.14)
41
45
  rake (0.9.2.2)
42
46
  releasy (0.2.2)
43
47
  cri (~> 2.1.0)
data/LICENSE.txt ADDED
@@ -0,0 +1,20 @@
1
+ Copyright (c) 2012 Bil Bas (Spooner)
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md CHANGED
@@ -3,6 +3,7 @@ Smash and Grab
3
3
 
4
4
  * [Website](http://spooner.github.com/games/smash_and_grab/)
5
5
  * The game was developed by Spooner (Bil Bas) bil.bagpuss@gmail.com
6
+ * License: MIT
6
7
 
7
8
  Description
8
9
  -----------
@@ -61,25 +62,40 @@ Move your supervillains around until you win!
61
62
 
62
63
  ### Implemented game features
63
64
 
64
- * Your Villains can:
65
- - move around.
66
- - melee with enemies (Goodies or Bystanders).
67
- - sprint to get extra movement (sacrificing all actions for that turn).
68
- - get reactive melee attacks from ZoC.
69
-
70
- * Zones of Control:
71
- - Enemies project a ZoC into adjacent tiles IF they have enough actions left to melee.
72
- - Entering or leaving a ZoC triggers a melee attack, which will occur before the mover can attack!
65
+ * Play in single-player (Human vs. AI), hot-seat (Human vs. Human) or AI vs. AI modes. Bystanders are always controlled by the AI though.
73
66
 
74
- * Goodies will:
75
- - attack if they can or wander aimlessly in their turn.
76
- - Get reactive melee attacks from ZoC.
67
+ * All characters can:
68
+ - automatically attack if they have actions left in another player's turn:
69
+ - get reactive melee attack against an enemy entering OR leaving an adjacent tile.
70
+ - make ranged shots against anyone moving in their LoS and within range (over-watch).
77
71
 
78
- * Bystanders will wander aimlessly in their turn.
72
+ * You can select your Baddies and/or Goodies to:
73
+ - move around.
74
+ - melee with enemies (Baddies => Goodies or Bystanders, Goodies => Baddies).
75
+ - shoot enemies within range and LoS.
76
+ - pick up objects, like bags of cash, by clicking on them.
77
+ - drop objects, to random adjacent square, with the drop button.
78
+ - sprint to get extra movement (sacrificing all actions for that turn). Can be cancelled at any time (if you have enough MP left).
79
+ - see indicated:
80
+ * all tiles they can move to
81
+ * all enemies they can melee
82
+ * all tiles where they'd suffer reactive fire or melee
83
+ * all tiles they have LOS to and all enemies they could shoot (assuming they have a ranged attack)
84
+
85
+ * AI
86
+ - the AI is pretty dreadful, even by game standards :)
87
+ - The AI ignores objects, like bags of money.
88
+ - Goodies/Baddies AI can:
89
+ * charge into melee with an enemy in range.
90
+ * shoot an enemy within range and LoS.
91
+ * if baddies, will prefer to attack goodies over picking on bystanders.
92
+ * move aimlessly.
93
+ - Bystanders AI can:
94
+ * wander aimlessly.
79
95
 
80
96
  * Scroll map with keyboard arrows; zoom with mouse wheel.
81
97
  * Saving/loading (F5/F6) of state in Editor & Game.
82
- * Undo/Redo (Ctrl-Z/Ctrl-Shift-Z)support in both Editor and Game (can't take back attacks though, since they are non-deterministic).
98
+ * Undo/Redo (Ctrl-Z/Ctrl-Shift-Z) support in both Editor and Game (can't take back attacks though, since they are non-deterministic).
83
99
 
84
100
  ### Implemented editor features
85
101
 
data/Rakefile CHANGED
@@ -10,8 +10,8 @@ require_relative "lib/smash_and_grab/version"
10
10
  CLEAN.include("*.log")
11
11
  CLOBBER.include("doc/**/*")
12
12
 
13
- require_relative 'build/outline_images'
14
- require_relative 'build/create_portraits'
13
+ require_relative 'tasks/outline_images'
14
+ require_relative 'tasks/create_portraits'
15
15
 
16
16
  Releasy::Project.new do
17
17
  name "Smash and Grab"
@@ -0,0 +1,134 @@
1
+ ---
2
+
3
+ Entity:
4
+ # Entities are mobile people and creatures, which can be moved by player/AI.
5
+
6
+ # === BADDIES ===
7
+
8
+ # - Supervillains -
9
+
10
+ green_goddess:
11
+ name: Green Goddess
12
+ title: Nefarious ninja from Nebraska
13
+
14
+ octobrain: # Scientist with giant brain.
15
+ name: Octobrain
16
+ title: Mastermind with the brains of eight men
17
+
18
+ femme_fatale: # Woman in red dress.
19
+ name: Felicity X
20
+ title: Scheming Femme Fatale
21
+
22
+ radioactive_gorilla:
23
+ name: Atomape
24
+ title: Radioactive gorrila
25
+
26
+ robot:
27
+ name: Rbt. 99
28
+ title: '"Robert" - Deranged automaton'
29
+
30
+ artist:
31
+ name: The Painter
32
+ title: Fine art forger
33
+
34
+ invisible_man:
35
+ name: Hiro Nosimi
36
+ title: Invisible man
37
+
38
+ professor_goggles:
39
+ name: Professor Goggles
40
+ title: Demented scientist
41
+
42
+ # - Minions -
43
+
44
+ # === GOODIES ===
45
+
46
+ # - Cops, G-men and Soldiers -
47
+
48
+ cop_with_gun:
49
+ name: Cop
50
+ title: Law enforcement
51
+
52
+ g_man_coat_with_gun:
53
+ name: G-Man
54
+ title: Federal agent
55
+
56
+ g_man_shirt_with_gun:
57
+ name: G-Man
58
+ title: Federal agent
59
+
60
+ soldier_with_gun:
61
+ name: Soldier
62
+ title: Military
63
+
64
+ soldier_with_bazooka:
65
+ name: Bazooka soldier
66
+ title: Military
67
+
68
+ # - Superheroes -
69
+
70
+ catman:
71
+ name: Cat Man
72
+ title: Notorious cat burgler
73
+
74
+ femme_fatale2: # Woman in green dress.
75
+ name: Olivia Dupres
76
+ title: Femme Fatale
77
+
78
+ homerun: # Baseball player
79
+ name: Homerun
80
+ title: Retired baseball legend
81
+
82
+ moleman:
83
+ name: The Mole Man
84
+ title: Infiltrator
85
+
86
+ mountie: # Canadian Mountie.
87
+ name: The Mountie
88
+ title: Foreign law enforcement who lost his horse
89
+
90
+ spandexman: # Guy in red spandex.
91
+ name: Spandexman
92
+ title: Legendary superhero
93
+
94
+ stinger: # Wasp-lady
95
+ name: Stinger
96
+ title: Waspish beatnick
97
+
98
+ knockout: # Boxer.
99
+ name: Knock-out
100
+ title: Has-been pugilist
101
+
102
+ # === BYSTANDERS ===
103
+
104
+ # - Newspaper -
105
+
106
+ boy_selling_papers:
107
+ name: Paper-boy
108
+ title: Read all about it!
109
+
110
+ editor:
111
+ name: "O'Malley"
112
+ title: Editor for the Daily Clarion
113
+
114
+ photographer:
115
+ name: Peter Panto
116
+ title: Works for the Daily Clarion
117
+
118
+ reporter:
119
+ name: Clara Kandinski
120
+ title: Reporter for the Daily Clarion
121
+
122
+ # - Other innocents and children
123
+
124
+ assistant:
125
+ name: Beril Neville
126
+ title: Assistant scientist
127
+
128
+ boy_with_slingshot:
129
+ name: Sam
130
+ title: Mischievious tomboy with slingshot
131
+
132
+ girl_with_balloon:
133
+ name: Sue
134
+ title: Has a nice balloon
@@ -0,0 +1,8 @@
1
+ ---
2
+
3
+ Static:
4
+ bag_of_cash:
5
+ name: Big bag of money
6
+
7
+ tree:
8
+ name: Tree
@@ -0,0 +1,11 @@
1
+ ---
2
+
3
+ Vehicle:
4
+ ambulance_car:
5
+ name: Ambulance
6
+
7
+ tank:
8
+ name: Tank
9
+
10
+ cop_car:
11
+ name: Police cruiser
@@ -12,7 +12,7 @@
12
12
  :spritesheet_position: [5, 4]
13
13
  :movement_points: 10
14
14
  :action_points: 3
15
- :health: 8
15
+ :health_points: 6
16
16
  :abilities:
17
17
  -
18
18
  :type: :melee
@@ -20,7 +20,6 @@
20
20
  -
21
21
  :type: :ranged
22
22
  :skill: 2
23
- :min_range: 2
24
23
  :max_range: 5
25
24
  -
26
25
  :type: :sprint
@@ -31,19 +30,26 @@
31
30
  :faction: :baddies
32
31
  :spritesheet_position: [7, 3]
33
32
  :movement_points: 6
34
- :action_points: 1
35
- :health: 5
33
+ :action_points: 2
34
+ :health_points: 4
36
35
  :abilities:
37
36
  -
38
37
  :type: :melee
39
38
  :skill: 1
39
+ -
40
+ :type: :ranged
41
+ :skill: 4
42
+ :max_range: 2
43
+ -
44
+ :type: :sprint
45
+ :skill: 1
40
46
 
41
47
  :femme_fatale: # Woman in red dress.
42
48
  :faction: :baddies
43
49
  :spritesheet_position: [7, 1]
44
50
  :movement_points: 8
45
51
  :action_points: 2
46
- :health: 8
52
+ :health_points: 5
47
53
  :abilities:
48
54
  -
49
55
  :type: :melee
@@ -57,7 +63,7 @@
57
63
  :spritesheet_position: [1, 4]
58
64
  :movement_points: 8
59
65
  :action_points: 2
60
- :health: 15
66
+ :health_points: 9
61
67
  :abilities:
62
68
  -
63
69
  :type: :melee
@@ -70,22 +76,19 @@
70
76
  :faction: :baddies
71
77
  :spritesheet_position: [0, 4]
72
78
  :movement_points: 5
73
- :action_points: 1
74
- :health: 10
79
+ :action_points: 2
80
+ :health_points: 10
75
81
  :abilities:
76
82
  -
77
83
  :type: :melee
78
84
  :skill: 5
79
- -
80
- :type: :sprint
81
- :skill: 1
82
85
 
83
86
  :artist:
84
87
  :faction: :baddies
85
88
  :spritesheet_position: [3, 2]
86
89
  :movement_points: 8
87
90
  :action_points: 2
88
- :health: 10
91
+ :health_points: 5
89
92
  :abilities:
90
93
  -
91
94
  :type: :melee
@@ -99,7 +102,7 @@
99
102
  :spritesheet_position: [7, 4]
100
103
  :movement_points: 7
101
104
  :action_points: 2
102
- :health: 10
105
+ :health_points: 5
103
106
  :abilities:
104
107
  -
105
108
  :type: :melee
@@ -112,12 +115,16 @@
112
115
  :faction: :baddies
113
116
  :spritesheet_position: [2, 4]
114
117
  :movement_points: 7
115
- :action_points: 1
116
- :health: 8
118
+ :action_points: 2
119
+ :health_points: 5
117
120
  :abilities:
118
121
  -
119
122
  :type: :melee
120
123
  :skill: 2
124
+ -
125
+ :type: :ranged
126
+ :skill: 4
127
+ :max_range: 10
121
128
  -
122
129
  :type: :sprint
123
130
  :skill: 2
@@ -133,7 +140,7 @@
133
140
  :spritesheet_position: [0, 0]
134
141
  :movement_points: 8
135
142
  :action_points: 1
136
- :health: 5
143
+ :health_points: 4
137
144
  :abilities:
138
145
  -
139
146
  :type: :melee
@@ -141,7 +148,6 @@
141
148
  -
142
149
  :type: :ranged
143
150
  :skill: 2
144
- :min_range: 2
145
151
  :max_range: 6
146
152
  -
147
153
  :type: :sprint
@@ -152,7 +158,7 @@
152
158
  :spritesheet_position: [5, 0]
153
159
  :movement_points: 8
154
160
  :action_points: 1
155
- :health: 5
161
+ :health_points: 4
156
162
  :abilities:
157
163
  -
158
164
  :type: :melee
@@ -160,7 +166,6 @@
160
166
  -
161
167
  :type: :ranged
162
168
  :skill: 2
163
- :min_range: 2
164
169
  :max_range: 8
165
170
  -
166
171
  :type: :sprint
@@ -171,7 +176,7 @@
171
176
  :spritesheet_position: [6, 0]
172
177
  :movement_points: 8
173
178
  :action_points: 1
174
- :health: 5
179
+ :health_points: 4
175
180
  :abilities:
176
181
  -
177
182
  :type: :melee
@@ -179,7 +184,6 @@
179
184
  -
180
185
  :type: :ranged
181
186
  :skill: 2
182
- :min_range: 2
183
187
  :max_range: 8
184
188
  -
185
189
  :type: :sprint
@@ -190,7 +194,7 @@
190
194
  :spritesheet_position: [3, 0]
191
195
  :movement_points: 8
192
196
  :action_points: 1
193
- :health: 5
197
+ :health_points: 4
194
198
  :abilities:
195
199
  -
196
200
  :type: :melee
@@ -209,7 +213,7 @@
209
213
  :spritesheet_position: [4, 0]
210
214
  :movement_points: 6
211
215
  :action_points: 1
212
- :health: 5
216
+ :health_points: 4
213
217
  :abilities:
214
218
  -
215
219
  :type: :melee
@@ -227,7 +231,7 @@
227
231
  :spritesheet_position: [4, 1]
228
232
  :movement_points: 10
229
233
  :action_points: 2
230
- :health: 8
234
+ :health_points: 5
231
235
  :abilities:
232
236
  -
233
237
  :type: :melee
@@ -241,7 +245,7 @@
241
245
  :spritesheet_position: [6, 1]
242
246
  :movement_points: 8
243
247
  :action_points: 2
244
- :health: 8
248
+ :health_points: 5
245
249
  :abilities:
246
250
  -
247
251
  :type: :melee
@@ -255,7 +259,7 @@
255
259
  :spritesheet_position: [2, 2]
256
260
  :movement_points: 10
257
261
  :action_points: 2
258
- :health: 10
262
+ :health_points: 6
259
263
  :abilities:
260
264
  -
261
265
  :type: :melee
@@ -269,7 +273,7 @@
269
273
  :spritesheet_position: [0, 2]
270
274
  :movement_points: 7
271
275
  :action_points: 2
272
- :health: 12
276
+ :health_points: 7
273
277
  :abilities:
274
278
  -
275
279
  :type: :melee
@@ -283,7 +287,7 @@
283
287
  :spritesheet_position: [0, 5]
284
288
  :movement_points: 8
285
289
  :action_points: 2
286
- :health: 10
290
+ :health_points: 7
287
291
  :abilities:
288
292
  -
289
293
  :type: :melee
@@ -297,7 +301,7 @@
297
301
  :spritesheet_position: [3, 1]
298
302
  :movement_points: 8
299
303
  :action_points: 2
300
- :health: 15
304
+ :health_points: 10
301
305
  :abilities:
302
306
  -
303
307
  :type: :melee
@@ -311,7 +315,7 @@
311
315
  :spritesheet_position: [1, 2]
312
316
  :movement_points: 8
313
317
  :action_points: 2
314
- :health: 10
318
+ :health_points: 6
315
319
  :abilities:
316
320
  -
317
321
  :type: :melee
@@ -325,7 +329,7 @@
325
329
  :spritesheet_position: [5, 1]
326
330
  :movement_points: 8
327
331
  :action_points: 3
328
- :health: 10
332
+ :health_points: 8
329
333
  :abilities:
330
334
  -
331
335
  :type: :melee
@@ -343,7 +347,7 @@
343
347
  :spritesheet_position: [6, 4]
344
348
  :movement_points: 7
345
349
  :action_points: 0
346
- :health: 1
350
+ :health_points: 1
347
351
  :abilities: []
348
352
 
349
353
  :editor:
@@ -351,7 +355,7 @@
351
355
  :spritesheet_position: [5, 2]
352
356
  :movement_points: 6
353
357
  :action_points: 0
354
- :health: 2
358
+ :health_points: 2
355
359
  :abilities: []
356
360
 
357
361
  :photographer:
@@ -359,7 +363,7 @@
359
363
  :spritesheet_position: [7, 0]
360
364
  :movement_points: 8
361
365
  :action_points: 0
362
- :health: 2
366
+ :health_points: 2
363
367
  :abilities: []
364
368
 
365
369
  :reporter:
@@ -367,7 +371,7 @@
367
371
  :spritesheet_position: [0, 1]
368
372
  :movement_points: 8
369
373
  :action_points: 0
370
- :health: 2
374
+ :health_points: 2
371
375
  :abilities: []
372
376
 
373
377
  # - Other innocents and children
@@ -377,7 +381,7 @@
377
381
  :spritesheet_position: [3, 4]
378
382
  :movement_points: 8
379
383
  :action_points: 0
380
- :health: 2
384
+ :health_points: 2
381
385
  :abilities: []
382
386
 
383
387
  :boy_with_slingshot:
@@ -385,7 +389,7 @@
385
389
  :spritesheet_position: [1, 1]
386
390
  :movement_points: 7
387
391
  :action_points: 0
388
- :health: 2
392
+ :health_points: 2
389
393
  :abilities: []
390
394
 
391
395
  :girl_with_balloon:
@@ -393,5 +397,5 @@
393
397
  :spritesheet_position: [2, 1]
394
398
  :movement_points: 7
395
399
  :action_points: 0
396
- :health: 2
400
+ :health_points: 2
397
401
  :abilities: []