diff options
author | kdx <kikoodx@paranoici.org> | 2023-10-30 14:49:04 +0100 |
---|---|---|
committer | kdx <kikoodx@paranoici.org> | 2023-10-30 14:49:04 +0100 |
commit | b2c2b59d3a9045166f110716840616f7bffc39be (patch) | |
tree | 870ada569ffdd8a36a933c361971ff22747484e3 | |
parent | d4ddfa4fc3d1b23d358c67b4fa93b9f3092790e5 (diff) | |
download | genshin2-b2c2b59d3a9045166f110716840616f7bffc39be.tar.gz |
omg
-rw-r--r-- | export_presets.cfg | 2 | ||||
-rw-r--r-- | fireball.gd | 4 | ||||
-rw-r--r-- | fireball.tscn | 4 | ||||
-rw-r--r-- | fireballshot.wav | bin | 0 -> 20808 bytes | |||
-rw-r--r-- | fireballshot.wav.import | 24 | ||||
-rw-r--r-- | game.tscn | 6 | ||||
-rw-r--r-- | project_time_traker.json | 8 | ||||
-rw-r--r-- | slap.wav | bin | 0 -> 112852 bytes | |||
-rw-r--r-- | slap.wav.import | 24 |
9 files changed, 62 insertions, 10 deletions
diff --git a/export_presets.cfg b/export_presets.cfg index af03565..4654443 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="./copium.x86_64" +export_path="../../../../tmp/copium.x86_64" encryption_include_filters="" encryption_exclude_filters="" encrypt_pck=false diff --git a/fireball.gd b/fireball.gd index 54ce497..74df7b5 100644 --- a/fireball.gd +++ b/fireball.gd @@ -12,10 +12,10 @@ func type() -> String: return "arrow" func damage(other: Area2D) -> void: other.damage(1.5) queue_free() - get_node("../BowHit").play() + get_node("../FireballHit").play() -func _physics_process(delta: float) -> void: +func _physics_process(_delta: float) -> void: position += velocity velocity *= 0.9 rotation += velocity.length() diff --git a/fireball.tscn b/fireball.tscn index 4f19a32..e5daaba 100644 --- a/fireball.tscn +++ b/fireball.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://fireball.gd" id="1_in5g7"] [ext_resource type="Shader" path="res://arrow.gdshader" id="2_3ixoq"] [ext_resource type="Texture2D" uid="uid://1n5ju36f5ly" path="res://fireball.png" id="3_4a7i4"] -[ext_resource type="AudioStream" uid="uid://bi6rnsdwfyax5" path="res://bowshot.wav" id="4_dw0ft"] +[ext_resource type="AudioStream" uid="uid://blwcopks2roru" path="res://fireballshot.wav" id="4_m4eqm"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_tt0m2"] shader = ExtResource("2_3ixoq") @@ -23,5 +23,5 @@ texture = ExtResource("3_4a7i4") shape = SubResource("CircleShape2D_2nx33") [node name="ShotSound" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource("4_dw0ft") +stream = ExtResource("4_m4eqm") volume_db = 5.0 diff --git a/fireballshot.wav b/fireballshot.wav Binary files differnew file mode 100644 index 0000000..010cd49 --- /dev/null +++ b/fireballshot.wav diff --git a/fireballshot.wav.import b/fireballshot.wav.import new file mode 100644 index 0000000..77efec7 --- /dev/null +++ b/fireballshot.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://blwcopks2roru" +path="res://.godot/imported/fireballshot.wav-9c7cefa1785ce4d20a6fedf34b0cbedb.sample" + +[deps] + +source_file="res://fireballshot.wav" +dest_files=["res://.godot/imported/fireballshot.wav-9c7cefa1785ce4d20a6fedf34b0cbedb.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://8ps5533ot84q"] +[gd_scene load_steps=12 format=3 uid="uid://8ps5533ot84q"] [ext_resource type="PackedScene" uid="uid://c2g45v321qddb" path="res://player.tscn" id="1_3q46r"] [ext_resource type="Script" path="res://game.gd" id="1_7jh2q"] @@ -9,6 +9,7 @@ [ext_resource type="PackedScene" uid="uid://cns884oaxgoof" path="res://dicaprio.tscn" id="8_llto6"] [ext_resource type="AudioStream" uid="uid://dqtjjgshbqn5j" path="res://bowhit.wav" id="9_3iyfb"] [ext_resource type="AudioStream" uid="uid://c7pa506xccdyq" path="res://ost.ogg" id="9_bhhfh"] +[ext_resource type="AudioStream" uid="uid://ih2l1ninh8u4" path="res://slap.wav" id="10_qb0vj"] [sub_resource type="Curve2D" id="Curve2D_txqas"] _data = { @@ -87,4 +88,7 @@ autostart = true [node name="BowHit" type="AudioStreamPlayer" parent="."] stream = ExtResource("9_3iyfb") +[node name="FireballHit" type="AudioStreamPlayer" parent="."] +stream = ExtResource("10_qb0vj") + [connection signal="timeout" from="SpawnTimer" to="." method="_on_spawn_timer_timeout"] diff --git a/project_time_traker.json b/project_time_traker.json index 201ef36..6f46efe 100644 --- a/project_time_traker.json +++ b/project_time_traker.json @@ -1,6 +1,6 @@ { - "2D": 319.842135190964, - "3D": 30.9836082458496, - "Editor": 1600.81316947937, - "Script": 1249.98742604256 + "2D": 502.171649932862, + "3D": 32.1319732666015, + "Editor": 2222.56374096871, + "Script": 1688.26011776925 }
\ No newline at end of file diff --git a/slap.wav b/slap.wav Binary files differnew file mode 100644 index 0000000..1e1f041 --- /dev/null +++ b/slap.wav diff --git a/slap.wav.import b/slap.wav.import new file mode 100644 index 0000000..b6f79f0 --- /dev/null +++ b/slap.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://ih2l1ninh8u4" +path="res://.godot/imported/slap.wav-6be9f97ee34d313bbd4e762088e4bc12.sample" + +[deps] + +source_file="res://slap.wav" +dest_files=["res://.godot/imported/slap.wav-6be9f97ee34d313bbd4e762088e4bc12.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 |