From c0103083846ac3be5855b379f62f70deb31a3a5a Mon Sep 17 00:00:00 2001
From: Canopteks <thomas.duhamel@protonmail.com>
Date: Tue, 11 Feb 2020 17:49:37 +0100
Subject: [PATCH] stable merge, everything is now extra squicky clean
---
server/{scenes => }/autoloads/gamestate.gd | 4 +--
.../player => entities/characters}/player.gd | 18 +++++-----
.../characters}/player.tscn | 4 ++-
server/icon.png | Bin 3433 -> 0 bytes
server/icon.png.import | 34 ------------------
server/{scenes => }/levels/lobby/lobby.tscn | 0
.../entities => levels/test}/bloc/bloc.tscn | 0
.../levels/game => levels/test}/game.gd | 0
.../levels/game => levels/test}/game.tscn | 6 ++--
server/project.godot | 4 +--
10 files changed, 19 insertions(+), 51 deletions(-)
rename server/{scenes => }/autoloads/gamestate.gd (93%)
rename server/{scenes/entities/player => entities/characters}/player.gd (91%)
rename server/{scenes/entities/player => entities/characters}/player.tscn (89%)
delete mode 100755 server/icon.png
delete mode 100644 server/icon.png.import
rename server/{scenes => }/levels/lobby/lobby.tscn (100%)
rename server/{scenes/entities => levels/test}/bloc/bloc.tscn (100%)
rename server/{scenes/levels/game => levels/test}/game.gd (100%)
rename server/{scenes/levels/game => levels/test}/game.tscn (85%)
diff --git a/server/scenes/autoloads/gamestate.gd b/server/autoloads/gamestate.gd
similarity index 93%
rename from server/scenes/autoloads/gamestate.gd
rename to server/autoloads/gamestate.gd
index d355e54..d28868e 100644
--- a/server/scenes/autoloads/gamestate.gd
+++ b/server/autoloads/gamestate.gd
@@ -62,10 +62,10 @@ func _playerDisconnected(id):
func startGame():
#Â Instancing the map and adding it to the scene tree
- var game = preload("res://scenes/levels/game/game.tscn").instance()
+ var game = preload("res://levels/test/game.tscn").instance()
get_tree().get_root().add_child(game)
- var playerScene = preload("res://scenes/entities/player/player.tscn")
+ var playerScene = preload("res://entities/characters/player.tscn")
var i = 1
for peer_id in players:
diff --git a/server/scenes/entities/player/player.gd b/server/entities/characters/player.gd
similarity index 91%
rename from server/scenes/entities/player/player.gd
rename to server/entities/characters/player.gd
index 3e334ba..81c4de8 100644
--- a/server/scenes/entities/player/player.gd
+++ b/server/entities/characters/player.gd
@@ -1,30 +1,28 @@
extends KinematicBody
-# duh
+# Speed values
const MAX_SPEED:float = 8.0
+const MAX_SPRINT_SPEED:float = 12.0
+var motion:float = 0
+var isSprinting:bool = false
-# duh 2
+# Acceleration values
const ACCEL:float = 8.5
const SPRINT_ACCEL:float = 16.0
const DEACCEL:float = 16.0
-# duh 3: the vengeance
-const MAX_SPRINT_SPEED:float = 12.0
-var isSprinting:bool = false
-
-# duh 4: the return of the vengeance 2
+# Jump and fall values
const JUMP_SPEED:float = 16.0
var isJumping:bool = false
-
-# TODO: unreal, try to understand that, genius
+# TODO: unreal, we may want to stick that to the physical value
const GRAVITY:float = -28.0
# Velocity updated continuously by move_and_slide
var vel:Vector3 = Vector3()
+# move_and_slide need that
const FLOOR_NORMAL:Vector3 = Vector3(0,1,0)
-var motion:float = 0
# called by the engine
func _physics_process(delta):
diff --git a/server/scenes/entities/player/player.tscn b/server/entities/characters/player.tscn
similarity index 89%
rename from server/scenes/entities/player/player.tscn
rename to server/entities/characters/player.tscn
index d768d61..f8eba0f 100644
--- a/server/scenes/entities/player/player.tscn
+++ b/server/entities/characters/player.tscn
@@ -1,6 +1,8 @@
[gd_scene load_steps=3 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]
+
+
[sub_resource type="BoxShape" id=1]
extents = Vector3( 0.175, 0.275, 0.7 )
diff --git a/server/icon.png b/server/icon.png
deleted file mode 100755
index 2b658158b6a2211b656d83fee35e3941e5ad376a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3433
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
LNkvXXu0mjfd922>
diff --git a/server/icon.png.import b/server/icon.png.import
deleted file mode 100644
index 96cbf46..0000000
--- a/server/icon.png.import
+++ /dev/null
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://icon.png"
-dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/bptc_ldr=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-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=true
-svg/scale=1.0
diff --git a/server/scenes/levels/lobby/lobby.tscn b/server/levels/lobby/lobby.tscn
similarity index 100%
rename from server/scenes/levels/lobby/lobby.tscn
rename to server/levels/lobby/lobby.tscn
diff --git a/server/scenes/entities/bloc/bloc.tscn b/server/levels/test/bloc/bloc.tscn
similarity index 100%
rename from server/scenes/entities/bloc/bloc.tscn
rename to server/levels/test/bloc/bloc.tscn
diff --git a/server/scenes/levels/game/game.gd b/server/levels/test/game.gd
similarity index 100%
rename from server/scenes/levels/game/game.gd
rename to server/levels/test/game.gd
diff --git a/server/scenes/levels/game/game.tscn b/server/levels/test/game.tscn
similarity index 85%
rename from server/scenes/levels/game/game.tscn
rename to server/levels/test/game.tscn
index c152862..6eff247 100644
--- a/server/scenes/levels/game/game.tscn
+++ b/server/levels/test/game.tscn
@@ -1,7 +1,9 @@
[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 )
diff --git a/server/project.godot b/server/project.godot
index 60cd1c0..73c0570 100644
--- a/server/project.godot
+++ b/server/project.godot
@@ -16,12 +16,12 @@ _global_script_class_icons={
[application]
config/name="server"
-run/main_scene="res://scenes/levels/lobby/lobby.tscn"
+run/main_scene="res://levels/lobby/lobby.tscn"
config/icon="res://icon.png"
[autoload]
-gamestate="*res://scenes/autoloads/gamestate.gd"
+gamestate="*res://autoloads/gamestate.gd"
[rendering]
--
GitLab