New project architecture for client

client/assets/entities/playerArrow/playerArrow.png.import

-[remap]
-
-importer="texture"
-type="StreamTexture"
-path.s3tc="res://.import/playerArrow.png-e97837ed9d5dd05df0543bd68ce1f6fa.s3tc.stex"
-path.etc2="res://.import/playerArrow.png-e97837ed9d5dd05df0543bd68ce1f6fa.etc2.stex"
-metadata={
-"imported_formats": [ "s3tc", "etc2" ],
-"vram_texture": true
-}
-
-[deps]
-
-source_file="res://assets/entities/playerArrow/playerArrow.png"
-dest_files=[ "res://.import/playerArrow.png-e97837ed9d5dd05df0543bd68ce1f6fa.s3tc.stex", "res://.import/playerArrow.png-e97837ed9d5dd05df0543bd68ce1f6fa.etc2.stex" ]
-
-[params]
-
-compress/mode=2
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=true
-flags/filter=true
-flags/mipmaps=true
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-process/invert_color=false
-stream=false
-size_limit=0
-detect_3d=false
-svg/scale=1.0

client/scenes/autoloads/gamestate.gd → client/autoloads/gamestate.gd

@@ -37,8 +37,8 @@ puppet func startGame():
 
 	get_node("/root/lobby").hide()
 	
-	var game = preload("res://scenes/levels/game/game.tscn").instance()
-	var player_scene = preload("res://scenes/entities/player/player.tscn")
+	var game = preload("res://levels/test/game.tscn").instance()
+	var player_scene = preload("res://entities/characters/player.tscn")
 	get_tree().get_root().add_child(game)
 	
 	# TODO: check (and perhaps) the scene changing functionality
@@ -58,5 +58,5 @@ puppet func startGame():
 		
 		i+=1
 		
-	var playerArrow = preload("res://scenes/entities/playerArrow/playerArrow.tscn").instance()
+	var playerArrow = preload("res://entities/characters/playerArrow.tscn").instance()
 	get_node(GAMEPATH+str(get_tree().get_network_unique_id())).add_child(playerArrow)
\ No newline at end of file

client/scenes/entities/player/player.tscn → client/entities/characters/player.tscn

 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://scenes/entities/player/player.gd" type="Script" id=1]
+[ext_resource path="res://entities/characters/player.gd" type="Script" id=1]
 
 [node name="Player" type="KinematicBody"]
 script = ExtResource( 1 )

client/scenes/entities/playerArrow/playerArrow.tscn → client/entities/characters/playerArrow.tscn

 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://assets/entities/playerArrow/playerArrow.png" type="Texture" id=1]
+[ext_resource path="res://models/player/playerArrow/playerArrow.png" type="Texture" id=1]
 
 [node name="playerArrow" type="Sprite3D"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.75, 0 )

client/scenes/levels/lobby/lobby.tscn → client/levels/lobby/lobby.tscn

 [gd_scene load_steps=2 format=2]
 
-[ext_resource path="res://scenes/levels/lobby/lobby.gd" type="Script" id=1]
+[ext_resource path="res://levels/lobby/lobby.gd" type="Script" id=1]
 
 [node name="lobby" type="Control"]
 anchor_right = 1.0

client/scenes/levels/game/game.tscn → client/levels/test/game.tscn

 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://scenes/levels/game/game.gd" type="Script" id=1]
-[ext_resource path="res://scenes/entities/bloc/bloc.tscn" type="PackedScene" id=2]
+[ext_resource path="res://levels/test/game.gd" type="Script" id=1]
+[ext_resource path="res://levels/test/bloc/bloc.tscn" type="PackedScene" id=2]
 
 [node name="game" type="Spatial"]
 script = ExtResource( 1 )

client/icon.png.import → client/models/icon.png.import

@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+path="res://.import/icon.png-efaa2af14617fe3f60d966f4e1ebca97.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
+source_file="res://models/icon.png"
+dest_files=[ "res://.import/icon.png-efaa2af14617fe3f60d966f4e1ebca97.stex" ]
 
 [params]
 

client/assets/icon.png.import → client/models/player/playerArrow/playerArrow.png.import

@@ -2,8 +2,8 @@
 
 importer="texture"
 type="StreamTexture"
-path.s3tc="res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.s3tc.stex"
-path.etc2="res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.etc2.stex"
+path.s3tc="res://.import/playerArrow.png-0844ae524b11e2d15288f73291626523.s3tc.stex"
+path.etc2="res://.import/playerArrow.png-0844ae524b11e2d15288f73291626523.etc2.stex"
 metadata={
 "imported_formats": [ "s3tc", "etc2" ],
 "vram_texture": true
@@ -11,8 +11,8 @@ metadata={
 
 [deps]
 
-source_file="res://assets/icon.png"
-dest_files=[ "res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.s3tc.stex", "res://.import/icon.png-b6a7fb2db36edd3d95dc42f1dc8c1c5d.etc2.stex" ]
+source_file="res://models/player/playerArrow/playerArrow.png"
+dest_files=[ "res://.import/playerArrow.png-0844ae524b11e2d15288f73291626523.s3tc.stex", "res://.import/playerArrow.png-0844ae524b11e2d15288f73291626523.etc2.stex" ]
 
 [params]
 

client/project.godot

@@ -16,12 +16,12 @@ _global_script_class_icons={
 [application]
 
 config/name="client"
-run/main_scene="res://scenes/levels/lobby/lobby.tscn"
+run/main_scene="res://levels/lobby/lobby.tscn"
 config/icon="res://assets/icon.png"
 
 [autoload]
 
-gamestate="*res://scenes/autoloads/gamestate.gd"
+gamestate="*res://autoloads/gamestate.gd"
 
 [input]