Skip to content

Commit

Permalink
refactor stuff and fix broken dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ole1711 committed Jan 22, 2024
1 parent 085d96e commit 7db5aec
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 12 deletions.
2 changes: 1 addition & 1 deletion addons/pronto/behaviors/CollisionBehavior.gd
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ var screen_entered_emitted = false
var screen_exited_emitted = false

func _ready():
var scene_b = preload("res://scenes/level2.tscn")
var scene_b = preload("res://prototypes/game-shadows-of-surveillance/levels/level2.tscn")
super._ready()
if not Engine.is_editor_hint():
var p = get_parent()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[gd_scene load_steps=4 format=3 uid="uid://boqn5yw22tcj7"]

[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/bullet.gd" id="1_qyq4p"]
[ext_resource type="Texture2D" uid="uid://cooutieukq5fx" path="res://prototypes/game-shadows-of-surveillance/assets/laserRed01.png" id="2_xmq7n"]
[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/bullet.gd" id="1_wvw6q"]
[ext_resource type="Texture2D" uid="uid://cooutieukq5fx" path="res://prototypes/game-shadows-of-surveillance/assets/laserRed01.png" id="2_h6e5i"]

[sub_resource type="RectangleShape2D" id="RectangleShape2D_cn71r"]
size = Vector2(57, 10)

[node name="Bullet" type="Area2D"]
script = ExtResource("1_qyq4p")
script = ExtResource("1_wvw6q")

[node name="Sprite2D" type="Sprite2D" parent="."]
rotation = 1.5708
texture = ExtResource("2_xmq7n")
texture = ExtResource("2_h6e5i")

[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(-2.5, 0)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gd_scene load_steps=6 format=3 uid="uid://dxp4mlvvs0g2"]

[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/player2.gd" id="1_1dw13"]
[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/player2.gd" id="1_dryno"]
[ext_resource type="Texture2D" uid="uid://chiivrwridrdd" path="res://prototypes/game-shadows-of-surveillance/assets/ole_player2.jpg" id="2_s085l"]
[ext_resource type="Script" path="res://addons/pronto/behaviors/PlatformerControllerBehavior.gd" id="3_mgoso"]
[ext_resource type="Texture2D" uid="uid://ch6w3mr4w7ueu" path="res://LightSprite.png" id="4_u5jrv"]
Expand All @@ -10,7 +10,7 @@ height = 248.062

[node name="Player2" type="CharacterBody2D" groups=["player"]]
scale = Vector2(0.258, 0.258)
script = ExtResource("1_1dw13")
script = ExtResource("1_dryno")

[node name="OlePlayer2" type="Sprite2D" parent="."]
position = Vector2(7.75194, 7.75195)
Expand Down
10 changes: 10 additions & 0 deletions prototypes/game-shadows-of-surveillance/levels/game_info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"authors": [
"Ole Becker",
"David Schroschk",
"Matvey Sivashinski"
],
"description": "You are a brilliant scientist who just discovered time travel. Unfortunately, during your first test, something goes wrong and your mind is split into two parts, one part travels to the future and one is stuck in the present. \nIn this coop split screen game, your goal is to somehow recombine the two parts of your mind. But be careful: In the future, some things have changed...",
"time": "2024-01-22",
"title": "Shadows of Surveillance"
}
2 changes: 1 addition & 1 deletion prototypes/game-shadows-of-surveillance/levels/level.tscn
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[gd_scene load_steps=8 format=3 uid="uid://dyvtu758xr2so"]

[ext_resource type="Texture2D" uid="uid://bhjxc5s34c3cu" path="res://prototypes/game-shadows-of-surveillance/assets/10.png" id="1_elldh"]
[ext_resource type="Script" path="res://scenes/LightSwitch.gd" id="2_4klox"]
[ext_resource type="Script" path="res://prototypes/game-shadows-of-surveillance/scripts/LightSwitch.gd" id="2_4klox"]
[ext_resource type="Script" path="res://addons/pronto/behaviors/PlaceholderBehavior.gd" id="3_euvp3"]
[ext_resource type="TileSet" uid="uid://dp12gfueqor5q" path="res://tileset.tres" id="3_r5ys7"]
[ext_resource type="PackedScene" uid="uid://c5c24526dtufn" path="res://prototypes/game-shadows-of-surveillance/characters/player1.tscn" id="3_x2hlg"]
Expand Down
8 changes: 5 additions & 3 deletions prototypes/game-shadows-of-surveillance/levels/level2.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ scale = Vector2(2.01189, 2.01189)
texture = ExtResource("1_j6sv0")

[node name="CanvasModulate" type="CanvasModulate" parent="6" groups=["dark"]]
visible = false
color = Color(0, 0, 0, 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, 131072, 0, 2031646, 131072, 1, 2097182, 131072, 1, 2162718, 131072, 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, 0, 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, 0, 1, 2162723, 0, 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, 0, 1, 2228259, 0, 1, 2031676, 131072, 1, 2097212, 131072, 1, 2162748, 131072, 1, 2228284, 131072, 1, 2293820, 131072, 1, 1966140, 131072, 0)

[node name="Enemy" parent="." instance=ExtResource("4_m1bym")]
[node name="drone1" parent="." instance=ExtResource("4_m1bym")]

[node name="drone2" parent="." instance=ExtResource("4_m1bym")]
position = Vector2(84, 313)

[node name="Player2" parent="." instance=ExtResource("5_a7n2h")]
position = Vector2(297, 304)
position = Vector2(409, 397)
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dnamp5jbhdkr0"
path="res://.godot/imported/thumbnail.png-7c4c7b5d46fe793314f2444d8b7a69fb.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://prototypes/game-shadows-of-surveillance/levels/thumbnail.png"
dest_files=["res://.godot/imported/thumbnail.png-7c4c7b5d46fe793314f2444d8b7a69fb.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
2 changes: 1 addition & 1 deletion prototypes/game-shadows-of-surveillance/scripts/player2.gd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
extends CharacterBody2D

const bullet_scene = preload("res://scenes/bullet.tscn")
const bullet_scene = preload("res://prototypes/game-shadows-of-surveillance/characters/bullet.tscn")
const SPEED = 300.0
const JUMP_VELOCITY = -400.0

Expand Down

0 comments on commit 7db5aec

Please sign in to comment.