diff options
| author | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-15 12:52:25 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-15 12:52:25 +0100 |
| commit | 3e5933fb43778707d7a53071a7243e6f31cc7e26 (patch) | |
| tree | 17870dce3102ad8f901f4cbfe1c90a73be7cb303 | |
| parent | 7de8c8bfaff30ae6674b678d666b345fc8c0eb5b (diff) | |
| download | nj26-3e5933fb43778707d7a53071a7243e6f31cc7e26.tar.gz | |
wjfojfsjfadposjgpojg
| -rw-r--r-- | Spatial.gd | 41 | ||||
| -rw-r--r-- | Spatial.tscn | 36 | ||||
| -rw-r--r-- | box.gd | 8 | ||||
| -rw-r--r-- | cat.gd | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | cat/c0.png | bin | 38070 -> 38069 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c1.png | bin | 47034 -> 47034 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c10.png | bin | 37615 -> 37617 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c11.png | bin | 38594 -> 38585 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c12.png | bin | 41245 -> 41253 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c13.png | bin | 41021 -> 41028 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c14.png | bin | 38341 -> 38346 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c15.png | bin | 38341 -> 38346 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c16.png | bin | 37576 -> 37578 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c17.png | bin | 38838 -> 38842 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c18.png | bin | 38159 -> 38163 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c19.png | bin | 37493 -> 37497 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c2.png | bin | 45730 -> 43905 bytes | |||
| -rwxr-xr-x | cat/c20.png | bin | 0 -> 37497 bytes | |||
| -rwxr-xr-x | cat/c21.png | bin | 0 -> 37318 bytes | |||
| -rwxr-xr-x | cat/c22.png | bin | 0 -> 37028 bytes | |||
| -rwxr-xr-x | cat/c23.png | bin | 0 -> 36122 bytes | |||
| -rwxr-xr-x | cat/c24.png | bin | 0 -> 36183 bytes | |||
| -rwxr-xr-x | cat/c25.png | bin | 0 -> 35634 bytes | |||
| -rwxr-xr-x | cat/c26.png | bin | 0 -> 43597 bytes | |||
| -rwxr-xr-x | cat/c27.png | bin | 0 -> 44601 bytes | |||
| -rwxr-xr-x | cat/c28.png | bin | 0 -> 41577 bytes | |||
| -rwxr-xr-x | cat/c29.png | bin | 0 -> 47971 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c3.png | bin | 45730 -> 45728 bytes | |||
| -rwxr-xr-x | cat/c30.png | bin | 0 -> 48002 bytes | |||
| -rwxr-xr-x | cat/c31.png | bin | 0 -> 44519 bytes | |||
| -rwxr-xr-x | cat/c32.png | bin | 0 -> 45737 bytes | |||
| -rwxr-xr-x | cat/c33.png | bin | 0 -> 41812 bytes | |||
| -rwxr-xr-x | cat/c34.png | bin | 0 -> 37461 bytes | |||
| -rwxr-xr-x | cat/c35.png | bin | 0 -> 43664 bytes | |||
| -rwxr-xr-x | cat/c36.png | bin | 0 -> 40900 bytes | |||
| -rwxr-xr-x | cat/c37.png | bin | 0 -> 38689 bytes | |||
| -rwxr-xr-x | cat/c38.png | bin | 0 -> 38246 bytes | |||
| -rwxr-xr-x | cat/c39.png | bin | 0 -> 37753 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c4.png | bin | 41845 -> 41874 bytes | |||
| -rwxr-xr-x | cat/c40.png | bin | 0 -> 38668 bytes | |||
| -rwxr-xr-x | cat/c41.png | bin | 0 -> 41092 bytes | |||
| -rwxr-xr-x | cat/c42.png | bin | 0 -> 40900 bytes | |||
| -rwxr-xr-x | cat/c43.png | bin | 0 -> 38270 bytes | |||
| -rwxr-xr-x | cat/c44.png | bin | 0 -> 38270 bytes | |||
| -rwxr-xr-x | cat/c45.png | bin | 0 -> 37739 bytes | |||
| -rwxr-xr-x | cat/c46.png | bin | 0 -> 39084 bytes | |||
| -rwxr-xr-x | cat/c47.png | bin | 0 -> 38491 bytes | |||
| -rwxr-xr-x | cat/c48.png | bin | 0 -> 37976 bytes | |||
| -rwxr-xr-x | cat/c49.png | bin | 0 -> 37701 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c5.png | bin | 37285 -> 37317 bytes | |||
| -rwxr-xr-x | cat/c50.png | bin | 0 -> 37423 bytes | |||
| -rwxr-xr-x | cat/c51.png | bin | 0 -> 36524 bytes | |||
| -rwxr-xr-x | cat/c52.png | bin | 0 -> 36496 bytes | |||
| -rwxr-xr-x | cat/c53.png | bin | 0 -> 35853 bytes | |||
| -rwxr-xr-x | cat/c54.png | bin | 0 -> 43823 bytes | |||
| -rwxr-xr-x | cat/c55.png | bin | 0 -> 37855 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c6.png | bin | 43474 -> 43484 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c7.png | bin | 41021 -> 41028 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c8.png | bin | 38744 -> 38736 bytes | |||
| -rwxr-xr-x[-rw-r--r--] | cat/c9.png | bin | 38058 -> 38065 bytes | |||
| -rw-r--r-- | credits.tscn | 18 | ||||
| -rw-r--r-- | draw.mp3 | bin | 0 -> 47500 bytes | |||
| -rw-r--r-- | game-over.gd | 17 | ||||
| -rw-r--r-- | game-over.tscn | 27 | ||||
| -rw-r--r-- | green-wins.png | bin | 0 -> 78960 bytes | |||
| -rw-r--r-- | greenbox.png | bin | 0 -> 445460 bytes | |||
| -rw-r--r-- | mainmenu.gd | 13 | ||||
| -rw-r--r-- | mainmenu.tscn | 31 | ||||
| -rw-r--r-- | music.mp3 | bin | 0 -> 1213656 bytes | |||
| -rw-r--r-- | pink-wins.png | bin | 0 -> 82780 bytes | |||
| -rw-r--r-- | powerup.tscn | 2 | ||||
| -rw-r--r-- | project.godot | 6 | ||||
| -rw-r--r-- | rcat.gd | 34 | ||||
| -rw-r--r-- | running-cat.gd | 2 | ||||
| -rw-r--r-- | select.gd | 81 | ||||
| -rw-r--r-- | select.tscn | 210 | ||||
| -rw-r--r-- | select/p0.png | bin | 0 -> 230586 bytes | |||
| -rw-r--r-- | select/p1.png | bin | 0 -> 236876 bytes | |||
| -rw-r--r-- | select/p2.png | bin | 0 -> 277208 bytes | |||
| -rw-r--r-- | select/p3.png | bin | 0 -> 7741 bytes | |||
| -rw-r--r-- | select/ps0.png | bin | 0 -> 203040 bytes | |||
| -rw-r--r-- | select/ps1.png | bin | 0 -> 210677 bytes | |||
| -rw-r--r-- | select/ps2.png | bin | 0 -> 142720 bytes | |||
| -rw-r--r-- | select/ps3.png | bin | 0 -> 192550 bytes | |||
| -rw-r--r-- | team.gd | 2 | ||||
| -rw-r--r-- | title.png | bin | 0 -> 715208 bytes | |||
| -rw-r--r-- | win.mp3 | bin | 0 -> 59680 bytes | |||
| -rw-r--r-- | zombie.gd | 6 |
88 files changed, 440 insertions, 98 deletions
@@ -8,7 +8,7 @@ var pw = preload("res://powerup.gd") var gameover = preload("res://game-over.tscn").instance() var countdown = preload("res://countdown.tscn").instance() -var blue_points = 0 +var green_points = 0 var pink_points = 0 var jailpos: Vector3 var zombies = [] @@ -23,8 +23,8 @@ signal new_points func set_points(box, points): var team = box.myteam - if team == t.Team.BLUE: - blue_points += points + if team == t.Team.GREEN: + green_points += points else: pink_points += points @@ -40,7 +40,7 @@ func _exited(box): set_points(box, -1) func on_points(): - $CanvasLayer/cc/hb/blue.text = "Team Blue: %d" % blue_points + $CanvasLayer/cc/hb/green.text = "Team Green: %d" % green_points $CanvasLayer/cc/hb/pink.text = "Team Pink: %d" % pink_points func _create_cat(): @@ -49,6 +49,7 @@ func _create_cat(): running_cat = cat for z in zombies: z.running_cat = cat + $jail/Spatial/cat.visible = false add_child(cat) func _physics_process(delta): @@ -106,13 +107,13 @@ func create_box(team): func _on_powerup(node): if node.get_type() == pw.Type.swap: - var blue = blue_points + var green = green_points for b in boxes: b.set_team(b.get_team() ^ 1) - blue_points = pink_points - pink_points = blue + green_points = pink_points + pink_points = green emit_signal("new_points") remove_child(node) @@ -120,7 +121,7 @@ func _on_powerup(node): func _on_cat_killed(zombie): $game_time.stop() get_tree().root.add_child(gameover) - gameover.set_winner(blue_points, pink_points, zombie.get_team()) + gameover.set_winner(green_points, pink_points, zombie.get_team()) remove_child(running_cat) func create_zombie(id, team, pos): @@ -147,7 +148,7 @@ func _on_powerup_timeout(): func game_over(): $game_time.stop() get_tree().root.add_child(gameover) - gameover.set_winner(blue_points, pink_points, null) + gameover.set_winner(green_points, pink_points, null) func _process(_delta): var text = "Time left: " @@ -166,7 +167,7 @@ func _on_box_timeout(): var team if randi() & 1: - team = t.Team.BLUE + team = t.Team.GREEN else: team = t.Team.PINK @@ -183,15 +184,22 @@ func start_game(): func go_back(): get_tree().root.remove_child(self) +func set_music_pos(pos): + $music.play(pos) + +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)) + func _ready(): randomize() jailpos = get_node("jail").global_transform.origin - create_zombie(0, t.Team.BLUE, Vector3(-6.0, 0, -3)) - create_zombie(1, t.Team.BLUE, Vector3(-6.0, 0, 3)) - create_zombie(2, t.Team.PINK, Vector3(6.0, 0, -3)) - create_zombie(3, t.Team.PINK, Vector3(6.0, 0, 3)) - for _i in range(randi() % 6 + 2): create_powerup() @@ -199,7 +207,7 @@ func _ready(): create_box(t.Team.PINK) for _i in range(15): - create_box(t.Team.BLUE) + create_box(t.Team.GREEN) $powerup_timer.connect("timeout", self, "_on_powerup_timeout") $powerup_timer.start(randi() % 16 + 5) @@ -212,3 +220,4 @@ func _ready(): countdown.connect("timeout", self, "start_game") connect("new_points", self, "on_points") gameover.connect("go_back", self, "go_back") + $music.connect("finished", self, "loop") diff --git a/Spatial.tscn b/Spatial.tscn index 3f79880..ee56967 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=22 format=2] +[gd_scene load_steps=23 format=2] [ext_resource path="res://floor.png" type="Texture" id=1] [ext_resource path="res://sky.tscn" type="PackedScene" id=2] @@ -7,6 +7,7 @@ [ext_resource path="res://basefloor.gd" type="Script" id=5] [ext_resource path="res://vera/Vera.ttf" type="DynamicFontData" id=6] [ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=7] +[ext_resource path="res://music.mp3" type="AudioStream" id=8] [sub_resource type="PlaneMesh" id=1] size = Vector2( 20, 40 ) @@ -43,10 +44,10 @@ albedo_color = Color( 0.415686, 0.305882, 0.545098, 1 ) [sub_resource type="SphereShape" id=11] radius = 6.565 -[sub_resource type="DynamicFont" id=15] +[sub_resource type="DynamicFont" id=17] size = 32 use_filter = true -font_data = ExtResource( 6 ) +font_data = ExtResource( 7 ) [sub_resource type="DynamicFont" id=13] size = 48 @@ -195,25 +196,23 @@ __meta__ = { } [node name="hb" type="HBoxContainer" parent="CanvasLayer/cc"] -margin_left = 555.0 -margin_right = 1405.0 +margin_left = 527.0 +margin_right = 1433.0 margin_bottom = 57.0 size_flags_horizontal = 3 size_flags_vertical = 3 [node name="pink" type="Label" parent="CanvasLayer/cc/hb"] margin_top = 9.0 -margin_right = 203.0 +margin_right = 230.0 margin_bottom = 47.0 -custom_colors/font_color = Color( 0.988235, 0.0862745, 0.803922, 1 ) -custom_fonts/font = SubResource( 15 ) +custom_colors/font_color = Color( 1, 0, 1, 1 ) +custom_fonts/font = SubResource( 17 ) text = "Team Pink: 0" -align = 1 -valign = 1 [node name="time_left" type="Label" parent="CanvasLayer/cc/hb"] -margin_left = 207.0 -margin_right = 614.0 +margin_left = 234.0 +margin_right = 641.0 margin_bottom = 57.0 custom_colors/font_color = Color( 1, 1, 1, 1 ) custom_constants/shadow_as_outline = 1 @@ -223,14 +222,14 @@ align = 1 valign = 1 uppercase = true -[node name="blue" type="Label" parent="CanvasLayer/cc/hb"] -margin_left = 618.0 +[node name="green" type="Label" parent="CanvasLayer/cc/hb"] +margin_left = 645.0 margin_top = 9.0 -margin_right = 850.0 +margin_right = 906.0 margin_bottom = 47.0 -custom_colors/font_color = Color( 0, 0.788235, 1, 1 ) +custom_colors/font_color = Color( 0, 1, 0, 1 ) custom_fonts/font = SubResource( 16 ) -text = "Team Blue: 0" +text = "Team Green: 0" align = 1 valign = 1 @@ -242,3 +241,6 @@ transform = Transform( 15, 0, 0, 0, 10.6066, 10.6066, 0, -10.6066, 10.6066, 0, 0 [node name="game_time" type="Timer" parent="."] [node name="box_timer" type="Timer" parent="."] + +[node name="music" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 8 ) @@ -1,10 +1,12 @@ class_name Box extends RigidBody const t = preload("res://team.gd") +const pinkbox = preload("res://redbox.png") +const greenbox = preload("res://greenbox.png") signal entered signal exited -var myteam = t.Team.BLUE +var myteam = t.Team.GREEN var _floor: Node func get_team(): @@ -16,9 +18,9 @@ func set_team(team): myteam = team if myteam == t.Team.PINK: - material.set_albedo(Color(1, 0, 1, 1)) + material.albedo_texture = pinkbox else: - material.set_albedo(Color(0, 0, 1, 1)) + material.albedo_texture = greenbox mesh.set_surface_material(0, material) @@ -11,7 +11,7 @@ func _process(delta): lastt = 0 frame_i += 1 - if frame_i >= 20: + if frame_i >= 55: frame_i = 0 var material = get_active_material(0) @@ -20,6 +20,6 @@ func _process(delta): # Called when the node enters the scene tree for the first time. func _ready(): - for i in range(20): + for i in range(55): images[i] = load("res://cat/c" + str(i) + ".png") diff --git a/cat/c0.png b/cat/c0.png Binary files differindex 8ab4d79..6d4580b 100644..100755 --- a/cat/c0.png +++ b/cat/c0.png diff --git a/cat/c1.png b/cat/c1.png Binary files differindex 09fdc70..09fdc70 100644..100755 --- a/cat/c1.png +++ b/cat/c1.png diff --git a/cat/c10.png b/cat/c10.png Binary files differindex 0d8f49d..62c5517 100644..100755 --- a/cat/c10.png +++ b/cat/c10.png diff --git a/cat/c11.png b/cat/c11.png Binary files differindex 156b58c..b41fd98 100644..100755 --- a/cat/c11.png +++ b/cat/c11.png diff --git a/cat/c12.png b/cat/c12.png Binary files differindex d918d1e..babd200 100644..100755 --- a/cat/c12.png +++ b/cat/c12.png diff --git a/cat/c13.png b/cat/c13.png Binary files differindex 09c868c..1fce3c8 100644..100755 --- a/cat/c13.png +++ b/cat/c13.png diff --git a/cat/c14.png b/cat/c14.png Binary files differindex 6fa51c4..b17a71b 100644..100755 --- a/cat/c14.png +++ b/cat/c14.png diff --git a/cat/c15.png b/cat/c15.png Binary files differindex 6fa51c4..b17a71b 100644..100755 --- a/cat/c15.png +++ b/cat/c15.png diff --git a/cat/c16.png b/cat/c16.png Binary files differindex 8c7a535..8ba664e 100644..100755 --- a/cat/c16.png +++ b/cat/c16.png diff --git a/cat/c17.png b/cat/c17.png Binary files differindex 5554842..96cd7fe 100644..100755 --- a/cat/c17.png +++ b/cat/c17.png diff --git a/cat/c18.png b/cat/c18.png Binary files differindex 3a7761c..a19b194 100644..100755 --- a/cat/c18.png +++ b/cat/c18.png diff --git a/cat/c19.png b/cat/c19.png Binary files differindex 5a79233..c7d287d 100644..100755 --- a/cat/c19.png +++ b/cat/c19.png diff --git a/cat/c2.png b/cat/c2.png Binary files differindex 7e239f6..cd6aaf7 100644..100755 --- a/cat/c2.png +++ b/cat/c2.png diff --git a/cat/c20.png b/cat/c20.png Binary files differnew file mode 100755 index 0000000..c7d287d --- /dev/null +++ b/cat/c20.png diff --git a/cat/c21.png b/cat/c21.png Binary files differnew file mode 100755 index 0000000..1828312 --- /dev/null +++ b/cat/c21.png diff --git a/cat/c22.png b/cat/c22.png Binary files differnew file mode 100755 index 0000000..5f40c70 --- /dev/null +++ b/cat/c22.png diff --git a/cat/c23.png b/cat/c23.png Binary files differnew file mode 100755 index 0000000..0579d40 --- /dev/null +++ b/cat/c23.png diff --git a/cat/c24.png b/cat/c24.png Binary files differnew file mode 100755 index 0000000..dc32859 --- /dev/null +++ b/cat/c24.png diff --git a/cat/c25.png b/cat/c25.png Binary files differnew file mode 100755 index 0000000..bdd44a8 --- /dev/null +++ b/cat/c25.png diff --git a/cat/c26.png b/cat/c26.png Binary files differnew file mode 100755 index 0000000..3d60771 --- /dev/null +++ b/cat/c26.png diff --git a/cat/c27.png b/cat/c27.png Binary files differnew file mode 100755 index 0000000..0189ab3 --- /dev/null +++ b/cat/c27.png diff --git a/cat/c28.png b/cat/c28.png Binary files differnew file mode 100755 index 0000000..625999c --- /dev/null +++ b/cat/c28.png diff --git a/cat/c29.png b/cat/c29.png Binary files differnew file mode 100755 index 0000000..cfcef68 --- /dev/null +++ b/cat/c29.png diff --git a/cat/c3.png b/cat/c3.png Binary files differindex 7e239f6..4c57fed 100644..100755 --- a/cat/c3.png +++ b/cat/c3.png diff --git a/cat/c30.png b/cat/c30.png Binary files differnew file mode 100755 index 0000000..5f66743 --- /dev/null +++ b/cat/c30.png diff --git a/cat/c31.png b/cat/c31.png Binary files differnew file mode 100755 index 0000000..eefc5c7 --- /dev/null +++ b/cat/c31.png diff --git a/cat/c32.png b/cat/c32.png Binary files differnew file mode 100755 index 0000000..52a7e9c --- /dev/null +++ b/cat/c32.png diff --git a/cat/c33.png b/cat/c33.png Binary files differnew file mode 100755 index 0000000..2d3a618 --- /dev/null +++ b/cat/c33.png diff --git a/cat/c34.png b/cat/c34.png Binary files differnew file mode 100755 index 0000000..3a893db --- /dev/null +++ b/cat/c34.png diff --git a/cat/c35.png b/cat/c35.png Binary files differnew file mode 100755 index 0000000..4dbfbac --- /dev/null +++ b/cat/c35.png diff --git a/cat/c36.png b/cat/c36.png Binary files differnew file mode 100755 index 0000000..5f23839 --- /dev/null +++ b/cat/c36.png diff --git a/cat/c37.png b/cat/c37.png Binary files differnew file mode 100755 index 0000000..eb1bc1c --- /dev/null +++ b/cat/c37.png diff --git a/cat/c38.png b/cat/c38.png Binary files differnew file mode 100755 index 0000000..ca39862 --- /dev/null +++ b/cat/c38.png diff --git a/cat/c39.png b/cat/c39.png Binary files differnew file mode 100755 index 0000000..2366222 --- /dev/null +++ b/cat/c39.png diff --git a/cat/c4.png b/cat/c4.png Binary files differindex 2cb7e55..0446da7 100644..100755 --- a/cat/c4.png +++ b/cat/c4.png diff --git a/cat/c40.png b/cat/c40.png Binary files differnew file mode 100755 index 0000000..e2993da --- /dev/null +++ b/cat/c40.png diff --git a/cat/c41.png b/cat/c41.png Binary files differnew file mode 100755 index 0000000..e258210 --- /dev/null +++ b/cat/c41.png diff --git a/cat/c42.png b/cat/c42.png Binary files differnew file mode 100755 index 0000000..5f23839 --- /dev/null +++ b/cat/c42.png diff --git a/cat/c43.png b/cat/c43.png Binary files differnew file mode 100755 index 0000000..acd26b7 --- /dev/null +++ b/cat/c43.png diff --git a/cat/c44.png b/cat/c44.png Binary files differnew file mode 100755 index 0000000..acd26b7 --- /dev/null +++ b/cat/c44.png diff --git a/cat/c45.png b/cat/c45.png Binary files differnew file mode 100755 index 0000000..e0b7d6a --- /dev/null +++ b/cat/c45.png diff --git a/cat/c46.png b/cat/c46.png Binary files differnew file mode 100755 index 0000000..740cbe3 --- /dev/null +++ b/cat/c46.png diff --git a/cat/c47.png b/cat/c47.png Binary files differnew file mode 100755 index 0000000..8e44ba8 --- /dev/null +++ b/cat/c47.png diff --git a/cat/c48.png b/cat/c48.png Binary files differnew file mode 100755 index 0000000..e1eaca9 --- /dev/null +++ b/cat/c48.png diff --git a/cat/c49.png b/cat/c49.png Binary files differnew file mode 100755 index 0000000..5de3793 --- /dev/null +++ b/cat/c49.png diff --git a/cat/c5.png b/cat/c5.png Binary files differindex d730a61..5dab993 100644..100755 --- a/cat/c5.png +++ b/cat/c5.png diff --git a/cat/c50.png b/cat/c50.png Binary files differnew file mode 100755 index 0000000..310c04d --- /dev/null +++ b/cat/c50.png diff --git a/cat/c51.png b/cat/c51.png Binary files differnew file mode 100755 index 0000000..e0f54a7 --- /dev/null +++ b/cat/c51.png diff --git a/cat/c52.png b/cat/c52.png Binary files differnew file mode 100755 index 0000000..0e32a3a --- /dev/null +++ b/cat/c52.png diff --git a/cat/c53.png b/cat/c53.png Binary files differnew file mode 100755 index 0000000..4e5bf1b --- /dev/null +++ b/cat/c53.png diff --git a/cat/c54.png b/cat/c54.png Binary files differnew file mode 100755 index 0000000..80624c9 --- /dev/null +++ b/cat/c54.png diff --git a/cat/c55.png b/cat/c55.png Binary files differnew file mode 100755 index 0000000..ef4d011 --- /dev/null +++ b/cat/c55.png diff --git a/cat/c6.png b/cat/c6.png Binary files differindex 56ea1db..2488b0c 100644..100755 --- a/cat/c6.png +++ b/cat/c6.png diff --git a/cat/c7.png b/cat/c7.png Binary files differindex 09c868c..1fce3c8 100644..100755 --- a/cat/c7.png +++ b/cat/c7.png diff --git a/cat/c8.png b/cat/c8.png Binary files differindex 9d3f7ae..b5760f5 100644..100755 --- a/cat/c8.png +++ b/cat/c8.png diff --git a/cat/c9.png b/cat/c9.png Binary files differindex 64fb589..be2397b 100644..100755 --- a/cat/c9.png +++ b/cat/c9.png diff --git a/credits.tscn b/credits.tscn index eda6f38..2d680d9 100644 --- a/credits.tscn +++ b/credits.tscn @@ -56,20 +56,20 @@ margin_bottom = 40.0 use_top_left = true [node name="Label" type="Label" parent="CanvasLayer/CenterContainer2"] -margin_left = -298.0 +margin_left = -558.0 margin_top = -332.0 -margin_right = 298.0 +margin_right = 558.0 margin_bottom = 331.0 custom_fonts/font = SubResource( 2 ) -text = "Ainoa - Animation -Alba - Animation -Berta - Animation -Gian - Animation -Kam - Animation +text = "Ainoa - Animation, editing +Alba - Video editing +Berta - Illustration, voice actor +Gian - Illustration, voice actor +Kam - Illustration Kat - Animation -## - Aniamtion +Laia - Animation Xavi - Programming -Xenia - Animation" +Xenia - Character design, voice actor" align = 1 valign = 1 diff --git a/draw.mp3 b/draw.mp3 Binary files differnew file mode 100644 index 0000000..5e200a0 --- /dev/null +++ b/draw.mp3 diff --git a/game-over.gd b/game-over.gd index 8d39170..e3a0918 100644 --- a/game-over.gd +++ b/game-over.gd @@ -1,30 +1,35 @@ extends Node2D const team = preload("res://team.gd") +const pink = preload("res://pink-wins.png") +const green = preload("res://green-wins.png") var mainmenu signal go_back -func set_winner(blue_points, pink_points, killer_team): - var bp = blue_points +func set_winner(green_points, pink_points, killer_team): + var bp = green_points var pp = pink_points if killer_team != null: - if killer_team == team.Team.BLUE: + if killer_team == team.Team.GREEN: bp += 5 $CanvasLayer/extra_bp.visible = true elif killer_team == team.Team.PINK: pp += 5 $CanvasLayer/extra_pp.visible = true + $win.play() + if bp > pp: - $CanvasLayer/CenterContainer/winner.text = "Team Blue wins!" + $CanvasLayer/CenterContainer/winner.set_texture(green) elif pp > bp: - $CanvasLayer/CenterContainer/winner.text = "Team Pink wins!" + $CanvasLayer/CenterContainer/winner.set_texture(pink) else: $CanvasLayer/CenterContainer/winner.text = "Draw!" + $draw.play() - $CanvasLayer/bp.text = "Team Blue: " + str(blue_points) + " points" + $CanvasLayer/bp.text = "Team Green: " + str(green_points) + " points" $CanvasLayer/pp.text = "Team Pink: " + str(pink_points) + " points" diff --git a/game-over.tscn b/game-over.tscn index 9667523..2468fa0 100644 --- a/game-over.tscn +++ b/game-over.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=1] [ext_resource path="res://game-over.gd" type="Script" id=2] [ext_resource path="res://vera/VeraIt.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://win.mp3" type="AudioStream" id=4] +[ext_resource path="res://draw.mp3" type="AudioStream" id=5] [sub_resource type="DynamicFont" id=2] size = 40 @@ -14,11 +16,6 @@ size = 40 use_filter = true font_data = ExtResource( 1 ) -[sub_resource type="DynamicFont" id=1] -size = 140 -use_filter = true -font_data = ExtResource( 1 ) - [sub_resource type="DynamicFont" id=4] size = 40 font_data = ExtResource( 3 ) @@ -38,9 +35,9 @@ anchor_left = 0.15 anchor_top = 0.7 anchor_right = 0.195 anchor_bottom = 0.7 -custom_colors/font_color = Color( 0.0117647, 0.627451, 1, 1 ) +custom_colors/font_color = Color( 0, 1, 0, 1 ) custom_fonts/font = SubResource( 2 ) -text = "Team Blue: 0 points" +text = "Team Green: 0 points" [node name="pp" type="Label" parent="CanvasLayer"] anchor_left = 0.6 @@ -60,13 +57,7 @@ margin_right = 40.0 margin_bottom = 40.0 use_top_left = true -[node name="winner" type="Label" parent="CanvasLayer/CenterContainer"] -margin_left = -443.0 -margin_top = -82.0 -margin_right = 442.0 -margin_bottom = 82.0 -custom_fonts/font = SubResource( 1 ) -text = "Team wins!" +[node name="winner" type="TextureRect" parent="CanvasLayer/CenterContainer"] [node name="extra_bp" type="Label" parent="CanvasLayer"] visible = false @@ -108,3 +99,9 @@ margin_right = 70.0 margin_bottom = 31.0 custom_fonts/font = SubResource( 5 ) text = "Back" + +[node name="win" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 4 ) + +[node name="draw" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) diff --git a/green-wins.png b/green-wins.png Binary files differnew file mode 100644 index 0000000..b5febda --- /dev/null +++ b/green-wins.png diff --git a/greenbox.png b/greenbox.png Binary files differnew file mode 100644 index 0000000..7820e03 --- /dev/null +++ b/greenbox.png diff --git a/mainmenu.gd b/mainmenu.gd index 213e518..aff4551 100644 --- a/mainmenu.gd +++ b/mainmenu.gd @@ -1,16 +1,25 @@ extends Node2D -var game = preload("res://Spatial.tscn").instance() +var select = preload("res://select.tscn").instance() var credits = preload("res://credits.tscn").instance() func start(): - get_tree().root.add_child(game) + get_tree().root.add_child(select) + select.set_music_pos($music.get_playback_position()) get_tree().root.remove_child(self) func run_credits(): get_tree().root.add_child(credits) get_tree().root.remove_child(self) +func set_music_pos(pos): + $music.play(pos) + +func loop(): + $music.play() + func _ready(): $cl/c2/play.connect("button_up", self, "start") $cl/c3/credits.connect("button_up", self, "run_credits") + $music.play() + $music.connect("finished", self, "loop") diff --git a/mainmenu.tscn b/mainmenu.tscn index d38afe2..4e05cc8 100644 --- a/mainmenu.tscn +++ b/mainmenu.tscn @@ -1,14 +1,11 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://bg.png" type="Texture" id=1] -[ext_resource path="res://vera/VeraBI.ttf" type="DynamicFontData" id=2] +[ext_resource path="res://title.png" type="Texture" id=2] [ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=3] [ext_resource path="res://mainmenu.gd" type="Script" id=4] [ext_resource path="res://cat/c0.png" type="Texture" id=5] - -[sub_resource type="DynamicFont" id=1] -size = 180 -font_data = ExtResource( 2 ) +[ext_resource path="res://music.mp3" type="AudioStream" id=6] [sub_resource type="DynamicFont" id=2] size = 120 @@ -31,9 +28,9 @@ texture = ExtResource( 1 ) [node name="CenterContainer3" type="CenterContainer" parent="cl"] anchor_left = 0.221 -anchor_top = 0.664 +anchor_top = 0.767 anchor_right = 0.5 -anchor_bottom = 0.664 +anchor_bottom = 0.782 margin_right = 40.0 margin_bottom = 40.0 use_top_left = true @@ -47,20 +44,19 @@ texture = ExtResource( 5 ) [node name="cc" type="CenterContainer" parent="cl"] anchor_left = 0.5 -anchor_top = 0.3 +anchor_top = 0.403 anchor_right = 0.5 -anchor_bottom = 0.3 +anchor_bottom = 0.418 margin_right = 40.0 margin_bottom = 40.0 use_top_left = true -[node name="Label" type="Label" parent="cl/cc"] -margin_left = -607.0 -margin_top = -106.0 -margin_right = 606.0 -margin_bottom = 105.0 -custom_fonts/font = SubResource( 1 ) -text = "Eat the Cat!" +[node name="Label" type="TextureRect" parent="cl/cc"] +margin_left = -540.0 +margin_top = -540.0 +margin_right = 540.0 +margin_bottom = 540.0 +texture = ExtResource( 2 ) [node name="c2" type="CenterContainer" parent="cl"] anchor_left = 0.5 @@ -95,3 +91,6 @@ margin_right = 135.0 margin_bottom = 41.0 custom_fonts/font = SubResource( 3 ) text = "Credits" + +[node name="music" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 6 ) diff --git a/music.mp3 b/music.mp3 Binary files differnew file mode 100644 index 0000000..a285014 --- /dev/null +++ b/music.mp3 diff --git a/pink-wins.png b/pink-wins.png Binary files differnew file mode 100644 index 0000000..7da5bed --- /dev/null +++ b/pink-wins.png diff --git a/powerup.tscn b/powerup.tscn index e8b48e6..b77d303 100644 --- a/powerup.tscn +++ b/powerup.tscn @@ -8,7 +8,7 @@ flags_transparent = true [sub_resource type="BoxShape" id=2] -extents = Vector3( 0.8, 0.9, 0.1 ) +extents = Vector3( 0.8, 0.9, 0.5 ) [node name="Spatial" type="KinematicBody"] script = ExtResource( 1 ) diff --git a/project.godot b/project.godot index 2d6ea04..592ca50 100644 --- a/project.godot +++ b/project.godot @@ -24,6 +24,11 @@ _global_script_classes=[ { "language": "GDScript", "path": "res://powerup.gd" }, { +"base": "MeshInstance", +"class": "RCat", +"language": "GDScript", +"path": "res://rcat.gd" +}, { "base": "KinematicBody", "class": "RunningCat", "language": "GDScript", @@ -38,6 +43,7 @@ _global_script_class_icons={ "Box": "", "Cat": "", "Powerup": "", +"RCat": "", "RunningCat": "", "Zombie": "" } @@ -1,12 +1,32 @@ -extends Cat +class_name RCat extends MeshInstance +var images: Dictionary = {} +var frame_i = 0 +var lastt = 0 +var mirror = 0 -# Declare member variables here. Examples: -# var a = 2 -# var b = "text" +func _process(delta): + lastt += delta + if lastt >= 0.05: + lastt = 0 + frame_i += 1 + if frame_i >= 12: + frame_i = 0 + + var material = get_active_material(0) + + material.albedo_texture = images[frame_i] + scale = Vector3(mirror, 1, 1) + +func set_x_speed(x): + if x > 0: + mirror = 1 + else: + mirror = -1 + +func _ready(): + for i in range(12): + images[i] = load("res://cat-walking/cm" + str(i) + ".png") -# Called every frame. 'delta' is the elapsed time since the previous frame. -#func _process(delta): -# pass diff --git a/running-cat.gd b/running-cat.gd index 2153557..1ee6204 100644 --- a/running-cat.gd +++ b/running-cat.gd @@ -17,6 +17,8 @@ func _set_speed(): if randi() & 1: speed.z = -speed.z + $Cat.set_x_speed(speed.x) + func _process(delta): last_t += delta diff --git a/select.gd b/select.gd new file mode 100644 index 0000000..407db6f --- /dev/null +++ b/select.gd @@ -0,0 +1,81 @@ +extends Node2D + +var bigpics: Array = [ + preload("res://select/p0.png"), + preload("res://select/p1.png"), + preload("res://select/p2.png"), + preload("res://select/p3.png") +] + +var smallpics: Array = [ + preload("res://select/ps0.png"), + preload("res://select/ps1.png"), + preload("res://select/ps2.png"), + preload("res://select/ps3.png") +] + +var lores: Array = [ + "P0", + "P1", + "P2", + "P3", +] + +var players: Array = [0, 1, 2, 3] + +func start(): + var game = preload("res://Spatial.tscn").instance() + game.set_players(players) + get_tree().root.add_child(game) + game.set_music_pos($music.get_playback_position()) + get_tree().root.remove_child(self) + +func back(): + var mainmenu = load("res://mainmenu.tscn").instance() + get_tree().root.add_child(mainmenu) + mainmenu.set_music_pos($music.get_playback_position()) + get_tree().root.remove_child(self) + +func process_zombie(i): + var id = "p" + str(i) + "_" + var key = 0 + + if Input.is_action_just_pressed(id + "down"): + players[i] += 1 + + if players[i] >= 4: + players[i] = 0 + key = 1 + elif Input.is_action_just_pressed(id + "up"): + players[i] -= 1 + + if players[i] < 0: + players[i] = 3 + key = 1 + + if key: + var bpath = "CanvasLayer/CenterContainer/c/CenterContainer/big/p" + str(i) + "/pic" + var spath = "CanvasLayer/CenterContainer/c/small/p" + str(i) + var txtpath = "CanvasLayer/CenterContainer/c/CenterContainer/big/p" + str(i) + "/lore" + var bimg = get_node(bpath) + var simg = get_node(spath) + var t = get_node(txtpath) + + bimg.set_texture(bigpics[players[i]]) + simg.set_texture(smallpics[players[i]]) + t.text = lores[players[i]] + +func _process(_delta): + for i in range(4): + process_zombie(i) + +func set_music_pos(pos): + $music.play(pos) + +func loop(): + $music.play() + +func _ready(): + $CanvasLayer/CenterContainer2/h/play.connect("button_up", self, "start") + $CanvasLayer/CenterContainer2/h/back.connect("button_up", self, "back") + $music.connect("finished", self, "loop") diff --git a/select.tscn b/select.tscn new file mode 100644 index 0000000..88db570 --- /dev/null +++ b/select.tscn @@ -0,0 +1,210 @@ +[gd_scene load_steps=16 format=2] + +[ext_resource path="res://bg.png" type="Texture" id=1] +[ext_resource path="res://select/p0.png" type="Texture" id=2] +[ext_resource path="res://select/p3.png" type="Texture" id=3] +[ext_resource path="res://select/p2.png" type="Texture" id=4] +[ext_resource path="res://select/p1.png" type="Texture" id=5] +[ext_resource path="res://select/ps3.png" type="Texture" id=6] +[ext_resource path="res://select/ps1.png" type="Texture" id=7] +[ext_resource path="res://select/ps0.png" type="Texture" id=8] +[ext_resource path="res://select/ps2.png" type="Texture" id=9] +[ext_resource path="res://vera/VeraBd.ttf" type="DynamicFontData" id=10] +[ext_resource path="res://select.gd" type="Script" id=11] +[ext_resource path="res://music.mp3" type="AudioStream" id=12] + +[sub_resource type="DynamicFont" id=1] +size = 120 +use_filter = true +font_data = ExtResource( 10 ) + +[sub_resource type="DynamicFont" id=3] +size = 64 +use_filter = true +font_data = ExtResource( 10 ) + +[sub_resource type="DynamicFont" id=2] +size = 96 +use_filter = true +font_data = ExtResource( 10 ) + +[node name="Node2D" type="Node2D"] +script = ExtResource( 11 ) + +[node name="CanvasLayer" type="CanvasLayer" parent="."] + +[node name="TextureRect" type="TextureRect" parent="CanvasLayer"] +margin_right = 1920.0 +margin_bottom = 1080.0 +texture = ExtResource( 1 ) + +[node name="CenterContainer" type="CenterContainer" parent="CanvasLayer"] +anchor_left = 0.5 +anchor_top = 0.5 +anchor_right = 0.5 +anchor_bottom = 0.5 +margin_right = 40.0 +margin_bottom = 40.0 +rect_scale = Vector2( 0.3, 0.3 ) +use_top_left = true + +[node name="c" type="VBoxContainer" parent="CanvasLayer/CenterContainer"] +margin_left = -1883.0 +margin_top = -856.0 +margin_right = 1883.0 +margin_bottom = 856.0 + +[node name="CenterContainer" type="CenterContainer" parent="CanvasLayer/CenterContainer/c"] +margin_right = 3766.0 +margin_bottom = 1028.0 + +[node name="big" type="GridContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer"] +margin_right = 3766.0 +margin_bottom = 1028.0 +columns = 2 + +[node name="p0" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"] +margin_right = 1881.0 +margin_bottom = 512.0 + +[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p0"] +margin_right = 512.0 +margin_bottom = 512.0 +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 +custom_fonts/font = SubResource( 1 ) +text = "Name: Lore player 0 +Description" + +[node name="p1" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"] +margin_left = 1885.0 +margin_right = 3766.0 +margin_bottom = 512.0 + +[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p1"] +margin_right = 512.0 +margin_bottom = 512.0 +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 +custom_fonts/font = SubResource( 1 ) +text = "Name: Lore player 0 +Description" + +[node name="p2" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"] +margin_top = 516.0 +margin_right = 1881.0 +margin_bottom = 1028.0 + +[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p2"] +margin_right = 512.0 +margin_bottom = 512.0 +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 +custom_fonts/font = SubResource( 1 ) +text = "Name: Lore player 0 +Description" + +[node name="p3" type="HBoxContainer" parent="CanvasLayer/CenterContainer/c/CenterContainer/big"] +margin_left = 1885.0 +margin_top = 516.0 +margin_right = 3766.0 +margin_bottom = 1028.0 + +[node name="pic" type="TextureRect" parent="CanvasLayer/CenterContainer/c/CenterContainer/big/p3"] +margin_right = 512.0 +margin_bottom = 512.0 +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 +custom_fonts/font = SubResource( 1 ) +text = "Name: Lore player 0 +Description" + +[node name="small" type="GridContainer" parent="CanvasLayer/CenterContainer/c"] +margin_top = 1032.0 +margin_right = 3766.0 +margin_bottom = 1712.0 +columns = 4 + +[node name="p0" type="TextureRect" parent="CanvasLayer/CenterContainer/c/small"] +margin_right = 680.0 +margin_bottom = 680.0 +texture = ExtResource( 8 ) + +[node name="p1" type="TextureRect" parent="CanvasLayer/CenterContainer/c/small"] +margin_left = 684.0 +margin_right = 1364.0 +margin_bottom = 680.0 +texture = ExtResource( 7 ) + +[node name="p2" type="TextureRect" parent="CanvasLayer/CenterContainer/c/small"] +margin_left = 1368.0 +margin_right = 2048.0 +margin_bottom = 680.0 +texture = ExtResource( 9 ) + +[node name="p3" type="TextureRect" parent="CanvasLayer/CenterContainer/c/small"] +margin_left = 2052.0 +margin_right = 2732.0 +margin_bottom = 680.0 +texture = ExtResource( 6 ) + +[node name="CenterContainer2" type="CenterContainer" parent="CanvasLayer"] +anchor_left = 0.5 +anchor_top = 0.85 +anchor_right = 0.5 +anchor_bottom = 0.85 +margin_right = 40.0 +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 + +[node name="back" type="Button" parent="CanvasLayer/CenterContainer2/h"] +margin_right = 185.0 +margin_bottom = 119.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 +custom_fonts/font = SubResource( 2 ) +text = "Start" + +[node name="music" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 12 ) + +[node name="sounds" type="Node" parent="."] + +[node name="p0" type="AudioStreamPlayer" parent="sounds"] + +[node name="p1" type="AudioStreamPlayer" parent="sounds"] + +[node name="p2" type="AudioStreamPlayer2D" parent="sounds"] + +[node name="p3" type="AudioStreamPlayer2D" parent="sounds"] diff --git a/select/p0.png b/select/p0.png Binary files differnew file mode 100644 index 0000000..c005db0 --- /dev/null +++ b/select/p0.png diff --git a/select/p1.png b/select/p1.png Binary files differnew file mode 100644 index 0000000..e7fad0e --- /dev/null +++ b/select/p1.png diff --git a/select/p2.png b/select/p2.png Binary files differnew file mode 100644 index 0000000..286b744 --- /dev/null +++ b/select/p2.png diff --git a/select/p3.png b/select/p3.png Binary files differnew file mode 100644 index 0000000..77f7f74 --- /dev/null +++ b/select/p3.png diff --git a/select/ps0.png b/select/ps0.png Binary files differnew file mode 100644 index 0000000..9c51085 --- /dev/null +++ b/select/ps0.png diff --git a/select/ps1.png b/select/ps1.png Binary files differnew file mode 100644 index 0000000..8ffd27a --- /dev/null +++ b/select/ps1.png diff --git a/select/ps2.png b/select/ps2.png Binary files differnew file mode 100644 index 0000000..508e737 --- /dev/null +++ b/select/ps2.png diff --git a/select/ps3.png b/select/ps3.png Binary files differnew file mode 100644 index 0000000..086c932 --- /dev/null +++ b/select/ps3.png @@ -2,5 +2,5 @@ extends Node enum Team { PINK - BLUE + GREEN } diff --git a/title.png b/title.png Binary files differBinary files differnew file mode 100644 index 0000000..604ccdf --- /dev/null +++ b/title.png @@ -170,10 +170,10 @@ func set_id(z): func set_team(team): var material = $team.get_surface_material(0).duplicate() - if team == t.Team.BLUE: - material.albedo_color = Color(0, 0, 1, 0.6) + if team == t.Team.GREEN: + material.albedo_color = Color(0, 1, 0, 0.3) elif team == t.Team.PINK: - material.albedo_color = Color(1, 0, 1, 0.6) + material.albedo_color = Color(1, 0, 1, 0.3) $team.set_surface_material(0, material) myteam = team |
