diff options
| author | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-18 01:05:04 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-18 01:05:04 +0100 |
| commit | deb102e1ea913abec2b9e29bf84e6611baa843fe (patch) | |
| tree | ff9276f7e4e8ae720bebc821c29e2afec87bb08b | |
| parent | 84768a693d4c0bca714e57da5fe25b8a5e622ed6 (diff) | |
| download | nj26-deb102e1ea913abec2b9e29bf84e6611baa843fe.tar.gz | |
Get rid of warnings
| -rw-r--r-- | Spatial.gd | 29 | ||||
| -rw-r--r-- | box.gd | 6 | ||||
| -rw-r--r-- | countdown.gd | 2 | ||||
| -rw-r--r-- | credits.gd | 5 | ||||
| -rw-r--r-- | game-over.gd | 5 | ||||
| -rw-r--r-- | mainmenu.gd | 10 | ||||
| -rw-r--r-- | powerup.gd | 2 | ||||
| -rw-r--r-- | select.gd | 9 | ||||
| -rw-r--r-- | zombie.gd | 33 |
9 files changed, 39 insertions, 62 deletions
@@ -1,8 +1,8 @@ extends Spatial const t = preload("res://team.gd") -var b = preload("res://box.tscn") -var z = preload("res://zombie.tscn") +var box_scene = preload("res://box.tscn") +var zombie_scene = preload("res://zombie.tscn") var pwup = preload("res://powerup.tscn") var pw = preload("res://powerup.gd") var gameover = preload("res://game-over.tscn").instance() @@ -47,8 +47,8 @@ func _create_cat(): var cat = load("res://cat.tscn").instance() cat.translate(Vector3(0, -1, 0)) running_cat = cat - for z in zombies: - z.running_cat = cat + for zombie in zombies: + zombie.running_cat = cat $jail/Spatial/cat.visible = false add_child(cat) @@ -71,7 +71,7 @@ func _physics_process(delta): for z in zombies: z.can_move = can_move - z.run_powerup(boxes, zombies) + z.run_powerup(boxes) func randpos(y = 10): var maxp = 6.8 @@ -95,7 +95,7 @@ func randpos(y = 10): return Vector3(x, y, z) func create_box(team): - var box = b.instance() + var box = box_scene.instance() box.set_team(team) box.set_floor(get_node("mesh/MeshInstance2/basefloor")) @@ -128,7 +128,7 @@ func _on_cat_killed(zombie): remove_child(running_cat) func create_zombie(rid, id, team, pos): - var zombie = z.instance() + var zombie = zombie_scene.instance() zombie.set_rid(rid) zombie.set_id(id) @@ -201,6 +201,8 @@ func set_players(players): create_zombie(3, players[3], t.Team.PINK, Vector3(6.0, 0, 3)) func _ready(): + var __ + randomize() jailpos = get_node("jail").global_transform.origin @@ -213,15 +215,14 @@ func _ready(): for _i in range(15): create_box(t.Team.GREEN) - $powerup_timer.connect("timeout", self, "_on_powerup_timeout") + __ = $powerup_timer.connect("timeout", self, "_on_powerup_timeout") $powerup_timer.start(randi() % 16 + 5) $box_timer.start(randi() % 16 + 5) - $box_timer.connect("timeout", self, "_on_box_timeout") + __ = $box_timer.connect("timeout", self, "_on_box_timeout") $game_time.start(120) $game_time.stop() - $game_time.connect("timeout", self, "game_over") + __ = $game_time.connect("timeout", self, "game_over") get_tree().root.add_child(countdown) - countdown.connect("timeout", self, "start_game") - connect("new_points", self, "on_points") - gameover.connect("go_back", self, "go_back") - $music.connect("finished", self, "loop") + __ = countdown.connect("timeout", self, "start_game") + __ = connect("new_points", self, "on_points") + __ = gameover.connect("go_back", self, "go_back") @@ -36,8 +36,10 @@ func set_floor(node: Node): _floor = node func _ready(): + var __ + contact_monitor = true contacts_reported = 4 - connect("body_entered", self, "_entered") - connect("body_exited", self, "_exited") + __ = connect("body_entered", self, "_entered") + __ = connect("body_exited", self, "_exited") diff --git a/countdown.gd b/countdown.gd index 1b53c1f..7788576 100644 --- a/countdown.gd +++ b/countdown.gd @@ -2,7 +2,7 @@ extends Node2D signal timeout -func _process(delta): +func _process(_delta): if $Timer.time_left < 1: emit_signal("timeout") @@ -14,5 +14,6 @@ func loop(): $music.play() func _ready(): - $CanvasLayer/CenterContainer3/back.connect("button_up", self, "back") - $music.connect("finished", self, "loop") + var __ + __ = $CanvasLayer/CenterContainer3/back.connect("button_up", self, "back") + __ = $music.connect("finished", self, "loop") diff --git a/game-over.gd b/game-over.gd index 4f810a9..6789c67 100644 --- a/game-over.gd +++ b/game-over.gd @@ -41,9 +41,10 @@ func back(): # Called when the node enters the scene tree for the first time. func _ready(): + var __ + mainmenu = load("res://mainmenu.tscn").instance() - $CanvasLayer/c/back.connect("button_up", self, "back") - $win.connect("finished", $win, "stop") + __ = $CanvasLayer/c/back.connect("button_up", self, "back") # Called every frame. 'delta' is the elapsed time since the previous frame. #func _process(delta): diff --git a/mainmenu.gd b/mainmenu.gd index 654c274..f188091 100644 --- a/mainmenu.gd +++ b/mainmenu.gd @@ -16,11 +16,9 @@ func run_credits(): 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") + var __ + + __ = $cl/c2/play.connect("button_up", self, "start") + __ = $cl/c3/credits.connect("button_up", self, "run_credits") $music.play() - $music.connect("finished", self, "loop") @@ -19,8 +19,6 @@ func get_type(): return mytype func _physics_process(delta): - var curpos = global_transform.origin.y - if abs(speed) > 0.5 * delta: toggle ^= 1 @@ -80,10 +80,7 @@ func _process(_delta): 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") + var _ig + _ig = $CanvasLayer/CenterContainer2/h/play.connect("button_up", self, "start") + _ig = $CanvasLayer/CenterContainer2/h/back.connect("button_up", self, "back") @@ -59,6 +59,7 @@ func _physics_process(delta): - Input.get_action_strength(id + "left")) * 2 * delta) var curdir = Dir.none var vspeed = 4 + var __ for i in range(get_slide_count()): var col = get_slide_collision(i).collider @@ -99,7 +100,7 @@ func _physics_process(delta): else: speed.y -= delta * 9.8 - move_and_slide(speed) + __ = move_and_slide(speed) for index in range(get_slide_count()): var c = get_slide_collision(index).collider @@ -177,8 +178,6 @@ func sethealth(): pass func _process(delta): - var id = "p" + str(myid) + "_" - tlast += delta if tlast > tframes[myid]: @@ -261,25 +260,7 @@ func box_magnet(b): b.add_central_force(Vector3(-xforce, 0, -zforce)) -func zombie_explosion(z): - var mypos = global_transform.origin - var bpos = z.global_transform.origin - var dist = bpos.distance_to(mypos) - var force = 100 / dist - var xforce = force - var yforce = force - var zforce = force - - if mypos.x > bpos.x: - xforce = -xforce - if mypos.y > bpos.y: - xforce = -xforce - if mypos.z > bpos.z: - zforce = -zforce - - # z.add_central_force(Vector3(xforce, 0, zforce)) - -func run_powerup(boxes, zombies): +func run_powerup(boxes): match powerup: pw.Type.explosion: var id = "p" + str(myrid) + "_" @@ -291,13 +272,11 @@ func run_powerup(boxes, zombies): for b in boxes: box_explosion(b) -# for z in zombies: -# if z != self: -# zombie_explosion(z) - pw.Type.magnet: for b in boxes: box_magnet(b) func _ready(): - $timer.connect("timeout", self, "_on_timer") + var __ + + __ = $timer.connect("timeout", self, "_on_timer") |
