diff --git a/data/pawns/a.tres b/data/pawns/a.tres index af904a6..fc70b40 100644 --- a/data/pawns/a.tres +++ b/data/pawns/a.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://yosnkcj4ci4v"] [ext_resource type="AudioStream" uid="uid://dhlg3pk3tbirp" path="res://external/sample audio/a.wav" id="1_mtelv"] -[ext_resource type="PackedScene" uid="uid://bnae77rxqldu8" path="res://templates/pawns/a.tscn" id="2_mtelv"] +[ext_resource type="PackedScene" uid="uid://dvrfudqbfbrbl" path="res://templates/pawns/a.scn" id="2_mtelv"] [ext_resource type="Texture2D" uid="uid://13pdg1vs81as" path="res://external/test portraits/a.png" id="3_qt3l7"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_3x7pt"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_lwcbw"] diff --git a/data/pawns/b.tres b/data/pawns/b.tres index 9c6920b..38b6f1c 100644 --- a/data/pawns/b.tres +++ b/data/pawns/b.tres @@ -1,7 +1,7 @@ -[gd_resource type="Resource" script_class="PawnBaseData" load_steps=9 format=3 uid="uid://df4gqi1us2dwu"] +[gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://df4gqi1us2dwu"] [ext_resource type="AudioStream" uid="uid://7dsv6kcptvar" path="res://external/sample audio/b.wav" id="1_vp6uu"] -[ext_resource type="PackedScene" uid="uid://bum67b50tn8ye" path="res://templates/pawns/b.tscn" id="2_vp6uu"] +[ext_resource type="PackedScene" uid="uid://dpahafe51cr5g" path="res://templates/pawns/b.scn" id="2_vp6uu"] [ext_resource type="Texture2D" uid="uid://ca6iihdssrh14" path="res://external/test portraits/b.png" id="3_qojdv"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_0gp76"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_ic2r4"] diff --git a/data/pawns/c.tres b/data/pawns/c.tres index be7e46e..06a96c9 100644 --- a/data/pawns/c.tres +++ b/data/pawns/c.tres @@ -1,7 +1,7 @@ -[gd_resource type="Resource" script_class="PawnBaseData" load_steps=9 format=3 uid="uid://dnty6gi4s2vdl"] +[gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://dnty6gi4s2vdl"] [ext_resource type="AudioStream" uid="uid://dr3jq3tnvtwu" path="res://external/sample audio/c.wav" id="1_ag1od"] -[ext_resource type="PackedScene" uid="uid://c6hojd4o764oc" path="res://templates/pawns/c.tscn" id="2_ag1od"] +[ext_resource type="PackedScene" uid="uid://d4kf2cjb7f033" path="res://templates/pawns/c.scn" id="2_ag1od"] [ext_resource type="Texture2D" uid="uid://dm7fo7tt00p1" path="res://external/test portraits/c.png" id="3_1yr5w"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_nmvyh"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_2i1hp"] diff --git a/data/pawns/d.tres b/data/pawns/d.tres index 25b3b53..d129b5d 100644 --- a/data/pawns/d.tres +++ b/data/pawns/d.tres @@ -1,7 +1,7 @@ -[gd_resource type="Resource" script_class="PawnBaseData" load_steps=9 format=3 uid="uid://bpb2nok3rqm1g"] +[gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://bpb2nok3rqm1g"] [ext_resource type="AudioStream" uid="uid://dsikjobcle18a" path="res://external/sample audio/d.wav" id="1_l2iwo"] -[ext_resource type="PackedScene" uid="uid://bqg51qfb0cj8y" path="res://templates/pawns/d.tscn" id="2_l2iwo"] +[ext_resource type="PackedScene" uid="uid://cr3h2hdwqjquh" path="res://templates/pawns/d.scn" id="2_l2iwo"] [ext_resource type="Texture2D" uid="uid://b2ovogspuupqa" path="res://external/test portraits/d.png" id="3_b6a3y"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_8vcih"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_v5xcc"] diff --git a/data/pawns/e.tres b/data/pawns/e.tres index 2767a11..68d8c49 100644 --- a/data/pawns/e.tres +++ b/data/pawns/e.tres @@ -1,7 +1,7 @@ -[gd_resource type="Resource" script_class="PawnBaseData" load_steps=9 format=3 uid="uid://casciqabe0wgo"] +[gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://casciqabe0wgo"] [ext_resource type="AudioStream" uid="uid://dornjmfg37bv0" path="res://external/sample audio/e.wav" id="1_hlw2y"] -[ext_resource type="PackedScene" uid="uid://bb6a6wu2kc3fr" path="res://templates/pawns/e.tscn" id="2_hlw2y"] +[ext_resource type="PackedScene" uid="uid://badg7k5ef0ys7" path="res://templates/pawns/e.scn" id="2_hlw2y"] [ext_resource type="Texture2D" uid="uid://b2rynijk10l8a" path="res://external/test portraits/e.png" id="3_1j2en"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_jmlxg"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_f1khw"] diff --git a/data/pawns/f.tres b/data/pawns/f.tres index a4dc668..09f7db9 100644 --- a/data/pawns/f.tres +++ b/data/pawns/f.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="PawnBaseData" format=3 uid="uid://6s8tqfssrt5i"] [ext_resource type="AudioStream" uid="uid://bqu2otr8b1oj6" path="res://external/sample audio/f.wav" id="1_2oi4n"] -[ext_resource type="PackedScene" path="res://templates/pawns/f.scn" id="2_2oi4n"] +[ext_resource type="PackedScene" uid="uid://drw4bpyuwsqtr" path="res://templates/pawns/f.scn" id="2_2oi4n"] [ext_resource type="Texture2D" uid="uid://c265jqwykqc2s" path="res://external/test portraits/f.png" id="3_ttwdt"] [ext_resource type="Script" uid="uid://c53ohdio1ksp1" path="res://data/pawn_base_data.gd" id="4_mlun8"] [ext_resource type="Script" uid="uid://b0b1107c0d807" path="res://data/hackset.gd" id="5_2hgkw"] diff --git a/scripts/level.gd b/scripts/level.gd index 446257c..c68c7e2 100644 --- a/scripts/level.gd +++ b/scripts/level.gd @@ -30,12 +30,13 @@ const camera_offset = Vector3(0, 10, 5.25) var keys : Array[int] = [] @export var max_keys = 7 - +@export var collectable_drop_time : float = 60.0 var hacks : Dictionary[Vector3i, Hack] = {} var pawns : Dictionary[int, PawnController] = {} var cameras : Dictionary[int, PawnCamera] = {} var map_markers : Dictionary[Object, MapMarker] = {} + signal level_started() signal keys_changed() diff --git a/scripts/pawn_body.gd b/scripts/pawn_body.gd index a6a63d3..dae1d25 100644 --- a/scripts/pawn_body.gd +++ b/scripts/pawn_body.gd @@ -16,6 +16,7 @@ class_name PawnBody extends Node3D signal shooting() signal reloading() + @rpc("call_local") func play_animation(anim_name : String) -> void: anim_player.play(anim_name) diff --git a/scripts/pawn_controller.gd b/scripts/pawn_controller.gd index 27f3a30..2ff045c 100644 --- a/scripts/pawn_controller.gd +++ b/scripts/pawn_controller.gd @@ -713,6 +713,7 @@ func is_attacking() -> bool: func is_meleeing() -> bool: return state == State.MELEE_ATTACKING + func is_shooting() -> bool: return state == State.RANGED_ATTACKING diff --git a/templates/pawns/a.scn b/templates/pawns/a.scn index eab6ba8..fcad62c 100644 Binary files a/templates/pawns/a.scn and b/templates/pawns/a.scn differ diff --git a/templates/pawns/c.scn b/templates/pawns/c.scn index 7ff7f09..a0b31da 100644 Binary files a/templates/pawns/c.scn and b/templates/pawns/c.scn differ diff --git a/templates/pawns/d.scn b/templates/pawns/d.scn index 72d1b16..898c13f 100644 Binary files a/templates/pawns/d.scn and b/templates/pawns/d.scn differ