Valcuda/project_teddy
1
0
Fork 0
forked from the_adventures_of_teddy/project_teddy
Code Pull requests Activity

Fixed issue #2

Browse source
This commit is contained in:
Paul Black 2023-02-25 14:31:15 -07:00
parent b2081c6e6a
commit 028037cdc4
10 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
characters/teddy/Teddy.gd
View file

@ -22,6 +22,7 @@ func _ready():
Global.selfTeddy = selfTeddy Global.selfTeddy = selfTeddy
selfTeddy = self.get_path() selfTeddy = self.get_path()
teddyParent = get_node(selfTeddy).get_parent() teddyParent = get_node(selfTeddy).get_parent()
Global.teddyAuthorityID = teddyAuthority
func _unhandled_input(event): func _unhandled_input(event):
Global.selfTeddy = selfTeddy Global.selfTeddy = selfTeddy

6
objects/toyland/Wood050_2K_Color.jpg.import
View file

@ -3,16 +3,16 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://dnobq0anmbln8" uid="uid://dnobq0anmbln8"
path.etc2="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex" path.s3tc="res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/Wood050_2K_Color.jpg" source_file="res://objects/toyland/Wood050_2K_Color.jpg"
dest_files=["res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.etc2.ctex"] dest_files=["res://.godot/imported/Wood050_2K_Color.jpg-e6185de0fa12ff4588e435b3845fb87e.s3tc.ctex"]
[params] [params]

6
objects/toyland/newplaster.jpg.import
View file

@ -3,16 +3,16 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cmhq2gjngssxg" uid="uid://cmhq2gjngssxg"
path.etc2="res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.etc2.ctex" path.s3tc="res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/newplaster.jpg" source_file="res://objects/toyland/newplaster.jpg"
dest_files=["res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.etc2.ctex"] dest_files=["res://.godot/imported/newplaster.jpg-c0159d01e1a6adffe0c3bf5b8dcfc7a7.s3tc.ctex"]
[params] [params]

6
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png.import
View file

@ -3,9 +3,9 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://c4brgjvonnjkr" uid="uid://c4brgjvonnjkr"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_Wood050_2K_Color.png-09e60c6431251b5cdad5e7603ca8ef91.s3tc.ctex"]
[params] [params]

6
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png.import
View file

@ -3,9 +3,9 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://ql40b60xucke" uid="uid://ql40b60xucke"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_newplaster.png-56bf5185a878e2d32e5a25ec8c8517fb.s3tc.ctex"]
[params] [params]

6
objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png.import
View file

@ -3,9 +3,9 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://cj28kq4i36gcg" uid="uid://cj28kq4i36gcg"
path.etc2="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex" path.s3tc="res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
generator_parameters={} generator_parameters={}
@ -13,7 +13,7 @@ generator_parameters={}
[deps] [deps]
source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png" source_file="res://objects/toyland/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png"
dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.etc2.ctex"] dest_files=["res://.godot/imported/toyland-acc3ec7302587eef6111479be4ff2e5f_windows_xp_bliss-wide.png-c0ea880c9d43e5d1d8d800dd069f83dd.s3tc.ctex"]
[params] [params]

6
objects/toyland/windows_xp_bliss-wide.jpg.import
View file

@ -3,16 +3,16 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://co6sxyhce6s7" uid="uid://co6sxyhce6s7"
path.etc2="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex" path.s3tc="res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/windows_xp_bliss-wide.jpg" source_file="res://objects/toyland/windows_xp_bliss-wide.jpg"
dest_files=["res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.etc2.ctex"] dest_files=["res://.godot/imported/windows_xp_bliss-wide.jpg-b027b98d80d6be8ceaca628f4dcf54ce.s3tc.ctex"]
[params] [params]

6
objects/toyland/woodfloor4k.jpg.001.jpg.import
View file

@ -3,16 +3,16 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://b6f2baaxv23qx" uid="uid://b6f2baaxv23qx"
path.etc2="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex" path.s3tc="res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex"
metadata={ metadata={
"imported_formats": ["etc2_astc"], "imported_formats": ["s3tc_bptc"],
"vram_texture": true "vram_texture": true
} }
[deps] [deps]
source_file="res://objects/toyland/woodfloor4k.jpg.001.jpg" source_file="res://objects/toyland/woodfloor4k.jpg.001.jpg"
dest_files=["res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.etc2.ctex"] dest_files=["res://.godot/imported/woodfloor4k.jpg.001.jpg-e2bdf4950350ecebed41e5db675a15f9.s3tc.ctex"]
[params] [params]

1
scripts/global.gd
View file

@ -19,6 +19,7 @@ var godMode = false # Defined by console.gd
var selfTeddy # Defined as soon as the player script is initalized var selfTeddy # Defined as soon as the player script is initalized
var multiplayerCurrent = false # Whether the player is using multiplayer var multiplayerCurrent = false # Whether the player is using multiplayer
var currentMapNode # Defined in map scripts var currentMapNode # Defined in map scripts
var teddyAuthorityID # Defined from teddy.gd after object is initalized
func _process(delta): func _process(delta):
if godMode: if godMode:

2
scripts/networking.gd
View file

@ -32,12 +32,14 @@ func load_map(map):
@rpc @rpc
func add_newly_connected_player_character(new_peer_id): func add_newly_connected_player_character(new_peer_id):
print("Connected to server!") print("Connected to server!")
if Global.teddyAuthorityID == null:
load_map(SCENE) load_map(SCENE)
Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED)
add_player_node(new_peer_id) add_player_node(new_peer_id)
func add_player_node(peer_id): func add_player_node(peer_id):
print("Global teddy Authority: ", Global.teddyAuthorityID)
connected_peers.append(peer_id) connected_peers.append(peer_id)
var player_character = preload("res://scenes/Teddy.tscn").instantiate() var player_character = preload("res://scenes/Teddy.tscn").instantiate()
player_character.set_multiplayer_authority(peer_id) player_character.set_multiplayer_authority(peer_id)