diff --git a/Assets/TextureAtlases/player.tres b/Assets/TextureAtlases/player.tres index 4c9b456..4e7c530 100644 --- a/Assets/TextureAtlases/player.tres +++ b/Assets/TextureAtlases/player.tres @@ -1,6 +1,6 @@ [gd_resource type="AtlasTexture" format=3 uid="uid://bf3gkg7f2oyg7"] -[ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="1_fx7vy"] +[ext_resource type="Texture2D" uid="uid://chmxo0rj26cxh" path="res://Enemies/EyeDog/icon_eye_dog.png" id="1_fx7vy"] [resource] resource_local_to_scene = true diff --git a/Enemies/ElderEyeDog/mdl_elder_eye_dog.glb.import b/Enemies/ElderEyeDog/mdl_elder_eye_dog.glb.import index 80b0251..64321ed 100644 --- a/Enemies/ElderEyeDog/mdl_elder_eye_dog.glb.import +++ b/Enemies/ElderEyeDog/mdl_elder_eye_dog.glb.import @@ -39,7 +39,7 @@ materials/extract_format=0 materials/extract_path="" _subresources={ "animations": { -"Walk": { +"ArmatureAction": { "save_to_file/enabled": false, "save_to_file/fallback_path": "", "save_to_file/keep_custom_tracks": "", diff --git a/Enemies/ElderEyeDog/scn_elder_eye_dog.tscn b/Enemies/ElderEyeDog/scn_elder_eye_dog.tscn index 022b96f..00f6335 100644 --- a/Enemies/ElderEyeDog/scn_elder_eye_dog.tscn +++ b/Enemies/ElderEyeDog/scn_elder_eye_dog.tscn @@ -85,11 +85,36 @@ metadata/_custom_type_script = "uid://cojjgevmbhwal" [node name="Node3D" type="Node3D" parent="." unique_id=1193172733] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.39813, 0) -[node name="elder_eyedog" parent="." unique_id=1512230579 instance=ExtResource("8_fil5h")] +[node name="elder_eyedog" parent="." unique_id=1528468919 instance=ExtResource("8_fil5h")] transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) -[node name="AnimationPlayer" parent="elder_eyedog" index="1" unique_id=562572224] -autoplay = &"Walk" +[node name="Skeleton3D" parent="elder_eyedog/Armature" parent_id_path=PackedInt32Array(1528468919, 1628745338) index="0" unique_id=1532207150] +bones/1/rotation = Quaternion(-0.43930408, -1.0709028e-07, 5.2369117e-08, 0.89833844) +bones/3/rotation = Quaternion(0.23378512, 0.3248512, 0.54275554, 0.7383987) +bones/4/rotation = Quaternion(0.20259592, 0.73083645, 0.1334472, 0.637985) +bones/5/rotation = Quaternion(0.08071684, 0.113793895, 0.10338807, 0.9848079) +bones/6/rotation = Quaternion(0.18970051, 0.045550458, -0.014727582, 0.98067427) +bones/7/rotation = Quaternion(0.21259236, -0.040924765, -0.7761468, 0.59222114) +bones/8/rotation = Quaternion(0.14559563, -0.673764, -0.22377315, 0.68903524) +bones/9/rotation = Quaternion(0.21457948, -0.06795216, -0.27383053, 0.9350695) +bones/10/rotation = Quaternion(0.36169598, -0.022981055, -0.07378152, 0.9290878) +bones/11/position = Vector3(-0.18218139, 0.024974564, -0.29701275) +bones/13/rotation = Quaternion(-0.19031386, -0.3437138, 0.6673053, 0.6327283) +bones/14/rotation = Quaternion(-0.3159462, -0.57630664, -0.23705919, 0.7154381) +bones/15/rotation = Quaternion(0.36767015, -0.03635547, 0.34470242, 0.86294687) +bones/16/rotation = Quaternion(0.39200988, 0.014128344, 0.1034986, 0.91401124) +bones/17/rotation = Quaternion(-0.4156433, 0.23491892, -0.8066817, 0.34830815) +bones/18/rotation = Quaternion(-0.1550715, 0.546436, 0.03793802, 0.8221443) +bones/19/rotation = Quaternion(0.16323958, -0.017942397, -0.1540662, 0.9743175) +bones/20/rotation = Quaternion(0.20094733, -0.0385468, -0.0018878259, 0.9788416) +bones/22/position = Vector3(-0.1285572, 0.015959304, 0.5192608) +bones/22/scale = Vector3(0.89347196, 1, 1) +bones/23/position = Vector3(0.25597548, 0.022818465, 0.20058686) +bones/23/scale = Vector3(0.89347196, 1, 1) +bones/24/position = Vector3(0.08454189, 0.014853473, 0.12984678) + +[node name="AnimationPlayer" parent="elder_eyedog" index="1" unique_id=1165387739] +autoplay = &"ArmatureAction" [connection signal="recieved_effect" from="Hitbox" to="StatusEffector" method="add_effect"] [connection signal="took_damage" from="Hitbox" to="." method="take_damage"] diff --git a/PCs/hero.tscn b/PCs/hero.tscn index 7a9fbca..642b098 100644 --- a/PCs/hero.tscn +++ b/PCs/hero.tscn @@ -55,7 +55,7 @@ [ext_resource type="Script" uid="uid://b5h7jfwkyokes" path="res://PCs/FSM/building_state.gd" id="47_d8pnf"] [ext_resource type="Script" uid="uid://cjdv1onyfej0m" path="res://PCs/FSM/carding_state.gd" id="48_7d213"] [ext_resource type="Script" uid="uid://cf7m4yyiqhhru" path="res://PCs/FSM/fighting_state.gd" id="49_60hic"] -[ext_resource type="PackedScene" uid="uid://bg4pmewlvshu8" path="res://coin/Coin.glb" id="51_w13oc"] +[ext_resource type="PackedScene" uid="uid://bg4pmewlvshu8" path="res://coin/mdl_coin.glb" id="51_w13oc"] [ext_resource type="Script" uid="uid://dq0yemhxscvtm" path="res://rotate.gd" id="52_rim6q"] [ext_resource type="AudioStream" uid="uid://cbuhhp3eg0j8r" path="res://Audio/MGWSoundDesign/Tall_Grass_Mono_01.wav" id="57_f7seo"] [ext_resource type="AudioStream" uid="uid://dxttsjturv45i" path="res://Audio/MGWSoundDesign/Tall_Grass_Mono_02.wav" id="58_egbuc"] @@ -150,9 +150,12 @@ viewport_path = NodePath("FirstPersonViewport") [sub_resource type="ViewportTexture" id="ViewportTexture_574jy"] viewport_path = NodePath("MiniMapViewport") -[sub_resource type="ViewportTexture" id="ViewportTexture_w13oc"] +[sub_resource type="ViewportTexture" id="ViewportTexture_vkt85"] viewport_path = NodePath("CoinViewport") +[sub_resource type="ViewportTexture" id="ViewportTexture_dyah2"] +viewport_path = NodePath("CassetteViewport") + [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_wyb7c"] streams_count = 4 stream_0/stream = ExtResource("24_8ch4w") @@ -179,6 +182,10 @@ stream_0/stream = ExtResource("36_lsvj8") streams_count = 1 stream_0/stream = ExtResource("37_kv1mg") +[sub_resource type="Environment" id="Environment_vkt85"] +ambient_light_source = 2 +ambient_light_color = Color(1, 1, 1, 1) + [sub_resource type="AudioStreamRandomizer" id="AudioStreamRandomizer_r3lbl"] random_pitch = 1.0116194 random_volume_offset_db = 0.1 @@ -451,12 +458,12 @@ bones/15/rotation = Quaternion(-0.2017903, 0.015379741, -0.03813146, 0.97856534) bones/16/rotation = Quaternion(-0.0048455074, 0.003865697, 0.59440565, 0.8041415) bones/18/rotation = Quaternion(-0.2272016, 0.019839177, 0.4623247, 0.856879) bones/23/rotation = Quaternion(-0.045133274, -0.11772486, 0.9614004, -0.24456768) -bones/24/rotation = Quaternion(-0.03303061, -0.005903939, -0.221179, 0.9746559) -bones/25/rotation = Quaternion(0.049654786, 0.0001291396, 0.019066628, 0.9985845) -bones/26/rotation = Quaternion(-0.68533796, 0.002092736, -0.0037087626, 0.7282128) -bones/28/rotation = Quaternion(-0.20499752, -0.0437259, 0.21891265, 0.9529646) -bones/29/rotation = Quaternion(0.586818, 0.04117671, -0.017359266, 0.8084849) -bones/30/rotation = Quaternion(-0.41481006, 0.02057148, 0.021915937, 0.9094114) +bones/24/rotation = Quaternion(-0.34049714, 0.083202966, -0.21178892, 0.9122963) +bones/25/rotation = Quaternion(0.70575047, -0.05055478, 0.015847947, 0.7064767) +bones/26/rotation = Quaternion(-0.691201, 0.0026601239, -0.0032455332, 0.7226505) +bones/28/rotation = Quaternion(-0.032278296, 0.0061198906, 0.22117302, 0.974681) +bones/29/rotation = Quaternion(0.038822703, -0.0009491462, -0.019037528, 0.9990643) +bones/30/rotation = Quaternion(-0.69215286, -0.0027526554, 0.0031699617, 0.7217388) [node name="AnimationPlayer" parent="Model/doe_girl" parent_id_path=PackedInt32Array(1269374108, 1532649165) index="1" unique_id=126187206] autoplay = &"HoldGun" @@ -601,7 +608,7 @@ wave_start_label = NodePath("StartWaveLabel") place_text = NodePath("VBoxContainer2/HBoxContainer/RichTextLabel") swap_text = NodePath("VBoxContainer2/HBoxContainer2/RichTextLabel") energy_label = NodePath("Currencies/HBoxContainer/EnergyLabel") -blank_cassette_label = NodePath("Currencies/BlankCassetteLabel") +blank_cassette_label = NodePath("Currencies/HBoxContainer2/BlankCassetteLabel") feature_preview = NodePath("FeaturePreview") hot_wheel = NodePath("HotWheel") shield_ui = NodePath("ShieldUI") @@ -894,8 +901,9 @@ layout_mode = 2 [node name="CoinTexture" type="TextureRect" parent="HUD/Currencies/CoinCounter" unique_id=2027246245] layout_mode = 2 +size_flags_horizontal = 3 mouse_filter = 2 -texture = SubResource("ViewportTexture_w13oc") +texture = SubResource("ViewportTexture_vkt85") [node name="CurrencyCount" type="Label" parent="HUD/Currencies/CoinCounter" unique_id=173450556] layout_mode = 2 @@ -921,8 +929,18 @@ text = "0" horizontal_alignment = 2 vertical_alignment = 1 -[node name="BlankCassetteLabel" type="Label" parent="HUD/Currencies" unique_id=1251931345] +[node name="HBoxContainer2" type="HBoxContainer" parent="HUD/Currencies" unique_id=1472120772] layout_mode = 2 + +[node name="TextureRect" type="TextureRect" parent="HUD/Currencies/HBoxContainer2" unique_id=1742363286] +layout_mode = 2 +size_flags_horizontal = 3 +mouse_filter = 2 +texture = SubResource("ViewportTexture_dyah2") + +[node name="BlankCassetteLabel" type="Label" parent="HUD/Currencies/HBoxContainer2" unique_id=1251931345] +layout_mode = 2 +size_flags_horizontal = 3 horizontal_alignment = 2 vertical_alignment = 1 @@ -1100,18 +1118,40 @@ transparent_bg = true size = Vector2i(32, 32) [node name="Coin" parent="CoinViewport" unique_id=1538763687 instance=ExtResource("51_w13oc")] -visible = false -[node name="Cylinder" parent="CoinViewport/Coin" index="0" unique_id=109227366] +[node name="Cylinder" parent="CoinViewport/Coin" index="0" unique_id=1826137300] layers = 8 [node name="Node3D" type="Node3D" parent="CoinViewport" unique_id=1150784365] script = ExtResource("52_rim6q") -speed = 70.0 +speed = -75.0 [node name="Camera3D" type="Camera3D" parent="CoinViewport/Node3D" unique_id=811908859] transform = Transform3D(1, 0, 0, 0, 0.74214, 0.670245, 0, -0.670245, 0.74214, 0, 0.977616, 1.08572) cull_mask = 1047560 +environment = SubResource("Environment_vkt85") +projection = 1 +size = 2.243 + +[node name="CassetteViewport" type="SubViewport" parent="." unique_id=1963385302] +transparent_bg = true +size = Vector2i(32, 32) + +[node name="cassette" parent="CassetteViewport" unique_id=507681547 instance=ExtResource("13_7immr")] +transform = Transform3D(20.878672, -1.0596485, 0.9020732, 1.3043611, 19.62867, -7.132282, -0.48500767, 7.172724, 19.651266, 0, 0, 0) + +[node name="Cassette" parent="CassetteViewport/cassette" index="0" unique_id=360288089] +transform = Transform3D(0.9999, 0.007972874, 0.01168015, -0.010257761, 0.977448, 0.21092665, -0.009735057, -0.21102542, 0.9774322, 0, 0, 0) +layers = 512 + +[node name="Node3D" type="Node3D" parent="CassetteViewport" unique_id=846737961] +script = ExtResource("52_rim6q") +speed = 60.0 + +[node name="Camera3D" type="Camera3D" parent="CassetteViewport/Node3D" unique_id=886724578] +transform = Transform3D(1, 0, 0, 0, 0.74214, 0.670245, 0, -0.670245, 0.74214, 0, 0.977616, 1.08572) +cull_mask = 1048064 +environment = SubResource("Environment_vkt85") projection = 1 size = 2.243 @@ -1182,3 +1222,4 @@ parameters/Add2/add_amount = 1.0 [editable path="Model"] [editable path="Model/doe_girl"] [editable path="CoinViewport/Coin"] +[editable path="CassetteViewport/cassette"] diff --git a/UI/Menus/MainMenu/main_menu.gd b/UI/Menus/MainMenu/main_menu.gd index f63edc5..88d03b8 100644 --- a/UI/Menus/MainMenu/main_menu.gd +++ b/UI/Menus/MainMenu/main_menu.gd @@ -160,7 +160,8 @@ func level_selected(level: LevelConfig, side: int) -> void: level.allowed_cards = level.hero_class.deck level.waves = [] game.level_config = level - #start_game() + if !gamemode.multiplayer: + start_game() func _on_standard_button_pressed() -> void: diff --git a/Worlds/GreenPlanet/Enemies/land_enemy.tscn b/Worlds/GreenPlanet/Enemies/land_enemy.tscn index eec366d..a0ef594 100644 --- a/Worlds/GreenPlanet/Enemies/land_enemy.tscn +++ b/Worlds/GreenPlanet/Enemies/land_enemy.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" uid="uid://ejqql2660u6h" path="res://Worlds/GreenPlanet/Enemies/enemy_controller.gd" id="1_fwsjt"] [ext_resource type="PackedScene" uid="uid://ri8r03wqy80t" path="res://Scenes/8_direction_sprite.tscn" id="2_o7jmg"] [ext_resource type="PackedScene" uid="uid://canrxnpxcugc2" path="res://Scenes/corpse.tscn" id="2_y7h25"] -[ext_resource type="Texture2D" uid="uid://dj13g1w14mekw" path="res://Assets/Textures/eye_dog.png" id="3_naknq"] +[ext_resource type="Texture2D" uid="uid://chmxo0rj26cxh" path="res://Enemies/EyeDog/icon_eye_dog.png" id="3_naknq"] [ext_resource type="Script" uid="uid://cummt2be3r1gq" path="res://Scripts/hitbox.gd" id="7_5eo4w"] [ext_resource type="Texture2D" uid="uid://b1fn60m6xfcsq" path="res://Assets/Textures/minimap_enemy.png" id="9_f8btv"] [ext_resource type="Script" uid="uid://b62xnsbki8axa" path="res://Scripts/EnemyAI/pathing_controller.gd" id="10_gljle"] diff --git a/coin/Coin_coin.png.import b/coin/Coin_coin.png.import deleted file mode 100644 index 168cb4c..0000000 --- a/coin/Coin_coin.png.import +++ /dev/null @@ -1,44 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bayjketjls0lt" -path.s3tc="res://.godot/imported/Coin_coin.png-130d4e26928a415246fa81206a49adee.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} -generator_parameters={ -"md5": "bb4a8a7e338539895ead7701c1dd8cd9" -} - -[deps] - -source_file="res://coin/Coin_coin.png" -dest_files=["res://.godot/imported/Coin_coin.png-130d4e26928a415246fa81206a49adee.s3tc.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/uastc_level=0 -compress/rdo_quality_loss=0.0 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/channel_remap/red=0 -process/channel_remap/green=1 -process/channel_remap/blue=2 -process/channel_remap/alpha=3 -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=0 diff --git a/coin/coin.png b/coin/coin.png deleted file mode 100644 index a98727c..0000000 Binary files a/coin/coin.png and /dev/null differ diff --git a/coin/coin_material.tres b/coin/mat_coin.tres similarity index 68% rename from coin/coin_material.tres rename to coin/mat_coin.tres index 519c873..f2a8fe7 100644 --- a/coin/coin_material.tres +++ b/coin/mat_coin.tres @@ -1,12 +1,12 @@ [gd_resource type="ShaderMaterial" format=3 uid="uid://5mnnhn5p1tll"] -[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_38tga"] -[ext_resource type="Texture2D" uid="uid://ctjkfe23t6crn" path="res://coin/coin.png" id="2_kttjc"] +[ext_resource type="Shader" uid="uid://dq04j2s5foo2f" path="res://Shaders/mightyduke_ps1.gdshader" id="1_0pmap"] +[ext_resource type="Texture2D" uid="uid://ctjkfe23t6crn" path="res://coin/tex_coin.png" id="2_vafos"] [resource] render_priority = 0 -shader = ExtResource("1_38tga") -shader_parameter/albedo = ExtResource("2_kttjc") +shader = ExtResource("1_0pmap") +shader_parameter/albedo = ExtResource("2_vafos") shader_parameter/jitter_z_coordinate = true shader_parameter/jitter_depth_independent = true shader_parameter/alpha_scissor = 1.0 diff --git a/coin/Coin.glb b/coin/mdl_coin.glb similarity index 100% rename from coin/Coin.glb rename to coin/mdl_coin.glb diff --git a/coin/Coin.glb.import b/coin/mdl_coin.glb.import similarity index 83% rename from coin/Coin.glb.import rename to coin/mdl_coin.glb.import index 45e12ca..abca4e8 100644 --- a/coin/Coin.glb.import +++ b/coin/mdl_coin.glb.import @@ -4,12 +4,12 @@ importer="scene" importer_version=1 type="PackedScene" uid="uid://bg4pmewlvshu8" -path="res://.godot/imported/Coin.glb-dcf33c435a74febc9dfe74054dddd467.scn" +path="res://.godot/imported/mdl_coin.glb-df47db8213c5372606df88568728cc65.scn" [deps] -source_file="res://coin/Coin.glb" -dest_files=["res://.godot/imported/Coin.glb-dcf33c435a74febc9dfe74054dddd467.scn"] +source_file="res://coin/mdl_coin.glb" +dest_files=["res://.godot/imported/mdl_coin.glb-df47db8213c5372606df88568728cc65.scn"] [params] diff --git a/coin/Coin_coin.png b/coin/tex_coin.png similarity index 100% rename from coin/Coin_coin.png rename to coin/tex_coin.png diff --git a/coin/coin.png.import b/coin/tex_coin.png.import similarity index 77% rename from coin/coin.png.import rename to coin/tex_coin.png.import index f206b08..9796bd3 100644 --- a/coin/coin.png.import +++ b/coin/tex_coin.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ctjkfe23t6crn" -path.s3tc="res://.godot/imported/coin.png-c9e5c2f51b2a10beb2d794afbbee004f.s3tc.ctex" +path.s3tc="res://.godot/imported/tex_coin.png-d348296543f118926f64962d4a31e70b.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://coin/coin.png" -dest_files=["res://.godot/imported/coin.png-c9e5c2f51b2a10beb2d794afbbee004f.s3tc.ctex"] +source_file="res://coin/tex_coin.png" +dest_files=["res://.godot/imported/tex_coin.png-d348296543f118926f64962d4a31e70b.s3tc.ctex"] [params] diff --git a/project.godot b/project.godot index 4af1cf7..4204f50 100644 --- a/project.godot +++ b/project.godot @@ -31,6 +31,7 @@ gdscript/warnings/inferred_declaration=2 window/size/viewport_width=1920 window/size/viewport_height=1080 window/stretch/mode="viewport" +window/stretch/scale=3.0 window/stretch/scale_mode="integer" [editor]