From: Alexis Laferrière Date: Sat, 3 May 2014 15:36:33 +0000 (-0400) Subject: examples/shoot: use new images X-Git-Tag: v0.6.9~59^2~1 X-Git-Url: http://nitlanguage.org examples/shoot: use new images Signed-off-by: Alexis Laferrière --- diff --git a/examples/shoot/Makefile b/examples/shoot/Makefile index ebba097..5e564d7 100644 --- a/examples/shoot/Makefile +++ b/examples/shoot/Makefile @@ -12,5 +12,9 @@ null: mkdir -p bin ../../bin/nitc -o bin/shoot_null src/shoot_null.nit +images: + mkdir -p assets/images + ../mnit_dino/tools/svg-to-pngs art/ships.svg assets/ + clean: rm -rf bin diff --git a/examples/shoot/assets/boss.png b/examples/shoot/assets/boss.png index c74ea75..49cf0c2 100644 Binary files a/examples/shoot/assets/boss.png and b/examples/shoot/assets/boss.png differ diff --git a/examples/shoot/assets/boss_left.png b/examples/shoot/assets/boss_left.png index f318078..c9de48a 100644 Binary files a/examples/shoot/assets/boss_left.png and b/examples/shoot/assets/boss_left.png differ diff --git a/examples/shoot/assets/boss_right.png b/examples/shoot/assets/boss_right.png index 08e4406..7901bdf 100644 Binary files a/examples/shoot/assets/boss_right.png and b/examples/shoot/assets/boss_right.png differ diff --git a/examples/shoot/assets/enemy0.png b/examples/shoot/assets/enemy0.png index b94152f..088d683 100644 Binary files a/examples/shoot/assets/enemy0.png and b/examples/shoot/assets/enemy0.png differ diff --git a/examples/shoot/assets/enemy1.png b/examples/shoot/assets/enemy1.png index f01616c..c250e0b 100644 Binary files a/examples/shoot/assets/enemy1.png and b/examples/shoot/assets/enemy1.png differ diff --git a/examples/shoot/assets/enemy2.png b/examples/shoot/assets/enemy2.png index a59c906..28e1ab1 100644 Binary files a/examples/shoot/assets/enemy2.png and b/examples/shoot/assets/enemy2.png differ diff --git a/examples/shoot/assets/enemy3.png b/examples/shoot/assets/enemy3.png index 894057e..da510e4 100644 Binary files a/examples/shoot/assets/enemy3.png and b/examples/shoot/assets/enemy3.png differ diff --git a/examples/shoot/assets/enemy4.png b/examples/shoot/assets/enemy4.png index b033122..c4c2ac3 100644 Binary files a/examples/shoot/assets/enemy4.png and b/examples/shoot/assets/enemy4.png differ diff --git a/examples/shoot/assets/enemy4_turret.png b/examples/shoot/assets/enemy4_turret.png index 5a9ec70..1afd8a4 100644 Binary files a/examples/shoot/assets/enemy4_turret.png and b/examples/shoot/assets/enemy4_turret.png differ diff --git a/examples/shoot/assets/enemy_kamikaze.png b/examples/shoot/assets/enemy_kamikaze.png index 7b00e6d..d2f64e3 100644 Binary files a/examples/shoot/assets/enemy_kamikaze.png and b/examples/shoot/assets/enemy_kamikaze.png differ diff --git a/examples/shoot/assets/enemy_missile.png b/examples/shoot/assets/enemy_missile.png index c73706c..8a167bc 100644 Binary files a/examples/shoot/assets/enemy_missile.png and b/examples/shoot/assets/enemy_missile.png differ diff --git a/examples/shoot/assets/enemy_shoot.png b/examples/shoot/assets/enemy_shoot.png index 5c89168..6282d8e 100644 Binary files a/examples/shoot/assets/enemy_shoot.png and b/examples/shoot/assets/enemy_shoot.png differ diff --git a/examples/shoot/assets/player.png b/examples/shoot/assets/player.png index 2de11bf..d522fcc 100644 Binary files a/examples/shoot/assets/player.png and b/examples/shoot/assets/player.png differ diff --git a/examples/shoot/assets/player_missile.png b/examples/shoot/assets/player_missile.png index ca6bedb..0ea26ca 100644 Binary files a/examples/shoot/assets/player_missile.png and b/examples/shoot/assets/player_missile.png differ diff --git a/examples/shoot/assets/player_shoot.png b/examples/shoot/assets/player_shoot.png old mode 100644 new mode 100755 index 68e7fe6..db5d808 Binary files a/examples/shoot/assets/player_shoot.png and b/examples/shoot/assets/player_shoot.png differ diff --git a/examples/shoot/src/shoot_logic.nit b/examples/shoot/src/shoot_logic.nit index 3443a47..1aefc7b 100644 --- a/examples/shoot/src/shoot_logic.nit +++ b/examples/shoot/src/shoot_logic.nit @@ -319,12 +319,24 @@ class Enemy0 super Enemy redef fun loot do return 3 + + redef init(scene) + do + self.width = 3600 + self.height = 3600 + end end -# Simple shooter of paris of basic bullets +# Simple shooter of pairs of basic bullets class Enemy1 super Enemy + redef init(scene) + do + self.width = 4400 + self.height = 4400 + end + redef fun shoot do # Next shoot @@ -348,6 +360,12 @@ end class Enemy2 super Enemy + redef init(scene) + do + self.width = 6000 + self.height = 6000 + end + redef fun shoot do # Next shoot @@ -366,10 +384,16 @@ class Enemy2 redef fun loot do return 10 end -# Enem that shoot rings of basic bullets +# Enemy that shoot rings of basic bullets class Enemy3 super Enemy + redef init(scene) + do + self.width = 5800 + self.height = 5800 + end + redef fun shoot do # Next shoot @@ -395,6 +419,12 @@ class Enemy4 # The angle of the turret var angle: Float = 0.0 + redef init(scene) + do + self.width = 4200 + self.height = 4200 + end + redef fun update do super @@ -437,6 +467,12 @@ end class EnemyKamikaze super Enemy + redef init(scene) + do + self.width = 3200 + self.height = 3200 + end + redef fun update do super @@ -465,12 +501,12 @@ class Boss init(scene) do super - self.width = 128 * 100 - self.height = 100 * 100 + self.width = 140 * 100 + self.height = 96 * 100 self.x = scene.width / 2 self.y = -100 * 100 - self.left_part = new BossPart(self, -48*100) - self.right_part = new BossPart(self, 48*100) + self.left_part = new BossPart(self, -66*100) + self.right_part = new BossPart(self, 66*100) end var flick_ttl: Int = 0 @@ -560,8 +596,8 @@ class BossPart self.boss = boss self.relx = relx super(boss.scene) - self.width = 32 * 100 - self.height = 60 * 100 + self.width = 38 * 100 + self.height = 48 * 100 # Alternate the shoots of the arms if relx > 0 then