diff --git a/fonts/lilita_one_regular.ttf.import b/fonts/lilita_one_regular.ttf.import index 617bacb..a43c54c 100644 --- a/fonts/lilita_one_regular.ttf.import +++ b/fonts/lilita_one_regular.ttf.import @@ -21,8 +21,10 @@ msdf_pixel_range=8 msdf_size=48 allow_system_fallback=true force_autohinter=false +modulate_color_glyphs=false hinting=1 subpixel_positioning=1 +keep_rounding_remainders=true oversampling=0.0 Fallbacks=null fallbacks=[] diff --git a/icon.png.import b/icon.png.import index 9440934..9728dae 100644 --- a/icon.png.import +++ b/icon.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/icon.png-487276ed1e3a0c39cad0279d744ee560.cte compress/mode=0 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 @@ -25,6 +27,10 @@ mipmaps/generate=false 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 diff --git a/models/Textures/colormap.png.import b/models/Textures/colormap.png.import index f3532b9..e62d53e 100644 --- a/models/Textures/colormap.png.import +++ b/models/Textures/colormap.png.import @@ -19,6 +19,8 @@ dest_files=["res://.godot/imported/colormap.png-c1bc3c3aabeec406ff4b53328583776a compress/mode=2 compress/high_quality=true 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 @@ -26,6 +28,10 @@ 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 diff --git a/models/blaster-repeater.glb.import b/models/blaster-repeater.glb.import index 2b9e464..bdb3374 100644 --- a/models/blaster-repeater.glb.import +++ b/models/blaster-repeater.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/blaster-repeater.glb-5f1125651aecb8bf54890e79 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/cloud.glb.import b/models/cloud.glb.import index 8520f05..0daeeb6 100644 --- a/models/cloud.glb.import +++ b/models/cloud.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/cloud.glb-53daedc24f8d7f4baa42baf232c66643.sc nodes/root_type="" nodes/root_name="" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=1 gltf/embedded_image_handling=1 diff --git a/models/enemy-flying.glb.import b/models/enemy-flying.glb.import index 087905e..3d84b92 100644 --- a/models/enemy-flying.glb.import +++ b/models/enemy-flying.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/enemy-flying.glb-6120572f403485a0abe68ce33d56 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/grass-small.glb.import b/models/grass-small.glb.import index c14e6cd..a952b5f 100644 --- a/models/grass-small.glb.import +++ b/models/grass-small.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/grass-small.glb-0be1c06405ef2ce478dc00acb5be5 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/grass.glb.import b/models/grass.glb.import index d605bde..7e99538 100644 --- a/models/grass.glb.import +++ b/models/grass.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/grass.glb-0ce858eae1c69c894a569863f13e24f1.sc nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/platform-large-grass.glb.import b/models/platform-large-grass.glb.import index ba2d692..9a97e4c 100644 --- a/models/platform-large-grass.glb.import +++ b/models/platform-large-grass.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/platform-large-grass.glb-eba1099445789c9c9ba0 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/platform.glb.import b/models/platform.glb.import index 91df3d9..da68500 100644 --- a/models/platform.glb.import +++ b/models/platform.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/platform.glb-3476c7cd272116fb58fd5d0a0eddb703 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/wall-high.glb.import b/models/wall-high.glb.import index 53b0cfa..985c615 100644 --- a/models/wall-high.glb.import +++ b/models/wall-high.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/wall-high.glb-74f2e81af43ef5254fe14637810326a nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/models/wall-low.glb.import b/models/wall-low.glb.import index 22b8418..341edec 100644 --- a/models/wall-low.glb.import +++ b/models/wall-low.glb.import @@ -15,9 +15,12 @@ dest_files=["res://.godot/imported/wall-low.glb-de080c69f0eef8b51181d363ed18f581 nodes/root_type="Node3D" nodes/root_name="Scene Root" +nodes/root_script=null nodes/apply_root_scale=true nodes/root_scale=1.0 nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true meshes/ensure_tangents=true meshes/generate_lods=true meshes/create_shadow_meshes=true @@ -31,6 +34,9 @@ animation/trimming=false animation/remove_immutable_tracks=true animation/import_rest_as_RESET=false import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" _subresources={} gltf/naming_version=0 gltf/embedded_image_handling=1 diff --git a/objects/cloud.tscn b/objects/cloud.tscn index 5907af9..cc6e923 100644 --- a/objects/cloud.tscn +++ b/objects/cloud.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://oqfhfp1a80qd"] [ext_resource type="PackedScene" uid="uid://g2w2608bc2dy" path="res://models/cloud.glb" id="1_2mo3p"] -[ext_resource type="Script" path="res://objects/cloud.gd" id="2_rmotl"] +[ext_resource type="Script" uid="uid://bfgpo8fvf136p" path="res://objects/cloud.gd" id="2_rmotl"] [node name="cube2" instance=ExtResource("1_2mo3p")] script = ExtResource("2_rmotl") diff --git a/objects/enemy.tscn b/objects/enemy.tscn index b48245d..064847f 100644 --- a/objects/enemy.tscn +++ b/objects/enemy.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://d2g78tpqbyf5g"] [ext_resource type="PackedScene" uid="uid://lde2xq3vq635" path="res://models/enemy-flying.glb" id="1_3v8nl"] -[ext_resource type="Script" path="res://objects/enemy.gd" id="1_jg24b"] +[ext_resource type="Script" uid="uid://b6udw8uhlp4ei" path="res://objects/enemy.gd" id="1_jg24b"] [ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://sprites/burst_animation.tres" id="3_iblw5"] [sub_resource type="SphereShape3D" id="SphereShape3D_iix87"] diff --git a/objects/impact.tscn b/objects/impact.tscn index 6e947a4..ae65850 100644 --- a/objects/impact.tscn +++ b/objects/impact.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=8 format=3 uid="uid://b7070gfoko4mo"] [ext_resource type="Texture2D" uid="uid://dh0t42ubhuv0" path="res://sprites/hit.png" id="1_mdfft"] -[ext_resource type="Script" path="res://objects/impact.gd" id="2_k826h"] +[ext_resource type="Script" uid="uid://bwkexrmt718dx" path="res://objects/impact.gd" id="2_k826h"] [sub_resource type="AtlasTexture" id="AtlasTexture_8c04i"] atlas = ExtResource("1_mdfft") diff --git a/objects/player.tscn b/objects/player.tscn index bf51400..55db1e1 100644 --- a/objects/player.tscn +++ b/objects/player.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=8 format=3 uid="uid://dl2ed4gkybggf"] +[gd_scene load_steps=9 format=3 uid="uid://dl2ed4gkybggf"] -[ext_resource type="Script" path="res://objects/player.gd" id="1_ffboj"] +[ext_resource type="Script" uid="uid://cu47grjp072jk" path="res://objects/player.gd" id="1_ffboj"] [ext_resource type="Resource" uid="uid://cu2gtxlcmbb34" path="res://weapons/blaster-repeater.tres" id="2_6epbw"] [ext_resource type="Texture2D" uid="uid://8ggihh27mlrr" path="res://sprites/blob_shadow.png" id="2_b0fo8"] +[ext_resource type="Script" uid="uid://dg01pkkc1c5vd" path="res://scripts/weapon.gd" id="2_i825w"] [ext_resource type="Resource" uid="uid://c56y8pqoyk15f" path="res://weapons/blaster.tres" id="3_kr4p8"] [ext_resource type="SpriteFrames" uid="uid://dbv3sy5qjatnl" path="res://sprites/burst_animation.tres" id="4_m6ukc"] [ext_resource type="AudioStream" uid="uid://cydjn1ct3hps2" path="res://sounds/walking.ogg" id="5_ics1s"] @@ -14,7 +15,7 @@ height = 1.0 [node name="Player" type="CharacterBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) script = ExtResource("1_ffboj") -weapons = Array[Resource("res://scripts/weapon.gd")]([ExtResource("3_kr4p8"), ExtResource("2_6epbw")]) +weapons = Array[ExtResource("2_i825w")]([ExtResource("3_kr4p8"), ExtResource("2_6epbw")]) [node name="Collider" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.55, 0) diff --git a/splash-screen.png.import b/splash-screen.png.import index 8852920..80c4cb5 100644 --- a/splash-screen.png.import +++ b/splash-screen.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/splash-screen.png-ae6c8b07e185ee8a074576008d9 compress/mode=0 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 @@ -25,6 +27,10 @@ mipmaps/generate=false 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 diff --git a/sprites/blob_shadow.png.import b/sprites/blob_shadow.png.import index 1abf03d..e2199b6 100644 --- a/sprites/blob_shadow.png.import +++ b/sprites/blob_shadow.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/blob_shadow.png-d19f4ffceb1d99dd3331acec2dc6d compress/mode=0 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 @@ -25,6 +27,10 @@ mipmaps/generate=false 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 diff --git a/sprites/burst.png.import b/sprites/burst.png.import index b338f57..008fc83 100644 --- a/sprites/burst.png.import +++ b/sprites/burst.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/burst.png-0ca3a873296b113f4396e0bdead4beff.ct compress/mode=1 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 @@ -25,6 +27,10 @@ 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=false process/premult_alpha=false process/normal_map_invert_y=false diff --git a/sprites/crosshair-repeater.png.import b/sprites/crosshair-repeater.png.import index 77aa612..f19e04d 100644 --- a/sprites/crosshair-repeater.png.import +++ b/sprites/crosshair-repeater.png.import @@ -18,6 +18,8 @@ dest_files=["res://.godot/imported/crosshair-repeater.png-ec408225e689b238759630 compress/mode=0 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 @@ -25,6 +27,10 @@ mipmaps/generate=false 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 diff --git a/sprites/crosshair.png.import b/sprites/crosshair.png.import index 97306ed..4a10dac 100644 --- a/sprites/crosshair.png.import +++ b/sprites/crosshair.png.import @@ -19,6 +19,8 @@ dest_files=["res://.godot/imported/crosshair.png-1281ee32d6777347e0f43a202c603c1 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 @@ -26,6 +28,10 @@ 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 diff --git a/sprites/hit.png.import b/sprites/hit.png.import index acdcac3..e283a70 100644 --- a/sprites/hit.png.import +++ b/sprites/hit.png.import @@ -19,6 +19,8 @@ dest_files=["res://.godot/imported/hit.png-32857f07c817e04581303953f2545db0.s3tc 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 @@ -26,6 +28,10 @@ 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 diff --git a/weapons/blaster-repeater.tres b/weapons/blaster-repeater.tres index b04ca56..504cfec 100644 --- a/weapons/blaster-repeater.tres +++ b/weapons/blaster-repeater.tres @@ -1,20 +1,16 @@ [gd_resource type="Resource" script_class="Weapon" load_steps=4 format=3 uid="uid://cu2gtxlcmbb34"] [ext_resource type="Texture2D" uid="uid://ce3lgq7foiusl" path="res://sprites/crosshair-repeater.png" id="1_hoqei"] -[ext_resource type="Script" path="res://scripts/weapon.gd" id="1_l1atd"] +[ext_resource type="Script" uid="uid://dg01pkkc1c5vd" path="res://scripts/weapon.gd" id="1_l1atd"] [ext_resource type="PackedScene" uid="uid://dd3oln1ucgqpd" path="res://models/blaster-repeater.glb" id="2_h64nv"] [resource] script = ExtResource("1_l1atd") model = ExtResource("2_h64nv") -position = Vector3(0, 0, 0) rotation = Vector3(0, 180, 0) muzzle_position = Vector3(0.1, -0.4, 1.5) -cooldown = 0.1 -max_distance = 10 damage = 10.0 spread = 0.5 -shot_count = 1 knockback = 10 sound_shoot = "sounds/blaster_repeater.ogg" crosshair = ExtResource("1_hoqei") diff --git a/weapons/blaster.tres b/weapons/blaster.tres index 2173e2e..f8089d2 100644 --- a/weapons/blaster.tres +++ b/weapons/blaster.tres @@ -2,17 +2,14 @@ [ext_resource type="Texture2D" uid="uid://2jld33y6h5pq" path="res://sprites/crosshair.png" id="1_2onsr"] [ext_resource type="PackedScene" uid="uid://b2p7bbkuxf7m" path="res://models/blaster.glb" id="1_x0glg"] -[ext_resource type="Script" path="res://scripts/weapon.gd" id="2_107w7"] +[ext_resource type="Script" uid="uid://dg01pkkc1c5vd" path="res://scripts/weapon.gd" id="2_107w7"] [resource] script = ExtResource("2_107w7") model = ExtResource("1_x0glg") -position = Vector3(0, 0, 0) rotation = Vector3(0, 180, 0) muzzle_position = Vector3(0.1, -0.4, 1.5) cooldown = 0.25 -max_distance = 10 -damage = 25.0 spread = 1.0 shot_count = 3 knockback = 40