diff --git a/README.md b/README.md index a9b27b9..34e9a83 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,9 @@ A pokemon game with my own spin on it that is only the battle mode TODO:\ -~~catching~~\ add pokemon switching\ make items do stuff\ +remake the moves fourmula\ +remake the move methods\ duel type overhall\ add trainers\ add all pokemon from gen 3\ diff --git a/assets/music & sfx/caught.wav b/assets/music & sfx/caught.wav new file mode 100644 index 0000000..a0cc779 Binary files /dev/null and b/assets/music & sfx/caught.wav differ diff --git a/assets/music & sfx/caught.wav.import b/assets/music & sfx/caught.wav.import new file mode 100644 index 0000000..e993e6c --- /dev/null +++ b/assets/music & sfx/caught.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c64dvj2m4ym3a" +path="res://.godot/imported/caught.wav-1de9768744d4a53aa41cb096a454fd5f.sample" + +[deps] + +source_file="res://assets/music & sfx/caught.wav" +dest_files=["res://.godot/imported/caught.wav-1de9768744d4a53aa41cb096a454fd5f.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 diff --git a/assets/music & sfx/intro.mp4 b/assets/music & sfx/intro.mp4 new file mode 100644 index 0000000..aa87347 Binary files /dev/null and b/assets/music & sfx/intro.mp4 differ diff --git a/assets/music & sfx/intro.ogv b/assets/music & sfx/intro.ogv new file mode 100644 index 0000000..56fa3fb Binary files /dev/null and b/assets/music & sfx/intro.ogv differ diff --git a/scenes/main_window.tscn b/scenes/main_window.tscn index e7f939b..4920cc8 100644 --- a/scenes/main_window.tscn +++ b/scenes/main_window.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=3 uid="uid://byxnol66fqe53"] +[gd_scene load_steps=26 format=3 uid="uid://byxnol66fqe53"] [ext_resource type="Script" path="res://scripts/main_window.gd" id="1_lta6h"] [ext_resource type="Texture2D" uid="uid://dord0sy4g5q2a" path="res://assets/UI/shadow.png" id="3_1hr1h"] @@ -14,6 +14,7 @@ [ext_resource type="AudioStream" uid="uid://6xeqrlw56tjw" path="res://assets/music & sfx/attack.wav" id="12_4muds"] [ext_resource type="Texture2D" uid="uid://cqtg8ahs85rx5" path="res://assets/UI/crit.png" id="14_tf27j"] [ext_resource type="AudioStream" uid="uid://ckn8b5i6b3alm" path="res://assets/music & sfx/LVLUP.wav" id="15_avpwn"] +[ext_resource type="AudioStream" uid="uid://c64dvj2m4ym3a" path="res://assets/music & sfx/caught.wav" id="15_hwawq"] [ext_resource type="AudioStream" uid="uid://d0ndh7wbh0g5q" path="res://assets/music & sfx/faint.wav" id="16_6kc6n"] [ext_resource type="Texture2D" uid="uid://cbn1nlqnbd2fc" path="res://assets/UI/backround_level_one.png" id="17_3nwhe"] [ext_resource type="Script" path="res://scripts/Rand_enemy_gen.gd" id="18_0r5vn"] @@ -109,6 +110,10 @@ autoplay = true stream = ExtResource("20_y8gax") volume_db = 24.0 +[node name="caught" type="AudioStreamPlayer2D" parent="SFX"] +stream = ExtResource("15_hwawq") +volume_db = 24.0 + [node name="Timers" type="Control" parent="."] anchors_preset = 0 offset_right = 40.0 diff --git a/scenes/pkmn choice.tscn b/scenes/pkmn choice.tscn index 8362e6f..5b268e6 100644 --- a/scenes/pkmn choice.tscn +++ b/scenes/pkmn choice.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=5 format=3 uid="uid://c1l5a53y8du8s"] +[gd_scene load_steps=6 format=3 uid="uid://c1l5a53y8du8s"] [ext_resource type="Texture2D" uid="uid://bu2gulnu4yaq5" path="res://assets/pokemon/treecko/front.png" id="2_1gqtk"] [ext_resource type="Texture2D" uid="uid://ppvtn3efwkvx" path="res://assets/pokemon/mudkip/front.png" id="3_7g28n"] +[ext_resource type="VideoStream" path="res://assets/music & sfx/intro.ogv" id="4_6s4gx"] [ext_resource type="Texture2D" uid="uid://dohtna0cj63ev" path="res://assets/pokemon/torchic/front.png" id="4_7wrk3"] [sub_resource type="GDScript" id="GDScript_k83u4"] @@ -163,6 +164,24 @@ grow_vertical = 2 scale = Vector2(2, 2) text = "Load" +[node name="video" type="Control" parent="."] +layout_mode = 3 +anchors_preset = 0 +offset_right = 40.0 +offset_bottom = 40.0 + +[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="video"] +z_index = -5 +layout_mode = 0 +offset_left = -2.0 +offset_top = 1.0 +offset_right = 1922.0 +offset_bottom = 1073.0 +stream = ExtResource("4_6s4gx") +autoplay = true +expand = true +loop = true + [connection signal="pressed" from="side button right/Button2" to="." method="guide"] [connection signal="pressed" from="side button left/Button3" to="." method="Changelog"] [connection signal="pressed" from="choice/GridContainer/treecko" to="." method="_on_treecko_pressed"] diff --git a/scripts/item_animations.gd b/scripts/item_animations.gd index 30a3032..d9004fb 100644 --- a/scripts/item_animations.gd +++ b/scripts/item_animations.gd @@ -3,6 +3,8 @@ extends Control @onready var player = get_parent().get_node("Cast/Player/Player_sprite") @onready var enemy = get_parent().get_node("Cast/Enemy/Enemy_sprite") @onready var star = get_parent().get_node("Move_layer/star") +@onready var caught = get_parent().get_node("SFX/caught") +@onready var Audio = get_parent().get_node("SFX/Audio") @onready var pkmn = pokemon.new() func Item_anim(item, e): match item: @@ -54,6 +56,7 @@ func Item_anim(item, e): enemy.show() false: #text - #sound + Audio.stop() + caught.play() #handle adding to party pass diff --git a/scripts/main_window.gd b/scripts/main_window.gd index 04abf0c..0de4a66 100644 --- a/scripts/main_window.gd +++ b/scripts/main_window.gd @@ -110,7 +110,10 @@ func random_enemy_level_one(): "sprite" : get_random_mon(1), "type": set_enemy_type(), "max_hp": null, - "stat": 1 + "stat": 1, + "exp": 0, + "max_exp": null, + "faint": false } refine_level_stats(data.Enemy,false,true) data.Enemy.max_hp = data.Enemy.hp