From e3b9e418265c765cbccc6f507e3d40c8b98db15b Mon Sep 17 00:00:00 2001 From: Alan O'Cull Date: Sun, 28 Jan 2024 16:50:06 -0500 Subject: [PATCH] AAAAA --- assets/env/bezos_ball.png | 3 + assets/env/bezos_ball.png.import | 34 ++++++ export_presets.cfg | 6 +- main.gd | 13 +++ main.tscn | 193 ++++++++++++++++--------------- project.godot | 8 +- props/shelves/shelf.tscn | 1 + 7 files changed, 157 insertions(+), 101 deletions(-) create mode 100644 assets/env/bezos_ball.png create mode 100644 assets/env/bezos_ball.png.import diff --git a/assets/env/bezos_ball.png b/assets/env/bezos_ball.png new file mode 100644 index 0000000..75e03a4 --- /dev/null +++ b/assets/env/bezos_ball.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b40be8eaba4ae0125a99cc9207b05560d08d256864cb6d1cb43cd5898dccbee +size 993212 diff --git a/assets/env/bezos_ball.png.import b/assets/env/bezos_ball.png.import new file mode 100644 index 0000000..5b8bc56 --- /dev/null +++ b/assets/env/bezos_ball.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://xc35060p1sa1" +path="res://.godot/imported/bezos_ball.png-da62e1a8e355eca94ccdfe2de84fedc7.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/env/bezos_ball.png" +dest_files=["res://.godot/imported/bezos_ball.png-da62e1a8e355eca94ccdfe2de84fedc7.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/export_presets.cfg b/export_presets.cfg index 782e83f..aa2cadd 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -8,7 +8,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="" +export_path="../../GodotExports/Armazon.exe" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false @@ -19,7 +19,7 @@ encrypt_directory=false custom_template/debug="" custom_template/release="" debug/export_console_wrapper=1 -binary_format/embed_pck=false +binary_format/embed_pck=true texture_format/bptc=true texture_format/s3tc=true texture_format/etc=false @@ -32,7 +32,7 @@ codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PackedStringArray() application/modify_resources=true -application/icon="" +application/icon="res://assets/env/bezos_ball.png" application/console_wrapper_icon="" application/icon_interpolation=4 application/file_version="" diff --git a/main.gd b/main.gd index 72b8000..41167cf 100644 --- a/main.gd +++ b/main.gd @@ -96,6 +96,17 @@ func _process(delta: float) -> void: quicktime_tween.tween_property(camera, 'global_transform', $world/cam_default.global_transform, dodge_timer_max * 0.7) func _input(event: InputEvent) -> void: + if event.is_action_pressed("fullscreen"): + var w: Window = get_viewport().get_window() + match w.mode: + Window.MODE_FULLSCREEN: + w.mode = Window.MODE_WINDOWED + _: + w.mode = Window.MODE_FULLSCREEN + + if event.is_action_pressed("exit"): + get_tree().quit() + if event.is_action_pressed("quicktime_dodge") and dodge_timer <= 0 and stun_timer < 0: dodge_timer = dodge_timer_max @@ -163,6 +174,8 @@ func do_bonus(): func do_penalty(): wage -= wage_penalty + if wage < 0: + get_tree().quit() emit_signal("penalty") func _on_trash(body_rid: RID, body: Node3D, body_shape_index: int, local_shape_index: int) -> void: diff --git a/main.tscn b/main.tscn index 17d57e5..8472c6f 100644 --- a/main.tscn +++ b/main.tscn @@ -87,7 +87,7 @@ adjustment_enabled = true adjustment_contrast = 1.5 adjustment_color_correction = SubResource("GradientTexture1D_y6d2o") -[sub_resource type="AnimationLibrary" id="AnimationLibrary_tvr6b"] +[sub_resource type="AnimationLibrary" id="AnimationLibrary_nadsl"] _data = { "GRAB": ExtResource("20_mcvde"), "HOLD": ExtResource("21_dwwlq"), @@ -136,7 +136,7 @@ plane = Plane(1, 0, 0, 0) material = ExtResource("53_slbh8") size = Vector2(1.5, 3) -[sub_resource type="Animation" id="Animation_k8s4x"] +[sub_resource type="Animation" id="Animation_brp58"] resource_name = "GRAB" length = 0.291667 tracks/0/type = "position_3d" @@ -868,7 +868,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214) -[sub_resource type="Animation" id="Animation_vqxyr"] +[sub_resource type="Animation" id="Animation_xo4ti"] resource_name = "HOLD" length = 0.25 tracks/0/type = "position_3d" @@ -1600,7 +1600,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09) -[sub_resource type="Animation" id="Animation_2rsit"] +[sub_resource type="Animation" id="Animation_s2o7k"] resource_name = "Idle" length = 1.5 loop_mode = 1 @@ -2333,7 +2333,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214) -[sub_resource type="Animation" id="Animation_oe46f"] +[sub_resource type="Animation" id="Animation_16il2"] resource_name = "rigAction_001" length = 0.25 tracks/0/type = "position_3d" @@ -3065,7 +3065,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09) -[sub_resource type="Animation" id="Animation_aj1hp"] +[sub_resource type="Animation" id="Animation_fp21s"] resource_name = "STONE-TOSS" length = 2.45833 tracks/0/type = "position_3d" @@ -3797,7 +3797,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, -0.0472625, -0.141197, -0.121214) -[sub_resource type="Animation" id="Animation_ku7ib"] +[sub_resource type="Animation" id="Animation_wntgo"] resource_name = "Stun" length = 0.291667 tracks/0/type = "position_3d" @@ -4529,7 +4529,7 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, 0.135625, -9.08356e-08, 0.99076, 8.59226e-09) -[sub_resource type="Animation" id="Animation_g1tfr"] +[sub_resource type="Animation" id="Animation_scxwl"] resource_name = "bezoball_low_final" length = 22.6667 tracks/0/type = "position_3d" @@ -5261,15 +5261,15 @@ tracks/103/interp = 1 tracks/103/loop_wrap = true tracks/103/keys = PackedFloat32Array(0, 1, 1, 1, 1) -[sub_resource type="AnimationLibrary" id="AnimationLibrary_k1wx6"] +[sub_resource type="AnimationLibrary" id="AnimationLibrary_w3xcp"] _data = { -"GRAB": SubResource("Animation_k8s4x"), -"HOLD": SubResource("Animation_vqxyr"), -"Idle": SubResource("Animation_2rsit"), -"STONE-TOSS": SubResource("Animation_aj1hp"), -"Stun": SubResource("Animation_ku7ib"), -"bezoball_low_final": SubResource("Animation_g1tfr"), -"rigAction_001": SubResource("Animation_oe46f") +"GRAB": SubResource("Animation_brp58"), +"HOLD": SubResource("Animation_xo4ti"), +"Idle": SubResource("Animation_s2o7k"), +"STONE-TOSS": SubResource("Animation_fp21s"), +"Stun": SubResource("Animation_wntgo"), +"bezoball_low_final": SubResource("Animation_scxwl"), +"rigAction_001": SubResource("Animation_16il2") } [sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_xsp1s"] @@ -5351,31 +5351,31 @@ bones/2/scale = Vector3(1.01115, 1.01115, 1.01115) bones/3/rotation = Quaternion(0.52569, 0.289474, 0.105462, 0.792927) bones/3/scale = Vector3(0.731301, 0.731302, 0.731301) bones/4/rotation = Quaternion(0.0791671, 0.591145, 0.0117835, 0.802584) -bones/5/rotation = Quaternion(0.0450107, 0.0380777, 0.0497003, 0.997023) -bones/6/rotation = Quaternion(0.136122, -0.0231303, -0.00767077, 0.990392) -bones/7/rotation = Quaternion(0.0863067, 0.00657699, -0.00178286, 0.996245) -bones/8/rotation = Quaternion(0.0208786, 0.871177, 0.484602, 0.0760052) +bones/5/rotation = Quaternion(-0.114859, 0.0296482, 0.055145, 0.991407) +bones/6/rotation = Quaternion(0.0288767, -0.0221721, -0.0101133, 0.999286) +bones/7/rotation = Quaternion(-0.0212786, 0.0067306, -0.0010648, 0.99975) +bones/8/rotation = Quaternion(0.0137349, 0.844099, 0.53078, 0.0747077) bones/8/scale = Vector3(1, 1, 1) -bones/9/rotation = Quaternion(0.0922261, -0.0135893, -0.00227439, 0.995643) -bones/10/rotation = Quaternion(-0.111863, -0.00269012, -0.0159975, 0.993591) +bones/9/rotation = Quaternion(0.0213616, -0.0162021, -0.00316435, 0.999636) +bones/10/rotation = Quaternion(-0.182076, -0.00154825, -0.0161487, 0.983151) bones/10/scale = Vector3(1, 1, 1) bones/11/rotation = Quaternion(0.00106178, 0.584364, -0.0154954, 0.811343) -bones/12/rotation = Quaternion(0.120747, 0.0227284, 0.0234212, 0.992147) -bones/13/rotation = Quaternion(0.107615, -0.0336076, 0.0384173, 0.992882) +bones/12/rotation = Quaternion(-0.0852055, 0.0174444, 0.0275827, 0.995829) +bones/13/rotation = Quaternion(-0.0277064, -0.0384966, 0.0335165, 0.998312) bones/13/scale = Vector3(1, 1, 1) -bones/14/rotation = Quaternion(0.0613068, -0.00721559, -0.0109309, 0.998033) +bones/14/rotation = Quaternion(-0.0742849, -0.00567057, -0.0118079, 0.997151) bones/15/rotation = Quaternion(-0.0611887, 0.573124, -0.0421539, 0.816093) -bones/16/rotation = Quaternion(0.169863, -0.0162869, 0.0368985, 0.984642) +bones/16/rotation = Quaternion(-0.0892523, -0.025234, 0.0314639, 0.995192) bones/16/scale = Vector3(1, 1, 1) -bones/17/rotation = Quaternion(0.137001, -0.00253015, 0.0311178, 0.990079) +bones/17/rotation = Quaternion(-0.0310715, -0.0077159, 0.0302523, 0.99903) bones/17/scale = Vector3(1, 1, 1) -bones/18/rotation = Quaternion(0.108275, -0.0269229, 0.0271236, 0.993386) +bones/18/rotation = Quaternion(-0.0599458, -0.0310922, 0.0222224, 0.99747) bones/18/scale = Vector3(1, 1, 1) bones/19/rotation = Quaternion(-0.15484, 0.544614, -0.0238322, 0.823925) -bones/20/rotation = Quaternion(0.250584, -0.00914195, 0.0197953, 0.967849) -bones/21/rotation = Quaternion(0.136664, -0.00168099, -0.0268728, 0.990251) +bones/20/rotation = Quaternion(-0.026638, -0.0142562, 0.0164975, 0.999407) +bones/21/rotation = Quaternion(-0.0485095, 0.00330874, -0.0267216, 0.99846) bones/21/scale = Vector3(1, 1, 1) -bones/22/rotation = Quaternion(0.1385, -0.00790934, 0.0711001, 0.987775) +bones/22/rotation = Quaternion(-0.0462456, -0.0208992, 0.068419, 0.996365) bones/22/scale = Vector3(1, 1, 1) [node name="Main_Body" parent="world/Armondo/rig/Skeleton3D" index="0"] @@ -5390,7 +5390,7 @@ target_node = NodePath("../../../../hand_target") [node name="AnimationTree" type="AnimationTree" parent="world/Armondo"] libraries = { -"": SubResource("AnimationLibrary_tvr6b") +"": SubResource("AnimationLibrary_nadsl") } tree_root = ExtResource("25_asp1p") anim_player = NodePath("../AnimationPlayer") @@ -5592,6 +5592,7 @@ surface_material_override/1 = ExtResource("17_cy31d") [node name="conveyor2" type="StaticBody3D" parent="world"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.192684, -2.66332) +collision_layer = 8 constant_linear_velocity = Vector3(1, 0, 0) [node name="CollisionShape3D" type="CollisionShape3D" parent="world/conveyor2"] @@ -5689,99 +5690,99 @@ bones/28/scale = Vector3(1.00001, 0.999972, 1.00001) bones/29/rotation = Quaternion(0.137653, 0.129111, 0.0826848, 0.978542) bones/29/scale = Vector3(0.979536, 1.0413, 0.981311) bones/30/rotation = Quaternion(0.024349, 0.587802, 0.0762459, 0.805036) -bones/31/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853) -bones/32/rotation = Quaternion(-0.032619, -0.0210634, 0.00186326, 0.999244) +bones/31/rotation = Quaternion(-0.0145326, 0.0372494, 0.0356239, 0.998565) +bones/32/rotation = Quaternion(-0.0360098, -0.0210696, 0.0017914, 0.999128) bones/32/scale = Vector3(1, 1, 1) -bones/33/rotation = Quaternion(0.0172205, 0.00679305, -0.00806877, 0.999796) -bones/34/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534) -bones/35/rotation = Quaternion(-0.0357779, -0.0167047, -0.01128, 0.999157) -bones/36/rotation = Quaternion(-0.235074, -0.00367766, 0.0261094, 0.97162) -bones/37/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853) -bones/38/rotation = Quaternion(-0.032619, -0.0210634, 0.00186326, 0.999244) +bones/33/rotation = Quaternion(0.0138276, 0.00682041, -0.00804549, 0.999849) +bones/34/rotation = Quaternion(-0.181512, 0.692524, 0.44971, 0.534065) +bones/35/rotation = Quaternion(0.0210372, -0.0146255, -0.0103709, 0.999618) +bones/36/rotation = Quaternion(-0.179473, -0.00218766, 0.0262766, 0.983409) +bones/37/rotation = Quaternion(-0.0145326, 0.0372494, 0.0356239, 0.998565) +bones/38/rotation = Quaternion(-0.0360098, -0.0210696, 0.0017914, 0.999128) bones/38/scale = Vector3(1, 1, 1) -bones/39/rotation = Quaternion(0.0172205, 0.00679305, -0.00806877, 0.999796) -bones/40/rotation = Quaternion(-0.0167865, 0.037169, 0.035708, 0.99853) -bones/40/scale = Vector3(1, 0.999633, 1) -bones/41/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534) -bones/42/rotation = Quaternion(-0.0357779, -0.0167047, -0.01128, 0.999157) -bones/43/rotation = Quaternion(-0.235074, -0.00367766, 0.0261094, 0.97162) -bones/44/rotation = Quaternion(-0.190104, 0.668955, 0.473179, 0.540797) -bones/44/scale = Vector3(1, 1.09812, 1) -bones/46/rotation = Quaternion(-0.0167856, 0.0371677, 0.0357081, 0.99853) +bones/39/rotation = Quaternion(0.0138276, 0.00682041, -0.00804549, 0.999849) +bones/40/rotation = Quaternion(-0.0145324, 0.0372495, 0.035624, 0.998565) +bones/40/scale = Vector3(1.00282, 1.00179, 1.00282) +bones/41/rotation = Quaternion(-0.181512, 0.692524, 0.44971, 0.534065) +bones/42/rotation = Quaternion(0.0210372, -0.0146255, -0.0103709, 0.999618) +bones/43/rotation = Quaternion(-0.179473, -0.00218766, 0.0262766, 0.983409) +bones/44/rotation = Quaternion(-0.17385, 0.683358, 0.452728, 0.545743) +bones/44/scale = Vector3(1.00397, 1.06192, 1.00397) +bones/46/rotation = Quaternion(-0.0145315, 0.0372482, 0.0356241, 0.998565) bones/46/scale = Vector3(1, 1, 1) -bones/48/rotation = Quaternion(-0.0326179, -0.0210648, 0.0018637, 0.999244) +bones/48/rotation = Quaternion(-0.0360088, -0.0210711, 0.00179219, 0.999128) bones/48/scale = Vector3(1, 1, 1) -bones/50/rotation = Quaternion(0.0172189, 0.00679512, -0.00806831, 0.999796) +bones/50/rotation = Quaternion(0.0138259, 0.00682248, -0.00804518, 0.999849) bones/50/scale = Vector3(1, 1, 1) -bones/52/rotation = Quaternion(-0.0755315, -6.17047e-08, 0.997143, 3.98341e-09) +bones/52/rotation = Quaternion(-0.0755315, -4.72999e-08, 0.997143, -6.08447e-09) bones/52/scale = Vector3(1, 1, 1) -bones/55/rotation = Quaternion(-0.0167865, 0.0371689, 0.0357078, 0.99853) -bones/56/rotation = Quaternion(-0.190103, 0.668954, 0.473179, 0.540797) -bones/58/rotation = Quaternion(-0.0359924, 0.00294827, -0.0105718, 0.999292) +bones/55/rotation = Quaternion(-0.0145326, 0.0372494, 0.0356239, 0.998565) +bones/56/rotation = Quaternion(-0.17385, 0.683358, 0.452728, 0.545743) +bones/58/rotation = Quaternion(0.0208584, 0.00234267, -0.0107223, 0.999722) bones/58/scale = Vector3(1, 1, 1) -bones/60/rotation = Quaternion(-0.235074, -0.00368006, 0.0261111, 0.97162) +bones/60/rotation = Quaternion(-0.179474, -0.00219015, 0.0262781, 0.983409) bones/62/rotation = Quaternion(0.884812, 3.32611e-06, 0.465948, -1.29939e-06) -bones/65/rotation = Quaternion(-0.199375, 0.679463, 0.469348, 0.527534) +bones/65/rotation = Quaternion(-0.181512, 0.692524, 0.44971, 0.534065) bones/66/rotation = Quaternion(-0.0150627, 0.584674, 0.0037911, 0.811119) -bones/67/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294) +bones/67/rotation = Quaternion(-0.0834463, 0.0175302, 0.0271748, 0.995987) bones/67/scale = Vector3(1, 1, 1) -bones/68/rotation = Quaternion(0.0433346, -0.0358254, 0.0230619, 0.998152) +bones/68/rotation = Quaternion(0.0174752, -0.0364105, 0.0221263, 0.998939) bones/68/scale = Vector3(1, 1, 1) -bones/69/rotation = Quaternion(0.0590244, -0.00614597, -0.0437613, 0.997278) -bones/70/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294) +bones/69/rotation = Quaternion(0.0331829, -0.00501077, -0.043906, 0.998472) +bones/70/rotation = Quaternion(-0.0834463, 0.0175302, 0.0271748, 0.995987) bones/70/scale = Vector3(1, 1, 1) -bones/71/rotation = Quaternion(0.0433346, -0.0358254, 0.0230619, 0.998152) +bones/71/rotation = Quaternion(0.0174752, -0.0364105, 0.0221263, 0.998939) bones/71/scale = Vector3(1, 1, 1) -bones/72/rotation = Quaternion(0.0590244, -0.00614597, -0.0437613, 0.997278) -bones/73/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265465, 0.998294) -bones/73/scale = Vector3(1, 0.99133, 1) -bones/75/rotation = Quaternion(-0.0486236, 0.0184673, 0.0265464, 0.998294) +bones/72/rotation = Quaternion(0.0331829, -0.00501077, -0.043906, 0.998472) +bones/73/rotation = Quaternion(-0.0834466, 0.0175302, 0.0271751, 0.995987) +bones/73/scale = Vector3(1.00195, 1.00782, 1.00195) +bones/75/rotation = Quaternion(-0.0834458, 0.0175293, 0.0271749, 0.995988) bones/75/scale = Vector3(1, 1, 1) -bones/77/rotation = Quaternion(0.0433365, -0.0358275, 0.023062, 0.998152) +bones/77/rotation = Quaternion(0.0174776, -0.0364127, 0.0221266, 0.998939) bones/77/scale = Vector3(1, 1, 1) -bones/79/rotation = Quaternion(0.0590273, -0.00614916, -0.0437623, 0.997278) +bones/79/rotation = Quaternion(0.0331857, -0.00501403, -0.0439069, 0.998472) bones/80/rotation = Quaternion(-3.08873e-06, 3.24659e-06, 8.01869e-07, 1) -bones/81/rotation = Quaternion(0.0289889, 2.7215e-09, 0.99958, 4.63454e-10) +bones/81/rotation = Quaternion(0.028989, 4.68881e-10, 0.99958, -1.9648e-09) bones/81/scale = Vector3(1, 1, 1) -bones/84/rotation = Quaternion(-0.0486244, 0.0184682, 0.0265464, 0.998294) +bones/84/rotation = Quaternion(-0.0834463, 0.0175302, 0.0271748, 0.995987) bones/84/scale = Vector3(1, 1, 1) bones/85/rotation = Quaternion(-0.0536367, 0.572428, -0.051421, 0.816581) bones/85/scale = Vector3(1, 1, 1) -bones/86/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111) -bones/87/rotation = Quaternion(0.0649279, -0.00486025, 0.015603, 0.997756) -bones/88/rotation = Quaternion(0.0825498, -0.0271993, -0.0105809, 0.99616) -bones/89/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111) -bones/90/rotation = Quaternion(0.0649279, -0.00486025, 0.015603, 0.997756) -bones/91/rotation = Quaternion(0.0825498, -0.0271993, -0.0105809, 0.99616) -bones/92/rotation = Quaternion(-0.0119805, -0.0227274, 0.0334339, 0.999111) -bones/92/scale = Vector3(1, 0.97766, 1) -bones/94/rotation = Quaternion(-0.0119802, -0.0227277, 0.0334343, 0.999111) +bones/86/rotation = Quaternion(-0.089591, -0.0252569, 0.0315665, 0.995158) +bones/87/rotation = Quaternion(0.0132315, -0.00566082, 0.0153307, 0.999779) +bones/88/rotation = Quaternion(0.0309126, -0.0266158, -0.0119733, 0.999096) +bones/89/rotation = Quaternion(-0.089591, -0.0252569, 0.0315665, 0.995158) +bones/90/rotation = Quaternion(0.0132315, -0.00566082, 0.0153307, 0.999779) +bones/91/rotation = Quaternion(0.0309126, -0.0266158, -0.0119733, 0.999096) +bones/92/rotation = Quaternion(-0.0895909, -0.025257, 0.0315665, 0.995158) +bones/92/scale = Vector3(1.0009, 1.0106, 1.0009) +bones/94/rotation = Quaternion(-0.0895906, -0.0252573, 0.0315668, 0.995158) bones/95/rotation = Quaternion(-2.952e-07, 2.49594e-07, -2.64961e-07, 1) -bones/96/rotation = Quaternion(0.0649287, -0.00486107, 0.0156025, 0.997756) -bones/98/rotation = Quaternion(0.082547, -0.0271964, -0.0105796, 0.99616) +bones/96/rotation = Quaternion(0.0132324, -0.00566162, 0.0153302, 0.999779) +bones/98/rotation = Quaternion(0.0309097, -0.0266128, -0.0119722, 0.999096) bones/98/scale = Vector3(1, 1, 1) -bones/100/rotation = Quaternion(0.135625, -9.38363e-08, 0.99076, 9.56959e-10) -bones/103/rotation = Quaternion(-0.0119806, -0.0227274, 0.0334339, 0.999111) +bones/100/rotation = Quaternion(0.135625, -9.3295e-08, 0.99076, 6.31304e-09) +bones/103/rotation = Quaternion(-0.089591, -0.0252569, 0.0315665, 0.995158) bones/104/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327) bones/104/scale = Vector3(1, 1, 1) -bones/105/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068) -bones/106/rotation = Quaternion(0.0540234, -9.55639e-06, -0.0383402, 0.997803) +bones/105/rotation = Quaternion(-0.136481, -0.0183524, 0.0574715, 0.988804) +bones/106/rotation = Quaternion(-0.0186327, 0.00277691, -0.0382397, 0.999091) bones/106/scale = Vector3(1, 1, 1) -bones/107/rotation = Quaternion(0.117164, -0.00894962, 0.0329822, 0.992524) -bones/108/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068) -bones/109/rotation = Quaternion(0.0540234, -9.55639e-06, -0.0383402, 0.997803) +bones/107/rotation = Quaternion(0.0447247, -0.0113229, 0.0322449, 0.998415) +bones/108/rotation = Quaternion(-0.136481, -0.0183524, 0.0574715, 0.988804) +bones/109/rotation = Quaternion(-0.0186327, 0.00277691, -0.0382397, 0.999091) bones/109/scale = Vector3(1, 1, 1) -bones/110/rotation = Quaternion(0.117164, -0.00894962, 0.0329822, 0.992524) -bones/111/rotation = Quaternion(-0.014852, -0.0112052, 0.0592809, 0.998068) -bones/111/scale = Vector3(1.01238, 0.967104, 1.01238) +bones/110/rotation = Quaternion(0.0447247, -0.0113229, 0.0322449, 0.998415) +bones/111/rotation = Quaternion(-0.136481, -0.0183524, 0.0574715, 0.988804) +bones/111/scale = Vector3(1.00584, 1.01341, 1.00584) bones/112/rotation = Quaternion(2.7474e-08, 3.72529e-09, -1.86265e-09, 1) -bones/113/rotation = Quaternion(-0.0148515, -0.0112056, 0.0592809, 0.998068) +bones/113/rotation = Quaternion(-0.136481, -0.0183528, 0.0574714, 0.988804) bones/113/scale = Vector3(1, 1, 1) -bones/115/rotation = Quaternion(0.054026, -1.19493e-05, -0.0383414, 0.997803) -bones/117/rotation = Quaternion(0.11716, -0.00894668, 0.0329819, 0.992525) +bones/115/rotation = Quaternion(-0.0186299, 0.00277446, -0.0382409, 0.999091) +bones/117/rotation = Quaternion(0.044721, -0.0113199, 0.0322445, 0.998415) bones/118/rotation = Quaternion(3.45754e-06, -3.00538e-06, 5.0338e-07, 1) bones/119/rotation = Quaternion(0.164736, 2.91293e-07, 0.986338, 7.60808e-07) -bones/122/rotation = Quaternion(-0.0148521, -0.0112053, 0.059281, 0.998068) +bones/122/rotation = Quaternion(-0.136481, -0.0183524, 0.0574715, 0.988804) bones/123/rotation = Quaternion(-0.0646238, 0.533247, -0.142714, 0.831327) bones/123/scale = Vector3(1, 1, 1) bones/124/rotation = Quaternion(0.707107, 0, 0, 0.707107) @@ -5829,7 +5830,7 @@ autostart = true [node name="AnimationTree" type="AnimationTree" parent="world/bezos/BALLZ"] libraries = { -"": SubResource("AnimationLibrary_k1wx6") +"": SubResource("AnimationLibrary_w3xcp") } tree_root = SubResource("AnimationNodeBlendTree_c1xvk") anim_player = NodePath("../AnimationPlayer") diff --git a/project.godot b/project.godot index 95dfdb6..0c4b696 100644 --- a/project.godot +++ b/project.godot @@ -14,8 +14,8 @@ config/name="Armazon" config/description="Pack boxes safely and efficiently to maximize customer satisfaction." run/main_scene="res://main.tscn" config/features=PackedStringArray("4.2", "Forward Plus") -boot_splash/bg_color=Color(0.415686, 0.333333, 0.227451, 1) -boot_splash/image="res://assets/env/logo.png" +boot_splash/bg_color=Color(0.384314, 0.133333, 0.121569, 1) +boot_splash/image="res://assets/env/bezos_ball.png" config/icon="res://icon.svg" [autoload] @@ -47,3 +47,7 @@ fullscreen={ 3d_physics/layer_1="all" 3d_physics/layer_2="box" 3d_physics/layer_3="item" + +[rendering] + +anti_aliasing/quality/msaa_3d=1 diff --git a/props/shelves/shelf.tscn b/props/shelves/shelf.tscn index ff6f7ba..0e6f08e 100644 --- a/props/shelves/shelf.tscn +++ b/props/shelves/shelf.tscn @@ -7,6 +7,7 @@ size = Vector3(3.02141, 4.27834, 0.811) [node name="Shelf" type="RigidBody3D"] +collision_mask = 9 mass = 100.0 [node name="Shelves" type="MeshInstance3D" parent="."]