diff options
author | Malfurious <m@lfurio.us> | 2022-09-12 03:37:12 -0400 |
---|---|---|
committer | Malfurious <m@lfurio.us> | 2022-09-12 03:37:12 -0400 |
commit | 31bc7653eb89688b9890523e1f2b39cc867837fc (patch) | |
tree | e5f25d2bfcf1205732707c0d89335f5d35d9904c /assets/maps/misc/test_map/shipping_yard_map.tscn | |
parent | e9baf6602be3efbf5ea566b4e0c80a12c38f475e (diff) | |
parent | 355dcc29148461dd79815e76fa1a5a887a44ecc3 (diff) | |
download | project-s-31bc7653eb89688b9890523e1f2b39cc867837fc.tar.gz project-s-31bc7653eb89688b9890523e1f2b39cc867837fc.zip |
Merge branch 'dynamic-viewmodel'
* dynamic-viewmodel:
ViewModel cycles characters on interact/ping
Decouple ViewModel and the BaseCharacter
Allow dynamic character material
Diffstat (limited to 'assets/maps/misc/test_map/shipping_yard_map.tscn')
-rw-r--r-- | assets/maps/misc/test_map/shipping_yard_map.tscn | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/assets/maps/misc/test_map/shipping_yard_map.tscn b/assets/maps/misc/test_map/shipping_yard_map.tscn index f2c5efb..f5cf4eb 100644 --- a/assets/maps/misc/test_map/shipping_yard_map.tscn +++ b/assets/maps/misc/test_map/shipping_yard_map.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=63 format=2] +[gd_scene load_steps=65 format=2] [ext_resource path="res://assets/maps/misc/test_map/test_map_assets/shipping_containers/red_malfurious_container/red_malfurious_container.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/maps/misc/test_map/test_map_assets/platforms/supports/support_01.tscn" type="PackedScene" id=2] @@ -36,6 +36,8 @@ [ext_resource path="res://custom_shaders/liquid.gdshader" type="Shader" id=34] [ext_resource path="res://assets/maps/misc/test_map/test_map_assets/environment/buildings/building_1/building_1.tscn" type="PackedScene" id=35] [ext_resource path="res://assets/maps/misc/test_map/test_map_assets/decals/ftf_graffiti.tscn" type="PackedScene" id=36] +[ext_resource path="res://assets/characters/base_character/BaseCharacter.tscn" type="PackedScene" id=37] +[ext_resource path="res://assets/characters/base_character/enemy_material.tres" type="Material" id=38] [sub_resource type="ArrayMesh" id=1] resource_name = "crane_load_Cylinder002" @@ -313,6 +315,16 @@ polygon_points = PoolVector2Array( 1.17958, -3.9844, 1.18686, 1.20034, -1.04211, [node name="shipping_yard_map" type="Spatial"] +[node name="ViewModel" parent="." instance=ExtResource( 11 )] +character = NodePath("../FriendlyPlayer") + +[node name="FriendlyPlayer" parent="." groups=["players"] instance=ExtResource( 37 )] +transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.066, 105.317 ) + +[node name="EnemyPlayer" parent="." groups=["players"] instance=ExtResource( 37 )] +transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2.066, -105.317 ) +material = ExtResource( 38 ) + [node name="left_side" type="Spatial" parent="."] [node name="shipping_yard_main_terrain" parent="left_side" instance=ExtResource( 6 )] @@ -1318,9 +1330,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.859604, 0, 34.7394 ) [node name="ftf_graffiti" parent="decorative/non_symmetrical_graffiti" instance=ExtResource( 36 )] transform = Transform( -4.37114e-08, -1, 4.37114e-08, 0.05007, -4.58452e-08, -0.998746, 0.998746, -4.14679e-08, 0.05007, 20.2422, 2.83189, 37.9582 ) -[node name="ViewModel" parent="." instance=ExtResource( 11 )] -transform = Transform( 1, 0, 1.74846e-07, 0, 1, 0, -1.74846e-07, 0, 1, 0, 2.06622, 105.317 ) - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = ExtResource( 21 ) |