X-Git-Url: http://git.purplebirdman.com/baabarian.git/blobdiff_plain/526b0a508cd476fa750b479e59045bd253ca2949..48a972450ae342fd7a4e635b3be6b157432d000d:/map/test2.tscn

diff --git a/map/test2.tscn b/map/test2.tscn
index e9c339a..37a2a6a 100644
--- a/map/test2.tscn
+++ b/map/test2.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://cn2p6orcbai0h"]
+[gd_scene load_steps=13 format=3 uid="uid://cn2p6orcbai0h"]
 
 [ext_resource type="Script" uid="uid://dpsqolvx3mdic" path="res://class/Scene.gd" id="1_mogmc"]
 [ext_resource type="Script" uid="uid://dd3sep8kprktl" path="res://class/ux/debug_overlay.gd" id="2_avrv7"]
@@ -8,6 +8,7 @@
 [ext_resource type="PackedScene" uid="uid://yutmq76fj37a" path="res://asset/pin.tscn" id="7_adqkx"]
 [ext_resource type="PackedScene" uid="uid://d2k5qfpdk2rsh" path="res://asset/test-ground.tscn" id="8_mogmc"]
 [ext_resource type="PackedScene" uid="uid://bx83k2u0snfjc" path="res://asset/cube.tscn" id="8_x52vu"]
+[ext_resource type="PackedScene" uid="uid://dvipfagbdiyod" path="res://asset/barrel.tscn" id="9_avrv7"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_mf4mk"]
 sky_horizon_color = Color(0.662243, 0.671743, 0.686743, 1)
@@ -22,7 +23,7 @@ sky = SubResource("Sky_37kl0")
 tonemap_mode = 2
 glow_enabled = true
 
-[node name="Test" type="Node3D"]
+[node name="Test2" type="Node3D"]
 script = ExtResource("1_mogmc")
 
 [node name="debug" type="CanvasLayer" parent="."]
@@ -46,7 +47,8 @@ offset_bottom = 40.0
 script = ExtResource("4_h0sby")
 
 [node name="player" parent="." instance=ExtResource("5_e88oi")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 9.0656, 20.1572)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 6.25214, 20.1572)
+collision_mask = 7
 
 [node name="map" type="Node3D" parent="."]
 
@@ -58,40 +60,43 @@ transform = Transform3D(1, 0, 0, 0, 0.499998, 0.866027, 0, -0.866027, 0.499998,
 shadow_enabled = true
 
 [node name="map-test" parent="map" instance=ExtResource("8_mogmc")]
-transform = Transform3D(1, 0, 0, 0, 0.58, 0, 0, 0, 1, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 0.4, 0, 0, 0, 1, 0, 0, 0)
 
 [node name="bowling" type="Node3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 12.3014, 32)
 
 [node name="Pin" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, -6.78075, 34)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2, -8.18374, 34)
 
 [node name="Pin2" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -6.66755, 34)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -8.10567, 34)
 
 [node name="Pin3" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -6.55983, 34)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -8.03138, 34)
 
 [node name="Pin4" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -6.44812, 34)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4, -7.95434, 34)
 
 [node name="Pin5" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -7.29534, 32)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, -8.53863, 32)
 
 [node name="Pin6" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -7.18529, 32)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -8.46273, 32)
 
 [node name="Pin7" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, -7.0746, 32)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3, -8.38639, 32)
 
 [node name="Pin8" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -8.06684, 30)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -9.0707, 30)
 
 [node name="Pin9" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -7.95368, 30)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2, -8.99266, 30)
 
 [node name="Pin10" parent="bowling" instance=ExtResource("7_adqkx")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -8.95658, 28)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -9.68431, 28)
 
 [node name="Cube" parent="bowling" instance=ExtResource("8_x52vu")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -8.03251, 2)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, -9.04702, 2)
+
+[node name="barrel" parent="." instance=ExtResource("9_avrv7")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.43346, 3.47426, 68.4355)