summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Spatial.gd11
-rw-r--r--credits.gd8
-rw-r--r--credits.tscn24
-rw-r--r--mainmenu.gd1
-rw-r--r--select.gd8
-rw-r--r--select.tscn85
-rw-r--r--select/ps1.pngbin210677 -> 201059 bytes
-rw-r--r--zombie.gd8
-rw-r--r--zombie0/n0.pngbin9610 -> 12521 bytes
-rw-r--r--zombie1/n0.pngbin9610 -> 10312 bytes
-rw-r--r--zombie2/n0.pngbin9610 -> 11975 bytes
-rw-r--r--zombie3/n0.pngbin9610 -> 12564 bytes
12 files changed, 83 insertions, 62 deletions
diff --git a/Spatial.gd b/Spatial.gd
index 1d33668..8adf0e7 100644
--- a/Spatial.gd
+++ b/Spatial.gd
@@ -124,9 +124,10 @@ func _on_cat_killed(zombie):
gameover.set_winner(green_points, pink_points, zombie.get_team())
remove_child(running_cat)
-func create_zombie(id, team, pos):
+func create_zombie(rid, id, team, pos):
var zombie = z.instance()
+ zombie.set_rid(rid)
zombie.set_id(id)
zombie.set_team(team)
zombie.translate(pos)
@@ -191,10 +192,10 @@ func loop():
$music.play()
func set_players(players):
- create_zombie(players[0], t.Team.GREEN, Vector3(-6.0, 0, -3))
- create_zombie(players[1], t.Team.GREEN, Vector3(-6.0, 0, 3))
- create_zombie(players[2], t.Team.PINK, Vector3(6.0, 0, -3))
- create_zombie(players[3], t.Team.PINK, Vector3(6.0, 0, 3))
+ create_zombie(0, players[0], t.Team.GREEN, Vector3(-6.0, 0, -3))
+ create_zombie(1, players[1], t.Team.GREEN, Vector3(-6.0, 0, 3))
+ create_zombie(2, players[2], t.Team.PINK, Vector3(6.0, 0, -3))
+ create_zombie(3, players[3], t.Team.PINK, Vector3(6.0, 0, 3))
func _ready():
randomize()
diff --git a/credits.gd b/credits.gd
index 9769daa..7e10b55 100644
--- a/credits.gd
+++ b/credits.gd
@@ -3,8 +3,16 @@ extends Node2D
func back():
var mainmenu = load("res://mainmenu.tscn").instance()
+ mainmenu.set_music_pos($music.get_playback_position())
get_tree().root.add_child(mainmenu)
get_tree().root.remove_child(self)
+func set_music_pos(pos):
+ $music.play(pos)
+
+func loop():
+ $music.play()
+
func _ready():
$CanvasLayer/CenterContainer3/back.connect("button_up", self, "back")
+ $music.connect("finished", self, "loop")
diff --git a/credits.tscn b/credits.tscn
index 2d680d9..7cf72a8 100644
--- a/credits.tscn
+++ b/credits.tscn
@@ -1,9 +1,10 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=9 format=2]
[ext_resource path="res://bg.png" type="Texture" id=1]
[ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=2]
[ext_resource path="res://vera/Vera.ttf" type="DynamicFontData" id=3]
[ext_resource path="res://credits.gd" type="Script" id=4]
+[ext_resource path="res://music.mp3" type="AudioStream" id=5]
[sub_resource type="DynamicFont" id=1]
size = 120
@@ -11,7 +12,7 @@ use_filter = true
font_data = ExtResource( 2 )
[sub_resource type="DynamicFont" id=2]
-size = 60
+size = 32
use_filter = true
font_data = ExtResource( 3 )
@@ -56,20 +57,22 @@ margin_bottom = 40.0
use_top_left = true
[node name="Label" type="Label" parent="CanvasLayer/CenterContainer2"]
-margin_left = -558.0
-margin_top = -332.0
-margin_right = 558.0
-margin_bottom = 331.0
+margin_left = -307.0
+margin_top = -224.0
+margin_right = 306.0
+margin_bottom = 224.0
custom_fonts/font = SubResource( 2 )
text = "Ainoa - Animation, editing
Alba - Video editing
-Berta - Illustration, voice actor
-Gian - Illustration, voice actor
+Alex - Voice acting
+Berta - Illustration, voice acting
+Gian - Illustration, voice acting
+Joy - Music, SFX
Kam - Illustration
Kat - Animation
Laia - Animation
Xavi - Programming
-Xenia - Character design, voice actor"
+Xenia - Character design, voice acting"
align = 1
valign = 1
@@ -89,3 +92,6 @@ margin_right = 70.0
margin_bottom = 31.0
custom_fonts/font = SubResource( 3 )
text = "Back"
+
+[node name="music" type="AudioStreamPlayer" parent="."]
+stream = ExtResource( 5 )
diff --git a/mainmenu.gd b/mainmenu.gd
index aff4551..654c274 100644
--- a/mainmenu.gd
+++ b/mainmenu.gd
@@ -10,6 +10,7 @@ func start():
func run_credits():
get_tree().root.add_child(credits)
+ credits.set_music_pos($music.get_playback_position())
get_tree().root.remove_child(self)
func set_music_pos(pos):
diff --git a/select.gd b/select.gd
index 407db6f..daf4564 100644
--- a/select.gd
+++ b/select.gd
@@ -15,10 +15,10 @@ var smallpics: Array = [
]
var lores: Array = [
- "P0",
- "P1",
- "P2",
- "P3",
+ "Orga",
+ "Coramy",
+ "Braingian",
+ "Pallase",
]
var players: Array = [0, 1, 2, 3]
diff --git a/select.tscn b/select.tscn
index 88db570..51bad49 100644
--- a/select.tscn
+++ b/select.tscn
@@ -19,12 +19,12 @@ use_filter = true
font_data = ExtResource( 10 )
[sub_resource type="DynamicFont" id=3]
-size = 64
+size = 32
use_filter = true
font_data = ExtResource( 10 )
[sub_resource type="DynamicFont" id=2]
-size = 96
+size = 48
use_filter = true
font_data = ExtResource( 10 )
@@ -49,22 +49,23 @@ rect_scale = Vector2( 0.3, 0.3 )
use_top_left = true
[node name="c" type="VBoxContainer" parent="CanvasLayer/CenterContainer"]
-margin_left = -1883.0
+margin_left = -1366.0
margin_top = -856.0
-margin_right = 1883.0
+margin_right = 1366.0
margin_bottom = 856.0
[node name="CenterContainer" type="CenterContainer" parent="CanvasLayer/CenterContainer/c"]
-margin_right = 3766.0
+margin_right = 2732.0
margin_bottom = 1028.0
[node name="big" type="GridContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer"]
-margin_right = 3766.0
+margin_left = 266.0
+margin_right = 2465.0
margin_bottom = 1028.0
columns = 2
[node name="p0" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"]
-margin_right = 1881.0
+margin_right = 1166.0
margin_bottom = 512.0
[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p0"]
@@ -74,16 +75,16 @@ texture = ExtResource( 2 )
[node name="lore" type="Label" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p0"]
margin_left = 516.0
-margin_top = 113.0
-margin_right = 1881.0
-margin_bottom = 398.0
+margin_top = 185.0
+margin_right = 844.0
+margin_bottom = 326.0
+custom_colors/font_color = Color( 0, 1, 0, 1 )
custom_fonts/font = SubResource( 1 )
-text = "Name: Lore player 0
-Description"
+text = "Orga"
[node name="p1" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"]
-margin_left = 1885.0
-margin_right = 3766.0
+margin_left = 1170.0
+margin_right = 2199.0
margin_bottom = 512.0
[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p1"]
@@ -93,16 +94,16 @@ texture = ExtResource( 5 )
[node name="lore" type="Label" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p1"]
margin_left = 516.0
-margin_top = 113.0
-margin_right = 1881.0
-margin_bottom = 398.0
+margin_top = 185.0
+margin_right = 1029.0
+margin_bottom = 326.0
+custom_colors/font_color = Color( 0, 1, 0, 1 )
custom_fonts/font = SubResource( 1 )
-text = "Name: Lore player 0
-Description"
+text = "Coramy"
[node name="p2" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"]
margin_top = 516.0
-margin_right = 1881.0
+margin_right = 1166.0
margin_bottom = 1028.0
[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p2"]
@@ -112,17 +113,17 @@ texture = ExtResource( 4 )
[node name="lore" type="Label" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p2"]
margin_left = 516.0
-margin_top = 113.0
-margin_right = 1881.0
-margin_bottom = 398.0
+margin_top = 185.0
+margin_right = 1166.0
+margin_bottom = 326.0
+custom_colors/font_color = Color( 1, 0, 1, 1 )
custom_fonts/font = SubResource( 1 )
-text = "Name: Lore player 0
-Description"
+text = "Braingian"
[node name="p3" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"]
-margin_left = 1885.0
+margin_left = 1170.0
margin_top = 516.0
-margin_right = 3766.0
+margin_right = 2199.0
margin_bottom = 1028.0
[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p3"]
@@ -132,16 +133,16 @@ texture = ExtResource( 3 )
[node name="lore" type="Label" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p3"]
margin_left = 516.0
-margin_top = 113.0
-margin_right = 1881.0
-margin_bottom = 398.0
+margin_top = 185.0
+margin_right = 997.0
+margin_bottom = 326.0
+custom_colors/font_color = Color( 1, 0, 1, 1 )
custom_fonts/font = SubResource( 1 )
-text = "Name: Lore player 0
-Description"
+text = "Pallase"
[node name="small" type="GridContainer" parent="CanvasLayer/CenterContainer/c"]
margin_top = 1032.0
-margin_right = 3766.0
+margin_right = 2732.0
margin_bottom = 1712.0
columns = 4
@@ -178,21 +179,21 @@ margin_bottom = 40.0
use_top_left = true
[node name="h" type="HBoxContainer" parent="CanvasLayer/CenterContainer2"]
-margin_left = -237.0
-margin_top = -60.0
-margin_right = 237.0
-margin_bottom = 59.0
+margin_left = -126.0
+margin_top = -32.0
+margin_right = 125.0
+margin_bottom = 31.0
[node name="back" type="Button" parent="CanvasLayer/CenterContainer2/h"]
-margin_right = 185.0
-margin_bottom = 119.0
+margin_right = 98.0
+margin_bottom = 63.0
custom_fonts/font = SubResource( 3 )
text = "Back"
[node name="play" type="Button" parent="CanvasLayer/CenterContainer2/h"]
-margin_left = 189.0
-margin_right = 474.0
-margin_bottom = 119.0
+margin_left = 102.0
+margin_right = 251.0
+margin_bottom = 63.0
custom_fonts/font = SubResource( 2 )
text = "Start"
diff --git a/select/ps1.png b/select/ps1.png
index 8ffd27a..42620d7 100644
--- a/select/ps1.png
+++ b/select/ps1.png
Binary files differ
diff --git a/zombie.gd b/zombie.gd
index 59b6668..7b122e7 100644
--- a/zombie.gd
+++ b/zombie.gd
@@ -22,6 +22,7 @@ var health = 100.0
var zspeed = 20.0
var myteam
var myid
+var myrid
# powerups
var powerup = pw.Type.none
var running_cat: Node
@@ -43,7 +44,7 @@ func set_can_move(value):
can_move = value
func _physics_process(delta):
- var id = "p" + str(myid) + "_"
+ var id = "p" + str(myrid) + "_"
var updown = ((Input.get_action_strength(id + "down")
- Input.get_action_strength(id + "up")) * 2 * delta)
var rightleft = ((Input.get_action_strength(id + "right")
@@ -158,6 +159,9 @@ func _process(delta):
setimg(getid())
sethealth()
+func set_rid(z):
+ myrid = z
+
func set_id(z):
myid = z
@@ -235,7 +239,7 @@ func zombie_explosion(z):
func run_powerup(boxes, zombies):
match powerup:
pw.Type.explosion:
- var id = "p" + str(myid) + "_"
+ var id = "p" + str(myrid) + "_"
if Input.is_action_just_released(id + "powerup"):
expired()
diff --git a/zombie0/n0.png b/zombie0/n0.png
index 668042e..cc69545 100644
--- a/zombie0/n0.png
+++ b/zombie0/n0.png
Binary files differ
diff --git a/zombie1/n0.png b/zombie1/n0.png
index 668042e..1498dbe 100644
--- a/zombie1/n0.png
+++ b/zombie1/n0.png
Binary files differ
diff --git a/zombie2/n0.png b/zombie2/n0.png
index 668042e..054d9bf 100644
--- a/zombie2/n0.png
+++ b/zombie2/n0.png
Binary files differ
diff --git a/zombie3/n0.png b/zombie3/n0.png
index 668042e..89cf11b 100644
--- a/zombie3/n0.png
+++ b/zombie3/n0.png
Binary files differ