added royal guard

This commit is contained in:
Jan 2020-10-08 23:18:46 +02:00
parent df25e99f04
commit f9ecf395f8
21 changed files with 809 additions and 50 deletions

View file

@ -0,0 +1,6 @@
extends "res://Player.gd"
func _ready():
if name == String(get_tree().get_network_unique_id()):
print("SELF")
#$Throne/Cube.cast_shadow = 3

View file

@ -0,0 +1,38 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Player.tscn" type="PackedScene" id=1]
[ext_resource path="res://Assets/Characters/HerMajestyTheQueen/HerMajestyTheQueen.gd" type="Script" id=2]
[ext_resource path="res://Assets/Characters/HerMajestyTheQueen/Throne/Throne.gltf" type="PackedScene" id=3]
[ext_resource path="res://Assets/Characters/HerMajestyTheQueen/RoyalGuard/RoyalGuard.tscn" type="PackedScene" id=4]
[sub_resource type="CapsuleShape" id=1]
radius = 1.2
height = 0.6
[node name="HerMajestyTheQueen" instance=ExtResource( 1 )]
script = ExtResource( 2 )
[node name="Camera" parent="." index="0"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.52414, -0.0651628 )
[node name="Billboard" parent="." index="1"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3.27203, 0 )
[node name="CollisionShapeBody" parent="." index="2"]
transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 1.5, 0 )
shape = SubResource( 1 )
[node name="Throne" parent="." index="7" instance=ExtResource( 3 )]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0, 0.989432, 0 )
[node name="FrontLeft" parent="." index="8" instance=ExtResource( 4 )]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0.918807, 0, -0.312819 )
[node name="FrontRight" parent="." index="9" instance=ExtResource( 4 )]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, -0.919, 0, -0.313 )
[node name="BackLeft" parent="." index="10" instance=ExtResource( 4 )]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, 0.918807, 0, 0.7619 )
[node name="BackRight" parent="." index="11" instance=ExtResource( 4 )]
transform = Transform( -1, 0, -3.25841e-07, 0, 1, 0, 3.25841e-07, 0, -1, -0.919, 0, 0.761719 )

View file

@ -0,0 +1,5 @@
[gd_scene load_steps=2 format=2]
[ext_resource path="res://Assets/Characters/HerMajestyTheQueen/RoyalGuard/royalguard.gltf" type="PackedScene" id=1]
[node name="royalguard" instance=ExtResource( 1 )]

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -8,7 +8,7 @@ export var auto_host = false
var mouse_sensitivity_multiplier = 1.0 var mouse_sensitivity_multiplier = 1.0
var player_scene = preload("res://Player.tscn") var player_scene = preload("res://Assets/Characters/HerMajestyTheQueen/HerMajestyTheQueen.tscn")
var settingmap = { var settingmap = {
"is_fullscreen": "set_fullscreen", "is_fullscreen": "set_fullscreen",

View file

@ -11,6 +11,7 @@ background_mode = 2
background_sky = SubResource( 1 ) background_sky = SubResource( 1 )
tonemap_mode = 2 tonemap_mode = 2
tonemap_white = 2.0 tonemap_white = 2.0
ss_reflections_enabled = true
ssao_enabled = true ssao_enabled = true
ssao_radius = 2.5 ssao_radius = 2.5
ssao_radius2 = 4.0 ssao_radius2 = 4.0

View file

@ -204,35 +204,12 @@ master func kill():
#print ("health:", health) #print ("health:", health)
$CollisionShapeBody.disabled = true $CollisionShapeBody.disabled = true
$CollisionShapeFeet.disabled = true
#print ("collision disabled")
# spawn gibs
#var gibs = $Player/Gibs.duplicate()
#get_tree().root.add_child(gibs)
#gibs.global_transform = global_transform
#gibs.show()
#print ("gibs spawned")
# enable the ragdoll colliders
#for i in gibs.get_children():
# i.get_child(1).disabled = false
#print ("gibs enabled")
# Respawn timer
#print ("set as dead")
$MeshInstance.hide()
$Camera/Hand.hide() $Camera/Hand.hide()
#$HUD.update_crosshair(false, false) #$HUD.update_crosshair(false, false)
yield(get_tree().create_timer(3), "timeout") yield(get_tree().create_timer(3), "timeout")
$MeshInstance.show()
spawn() spawn()
yield(get_tree().create_timer(3), "timeout") yield(get_tree().create_timer(3), "timeout")
@ -252,7 +229,7 @@ func spawn():
game.get_spawn_point().spawn(self) game.get_spawn_point().spawn(self)
$MeshInstance.show() #$MeshInstance.show()
$Camera/Hand.show() $Camera/Hand.show()
$CollisionShapeBody.disabled = false $CollisionShapeBody.disabled = false

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=2] [gd_scene load_steps=10 format=2]
[ext_resource path="res://Player.gd" type="Script" id=1] [ext_resource path="res://Player.gd" type="Script" id=1]
[ext_resource path="res://Assets/Weapons/Handgun/Handgun.tscn" type="PackedScene" id=2] [ext_resource path="res://Assets/Weapons/Handgun/Handgun.tscn" type="PackedScene" id=2]
@ -11,18 +11,10 @@
[sub_resource type="QuadMesh" id=1] [sub_resource type="QuadMesh" id=1]
size = Vector2( 2, 0.6 ) size = Vector2( 2, 0.6 )
[sub_resource type="CapsuleShape" id=3] [sub_resource type="CapsuleShape" id=2]
radius = 0.33 radius = 0.33
height = 1.1 height = 1.1
[sub_resource type="CylinderShape" id=4]
radius = 0.2
height = 0.3
[sub_resource type="CapsuleMesh" id=5]
radius = 0.33
mid_height = 1.1
[node name="Player" type="KinematicBody"] [node name="Player" type="KinematicBody"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@ -35,7 +27,7 @@ transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, 0.335,
[node name="Weapon" parent="Camera/Hand" instance=ExtResource( 2 )] [node name="Weapon" parent="Camera/Hand" instance=ExtResource( 2 )]
[node name="Billboard" type="MeshInstance" parent="."] [node name="Billboard" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.03304, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.49795, 0 )
mesh = SubResource( 1 ) mesh = SubResource( 1 )
material/0 = null material/0 = null
script = ExtResource( 4 ) script = ExtResource( 4 )
@ -58,7 +50,7 @@ __meta__ = {
[node name="Nametag" type="Label" parent="Billboard/Viewport/VBoxContainer"] [node name="Nametag" type="Label" parent="Billboard/Viewport/VBoxContainer"]
margin_right = 500.0 margin_right = 500.0
margin_bottom = 57.0 margin_bottom = 50.0
rect_min_size = Vector2( 500, 50 ) rect_min_size = Vector2( 500, 50 )
custom_fonts/font = ExtResource( 5 ) custom_fonts/font = ExtResource( 5 )
text = "guest" text = "guest"
@ -72,22 +64,13 @@ __meta__ = {
anchor_top = 0.0 anchor_top = 0.0
anchor_bottom = 0.0 anchor_bottom = 0.0
margin_left = 0.0 margin_left = 0.0
margin_top = 61.0 margin_top = 54.0
margin_right = 500.0 margin_right = 500.0
margin_bottom = 111.0 margin_bottom = 104.0
[node name="CollisionShapeBody" type="CollisionShape" parent="."] [node name="CollisionShapeBody" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0.882822, 0 ) transform = Transform( 1, 0, 0, 0, -1.62921e-07, 1, 0, -1, -1.62921e-07, 0, 0.882822, 0 )
shape = SubResource( 3 ) shape = SubResource( 2 )
[node name="CollisionShapeFeet" type="CollisionShape" parent="."]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.150321, 0 )
shape = SubResource( 4 )
[node name="MeshInstance" type="MeshInstance" parent="."]
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0.882822, 0 )
mesh = SubResource( 5 )
material/0 = null
[node name="Debug" type="Label" parent="."] [node name="Debug" type="Label" parent="."]
margin_right = 41.0 margin_right = 41.0

BIN
royalguard.blend1 Normal file

Binary file not shown.