Permalink
Browse files

Merge branch 'master' of github.com:frogatto/frogatto

  • Loading branch information...
davewx7 committed Jun 19, 2012
2 parents ff88784 + c36c2fb commit 6145219ab51c24e7cc3249981e9916c38c1b0eff
Showing with 2 additions and 2 deletions.
  1. +2 −2 data/objects/enemies/milgramen/kitty_sword.cfg
@@ -14,7 +14,7 @@ hitpoints: 2000,
id: "kitty_sword",
mass: 64,
properties: {
- attack_damage: 2,
+ attack_damage: "if(level.player.difficulty <= difficulty_casual,1,3)",
team: "'evil'",
facing_player: "if(level.player.x < x, facing < 0, facing > 0)",
hurt_velocity_x: 0,
@@ -38,7 +38,7 @@ consts: {
spring_amount: 1400,
bounce_roundness: 200,
},
-on_create: "map(level.gui, set(value.vars.bosses, value.vars.bosses + [me]))",
+on_create: "[if(level.player.difficulty <= difficulty_casual, set(max_hitpoints, 600)),map(level.gui, set(value.vars.bosses, value.vars.bosses + [me]))]",
on_bounced_on: "if(is_invincible_posthit,null,[add(hitpoints, -200),set(vars.time_last_hit, cycle), hurt_flash_sequence(),display_posthit_invincibility_flash_sequence(), if(jumped_on_by.mass >= 1000, die(), animation('spring'))])",
on_collide_side: "if(collide_with = level.player,
#make it so if we collide with the player we immediately jump/attack.

0 comments on commit 6145219

Please sign in to comment.