fixed bullets and extended background

hpi-swa-lab · Feb 5, 2024 · 89c53a4 · 89c53a4
1 parent dd7c822
commit 89c53a4
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 8 deletions.
diff --git a/prototypes/game-shadows-of-surveillance/.DS_Store b/prototypes/game-shadows-of-surveillance/.DS_Store
diff --git a/prototypes/game-shadows-of-surveillance/assets/Floor.png b/prototypes/game-shadows-of-surveillance/assets/Floor.png
diff --git a/prototypes/game-shadows-of-surveillance/assets/Floor.png.import b/prototypes/game-shadows-of-surveillance/assets/Floor.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cun4qv6aogviy"
+path="res://.godot/imported/Floor.png-178675557c32ff493e373908df5e96ab.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://prototypes/game-shadows-of-surveillance/assets/Floor.png"
+dest_files=["res://.godot/imported/Floor.png-178675557c32ff493e373908df5e96ab.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/prototypes/game-shadows-of-surveillance/assets/Sky.png b/prototypes/game-shadows-of-surveillance/assets/Sky.png
diff --git a/prototypes/game-shadows-of-surveillance/assets/Sky.png.import b/prototypes/game-shadows-of-surveillance/assets/Sky.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b7ahcbkd6wvky"
+path="res://.godot/imported/Sky.png-295d009b559be0f5d62d7ee5b3521b0f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://prototypes/game-shadows-of-surveillance/assets/Sky.png"
+dest_files=["res://.godot/imported/Sky.png-295d009b559be0f5d62d7ee5b3521b0f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
diff --git a/prototypes/game-shadows-of-surveillance/characters/droneBullet.tscn b/prototypes/game-shadows-of-surveillance/characters/droneBullet.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=4 format=3 uid="uid://ci42negqibb6p"]
 
-[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/bullet.gd" id="1_kahhp"]
+[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/characters/droneBullet.gd" id="1_u7oaw"]
 [ext_resource type="Texture2D" uid="uid://cooutieukq5fx" path="res://prototypes/game-shadows-of-surveillance/assets/laserRed01.png" id="2_uy31x"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_cn71r"]
@@ -9,7 +9,7 @@ size = Vector2(57, 10)
 [node name="Bullet" type="Area2D"]
 collision_layer = 2
 collision_mask = 2
-script = ExtResource("1_kahhp")
+script = ExtResource("1_u7oaw")
 
 [node name="Sprite2D" type="Sprite2D" parent="."]
 rotation = 1.5708

diff --git a/prototypes/game-shadows-of-surveillance/levels/level2.tscn b/prototypes/game-shadows-of-surveillance/levels/level2.tscn
@@ -8,18 +8,47 @@
 
 [node name="Level2" type="Node2D"]
 
-[node name="6" type="Sprite2D" parent="."]
+[node name="Background" type="Sprite2D" parent="."]
 position = Vector2(578, 319)
 scale = Vector2(3.5, 3.5)
 texture = ExtResource("1_j6sv0")
 
-[node name="CanvasModulate" type="CanvasModulate" parent="6" groups=["dark"]]
-visible = false
+[node name="Background_2" type="Sprite2D" parent="Background"]
+position = Vector2(576, 0)
+scale = Vector2(1, 1)
+texture = ExtResource("1_j6sv0")
+
+[node name="Background_3" type="Sprite2D" parent="Background"]
+position = Vector2(1152, 0)
+scale = Vector2(1, 1)
+texture = ExtResource("1_j6sv0")
+
+[node name="Background_4" type="Sprite2D" parent="Background/Background_3"]
+position = Vector2(575.714, 2.27374e-12)
+scale = Vector2(1, 1)
+texture = ExtResource("1_j6sv0")
+
+[node name="CanvasModulate" type="CanvasModulate" parent="Background" groups=["dark"]]
 color = Color(0, 0, 0, 1)
 
+[node name="Sky" type="ColorRect" parent="Background"]
+offset_left = -288.0
+offset_top = -217.143
+offset_right = -248.0
+offset_bottom = -177.143
+scale = Vector2(57.5928, 2.33266)
+color = Color(0.141176, 0.588235, 0.862745, 1)
+
+[node name="Floor" type="ColorRect" parent="Background"]
+offset_left = -288.0
+offset_top = 159.0
+offset_right = 2016.0
+offset_bottom = 314.0
+color = Color(0.14902, 0.109804, 0.215686, 1)
+
 [node name="TileMap" parent="." instance=ExtResource("2_llo4g")]
 tile_set = ExtResource("3_ko4tt")
-layer_0/tile_data = PackedInt32Array(1966089, 0, 0, 1966090, 65536, 0, 1966091, 65536, 0, 1966092, 65536, 0, 1966093, 65536, 0, 1966094, 65536, 0, 1966095, 65536, 0, 1966096, 65536, 0, 1966097, 65536, 0, 1966098, 65536, 0, 1966099, 65536, 0, 1966100, 65536, 0, 1966101, 65536, 0, 1966102, 65536, 0, 1966103, 65536, 0, 1966104, 65536, 0, 1966105, 65536, 0, 1966106, 65536, 0, 1966107, 65536, 0, 1966108, 65536, 0, 1966109, 65536, 0, 1966110, 65536, 0, 2031646, 65536, 1, 2097182, 65536, 1, 2162718, 65536, 1, 2031625, 0, 1, 2097161, 0, 1, 2162697, 0, 1, 2031626, 65536, 1, 2031627, 65536, 1, 2097164, 65536, 1, 2097165, 65536, 1, 2097166, 65536, 1, 2097167, 65536, 1, 2097168, 65536, 1, 2162705, 65536, 1, 2162706, 65536, 1, 2162707, 65536, 1, 2162708, 65536, 1, 2162709, 65536, 1, 2162710, 65536, 1, 2162711, 65536, 1, 2162712, 65536, 1, 2162713, 65536, 1, 2162714, 65536, 1, 2162715, 65536, 1, 2162716, 65536, 1, 2162717, 65536, 1, 2097181, 65536, 1, 2031645, 65536, 1, 2031644, 65536, 1, 2031643, 65536, 1, 2031642, 65536, 1, 2031641, 65536, 1, 2031640, 65536, 1, 2031639, 65536, 1, 2031638, 65536, 1, 2031637, 65536, 1, 2031636, 65536, 1, 2031635, 65536, 1, 2097170, 65536, 1, 2097169, 65536, 1, 2097163, 65536, 1, 2031629, 65536, 1, 2031628, 65536, 1, 2031630, 65536, 1, 2031631, 65536, 1, 2031632, 65536, 1, 2031633, 65536, 1, 2031634, 65536, 1, 2097171, 65536, 1, 2097172, 65536, 1, 2097173, 65536, 1, 2097174, 65536, 1, 2097175, 65536, 1, 2097176, 65536, 1, 2097177, 65536, 1, 2097178, 65536, 1, 2097179, 65536, 1, 2097180, 65536, 1, 2162704, 65536, 1, 2162703, 65536, 1, 2097162, 65536, 1, 2162698, 65536, 1, 2162699, 65536, 1, 2162701, 65536, 1, 2162702, 65536, 1, 2162700, 65536, 1, 1966115, 65536, 0, 1966116, 65536, 0, 1966128, 65536, 0, 1966117, 65536, 0, 1966118, 65536, 0, 2031655, 65536, 1, 2031656, 65536, 1, 2031657, 65536, 1, 2031658, 65536, 1, 2031659, 65536, 1, 2031660, 65536, 1, 2031661, 65536, 1, 2031662, 65536, 1, 2031663, 65536, 1, 2031664, 65536, 1, 2031665, 65536, 1, 2031666, 65536, 1, 1966119, 65536, 0, 1966120, 65536, 0, 1966121, 65536, 0, 1966122, 65536, 0, 1966123, 65536, 0, 1966124, 65536, 0, 1966125, 65536, 0, 1966126, 65536, 0, 1966127, 65536, 0, 1966129, 65536, 0, 1966130, 65536, 0, 1966131, 65536, 0, 1966132, 65536, 0, 1966133, 65536, 0, 1966134, 65536, 0, 1966135, 65536, 0, 1966136, 65536, 0, 1966137, 65536, 0, 1966138, 65536, 0, 1966139, 65536, 0, 2031652, 65536, 1, 2031653, 65536, 1, 2031654, 65536, 1, 2031667, 65536, 1, 2031668, 65536, 1, 2031669, 65536, 1, 2031670, 65536, 1, 2031671, 65536, 1, 2031672, 65536, 1, 2031673, 65536, 1, 2031674, 65536, 1, 2097210, 65536, 1, 2162746, 65536, 1, 2162745, 65536, 1, 2162744, 65536, 1, 2097207, 65536, 1, 2097206, 65536, 1, 2097205, 65536, 1, 2097204, 65536, 1, 2097203, 65536, 1, 2097202, 65536, 1, 2097201, 65536, 1, 2097200, 65536, 1, 2097199, 65536, 1, 2097198, 65536, 1, 2097197, 65536, 1, 2097196, 65536, 1, 2097195, 65536, 1, 2097194, 65536, 1, 2097193, 65536, 1, 2097192, 65536, 1, 2097191, 65536, 1, 2097190, 65536, 1, 2097189, 65536, 1, 2097188, 65536, 1, 2097187, 65536, 1, 2162723, 65536, 1, 2162724, 65536, 1, 2162725, 65536, 1, 2162726, 65536, 1, 2162727, 65536, 1, 2162732, 65536, 1, 2162733, 65536, 1, 2162734, 65536, 1, 2162735, 65536, 1, 2162736, 65536, 1, 2162737, 65536, 1, 2162738, 65536, 1, 2162739, 65536, 1, 2162740, 65536, 1, 2162741, 65536, 1, 2162742, 65536, 1, 2162743, 65536, 1, 2097209, 65536, 1, 2097208, 65536, 1, 2162731, 65536, 1, 2162730, 65536, 1, 2162729, 65536, 1, 2162728, 65536, 1, 2031675, 65536, 1, 2097211, 65536, 1, 2162747, 65536, 1, 2031651, 65536, 1, 2228259, 65536, 1, 2031676, 131072, 1, 2097212, 131072, 1, 2162748, 131072, 1, 2228284, 131072, 2, 1966140, 131072, 0, 2228254, 65536, 1, 2293790, 0, 2, 2293791, 65536, 2, 2293792, 65536, 2, 2293793, 65536, 2, 2293794, 65536, 2, 2293795, 131072, 2, 1900552, 458752, 1, 1835016, 458752, 1, 1769480, 458752, 1, 1703944, 458752, 1, 1638408, 458752, 1, 1572872, 458752, 1, 1507336, 458752, 1, 1441800, 458752, 1, 1376264, 458752, 1, 1310728, 458752, 1, 1245192, 458752, 1, 1179656, 458752, 1, 1114120, 458752, 1, 1048584, 458752, 1, 983048, 458752, 1, 917512, 458752, 1, 851976, 458752, 1, 786440, 458752, 1, 720904, 458752, 1, 655368, 458752, 1, 589832, 458752, 1, 524296, 458752, 1, 458760, 458752, 1, 393224, 458752, 1, 327688, 458752, 1, 262152, 458752, 1, 196616, 458752, 1, 131080, 458752, 1, 1507388, 458752, 1, 1441852, 458752, 1, 1376316, 458752, 1, 1310780, 458752, 1, 1245244, 458752, 1, 1179708, 458752, 1, 1114172, 458752, 1, 1048636, 458752, 1, 983100, 458752, 1, 917564, 458752, 1, 852028, 458752, 1, 786492, 458752, 1, 720956, 458752, 1, 655420, 458752, 1, 589884, 458752, 1, 524348, 458752, 1, 458812, 458752, 1, 1900604, 458752, 2, 2228233, 0, 2, 2228234, 65536, 2, 2228235, 65536, 2, 2228236, 65536, 2, 2228237, 65536, 2, 2228238, 65536, 2, 2228239, 65536, 2, 2228240, 65536, 2, 2228241, 65536, 2, 2228242, 65536, 2, 2228243, 65536, 2, 2228244, 65536, 2, 2228245, 65536, 2, 2228246, 65536, 2, 2228247, 65536, 2, 2228248, 65536, 2, 2228249, 65536, 2, 2228250, 65536, 2, 2228251, 65536, 2, 2228252, 65536, 2, 2228253, 65536, 2, 2228260, 65536, 2, 2228261, 65536, 2, 2228262, 65536, 2, 2228263, 65536, 2, 2228264, 65536, 2, 2228265, 65536, 2, 2228266, 65536, 2, 2228267, 65536, 2, 2228268, 65536, 2, 2228269, 65536, 2, 2228270, 65536, 2, 2228271, 65536, 2, 2228272, 65536, 2, 2228273, 65536, 2, 2228274, 65536, 2, 2228275, 65536, 2, 2228276, 65536, 2, 2228277, 65536, 2, 2228278, 65536, 2, 2228279, 65536, 2, 2228280, 65536, 2, 2228281, 65536, 2, 2228282, 65536, 2, 2228283, 65536, 2, 1966088, 458752, 2, 65544, 458752, 0, 1835068, 458752, 1, 1769532, 458752, 1, 1703996, 458752, 1, 1638460, 458752, 1, 1572924, 458752, 1, 393276, 458752, 0)
+layer_0/tile_data = PackedInt32Array(1966089, 0, 0, 1966090, 65536, 0, 1966091, 65536, 0, 1966092, 65536, 0, 1966093, 65536, 0, 1966094, 65536, 0, 1966095, 65536, 0, 1966096, 65536, 0, 1966097, 65536, 0, 1966098, 65536, 0, 1966099, 65536, 0, 1966100, 65536, 0, 1966101, 65536, 0, 1966102, 65536, 0, 1966103, 65536, 0, 1966104, 65536, 0, 1966105, 65536, 0, 1966106, 65536, 0, 1966107, 65536, 0, 1966108, 65536, 0, 1966109, 65536, 0, 1966110, 65536, 0, 2031646, 65536, 1, 2097182, 65536, 1, 2162718, 65536, 1, 2031625, 0, 1, 2097161, 0, 1, 2162697, 0, 1, 2031626, 65536, 1, 2031627, 65536, 1, 2097164, 65536, 1, 2097165, 65536, 1, 2097166, 65536, 1, 2097167, 65536, 1, 2097168, 65536, 1, 2162705, 65536, 1, 2162706, 65536, 1, 2162707, 65536, 1, 2162708, 65536, 1, 2162709, 65536, 1, 2162710, 65536, 1, 2162711, 65536, 1, 2162712, 65536, 1, 2162713, 65536, 1, 2162714, 65536, 1, 2162715, 65536, 1, 2162716, 65536, 1, 2162717, 65536, 1, 2097181, 65536, 1, 2031645, 65536, 1, 2031644, 65536, 1, 2031643, 65536, 1, 2031642, 65536, 1, 2031641, 65536, 1, 2031640, 65536, 1, 2031639, 65536, 1, 2031638, 65536, 1, 2031637, 65536, 1, 2031636, 65536, 1, 2031635, 65536, 1, 2097170, 65536, 1, 2097169, 65536, 1, 2097163, 65536, 1, 2031629, 65536, 1, 2031628, 65536, 1, 2031630, 65536, 1, 2031631, 65536, 1, 2031632, 65536, 1, 2031633, 65536, 1, 2031634, 65536, 1, 2097171, 65536, 1, 2097172, 65536, 1, 2097173, 65536, 1, 2097174, 65536, 1, 2097175, 65536, 1, 2097176, 65536, 1, 2097177, 65536, 1, 2097178, 65536, 1, 2097179, 65536, 1, 2097180, 65536, 1, 2162704, 65536, 1, 2162703, 65536, 1, 2097162, 65536, 1, 2162698, 65536, 1, 2162699, 65536, 1, 2162701, 65536, 1, 2162702, 65536, 1, 2162700, 65536, 1, 1966115, 65536, 0, 1966116, 65536, 0, 1966128, 65536, 0, 1966117, 65536, 0, 1966118, 65536, 0, 2031655, 65536, 1, 2031656, 65536, 1, 2031657, 65536, 1, 2031658, 65536, 1, 2031659, 65536, 1, 2031660, 65536, 1, 2031661, 65536, 1, 2031662, 65536, 1, 2031663, 65536, 1, 2031664, 65536, 1, 2031665, 65536, 1, 2031666, 65536, 1, 1966119, 65536, 0, 1966120, 65536, 0, 1966121, 65536, 0, 1966122, 65536, 0, 1966123, 65536, 0, 1966124, 65536, 0, 1966125, 65536, 0, 1966126, 65536, 0, 1966127, 65536, 0, 1966129, 65536, 0, 1966130, 65536, 0, 1966131, 65536, 0, 1966132, 65536, 0, 1966133, 65536, 0, 1966134, 65536, 0, 1966135, 65536, 0, 1966136, 65536, 0, 1966137, 65536, 0, 1966138, 65536, 0, 1966139, 65536, 0, 2031652, 65536, 1, 2031653, 65536, 1, 2031654, 65536, 1, 2031667, 65536, 1, 2031668, 65536, 1, 2031669, 65536, 1, 2031670, 65536, 1, 2031671, 65536, 1, 2031672, 65536, 1, 2031673, 65536, 1, 2031674, 65536, 1, 2097210, 65536, 1, 2162746, 65536, 1, 2162745, 65536, 1, 2162744, 65536, 1, 2097207, 65536, 1, 2097206, 65536, 1, 2097205, 65536, 1, 2097204, 65536, 1, 2097203, 65536, 1, 2097202, 65536, 1, 2097201, 65536, 1, 2097200, 65536, 1, 2097199, 65536, 1, 2097198, 65536, 1, 2097197, 65536, 1, 2097196, 65536, 1, 2097195, 65536, 1, 2097194, 65536, 1, 2097193, 65536, 1, 2097192, 65536, 1, 2097191, 65536, 1, 2097190, 65536, 1, 2097189, 65536, 1, 2097188, 65536, 1, 2097187, 65536, 1, 2162723, 65536, 1, 2162724, 65536, 1, 2162725, 65536, 1, 2162726, 65536, 1, 2162727, 65536, 1, 2162732, 65536, 1, 2162733, 65536, 1, 2162734, 65536, 1, 2162735, 65536, 1, 2162736, 65536, 1, 2162737, 65536, 1, 2162738, 65536, 1, 2162739, 65536, 1, 2162740, 65536, 1, 2162741, 65536, 1, 2162742, 65536, 1, 2162743, 65536, 1, 2097209, 65536, 1, 2097208, 65536, 1, 2162731, 65536, 1, 2162730, 65536, 1, 2162729, 65536, 1, 2162728, 65536, 1, 2031675, 65536, 1, 2097211, 65536, 1, 2162747, 65536, 1, 2031651, 65536, 1, 2228259, 65536, 1, 2031676, 131072, 1, 2097212, 131072, 1, 2162748, 131072, 1, 2228284, 131072, 2, 1966140, 131072, 0, 2228254, 65536, 1, 2293790, 0, 2, 2293791, 65536, 2, 2293792, 65536, 2, 2293793, 65536, 2, 2293794, 65536, 2, 2293795, 131072, 2, 2228233, 0, 2, 2228234, 65536, 2, 2228235, 65536, 2, 2228236, 65536, 2, 2228237, 65536, 2, 2228238, 65536, 2, 2228239, 65536, 2, 2228240, 65536, 2, 2228241, 65536, 2, 2228242, 65536, 2, 2228243, 65536, 2, 2228244, 65536, 2, 2228245, 65536, 2, 2228246, 65536, 2, 2228247, 65536, 2, 2228248, 65536, 2, 2228249, 65536, 2, 2228250, 65536, 2, 2228251, 65536, 2, 2228252, 65536, 2, 2228253, 65536, 2, 2228260, 65536, 2, 2228261, 65536, 2, 2228262, 65536, 2, 2228263, 65536, 2, 2228264, 65536, 2, 2228265, 65536, 2, 2228266, 65536, 2, 2228267, 65536, 2, 2228268, 65536, 2, 2228269, 65536, 2, 2228270, 65536, 2, 2228271, 65536, 2, 2228272, 65536, 2, 2228273, 65536, 2, 2228274, 65536, 2, 2228275, 65536, 2, 2228276, 65536, 2, 2228277, 65536, 2, 2228278, 65536, 2, 2228279, 65536, 2, 2228280, 65536, 2, 2228281, 65536, 2, 2228282, 65536, 2, 2228283, 65536, 2)
 
 [node name="drone2" parent="." instance=ExtResource("4_m1bym")]
 position = Vector2(932, -32)

diff --git a/prototypes/game-shadows-of-surveillance/levels/thumbnail.png b/prototypes/game-shadows-of-surveillance/levels/thumbnail.png
diff --git a/prototypes/game-shadows-of-surveillance/scripts/bullet.gd b/prototypes/game-shadows-of-surveillance/scripts/bullet.gd
@@ -17,7 +17,7 @@ func _process(delta):
 	position += dir * speed * delta
 
 func _on_body_entered(body):
-	if body.is_in_group("player"):
+	if body.is_in_group("enemy"):
 		body.queue_free()
-	if !body.is_in_group("enemy"):
+	if !body.is_in_group("player"):
 		queue_free()