Skip to content

Commit

Permalink
done with that !
Browse files Browse the repository at this point in the history
  • Loading branch information
GreatNateDev committed Aug 3, 2024
1 parent 69d2c99 commit 862363e
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 5 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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\
Expand Down
Binary file added assets/music & sfx/caught.wav
Binary file not shown.
24 changes: 24 additions & 0 deletions assets/music & sfx/caught.wav.import
Original file line number Diff line number Diff line change
@@ -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
Binary file added assets/music & sfx/intro.mp4
Binary file not shown.
Binary file added assets/music & sfx/intro.ogv
Binary file not shown.
7 changes: 6 additions & 1 deletion scenes/main_window.tscn
Original file line number Diff line number Diff line change
@@ -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"]
Expand All @@ -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"]
Expand Down Expand Up @@ -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
Expand Down
21 changes: 20 additions & 1 deletion scenes/pkmn choice.tscn
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down
5 changes: 4 additions & 1 deletion scripts/item_animations.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -54,6 +56,7 @@ func Item_anim(item, e):
enemy.show()
false:
#text
#sound
Audio.stop()
caught.play()
#handle adding to party
pass
5 changes: 4 additions & 1 deletion scripts/main_window.gd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 862363e

Please sign in to comment.