diff options
| author | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-14 16:46:51 +0100 |
|---|---|---|
| committer | Xavier Del Campo Romero <xavi92@disroot.org> | 2026-11-14 16:46:51 +0100 |
| commit | 87e18329a2bd583bc6a53fb106274a71adde8792 (patch) | |
| tree | a5d4ab7ef3066ef3f28bdfcb92c6d0906abed05f | |
| parent | 96e2028c52c9d78e77a6b875a87e83970f3c97c6 (diff) | |
| download | nj26-87e18329a2bd583bc6a53fb106274a71adde8792.tar.gz | |
Implement powerups
| -rw-r--r-- | Spatial.gd | 22 | ||||
| -rw-r--r-- | Spatial.tscn | 9 | ||||
| -rw-r--r-- | box.tscn | 3 | ||||
| -rw-r--r-- | powerup.gd | 19 | ||||
| -rw-r--r-- | project.godot | 19 | ||||
| -rw-r--r-- | zombie.gd | 59 | ||||
| -rw-r--r-- | zombie.tscn | 12 |
7 files changed, 133 insertions, 10 deletions
@@ -8,6 +8,8 @@ var pwup = preload("res://powerup.tscn") var blue_points = 0 var pink_points = 0 var jailpos: Vector3 +var zombies = [] +var boxes = [] func set_points(box, points): var team = box.myteam @@ -32,15 +34,21 @@ func _physics_process(delta): var pos = jail.global_transform.origin var diff = jailpos.y - lerp(jailpos.y, pos.y, delta) + for z in zombies: + pass + jail.translate(Vector3(0, diff, 0)) + for z in zombies: + z.run_powerup(boxes) + func randpos(y = 10): - var maxp = 7.0 + var maxp = 7.5 var minp = 6.0 var x = randf() * maxp var z = randf() * maxp - if x < minp: + if x < minp and z > minp: x += minp x = fmod(x, maxp) elif z < minp: @@ -63,6 +71,7 @@ func create_box(team): box.translate(randpos()) box.connect("entered", self, "_entered") box.connect("exited", self, "_exited") + boxes += [box] add_child(box) func _on_powerup(node): @@ -75,6 +84,7 @@ func create_zombie(id, team, pos): zombie.set_team(team) zombie.translate(pos) zombie.connect("powerup", self, "_on_powerup") + zombies += [zombie] add_child(zombie) func create_powerup(): @@ -83,6 +93,9 @@ func create_powerup(): powerup.translate(randpos(-0.5)) add_child(powerup) +func _on_powerup_timeout(): + create_powerup() + # Called when the node enters the scene tree for the first time. func _ready(): randomize() @@ -93,7 +106,7 @@ func _ready(): 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() % 10 + 1): + for _i in range(randi() % 16 + 1): create_powerup() for _i in range(15): @@ -101,3 +114,6 @@ func _ready(): for _i in range(15): create_box(t.Team.BLUE) + + $powerup_timer.connect("timeout", self, "_on_powerup_timeout") + $powerup_timer.start(randi() % 31 + 1) diff --git a/Spatial.tscn b/Spatial.tscn index 2e6b87d..9a7d672 100644 --- a/Spatial.tscn +++ b/Spatial.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=14 format=2] +[gd_scene load_steps=16 format=2] +[ext_resource path="res://floor.png" type="Texture" id=1] [ext_resource path="res://jail.tscn" type="PackedScene" id=3] [ext_resource path="res://Spatial.gd" type="Script" id=4] [ext_resource path="res://basefloor.gd" type="Script" id=5] @@ -13,6 +14,9 @@ albedo_color = Color( 0.435294, 0.0784314, 0.0784314, 1 ) [sub_resource type="BoxShape" id=2] extents = Vector3( 10, 1, 20 ) +[sub_resource type="SpatialMaterial" id=12] +albedo_texture = ExtResource( 1 ) + [sub_resource type="ProceduralSky" id=6] sky_horizon_color = Color( 0.329412, 0.0784314, 0.368627, 1 ) @@ -58,6 +62,7 @@ shape = SubResource( 2 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 0.5, 0.11645, -0.833609, 0 ) mesh = SubResource( 1 ) skeleton = NodePath("../..") +material/0 = SubResource( 12 ) [node name="StaticBody" type="StaticBody" parent="floor2/MeshInstance"] @@ -176,3 +181,5 @@ custom_colors/font_color = Color( 0, 0.788235, 1, 1 ) text = "Team Blue: 0" align = 1 valign = 1 + +[node name="powerup_timer" type="Timer" parent="."] @@ -1,9 +1,10 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://box/box.obj" type="ArrayMesh" id=1] +[ext_resource path="res://box.obj" type="ArrayMesh" id=1] [ext_resource path="res://box.gd" type="Script" id=2] [sub_resource type="BoxShape" id=1] +extents = Vector3( 1.4, 1.35, 1.4 ) [node name="RigidBody" type="RigidBody"] mass = 0.1 diff --git a/powerup.gd b/powerup.gd new file mode 100644 index 0000000..a5cab6e --- /dev/null +++ b/powerup.gd @@ -0,0 +1,19 @@ +class_name Powerup extends KinematicBody + +enum Type { + none + magnet + explosion + + max_pw +} + +var mytype + +func get_type(): + return mytype + +func _init(): + mytype = randi() % (Type.max_pw - 1) + 1 + print("type=%d" % mytype) + add_to_group("powerup") diff --git a/project.godot b/project.godot index fc44e88..8133728 100644 --- a/project.godot +++ b/project.godot @@ -80,19 +80,27 @@ p0_right={ } p1_up={ "deadzone": 0.5, -"events": [ ] +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":-1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":12,"pressure":0.0,"pressed":false,"script":null) + ] } p1_down={ "deadzone": 0.5, -"events": [ ] +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":1,"axis_value":1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":13,"pressure":0.0,"pressed":false,"script":null) + ] } p1_left={ "deadzone": 0.5, -"events": [ ] +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":-1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":14,"pressure":0.0,"pressed":false,"script":null) + ] } p1_right={ "deadzone": 0.5, -"events": [ ] +"events": [ Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":1,"axis":0,"axis_value":1.0,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":15,"pressure":0.0,"pressed":false,"script":null) + ] } p2_up={ "deadzone": 0.5, @@ -134,7 +142,8 @@ p0_powerup={ } p1_powerup={ "deadzone": 0.5, -"events": [ ] +"events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) + ] } p2_powerup={ "deadzone": 0.5, @@ -26,6 +26,15 @@ var powerup = pw.Type.none var images: Dictionary = {} var speed: Vector3 +func expired(): + print("powerup expired") + $magnet_light.visible = false + $explosion_light.visible = false + powerup = pw.Type.none + +func _on_timer(): + expired() + func _physics_process(delta): var id = "p" + str(myid) + "_" var updown = ((Input.get_action_strength(id + "down") @@ -67,8 +76,14 @@ func _physics_process(delta): var c = get_slide_collision(index).collider if c.is_in_group("powerup"): powerup = c.get_type() + $timer.start(10) emit_signal("powerup", c) + if powerup == pw.Type.magnet: + $magnet_light.visible = true + elif powerup == pw.Type.explosion: + $explosion_light.visible = true + func getid() -> String: var id = "" @@ -136,3 +151,47 @@ func set_team(team): func get_team(): return myteam + +func run_powerup(boxes): + match powerup: + pw.Type.explosion: + var id = "p" + str(myid) + "_" + + if Input.is_action_just_released(id + "powerup"): + expired() + + for b in boxes: + var mypos = global_transform.origin + var bpos = b.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 + + b.add_central_force(Vector3(xforce, yforce, zforce)) + pw.Type.magnet: + for b in boxes: + var mypos = global_transform.origin + var bpos = b.global_transform.origin + var dist = bpos.distance_to(mypos) + var force = 2 / dist + var xforce = force + var zforce = force + + if mypos.x > bpos.x: + xforce = -xforce + if mypos.z > bpos.z: + zforce = -zforce + + b.add_central_force(Vector3(-xforce, 0, -zforce)) + +func _ready(): + $timer.connect("timeout", self, "_on_timer") diff --git a/zombie.tscn b/zombie.tscn index ade2022..1790f55 100644 --- a/zombie.tscn +++ b/zombie.tscn @@ -49,3 +49,15 @@ transform = Transform( 1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 1.3, 0.001 ) mesh = SubResource( 5 ) [node name="root" type="Spatial" parent="."] + +[node name="timer" type="Timer" parent="."] + +[node name="magnet_light" type="OmniLight" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.182936 ) +visible = false +light_color = Color( 0, 0.741176, 1, 1 ) + +[node name="explosion_light" type="OmniLight" parent="."] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.182936 ) +visible = false +light_color = Color( 1, 0, 0, 1 ) |
