mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-11-13 20:47:19 +01:00
Removed the Mob, Player and NetworkedPlayer scenes.
This commit is contained in:
parent
2d5f4d9d88
commit
4b23a059ce
@ -10,7 +10,6 @@
|
||||
body_path = NodePath("DisplayPlayer")
|
||||
character_skeleton_path = NodePath("DisplayPlayer/Rotation_Helper/Model/character")
|
||||
sseed = 9240987
|
||||
cseed = 9240987
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="DisplayPlayer" type="KinematicBody" parent="."]
|
||||
|
@ -1,4 +1,5 @@
|
||||
extends Entity
|
||||
class_name MobGD
|
||||
|
||||
# Copyright Péter Magyar relintai@gmail.com
|
||||
# MIT License, functionality from this class needs to be protable to the entity spell system
|
||||
|
@ -1,8 +0,0 @@
|
||||
[gd_scene load_steps=2 format=2]
|
||||
|
||||
[ext_resource path="res://player/Mob.gd" type="Script" id=2]
|
||||
|
||||
[node name="Mob" type="Entity" groups=[
|
||||
"mobs",
|
||||
]]
|
||||
script = ExtResource( 2 )
|
@ -1,6 +0,0 @@
|
||||
[gd_scene load_steps=2 format=2]
|
||||
|
||||
[ext_resource path="res://player/NetworkedPlayer.gd" type="Script" id=1]
|
||||
|
||||
[node name="NetworkedPlayer" type="Entity"]
|
||||
script = ExtResource( 1 )
|
@ -1,8 +0,0 @@
|
||||
[gd_scene load_steps=2 format=2]
|
||||
|
||||
[ext_resource path="res://player/Player.gd" type="Script" id=2]
|
||||
|
||||
[node name="Player" type="Entity" groups=[
|
||||
"players",
|
||||
]]
|
||||
script = ExtResource( 2 )
|
@ -23,9 +23,6 @@ extends ESSEntitySpawner
|
||||
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
# SOFTWARE.
|
||||
|
||||
export(PackedScene) var player_scene : PackedScene
|
||||
export(PackedScene) var networked_player_scene : PackedScene
|
||||
export(PackedScene) var mob_scene : PackedScene
|
||||
export(PackedScene) var player_display_scene : PackedScene
|
||||
export(String) var spawn_parent_path : String = "/root/Main"
|
||||
export(int) var default_level_override : int = 0
|
||||
@ -249,11 +246,11 @@ func _request_entity_spawn(createinfo : EntityCreateInfo):
|
||||
else:
|
||||
if not createinfo.networked:
|
||||
if createinfo.entity_controller == EntityEnums.ENITIY_CONTROLLER_PLAYER:
|
||||
entity_node = player_scene.instance()
|
||||
entity_node = PlayerGD.new()
|
||||
else:
|
||||
entity_node = mob_scene.instance()
|
||||
entity_node = MobGD.new()
|
||||
else:
|
||||
entity_node = networked_player_scene.instance()
|
||||
entity_node = NetworkedPlayerGD.new()
|
||||
|
||||
if entity_node == null:
|
||||
print("EntityManager: entity node is null")
|
||||
|
@ -1,16 +1,10 @@
|
||||
[gd_resource type="ESSEntitySpawner" load_steps=6 format=2]
|
||||
[gd_resource type="ESSEntitySpawner" load_steps=3 format=2]
|
||||
|
||||
[ext_resource path="res://player/bs_entity_spawner.gd" type="Script" id=1]
|
||||
[ext_resource path="res://player/NetworkedPlayer.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://player/Mob.tscn" type="PackedScene" id=3]
|
||||
[ext_resource path="res://player/DisplayPlayer.tscn" type="PackedScene" id=4]
|
||||
[ext_resource path="res://player/Player.tscn" type="PackedScene" id=5]
|
||||
|
||||
[resource]
|
||||
script = ExtResource( 1 )
|
||||
player_scene = ExtResource( 5 )
|
||||
networked_player_scene = ExtResource( 2 )
|
||||
mob_scene = ExtResource( 3 )
|
||||
player_display_scene = ExtResource( 4 )
|
||||
spawn_parent_path = "/root/Main"
|
||||
default_level_override = 0
|
||||
|
@ -224,6 +224,11 @@ _global_script_classes=[ {
|
||||
"language": "GDScript",
|
||||
"path": "res://scenes/Menu.gd"
|
||||
}, {
|
||||
"base": "Entity",
|
||||
"class": "MobGD",
|
||||
"language": "GDScript",
|
||||
"path": "res://player/Mob.gd"
|
||||
}, {
|
||||
"base": "",
|
||||
"class": "NetworkedPlayerGD",
|
||||
"language": "GDScript",
|
||||
@ -308,6 +313,7 @@ _global_script_class_icons={
|
||||
"MainPlanetGenerator": "",
|
||||
"ManaResource": "",
|
||||
"Menu": "",
|
||||
"MobGD": "",
|
||||
"NetworkedPlayerGD": "",
|
||||
"PlayerGD": "",
|
||||
"PlayerMaster": "",
|
||||
|
Loading…
Reference in New Issue
Block a user