Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

Commit

Permalink
Implements code improvement and enemy life.
Browse files Browse the repository at this point in the history
  • Loading branch information
brenomfviana committed Nov 17, 2017
1 parent 8563745 commit a4140c9
Show file tree
Hide file tree
Showing 14 changed files with 87 additions and 78 deletions.
64 changes: 32 additions & 32 deletions game/scenes/enemies/female_zombie.tscn
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
[gd_scene load_steps=48 format=1]

[ext_resource path="res://scripts/enemies/zombie.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/zombie/female/Idle__1.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/female/Idle__2.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/female/Idle__3.png" type="Texture" id=4]
[ext_resource path="res://assets/sprites/zombie/female/Idle__4.png" type="Texture" id=5]
[ext_resource path="res://assets/sprites/zombie/female/Idle__5.png" type="Texture" id=6]
[ext_resource path="res://assets/sprites/zombie/female/Idle__6.png" type="Texture" id=7]
[ext_resource path="res://assets/sprites/zombie/female/Idle__7.png" type="Texture" id=8]
[ext_resource path="res://assets/sprites/zombie/female/Idle__8.png" type="Texture" id=9]
[ext_resource path="res://assets/sprites/zombie/female/Idle__9.png" type="Texture" id=10]
[ext_resource path="res://assets/sprites/zombie/female/Idle__10.png" type="Texture" id=11]
[ext_resource path="res://assets/sprites/zombie/female/Idle__11.png" type="Texture" id=12]
[ext_resource path="res://assets/sprites/zombie/female/Idle__12.png" type="Texture" id=13]
[ext_resource path="res://assets/sprites/zombie/female/Idle__13.png" type="Texture" id=14]
[ext_resource path="res://assets/sprites/zombie/female/Idle__14.png" type="Texture" id=15]
[ext_resource path="res://assets/sprites/zombie/female/Dead__1.png" type="Texture" id=16]
[ext_resource path="res://assets/sprites/zombie/female/Dead__2.png" type="Texture" id=17]
[ext_resource path="res://assets/sprites/zombie/female/Dead__3.png" type="Texture" id=18]
[ext_resource path="res://assets/sprites/zombie/female/Dead__4.png" type="Texture" id=19]
[ext_resource path="res://assets/sprites/zombie/female/Dead__5.png" type="Texture" id=20]
[ext_resource path="res://assets/sprites/zombie/female/Dead__6.png" type="Texture" id=21]
[ext_resource path="res://assets/sprites/zombie/female/Dead__7.png" type="Texture" id=22]
[ext_resource path="res://assets/sprites/zombie/female/Dead__8.png" type="Texture" id=23]
[ext_resource path="res://assets/sprites/zombie/female/Dead__9.png" type="Texture" id=24]
[ext_resource path="res://assets/sprites/zombie/female/Dead__10.png" type="Texture" id=25]
[ext_resource path="res://assets/sprites/zombie/female/Dead__11.png" type="Texture" id=26]
[ext_resource path="res://assets/sprites/zombie/female/Dead__12.png" type="Texture" id=27]
[ext_resource path="res://assets/sprites/zombie/female/Dead__1.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/female/Dead__2.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/female/Dead__3.png" type="Texture" id=4]
[ext_resource path="res://assets/sprites/zombie/female/Dead__4.png" type="Texture" id=5]
[ext_resource path="res://assets/sprites/zombie/female/Dead__5.png" type="Texture" id=6]
[ext_resource path="res://assets/sprites/zombie/female/Dead__6.png" type="Texture" id=7]
[ext_resource path="res://assets/sprites/zombie/female/Dead__7.png" type="Texture" id=8]
[ext_resource path="res://assets/sprites/zombie/female/Dead__8.png" type="Texture" id=9]
[ext_resource path="res://assets/sprites/zombie/female/Dead__9.png" type="Texture" id=10]
[ext_resource path="res://assets/sprites/zombie/female/Dead__10.png" type="Texture" id=11]
[ext_resource path="res://assets/sprites/zombie/female/Dead__11.png" type="Texture" id=12]
[ext_resource path="res://assets/sprites/zombie/female/Dead__12.png" type="Texture" id=13]
[ext_resource path="res://assets/sprites/zombie/female/Idle__1.png" type="Texture" id=14]
[ext_resource path="res://assets/sprites/zombie/female/Idle__2.png" type="Texture" id=15]
[ext_resource path="res://assets/sprites/zombie/female/Idle__3.png" type="Texture" id=16]
[ext_resource path="res://assets/sprites/zombie/female/Idle__4.png" type="Texture" id=17]
[ext_resource path="res://assets/sprites/zombie/female/Idle__5.png" type="Texture" id=18]
[ext_resource path="res://assets/sprites/zombie/female/Idle__6.png" type="Texture" id=19]
[ext_resource path="res://assets/sprites/zombie/female/Idle__7.png" type="Texture" id=20]
[ext_resource path="res://assets/sprites/zombie/female/Idle__8.png" type="Texture" id=21]
[ext_resource path="res://assets/sprites/zombie/female/Idle__9.png" type="Texture" id=22]
[ext_resource path="res://assets/sprites/zombie/female/Idle__10.png" type="Texture" id=23]
[ext_resource path="res://assets/sprites/zombie/female/Idle__11.png" type="Texture" id=24]
[ext_resource path="res://assets/sprites/zombie/female/Idle__12.png" type="Texture" id=25]
[ext_resource path="res://assets/sprites/zombie/female/Idle__13.png" type="Texture" id=26]
[ext_resource path="res://assets/sprites/zombie/female/Idle__14.png" type="Texture" id=27]
[ext_resource path="res://assets/sprites/zombie/female/Walk__1.png" type="Texture" id=28]
[ext_resource path="res://assets/sprites/zombie/female/Walk__2.png" type="Texture" id=29]
[ext_resource path="res://assets/sprites/zombie/female/Walk__3.png" type="Texture" id=30]
Expand Down Expand Up @@ -54,16 +54,16 @@ extents = Vector2( 11.4339, 10.1111 )
[sub_resource type="SpriteFrames" id=2]

animations = [ {
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 15 ) ],
"loop": true,
"name": "stopped",
"speed": 5.0
}, {
"frames": [ ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 24 ), ExtResource( 25 ), ExtResource( 26 ), ExtResource( 27 ) ],
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ) ],
"loop": false,
"name": "dead",
"speed": 7.0
}, {
"frames": [ ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 24 ), ExtResource( 25 ), ExtResource( 26 ), ExtResource( 27 ), ExtResource( 27 ) ],
"loop": true,
"name": "stopped",
"speed": 5.0
}, {
"frames": [ ExtResource( 28 ), ExtResource( 29 ), ExtResource( 30 ), ExtResource( 31 ), ExtResource( 32 ), ExtResource( 33 ), ExtResource( 34 ), ExtResource( 35 ), ExtResource( 36 ), ExtResource( 37 ) ],
"loop": true,
"name": "walking",
Expand Down
67 changes: 33 additions & 34 deletions game/scenes/enemies/male_zombie.tscn
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
[gd_scene load_steps=49 format=1]

[ext_resource path="res://scripts/enemies/zombie.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/zombie/male/Idle__1.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/male/Idle__2.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/male/Idle__3.png" type="Texture" id=4]
[ext_resource path="res://assets/sprites/zombie/male/Idle__4.png" type="Texture" id=5]
[ext_resource path="res://assets/sprites/zombie/male/Idle__5.png" type="Texture" id=6]
[ext_resource path="res://assets/sprites/zombie/male/Idle__6.png" type="Texture" id=7]
[ext_resource path="res://assets/sprites/zombie/male/Idle__7.png" type="Texture" id=8]
[ext_resource path="res://assets/sprites/zombie/male/Idle__8.png" type="Texture" id=9]
[ext_resource path="res://assets/sprites/zombie/male/Idle__9.png" type="Texture" id=10]
[ext_resource path="res://assets/sprites/zombie/male/Idle__10.png" type="Texture" id=11]
[ext_resource path="res://assets/sprites/zombie/male/Idle__11.png" type="Texture" id=12]
[ext_resource path="res://assets/sprites/zombie/male/Idle__12.png" type="Texture" id=13]
[ext_resource path="res://assets/sprites/zombie/male/Idle__13.png" type="Texture" id=14]
[ext_resource path="res://assets/sprites/zombie/male/Idle__14.png" type="Texture" id=15]
[ext_resource path="res://assets/sprites/zombie/male/Idle__15.png" type="Texture" id=16]
[ext_resource path="res://assets/sprites/zombie/male/Dead__1.png" type="Texture" id=17]
[ext_resource path="res://assets/sprites/zombie/male/Dead__2.png" type="Texture" id=18]
[ext_resource path="res://assets/sprites/zombie/male/Dead__3.png" type="Texture" id=19]
[ext_resource path="res://assets/sprites/zombie/male/Dead__4.png" type="Texture" id=20]
[ext_resource path="res://assets/sprites/zombie/male/Dead__5.png" type="Texture" id=21]
[ext_resource path="res://assets/sprites/zombie/male/Dead__6.png" type="Texture" id=22]
[ext_resource path="res://assets/sprites/zombie/male/Dead__7.png" type="Texture" id=23]
[ext_resource path="res://assets/sprites/zombie/male/Dead__8.png" type="Texture" id=24]
[ext_resource path="res://assets/sprites/zombie/male/Dead__9.png" type="Texture" id=25]
[ext_resource path="res://assets/sprites/zombie/male/Dead__10.png" type="Texture" id=26]
[ext_resource path="res://assets/sprites/zombie/male/Dead__11.png" type="Texture" id=27]
[ext_resource path="res://assets/sprites/zombie/male/Dead__12.png" type="Texture" id=28]
[ext_resource path="res://assets/sprites/zombie/male/Dead__1.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/male/Dead__2.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/male/Dead__3.png" type="Texture" id=4]
[ext_resource path="res://assets/sprites/zombie/male/Dead__4.png" type="Texture" id=5]
[ext_resource path="res://assets/sprites/zombie/male/Dead__5.png" type="Texture" id=6]
[ext_resource path="res://assets/sprites/zombie/male/Dead__6.png" type="Texture" id=7]
[ext_resource path="res://assets/sprites/zombie/male/Dead__7.png" type="Texture" id=8]
[ext_resource path="res://assets/sprites/zombie/male/Dead__8.png" type="Texture" id=9]
[ext_resource path="res://assets/sprites/zombie/male/Dead__9.png" type="Texture" id=10]
[ext_resource path="res://assets/sprites/zombie/male/Dead__10.png" type="Texture" id=11]
[ext_resource path="res://assets/sprites/zombie/male/Dead__11.png" type="Texture" id=12]
[ext_resource path="res://assets/sprites/zombie/male/Dead__12.png" type="Texture" id=13]
[ext_resource path="res://assets/sprites/zombie/male/Idle__1.png" type="Texture" id=14]
[ext_resource path="res://assets/sprites/zombie/male/Idle__2.png" type="Texture" id=15]
[ext_resource path="res://assets/sprites/zombie/male/Idle__3.png" type="Texture" id=16]
[ext_resource path="res://assets/sprites/zombie/male/Idle__4.png" type="Texture" id=17]
[ext_resource path="res://assets/sprites/zombie/male/Idle__5.png" type="Texture" id=18]
[ext_resource path="res://assets/sprites/zombie/male/Idle__6.png" type="Texture" id=19]
[ext_resource path="res://assets/sprites/zombie/male/Idle__7.png" type="Texture" id=20]
[ext_resource path="res://assets/sprites/zombie/male/Idle__8.png" type="Texture" id=21]
[ext_resource path="res://assets/sprites/zombie/male/Idle__9.png" type="Texture" id=22]
[ext_resource path="res://assets/sprites/zombie/male/Idle__10.png" type="Texture" id=23]
[ext_resource path="res://assets/sprites/zombie/male/Idle__11.png" type="Texture" id=24]
[ext_resource path="res://assets/sprites/zombie/male/Idle__12.png" type="Texture" id=25]
[ext_resource path="res://assets/sprites/zombie/male/Idle__13.png" type="Texture" id=26]
[ext_resource path="res://assets/sprites/zombie/male/Idle__14.png" type="Texture" id=27]
[ext_resource path="res://assets/sprites/zombie/male/Idle__15.png" type="Texture" id=28]
[ext_resource path="res://assets/sprites/zombie/male/Walk__1.png" type="Texture" id=29]
[ext_resource path="res://assets/sprites/zombie/male/Walk__2.png" type="Texture" id=30]
[ext_resource path="res://assets/sprites/zombie/male/Walk__3.png" type="Texture" id=31]
Expand Down Expand Up @@ -55,16 +55,16 @@ extents = Vector2( 11.4339, 10.1111 )
[sub_resource type="SpriteFrames" id=2]

animations = [ {
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ) ],
"loop": true,
"name": "stopped",
"speed": 5.0
}, {
"frames": [ ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 24 ), ExtResource( 25 ), ExtResource( 26 ), ExtResource( 27 ), ExtResource( 28 ) ],
"frames": [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 5 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ) ],
"loop": false,
"name": "dead",
"speed": 7.0
}, {
"frames": [ ExtResource( 14 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 20 ), ExtResource( 21 ), ExtResource( 22 ), ExtResource( 23 ), ExtResource( 24 ), ExtResource( 25 ), ExtResource( 26 ), ExtResource( 27 ), ExtResource( 28 ) ],
"loop": true,
"name": "stopped",
"speed": 5.0
}, {
"frames": [ ExtResource( 29 ), ExtResource( 30 ), ExtResource( 31 ), ExtResource( 32 ), ExtResource( 33 ), ExtResource( 34 ), ExtResource( 35 ), ExtResource( 36 ), ExtResource( 37 ), ExtResource( 38 ) ],
"loop": true,
"name": "walking",
Expand Down Expand Up @@ -93,7 +93,6 @@ transform/pos = Vector2( 0, -3 )
transform/scale = Vector2( 0.15, 0.15 )
frames = SubResource( 2 )
animation = "stopped"
frame = 14

[node name="hitbox" type="CollisionShape2D" parent="."]

Expand Down
2 changes: 1 addition & 1 deletion game/scenes/levels/w1l1.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ transform/pos = Vector2( 2533.31, 532.211 )

[node name="tomb_stone1" parent="terrain" instance=ExtResource( 21 )]

transform/pos = Vector2( 888.061, 469.119 )
transform/pos = Vector2( 888.061, 465.5 )

[node name="crate" parent="terrain" instance=ExtResource( 22 )]

Expand Down
3 changes: 2 additions & 1 deletion game/scenes/screens/credits.tscn
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[gd_scene load_steps=9 format=1]

[ext_resource path="res://scripts/menus/back.gd" type="Script" id=1]
[ext_resource path="res://scripts/screens/back.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/graveyardtilesetnew/BG.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/male/Attack__5.png" type="Texture" id=3]
[ext_resource path="res://assets/fonts/menu_title.fnt" type="BitmapFont" id=4]
[ext_resource path="res://assets/fonts/menu_headers.fnt" type="BitmapFont" id=5]
[ext_resource path="res://assets/fonts/menu_text.fnt" type="BitmapFont" id=6]
[ext_resource path="res://assets/sounds/intro.wav" type="Sample" id=7]


[sub_resource type="SampleLibrary" id=1]

samples/intro = {
Expand Down
3 changes: 2 additions & 1 deletion game/scenes/screens/instructions.tscn
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[gd_scene load_steps=9 format=1]

[ext_resource path="res://scripts/menus/back.gd" type="Script" id=1]
[ext_resource path="res://scripts/screens/back.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/graveyardtilesetnew/BG.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/zombie/female/Attack__3.png" type="Texture" id=3]
[ext_resource path="res://assets/fonts/menu_title.fnt" type="BitmapFont" id=4]
[ext_resource path="res://assets/fonts/menu_headers.fnt" type="BitmapFont" id=5]
[ext_resource path="res://assets/fonts/menu_text.fnt" type="BitmapFont" id=6]
[ext_resource path="res://assets/sounds/intro.wav" type="Sample" id=7]


[sub_resource type="SampleLibrary" id=1]

samples/intro = {
Expand Down
3 changes: 2 additions & 1 deletion game/scenes/screens/load_game.tscn
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
[gd_scene load_steps=9 format=1]

[ext_resource path="res://scripts/menus/load_game.gd" type="Script" id=1]
[ext_resource path="res://scripts/screens/load_game.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/graveyardtilesetnew/BG.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/ninjaman/Jump_Attack__006.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/male/Attack__2.png" type="Texture" id=4]
[ext_resource path="res://assets/fonts/menu_title.fnt" type="BitmapFont" id=5]
[ext_resource path="res://assets/fonts/item_font.fnt" type="BitmapFont" id=6]
[ext_resource path="res://assets/sounds/intro.wav" type="Sample" id=7]


[sub_resource type="SampleLibrary" id=1]

samples/intro = {
Expand Down
2 changes: 1 addition & 1 deletion game/scenes/screens/main.tscn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=10 format=1]

[ext_resource path="res://scripts/menus/menu.gd" type="Script" id=1]
[ext_resource path="res://scripts/screens/menu.gd" type="Script" id=1]
[ext_resource path="res://assets/sprites/graveyardtilesetnew/BG.png" type="Texture" id=2]
[ext_resource path="res://assets/sprites/ninjaman/Attack__009.png" type="Texture" id=3]
[ext_resource path="res://assets/sprites/zombie/male/Walk__3.png" type="Texture" id=4]
Expand Down
8 changes: 7 additions & 1 deletion game/scripts/enemies/zombie.gd
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ func _ready():
# Set processes
set_process(true)
# Initialize values
current_life = 50
initial_position = get_pos()
velocity = Vector2(0, 0)
direction = 1
Expand All @@ -53,6 +54,8 @@ func _process(delta):
get_node("sprite").stop();
if(not Globals.get("paused")):
# Check if the zombie is not dead
if(current_life <= 0):
dead = true
if(not dead):
# Zombie movement
if(get_pos().x <= initial_position.x and direction == -1):
Expand All @@ -74,6 +77,9 @@ func _process(delta):
var motion = velocity * delta
move(motion)
elif(has_node("hitbox")):
if(get_node("sprite").is_flipped_h()):
get_node("sprite").set_offset(Vector2(-180, 45))
else:
get_node("sprite").set_offset(Vector2(180, 45))
get_node("sprite").play("dead")
remove_child(get_node("hitbox"))
get_node("sprite").set_offset(Vector2(0, 50))
2 changes: 1 addition & 1 deletion game/scripts/player/kunai.gd
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ func _on_body_enter(body):
# Check if the enemy is not dead
if(not body.dead):
Globals.set("score", Globals.get("score") + body.PONTUATION)
body.dead = true
body.current_life -= damage
# Delete this kunai
queue_free()
7 changes: 4 additions & 3 deletions game/scripts/player/ninja.gd
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,10 @@ func _input(event):
if(event.is_action_pressed("attack_sword")):
attacking = true
sword = true
if(event.is_action_pressed("attack_kunai")):
attacking = true
kunai = true
if(event.is_action_pressed("attack_kunai")
and (Globals.get("amount_of_kunais") > 0)):
attacking = true
kunai = true
if(event.is_action_released("attack_sword")):
sword = false
if(event.is_action_pressed("ui_accept")):
Expand Down
2 changes: 1 addition & 1 deletion game/scripts/player/sword.gd
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ func _on_body_enter(body):
# Check if the enemy is not dead
if(not body.dead):
Globals.set("score", Globals.get("score") + body.PONTUATION)
body.dead = true
body.current_life -= damage
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ extends Node2D
func _ready():
""" Called every time the node is added to the scene.
Initialization here. """
set_process(true)
get_node("intro_song").play("intro")
set_process(true)

func _process(delta):
""" Called every frame. Check the interactions with the menu. """
Expand Down

0 comments on commit a4140c9

Please sign in to comment.