diff --git a/battle/battle.gd b/battle/battle.gd index c12d89b4838f78f1a174ebace8a9807908bf7d72..a155a76bc4246a67bc601e8b2c4ba0685e01caa7 100644 --- a/battle/battle.gd +++ b/battle/battle.gd @@ -66,7 +66,7 @@ func push_menu_(menu) -> void: menu_stack_.back().set_process_input(false) if menu_stack_.size() > 0: - menu.connect("cancel", self, "pop_menu_", [], CONNECT_ONESHOT) + menu.connect("cancel", self, "pop_menu_", []) menu_stack_.push_back(menu) menu.visible = true @@ -79,7 +79,9 @@ func pop_menu_() -> void: var popped_menu = menu_stack_.pop_back() popped_menu.visible = false popped_menu.set_process_input(false) - + if popped_menu.is_connected("cancel", self, "pop_menu_"): + popped_menu.disconnect("cancel", self, "pop_menu_") + if menu_stack_.empty(): return @@ -177,8 +179,8 @@ func apply_player_attack_(move_idx:int) -> void: apply_attack_(player.active_pokemon, enemy.active_pokemon, get_node("player"), get_node("enemy"), move_idx) func apply_enemy_attack_(move_idx:int) -> void: - apply_attack_(enemy.active_pokemon, player.active_pokemon, get_node("enemy"), get_node("player"), move_idx) + apply_attack_(enemy.active_pokemon, player.active_pokemon, get_node("enemy"), get_node("player"), move_idx) func apply_attack_(attacking_pokemon:PokemonModel, defending_pokemon:PokemonModel, attacking_graphics:Node, defending_graphics:Node, move_idx:int) -> void: if attacking_pokemon.moves.size() <= move_idx: return @@ -187,8 +189,7 @@ func apply_attack_(attacking_pokemon:PokemonModel, defending_pokemon:PokemonMode var e := "Enemy " if attacking_pokemon == enemy.active_pokemon else "" - info_box_.set_text("%s%s used %s!" % [e, attacking_pokemon.name, move.name]) - yield(info_box_, "done") + yield(info_box_.set_text("%s%s used %s!" % [e, attacking_pokemon.name, move.name]), "done") if move.fx: var fx = move.fx.instance() fx.target_position = defending_graphics.find_node("pokemon").position @@ -202,9 +203,8 @@ func apply_attack_(attacking_pokemon:PokemonModel, defending_pokemon:PokemonMode defending_pokemon.hp -= damage * critical yield(defending_graphics.find_node("stats").animate_hp(defending_pokemon.hp), "animate_hp_done") - if critical > 1.0: - info_box_.set_text("Critical hit!") - yield(info_box_, "done") + if critical >= 2.0: + yield(info_box_.set_text_for_confirm("Critical hit!"), "done") info_box_.clear_text() emit_signal("action_applied") @@ -216,7 +216,7 @@ func game_() -> void: enemy_graphics_.trainer.begin($tween) yield($tween.block(), "done") - yield(info_box_.set_text("Dude wants to fight!"), "done") + yield(info_box_.set_text_for_confirm("Dude wants to fight!"), "done") apply_enemy_swap_pokemon_(0) yield(self, "action_applied") @@ -243,14 +243,14 @@ func game_() -> void: yield(info_box_.set_text("You ran in a circle by mistake."), "done") if enemy.active_pokemon.is_dead(): - yield(info_box_.set_text("Enemy fainted."), "done") enemy_graphics_.stats.visible = false yield(enemy_graphics_.get_pokemon().faint(), "done") + yield(info_box_.set_text_for_confirm("Enemy %s fainted!" % enemy.active_pokemon.name), "done") - yield(info_box_.set_text("%s gained 50 exp." % player.active_pokemon.name), "done") + yield(info_box_.set_text_for_confirm("%s gained 50 EXP." % player.active_pokemon.name), "done") if enemy.is_dead(): - yield(info_box_.set_text("%s is defeated!" % enemy.name), "done") + yield(info_box_.set_text_for_confirm("%s is defeated!" % enemy.name), "done") break var next_enemy_pokemon_idx = enemy.pokemon.find(enemy.active_pokemon) + 1 @@ -294,6 +294,6 @@ func game_() -> void: enemy_graphics_.trainer.enter($tween) yield($tween.block(), "done") for line in enemy.loose_speach: - yield(info_box_.set_text(line), "done") + yield(info_box_.set_text_for_confirm(line), "done") emit_signal("done") diff --git a/battle/graphic.gd b/battle/graphic.gd index 6fe136ec915c672d32f310384cdfa3fd0e4a25a5..de8396f618bebddb2dce1667f40881f087fbb328 100644 --- a/battle/graphic.gd +++ b/battle/graphic.gd @@ -10,7 +10,9 @@ func set_pokemon(value): find_node("pokemon").add_child(value.instance()) func get_pokemon() -> Node: - return find_node("pokemon").get_child(0) + if find_node("pokemon").get_child_count() > 0: + return find_node("pokemon").get_child(0) + return null func set_trainer(value): trainer = value diff --git a/blue_trainer_graphic.tscn b/blue_trainer_graphic.tscn deleted file mode 100644 index 28f7bc2288f5731cb39ee2c917881389da70f6b9..0000000000000000000000000000000000000000 --- a/blue_trainer_graphic.tscn +++ /dev/null @@ -1,20 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://trainer/trainer_graphic.gd" type="Script" id=1] -[ext_resource path="res://trainer/blue/char04_0006.png" type="Texture" id=2] -[ext_resource path="res://sounds/battle_begin.wav" type="AudioStream" id=3] - -[node name="blue_trainer_graphic" type="Node2D"] -script = ExtResource( 1 ) - -[node name="front" type="Sprite" parent="."] -visible = false -texture = ExtResource( 2 ) - -[node name="back" type="Sprite" parent="."] -position = Vector2( 31, 81 ) -scale = Vector2( 0.696429, 0.696429 ) -texture = ExtResource( 2 ) - -[node name="enter" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) diff --git a/moves/effects/effect.gd b/effect.gd similarity index 81% rename from moves/effects/effect.gd rename to effect.gd index 80964543df211e297177a2d97b87bbb7b7417547..9e8d219c27e41b0adf8fbe49a4239a86f4bc370b 100644 --- a/moves/effects/effect.gd +++ b/effect.gd @@ -7,7 +7,7 @@ export(Vector2) var target_position var delta_sum_ := 0.0 func _ready(): - $circle.position = target_position + position = target_position $tween.interpolate_property(Cam, "offset", null, Vector2( 4, 0), 0.1, Tween.TRANS_BOUNCE, Tween.EASE_IN_OUT) $tween.interpolate_property(Cam, "offset", null, Vector2(-4, 0), 0.1, Tween.TRANS_BOUNCE, Tween.EASE_IN_OUT, 0.1) $tween.interpolate_property(Cam, "offset", null, Vector2( 0, 0), 0.1, Tween.TRANS_BOUNCE, Tween.EASE_IN_OUT, 0.2) @@ -16,10 +16,10 @@ func _ready(): func _process(delta) -> void: delta_sum_ += delta - $circle.visible = sin(delta_sum_ * 20.0) > 0.0 - $invert.value = sin(delta_sum_ * 20.0) > 0.9 + #$circle.visible = sin(delta_sum_ * 20.0) > 0.0 + $c/invert.value = sin(delta_sum_ * 20.0) > 0.5 - if delta_sum_ > 1.0: + if delta_sum_ > 2.0: emit_signal("done") func _unhandled_input(event) -> void: diff --git a/game.gd b/game.gd index 87a8931d2cf7b9797ed84c5a9e1a31dc1f945878..080f3de36794fc28208e963247842ba5020c03f9 100644 --- a/game.gd +++ b/game.gd @@ -5,13 +5,15 @@ onready var info = find_node("info") func _ready(): while true: - yield(info.set_text("Are you ready to be a pokemon master?"), "done") + yield(info.set_text_for_confirm("Are you ready to be a pokemon master?"), "done") + info.clear_text() + yield(get_tree().create_timer(0.5), "timeout") var transition = $transition.create_instance() transition.start() yield(transition, "done") - yield(get_tree().create_timer(1.0), "timeout") - transition.queue_free() $music.play() + yield(get_tree().create_timer(0.8), "timeout") + transition.queue_free() var battle = $battle.create_instance() yield(battle, "done") battle.queue_free() diff --git a/game.tscn b/game.tscn index dbe17307064888644f75a9542f429a7da20e2cda..11daeddb4b98074156ac8c1a3595def8dfd07489 100644 --- a/game.tscn +++ b/game.tscn @@ -18,7 +18,11 @@ void fragment() blur.a = round(sin((uv.y * 800.0))); - vec4 color = mix(blur, clear, blur.r * 1.5); + vec4 color = mix(blur, clear, blur.r * 2.0); + + //clear.rgb = floor(clear.rgb * 2.0) / 2.0; + + COLOR = color; }" diff --git a/moves/cut/cut.tres b/moves/cut/cut.tres new file mode 100644 index 0000000000000000000000000000000000000000..df4fdc78cbacb8035dc4f2b81bec64ca3ece364e --- /dev/null +++ b/moves/cut/cut.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://moves/move_model.gd" type="Script" id=1] +[ext_resource path="res://moves/cut/cut.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "cut" +power = 1 +fx = ExtResource( 2 ) diff --git a/moves/cut/cut.tscn b/moves/cut/cut.tscn new file mode 100644 index 0000000000000000000000000000000000000000..ab787417cb643e0883f2efd886efb3b3328a4b6f --- /dev/null +++ b/moves/cut/cut.tscn @@ -0,0 +1,42 @@ +[gd_scene load_steps=13 format=2] + +[ext_resource path="res://moves/cut/scissor0001.png" type="Texture" id=1] +[ext_resource path="res://effect.gd" type="Script" id=2] +[ext_resource path="res://moves/cut/scissor0006.png" type="Texture" id=3] +[ext_resource path="res://moves/cut/scissor0000.png" type="Texture" id=4] +[ext_resource path="res://moves/cut/scissor0004.png" type="Texture" id=5] +[ext_resource path="res://moves/cut/scissor0003.png" type="Texture" id=6] +[ext_resource path="res://moves/effects/invert.tscn" type="PackedScene" id=7] +[ext_resource path="res://moves/cut/cut.wav" type="AudioStream" id=8] +[ext_resource path="res://moves/cut/scissor0002.png" type="Texture" id=9] +[ext_resource path="res://moves/cut/scissor0005.png" type="Texture" id=10] +[ext_resource path="res://moves/cut/scissor0007.png" type="Texture" id=11] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 4 ), ExtResource( 1 ), ExtResource( 9 ), ExtResource( 6 ), ExtResource( 5 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 11 ) ], +"loop": true, +"name": "default", +"speed": 12.0 +} ] + +[node name="Node2D" type="Node2D"] +script = ExtResource( 2 ) + +[node name="c" type="CanvasLayer" parent="."] + +[node name="invert" parent="c" instance=ExtResource( 7 )] +rect_min_size = Vector2( 160, 144 ) + +[node name="circle" type="AnimatedSprite" parent="."] +scale = Vector2( 0.5, 0.5 ) +frames = SubResource( 1 ) +frame = 2 +playing = true + +[node name="electirc" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 8 ) +autoplay = true +bus = "fx" + +[node name="tween" type="Tween" parent="."] diff --git a/moves/cut/cut.wav b/moves/cut/cut.wav new file mode 100644 index 0000000000000000000000000000000000000000..c19a7577dcaa63f2c9e9961f05a7f5d094203682 Binary files /dev/null and b/moves/cut/cut.wav differ diff --git a/moves/cut/cut.wav.import b/moves/cut/cut.wav.import new file mode 100644 index 0000000000000000000000000000000000000000..95152391d73f2d1c288a12a2235e53b6a1b1cba3 --- /dev/null +++ b/moves/cut/cut.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/cut.wav-099e499ce4d881b6acfb716f774b5694.sample" + +[deps] + +source_file="res://moves/cut/cut.wav" +dest_files=[ "res://.import/cut.wav-099e499ce4d881b6acfb716f774b5694.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=true +compress/mode=0 diff --git a/moves/cut/scissor0000.png b/moves/cut/scissor0000.png new file mode 100644 index 0000000000000000000000000000000000000000..afdb6a177b31daab9364ce0fb55da0e0f03fff3b Binary files /dev/null and b/moves/cut/scissor0000.png differ diff --git a/moves/cut/scissor0000.png.import b/moves/cut/scissor0000.png.import new file mode 100644 index 0000000000000000000000000000000000000000..1de0eb18da6599b9349e458b8f054713a78e777b --- /dev/null +++ b/moves/cut/scissor0000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0000.png-b3db10c033c440cfc291392a60ccbfc2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0000.png" +dest_files=[ "res://.import/scissor0000.png-b3db10c033c440cfc291392a60ccbfc2.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0001.png b/moves/cut/scissor0001.png new file mode 100644 index 0000000000000000000000000000000000000000..b7d0b967c46b8f9e89692ec85609b310237a8096 Binary files /dev/null and b/moves/cut/scissor0001.png differ diff --git a/moves/cut/scissor0001.png.import b/moves/cut/scissor0001.png.import new file mode 100644 index 0000000000000000000000000000000000000000..9d867a4a15165d98c38638a83b992ebde5ce6123 --- /dev/null +++ b/moves/cut/scissor0001.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0001.png-0dc358c5a42b4e1c32ce23c49b369580.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0001.png" +dest_files=[ "res://.import/scissor0001.png-0dc358c5a42b4e1c32ce23c49b369580.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0002.png b/moves/cut/scissor0002.png new file mode 100644 index 0000000000000000000000000000000000000000..adb3214c617fc985dd2fcaa16edadc1fe80ad8b2 Binary files /dev/null and b/moves/cut/scissor0002.png differ diff --git a/moves/cut/scissor0002.png.import b/moves/cut/scissor0002.png.import new file mode 100644 index 0000000000000000000000000000000000000000..4a077d9d9d8a8fbabc2fcfc6212a4adebf5888d2 --- /dev/null +++ b/moves/cut/scissor0002.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0002.png-844f7e7fc9e8d0bddf9408d83fbf3558.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0002.png" +dest_files=[ "res://.import/scissor0002.png-844f7e7fc9e8d0bddf9408d83fbf3558.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0003.png b/moves/cut/scissor0003.png new file mode 100644 index 0000000000000000000000000000000000000000..b3fe95168a3b1b34a281c91b1a331f9e7eb00172 Binary files /dev/null and b/moves/cut/scissor0003.png differ diff --git a/moves/cut/scissor0003.png.import b/moves/cut/scissor0003.png.import new file mode 100644 index 0000000000000000000000000000000000000000..2e5f662c29ac799cf67b33f7848d8c157751659d --- /dev/null +++ b/moves/cut/scissor0003.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0003.png-f2f4a94958afe05e7716bbfec919d721.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0003.png" +dest_files=[ "res://.import/scissor0003.png-f2f4a94958afe05e7716bbfec919d721.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0004.png b/moves/cut/scissor0004.png new file mode 100644 index 0000000000000000000000000000000000000000..b7472affc00da36e3bb15b90dc2ad1a187021423 Binary files /dev/null and b/moves/cut/scissor0004.png differ diff --git a/moves/cut/scissor0004.png.import b/moves/cut/scissor0004.png.import new file mode 100644 index 0000000000000000000000000000000000000000..8f4b25afc8841104a4fb57006547824003166a02 --- /dev/null +++ b/moves/cut/scissor0004.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0004.png-0f29adf7ef4036577208370b58bda8eb.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0004.png" +dest_files=[ "res://.import/scissor0004.png-0f29adf7ef4036577208370b58bda8eb.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0005.png b/moves/cut/scissor0005.png new file mode 100644 index 0000000000000000000000000000000000000000..23b5f456f15e6dca1b51a4338e2c2477ad074b0a Binary files /dev/null and b/moves/cut/scissor0005.png differ diff --git a/moves/cut/scissor0005.png.import b/moves/cut/scissor0005.png.import new file mode 100644 index 0000000000000000000000000000000000000000..6d6d3f5a98e61237c2cdd175a0025fb7ec13c9af --- /dev/null +++ b/moves/cut/scissor0005.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0005.png-1270b1724308f6277d5dae2fc3728a7a.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0005.png" +dest_files=[ "res://.import/scissor0005.png-1270b1724308f6277d5dae2fc3728a7a.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0006.png b/moves/cut/scissor0006.png new file mode 100644 index 0000000000000000000000000000000000000000..5a643389e68bdc62dcb008736d74fad7fd23327d Binary files /dev/null and b/moves/cut/scissor0006.png differ diff --git a/moves/cut/scissor0006.png.import b/moves/cut/scissor0006.png.import new file mode 100644 index 0000000000000000000000000000000000000000..0b832363542121153e0af7a59ed50a4e75c456a4 --- /dev/null +++ b/moves/cut/scissor0006.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0006.png-74b961e57816be81f3b8cc4deef736ae.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0006.png" +dest_files=[ "res://.import/scissor0006.png-74b961e57816be81f3b8cc4deef736ae.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/cut/scissor0007.png b/moves/cut/scissor0007.png new file mode 100644 index 0000000000000000000000000000000000000000..8fc642eaff3b832a17f2e20dda8cfd37a42b4e10 Binary files /dev/null and b/moves/cut/scissor0007.png differ diff --git a/moves/cut/scissor0007.png.import b/moves/cut/scissor0007.png.import new file mode 100644 index 0000000000000000000000000000000000000000..37ec490bdaa0e6a938de34fc1ff477419778eda9 --- /dev/null +++ b/moves/cut/scissor0007.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/scissor0007.png-e1bccf976ec3c0c78baab8b8d2fc3628.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/cut/scissor0007.png" +dest_files=[ "res://.import/scissor0007.png-e1bccf976ec3c0c78baab8b8d2fc3628.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/effects/thunderbolt.tscn b/moves/effects/thunderbolt.tscn deleted file mode 100644 index 8649bfbc992f609d9e6005b6162458829968b880..0000000000000000000000000000000000000000 --- a/moves/effects/thunderbolt.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=5 format=2] - -[ext_resource path="res://moves/effects/effect.gd" type="Script" id=1] -[ext_resource path="res://widgets/sprites/circle.png" type="Texture" id=2] -[ext_resource path="res://moves/effects/invert.tscn" type="PackedScene" id=3] -[ext_resource path="res://sounds/electric.wav" type="AudioStream" id=4] - -[node name="Node2D" type="Node2D"] -script = ExtResource( 1 ) - -[node name="electirc" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 4 ) -autoplay = true -bus = "fx" - -[node name="circle" type="Sprite" parent="."] -position = Vector2( 0.112549, 0.278774 ) -texture = ExtResource( 2 ) - -[node name="tween" type="Tween" parent="."] - -[node name="invert" parent="." instance=ExtResource( 3 )] diff --git a/moves/electric/BoulderSpike0000.png b/moves/electric/BoulderSpike0000.png new file mode 100644 index 0000000000000000000000000000000000000000..b982f84c457fc1d7874bf707a8ca2a2314d04514 Binary files /dev/null and b/moves/electric/BoulderSpike0000.png differ diff --git a/moves/electric/BoulderSpike0000.png.import b/moves/electric/BoulderSpike0000.png.import new file mode 100644 index 0000000000000000000000000000000000000000..5fa0f4ddc999c009795d3ae6c5dda59006fb4e7f --- /dev/null +++ b/moves/electric/BoulderSpike0000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0000.png-efb04982c9c67f02eccf4e2eb7b3848b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0000.png" +dest_files=[ "res://.import/BoulderSpike0000.png-efb04982c9c67f02eccf4e2eb7b3848b.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0001.png b/moves/electric/BoulderSpike0001.png new file mode 100644 index 0000000000000000000000000000000000000000..c2c87c39d5a7d589141770210a66a5c90b57da5b Binary files /dev/null and b/moves/electric/BoulderSpike0001.png differ diff --git a/moves/electric/BoulderSpike0001.png.import b/moves/electric/BoulderSpike0001.png.import new file mode 100644 index 0000000000000000000000000000000000000000..939ca8bee10dc2c9d11852a99c35d03cc7839f3c --- /dev/null +++ b/moves/electric/BoulderSpike0001.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0001.png-a48f736909e68ec99774dc95378d5ce5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0001.png" +dest_files=[ "res://.import/BoulderSpike0001.png-a48f736909e68ec99774dc95378d5ce5.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0002.png b/moves/electric/BoulderSpike0002.png new file mode 100644 index 0000000000000000000000000000000000000000..2405d469e18a9a56b2ed86a61897c837078a1106 Binary files /dev/null and b/moves/electric/BoulderSpike0002.png differ diff --git a/moves/electric/BoulderSpike0002.png.import b/moves/electric/BoulderSpike0002.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a9e5350e04c594f2da87c5d7923e52c33f457da8 --- /dev/null +++ b/moves/electric/BoulderSpike0002.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0002.png-3b34837a1c72d60cb303ee37d2a3a006.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0002.png" +dest_files=[ "res://.import/BoulderSpike0002.png-3b34837a1c72d60cb303ee37d2a3a006.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0003.png b/moves/electric/BoulderSpike0003.png new file mode 100644 index 0000000000000000000000000000000000000000..08a90bc698d0aa30f4e90b14521f0eac732fc420 Binary files /dev/null and b/moves/electric/BoulderSpike0003.png differ diff --git a/moves/electric/BoulderSpike0003.png.import b/moves/electric/BoulderSpike0003.png.import new file mode 100644 index 0000000000000000000000000000000000000000..7e40c11d37d517108c8e45976855cd91749dbace --- /dev/null +++ b/moves/electric/BoulderSpike0003.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0003.png-60d7a363271b9ffe1fc01b39f160a286.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0003.png" +dest_files=[ "res://.import/BoulderSpike0003.png-60d7a363271b9ffe1fc01b39f160a286.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0004.png b/moves/electric/BoulderSpike0004.png new file mode 100644 index 0000000000000000000000000000000000000000..799e22faa8e6bbc065918e0750075af8979149d2 Binary files /dev/null and b/moves/electric/BoulderSpike0004.png differ diff --git a/moves/electric/BoulderSpike0004.png.import b/moves/electric/BoulderSpike0004.png.import new file mode 100644 index 0000000000000000000000000000000000000000..f1204493966fa21643f9d8275c887c088f4dbebb --- /dev/null +++ b/moves/electric/BoulderSpike0004.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0004.png-8cb423b3254ef00644ae79fb477f2ea8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0004.png" +dest_files=[ "res://.import/BoulderSpike0004.png-8cb423b3254ef00644ae79fb477f2ea8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0005.png b/moves/electric/BoulderSpike0005.png new file mode 100644 index 0000000000000000000000000000000000000000..c3aa7cc9a74ed98a81daa1cd2b89a0fcaf12c2a1 Binary files /dev/null and b/moves/electric/BoulderSpike0005.png differ diff --git a/moves/electric/BoulderSpike0005.png.import b/moves/electric/BoulderSpike0005.png.import new file mode 100644 index 0000000000000000000000000000000000000000..c6296b6e98f741898131c10e712c17c386bb1af1 --- /dev/null +++ b/moves/electric/BoulderSpike0005.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0005.png-f7c64b16d607759ccdd74b10d9303e41.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0005.png" +dest_files=[ "res://.import/BoulderSpike0005.png-f7c64b16d607759ccdd74b10d9303e41.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0006.png b/moves/electric/BoulderSpike0006.png new file mode 100644 index 0000000000000000000000000000000000000000..e04d470227c4b1d4a811c042679d61eb7ee873ff Binary files /dev/null and b/moves/electric/BoulderSpike0006.png differ diff --git a/moves/electric/BoulderSpike0006.png.import b/moves/electric/BoulderSpike0006.png.import new file mode 100644 index 0000000000000000000000000000000000000000..3b617d1bc164bba31a21ed4d1769ee0a6b182559 --- /dev/null +++ b/moves/electric/BoulderSpike0006.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0006.png-ba3f9adf1fc1f5775c144655e8ad8047.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0006.png" +dest_files=[ "res://.import/BoulderSpike0006.png-ba3f9adf1fc1f5775c144655e8ad8047.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/electric/BoulderSpike0007.png b/moves/electric/BoulderSpike0007.png new file mode 100644 index 0000000000000000000000000000000000000000..a36a3c6a1db2e61e5fcc045c70261403961caa79 Binary files /dev/null and b/moves/electric/BoulderSpike0007.png differ diff --git a/moves/electric/BoulderSpike0007.png.import b/moves/electric/BoulderSpike0007.png.import new file mode 100644 index 0000000000000000000000000000000000000000..8ced76dcbb53f1368c7a77c76e29f81d372d6873 --- /dev/null +++ b/moves/electric/BoulderSpike0007.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/BoulderSpike0007.png-b3b8cb4f2715f5856368dfcbc7e73cab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/electric/BoulderSpike0007.png" +dest_files=[ "res://.import/BoulderSpike0007.png-b3b8cb4f2715f5856368dfcbc7e73cab.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/sounds/electric.wav b/moves/electric/electric.wav similarity index 100% rename from sounds/electric.wav rename to moves/electric/electric.wav diff --git a/moves/electric/electric.wav.import b/moves/electric/electric.wav.import new file mode 100644 index 0000000000000000000000000000000000000000..fa586c63f87eeca363947f2247b9bbeac2daf3e4 --- /dev/null +++ b/moves/electric/electric.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/electric.wav-a9ea7cb6a9d971409489712e9d925606.sample" + +[deps] + +source_file="res://moves/electric/electric.wav" +dest_files=[ "res://.import/electric.wav-a9ea7cb6a9d971409489712e9d925606.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=true +compress/mode=0 diff --git a/moves/thunderbolt.tres b/moves/electric/thunderbolt.tres similarity index 71% rename from moves/thunderbolt.tres rename to moves/electric/thunderbolt.tres index 36b43195923c95b1124912c12a7b7e70f7cf4945..33daa3aec7ad8ce210d3e6dc13230a68ccd9c2bc 100644 --- a/moves/thunderbolt.tres +++ b/moves/electric/thunderbolt.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" load_steps=3 format=2] [ext_resource path="res://moves/move_model.gd" type="Script" id=1] -[ext_resource path="res://moves/effects/thunderbolt.tscn" type="PackedScene" id=2] +[ext_resource path="res://moves/electric/thunderbolt.tscn" type="PackedScene" id=2] [resource] script = ExtResource( 1 ) diff --git a/moves/electric/thunderbolt.tscn b/moves/electric/thunderbolt.tscn new file mode 100644 index 0000000000000000000000000000000000000000..8b9b2fd6fc625430f497ebe60fdec9254ac08d11 --- /dev/null +++ b/moves/electric/thunderbolt.tscn @@ -0,0 +1,42 @@ +[gd_scene load_steps=13 format=2] + +[ext_resource path="res://effect.gd" type="Script" id=1] +[ext_resource path="res://moves/electric/BoulderSpike0004.png" type="Texture" id=2] +[ext_resource path="res://moves/electric/BoulderSpike0005.png" type="Texture" id=3] +[ext_resource path="res://moves/electric/BoulderSpike0001.png" type="Texture" id=4] +[ext_resource path="res://moves/effects/invert.tscn" type="PackedScene" id=5] +[ext_resource path="res://moves/electric/electric.wav" type="AudioStream" id=6] +[ext_resource path="res://moves/electric/BoulderSpike0002.png" type="Texture" id=7] +[ext_resource path="res://moves/electric/BoulderSpike0003.png" type="Texture" id=8] +[ext_resource path="res://moves/electric/BoulderSpike0006.png" type="Texture" id=9] +[ext_resource path="res://moves/electric/BoulderSpike0007.png" type="Texture" id=10] +[ext_resource path="res://moves/electric/BoulderSpike0000.png" type="Texture" id=11] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 11 ), ExtResource( 4 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 9 ), ExtResource( 10 ) ], +"loop": true, +"name": "default", +"speed": 12.0 +} ] + +[node name="Node2D" type="Node2D"] +script = ExtResource( 1 ) + +[node name="c" type="CanvasLayer" parent="."] + +[node name="invert" parent="c" instance=ExtResource( 5 )] +rect_min_size = Vector2( 160, 144 ) + +[node name="circle" type="AnimatedSprite" parent="."] +scale = Vector2( 0.25, 0.25 ) +frames = SubResource( 1 ) +frame = 4 +playing = true + +[node name="electirc" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 6 ) +autoplay = true +bus = "fx" + +[node name="tween" type="Tween" parent="."] diff --git a/moves/fire/burn.tres b/moves/fire/burn.tres new file mode 100644 index 0000000000000000000000000000000000000000..9ae78d54c0089539537d840c14c36fdbd95f422d --- /dev/null +++ b/moves/fire/burn.tres @@ -0,0 +1,10 @@ +[gd_resource type="Resource" load_steps=3 format=2] + +[ext_resource path="res://moves/move_model.gd" type="Script" id=1] +[ext_resource path="res://moves/fire/burn.tscn" type="PackedScene" id=2] + +[resource] +script = ExtResource( 1 ) +name = "burn" +power = 1 +fx = ExtResource( 2 ) diff --git a/moves/fire/burn.tscn b/moves/fire/burn.tscn new file mode 100644 index 0000000000000000000000000000000000000000..6fcb6f8bd8420661612edc20fad0b2fc91f13e8a --- /dev/null +++ b/moves/fire/burn.tscn @@ -0,0 +1,46 @@ +[gd_scene load_steps=14 format=2] + +[ext_resource path="res://moves/fire/torch0002.png" type="Texture" id=1] +[ext_resource path="res://effect.gd" type="Script" id=2] +[ext_resource path="res://moves/fire/torch0005.png" type="Texture" id=3] +[ext_resource path="res://moves/fire/torch0006.png" type="Texture" id=4] +[ext_resource path="res://moves/fire/torch0003.png" type="Texture" id=5] +[ext_resource path="res://moves/fire/torch0000.png" type="Texture" id=6] +[ext_resource path="res://moves/effects/invert.tscn" type="PackedScene" id=7] +[ext_resource path="res://moves/fire/burn.wav" type="AudioStream" id=8] +[ext_resource path="res://moves/fire/torch0004.png" type="Texture" id=9] +[ext_resource path="res://moves/fire/torch0007.png" type="Texture" id=10] +[ext_resource path="res://moves/fire/torch0001.png" type="Texture" id=11] + +[sub_resource type="ShaderMaterial" id=3] + +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 6 ), ExtResource( 11 ), ExtResource( 1 ), ExtResource( 5 ), ExtResource( 9 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 10 ) ], +"loop": true, +"name": "default", +"speed": 12.0 +} ] + +[node name="Node2D" type="Node2D"] +script = ExtResource( 2 ) + +[node name="c" type="CanvasLayer" parent="."] + +[node name="invert" parent="c" instance=ExtResource( 7 )] +visible = false +rect_min_size = Vector2( 160, 144 ) + +[node name="circle" type="AnimatedSprite" parent="."] +material = SubResource( 3 ) +scale = Vector2( 0.5, 0.5 ) +frames = SubResource( 1 ) +frame = 2 +playing = true + +[node name="electirc" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 8 ) +autoplay = true +bus = "fx" + +[node name="tween" type="Tween" parent="."] diff --git a/moves/fire/burn.wav b/moves/fire/burn.wav new file mode 100644 index 0000000000000000000000000000000000000000..323fe80d85449b63bcde44f78a9fa9409ace1230 Binary files /dev/null and b/moves/fire/burn.wav differ diff --git a/moves/fire/burn.wav.import b/moves/fire/burn.wav.import new file mode 100644 index 0000000000000000000000000000000000000000..604224723cd61cc8856456d3cee59c30a3e944e0 --- /dev/null +++ b/moves/fire/burn.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/burn.wav-3c5af4b7235d75f92a46bf17e9f25b82.sample" + +[deps] + +source_file="res://moves/fire/burn.wav" +dest_files=[ "res://.import/burn.wav-3c5af4b7235d75f92a46bf17e9f25b82.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=true +compress/mode=0 diff --git a/moves/fire/torch0000.png b/moves/fire/torch0000.png new file mode 100644 index 0000000000000000000000000000000000000000..c7993e368b0b60675fcbc49fda65203ebcbb8288 Binary files /dev/null and b/moves/fire/torch0000.png differ diff --git a/moves/fire/torch0000.png.import b/moves/fire/torch0000.png.import new file mode 100644 index 0000000000000000000000000000000000000000..b8c22bfccd26a221c2dd284a779bc6620d8f5235 --- /dev/null +++ b/moves/fire/torch0000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0000.png-f20501a753eb98e8e6e79ff313c6cdde.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0000.png" +dest_files=[ "res://.import/torch0000.png-f20501a753eb98e8e6e79ff313c6cdde.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0001.png b/moves/fire/torch0001.png new file mode 100644 index 0000000000000000000000000000000000000000..b3730cdd0ea222e5f30130b9ba94e18bd40a5c94 Binary files /dev/null and b/moves/fire/torch0001.png differ diff --git a/moves/fire/torch0001.png.import b/moves/fire/torch0001.png.import new file mode 100644 index 0000000000000000000000000000000000000000..8acfd66c681885129a201448d4faa5499bd63c29 --- /dev/null +++ b/moves/fire/torch0001.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0001.png-d8c53115b76f9417154600a694e9ba95.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0001.png" +dest_files=[ "res://.import/torch0001.png-d8c53115b76f9417154600a694e9ba95.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0002.png b/moves/fire/torch0002.png new file mode 100644 index 0000000000000000000000000000000000000000..16c675dbcc21c1eba820e0affc1ecab219a0a906 Binary files /dev/null and b/moves/fire/torch0002.png differ diff --git a/moves/fire/torch0002.png.import b/moves/fire/torch0002.png.import new file mode 100644 index 0000000000000000000000000000000000000000..abda50316df3f9a7457f449a69c0be375e4aa2a3 --- /dev/null +++ b/moves/fire/torch0002.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0002.png-5a5c99856f7a95241c382d2d7de6e389.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0002.png" +dest_files=[ "res://.import/torch0002.png-5a5c99856f7a95241c382d2d7de6e389.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0003.png b/moves/fire/torch0003.png new file mode 100644 index 0000000000000000000000000000000000000000..95ba79220c57d8031bfe644e0a1166e3460596c0 Binary files /dev/null and b/moves/fire/torch0003.png differ diff --git a/moves/fire/torch0003.png.import b/moves/fire/torch0003.png.import new file mode 100644 index 0000000000000000000000000000000000000000..f511d1d3da2a02c4ed82f8eada9a2ba18121a997 --- /dev/null +++ b/moves/fire/torch0003.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0003.png-759a3bd81540a743f2311987d00f9798.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0003.png" +dest_files=[ "res://.import/torch0003.png-759a3bd81540a743f2311987d00f9798.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0004.png b/moves/fire/torch0004.png new file mode 100644 index 0000000000000000000000000000000000000000..dc6f207c9aa279193377ec9c354faec2c925bf71 Binary files /dev/null and b/moves/fire/torch0004.png differ diff --git a/moves/fire/torch0004.png.import b/moves/fire/torch0004.png.import new file mode 100644 index 0000000000000000000000000000000000000000..c9b56d6e6bfc169ebfb48c37faa8d3a280a3f1ed --- /dev/null +++ b/moves/fire/torch0004.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0004.png-77a3240fd83080190394f159469842db.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0004.png" +dest_files=[ "res://.import/torch0004.png-77a3240fd83080190394f159469842db.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0005.png b/moves/fire/torch0005.png new file mode 100644 index 0000000000000000000000000000000000000000..8d34e53dbbc45c25055f4b4a1f641f73412be203 Binary files /dev/null and b/moves/fire/torch0005.png differ diff --git a/moves/fire/torch0005.png.import b/moves/fire/torch0005.png.import new file mode 100644 index 0000000000000000000000000000000000000000..757a667816a8a2e752c5a67ab430d9507d4e6ef1 --- /dev/null +++ b/moves/fire/torch0005.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0005.png-9103240b3ad6714e045c3fc7377cee69.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0005.png" +dest_files=[ "res://.import/torch0005.png-9103240b3ad6714e045c3fc7377cee69.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0006.png b/moves/fire/torch0006.png new file mode 100644 index 0000000000000000000000000000000000000000..f1ee41f862f6877512af8320e4165a0a47601a3f Binary files /dev/null and b/moves/fire/torch0006.png differ diff --git a/moves/fire/torch0006.png.import b/moves/fire/torch0006.png.import new file mode 100644 index 0000000000000000000000000000000000000000..a9a2cf243884dfa9276b5b07aced5366cbae882c --- /dev/null +++ b/moves/fire/torch0006.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0006.png-6ad2d1d131e77a95b92ed900cd28d3f8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0006.png" +dest_files=[ "res://.import/torch0006.png-6ad2d1d131e77a95b92ed900cd28d3f8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/moves/fire/torch0007.png b/moves/fire/torch0007.png new file mode 100644 index 0000000000000000000000000000000000000000..41dc52045f209abc61ec13788faf3921916d32e1 Binary files /dev/null and b/moves/fire/torch0007.png differ diff --git a/moves/fire/torch0007.png.import b/moves/fire/torch0007.png.import new file mode 100644 index 0000000000000000000000000000000000000000..fc7953d430fd3ed6adfd0a997ec9365cb76d61e9 --- /dev/null +++ b/moves/fire/torch0007.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/torch0007.png-268682a38d801ed60b0a6aa7faf62938.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://moves/fire/torch0007.png" +dest_files=[ "res://.import/torch0007.png-268682a38d801ed60b0a6aa7faf62938.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/pokemon/beer/beer.tres b/pokemon/beer/beer.tres index bc30e5ccd3a83bc62edf3dba3778c22124bce1e6..b94591e1c976023ac01030440e5fe196e5023857 100644 --- a/pokemon/beer/beer.tres +++ b/pokemon/beer/beer.tres @@ -1,8 +1,10 @@ -[gd_resource type="Resource" load_steps=4 format=2] +[gd_resource type="Resource" load_steps=6 format=2] [ext_resource path="res://pokemon/pokemon_model.gd" type="Script" id=1] -[ext_resource path="res://moves/thunderbolt.tres" type="Resource" id=2] +[ext_resource path="res://moves/electric/thunderbolt.tres" type="Resource" id=2] [ext_resource path="res://pokemon/beer/beer_battle_graphic.tscn" type="PackedScene" id=3] +[ext_resource path="res://moves/cut/cut.tres" type="Resource" id=4] +[ext_resource path="res://moves/fire/burn.tres" type="Resource" id=5] [resource] resource_local_to_scene = true @@ -12,8 +14,8 @@ level = 40 hp = 20 max_hp = 20 xp = 10 -attack = 50 +attack = 1 defense = 1 speed = 1 -moves = [ ExtResource( 2 ) ] +moves = [ ExtResource( 2 ), ExtResource( 5 ), ExtResource( 4 ) ] battle_graphics = ExtResource( 3 ) diff --git a/pokemon/hat/hat.tres b/pokemon/hat/hat.tres index 87da42cf68afe1ab2a3e68896f03a8a62391c07e..203b6a9afb7c175bf27c54c1432eff71afd7fc53 100644 --- a/pokemon/hat/hat.tres +++ b/pokemon/hat/hat.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" load_steps=4 format=2] [ext_resource path="res://pokemon/pokemon_model.gd" type="Script" id=1] -[ext_resource path="res://moves/thunderbolt.tres" type="Resource" id=2] +[ext_resource path="res://moves/electric/thunderbolt.tres" type="Resource" id=2] [ext_resource path="res://pokemon/hat/hat_battle_graphic.tscn" type="PackedScene" id=3] [resource] diff --git a/sounds/electric.wav.import b/sounds/electric.wav.import deleted file mode 100644 index bc34bea5e2937997bf6724059bc0178924f684e3..0000000000000000000000000000000000000000 --- a/sounds/electric.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/electric.wav-90c33828bbfab17b6a65de3716fc609f.sample" - -[deps] - -source_file="res://sounds/electric.wav" -dest_files=[ "res://.import/electric.wav-90c33828bbfab17b6a65de3716fc609f.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=false -compress/mode=0 diff --git a/trainer/blue/blue.tres b/trainer/blue/blue.tres index dca8cb756adac1480a0e073c4b43db73de7cc8a8..16536348f4bc6df3bbb0e9ee8eefd91e481c9ae9 100644 --- a/trainer/blue/blue.tres +++ b/trainer/blue/blue.tres @@ -4,7 +4,7 @@ [ext_resource path="res://pokemon/beer/beer.tres" type="Resource" id=2] [ext_resource path="res://pokemon/pokemon_model.gd" type="Script" id=3] [ext_resource path="res://pokemon/hat/hat.tres" type="Resource" id=4] -[ext_resource path="res://moves/thunderbolt.tres" type="Resource" id=5] +[ext_resource path="res://moves/electric/thunderbolt.tres" type="Resource" id=5] [ext_resource path="res://pokemon/beer/beer_battle_graphic.tscn" type="PackedScene" id=6] [ext_resource path="res://trainer/blue/blue_trainer_graphic.tscn" type="PackedScene" id=7] diff --git a/trainer/red/red.tres b/trainer/red/red.tres index 54ef987f72abeb6bafb74df72e260b60165b96ed..e7359e6a09aa736e91cf44d84c01fa2403110203 100644 --- a/trainer/red/red.tres +++ b/trainer/red/red.tres @@ -2,7 +2,7 @@ [ext_resource path="res://trainer/trainer_model.gd" type="Script" id=1] [ext_resource path="res://pokemon/pokemon_model.gd" type="Script" id=2] -[ext_resource path="res://moves/thunderbolt.tres" type="Resource" id=3] +[ext_resource path="res://moves/electric/thunderbolt.tres" type="Resource" id=3] [ext_resource path="res://pokemon/beer/beer_battle_graphic.tscn" type="PackedScene" id=4] [ext_resource path="res://trainer/red/red_trainer_graphic.tscn" type="PackedScene" id=5] @@ -14,7 +14,7 @@ level = 40 hp = 15 max_hp = 20 xp = 10 -attack = 50 +attack = 1 defense = 1 speed = 1 moves = [ ExtResource( 3 ) ] diff --git a/trainer/trainer_graphic.gd b/trainer/trainer_graphic.gd index d42334adcfccff7ad4752627d99f924da113d253..c45ea30d94ce31a15e858d58bf01702b4627a369 100644 --- a/trainer/trainer_graphic.gd +++ b/trainer/trainer_graphic.gd @@ -5,8 +5,8 @@ onready var front_position_:Vector2 = $front.position onready var back_position_:Vector2 = $back.position func begin(tween:TweenEx) -> void: - tween.interpolate_property($front, "position:x", 0, front_position_.x, 1.0) - tween.interpolate_property($back, "position:x", 160, back_position_.x, 1.0) + tween.interpolate_property($front, "position:x", -40, front_position_.x, 1.0) + tween.interpolate_property($back, "position:x", 180, back_position_.x, 1.0) if $front.visible: tween.step_property($enter, "playing", false, true, 1.0) tween.step_property($front, "modulate:a", 1.0, 0.0, 1.0) diff --git a/widgets/info_box.gd b/widgets/info_box.gd index c60aa94e0f4be14f397491da131467d95cf06b5a..70617bb1c5a2db919d832c0e226fa9427f60639b 100644 --- a/widgets/info_box.gd +++ b/widgets/info_box.gd @@ -1,18 +1,26 @@ extends PanelContainer -signal done - onready var info_text_ = find_node("info_text") onready var tween_ = find_node("tween") +onready var arrow_ = find_node("arrow") -func set_text(text, post_delay:float = 0.5) -> Node: +func set_text(text, post_delay:float = 0.7) -> Tween: info_text_.percent_visible = 0 info_text_.bbcode_text = str(text) tween_.interpolate_property(info_text_, "percent_visible", null, 1, 0.5) tween_.interpolate_method(tween_, "nop", 0, 0, post_delay, 0, 0, 0.5) - tween_.connect("tween_all_completed", self, "emit_signal", ["done"]) - tween_.block() - return self + return tween_.block() + +func set_text_for_confirm(text) -> Tween: + info_text_.percent_visible = 0 + info_text_.bbcode_text = str(text) + tween_.interpolate_property(info_text_, "percent_visible", null, 1, 0.5) + tween_.step_property(arrow_, "visible", false, true, 0.5) + tween_.interpolate_method(tween_, "nop", 0, 0, 999999999, 0, 0, 0.5) + tween_.connect("tween_all_completed", arrow_, "set_visible", [false], CONNECT_ONESHOT) + tween_.connect("tween_all_completed", $activate, "play", [], CONNECT_ONESHOT) + return tween_.block() func clear_text() -> void: + arrow_.visible = false info_text_.bbcode_text = "" diff --git a/widgets/info_box.tscn b/widgets/info_box.tscn index 7196d77bd94715ddd045fb311d3d1a3ffbdd62e8..8b14c5fa081c4abd61e7286ff7359d4917e7ea39 100644 --- a/widgets/info_box.tscn +++ b/widgets/info_box.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=7 format=2] [ext_resource path="res://widgets/info_box.gd" type="Script" id=1] [ext_resource path="res://widgets/sprites/panel.png" type="Texture" id=2] [ext_resource path="res://widgets/tween_ex.gd" type="Script" id=3] [ext_resource path="res://widgets/sprites/arrow.png" type="Texture" id=4] +[ext_resource path="res://sounds/activate.wav" type="AudioStream" id=5] [sub_resource type="StyleBoxFlat" id=1] content_margin_left = 1.0 @@ -71,3 +72,6 @@ custom_effects = [ null ] [node name="tween" type="Tween" parent="NinePatchRect/MarginContainer/info_text"] script = ExtResource( 3 ) + +[node name="activate" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 5 ) diff --git a/widgets/menu.gd b/widgets/menu.gd index 28c23e7c8794d8eeb6ff1bb4c6e0130daf8ba739..efa042f1c66ccecf695833e69591bad80a95123b 100644 --- a/widgets/menu.gd +++ b/widgets/menu.gd @@ -98,5 +98,6 @@ func select_(idx, force := false, sound := input_) -> void: func activate_() -> void: activate_sound_.play() - emit_signal(get_node(menu_items[idx_]).name) + if has_user_signal(get_node(menu_items[idx_]).name): + emit_signal(get_node(menu_items[idx_]).name) emit_signal("activated", get_node(menu_items[idx_]).get_position_in_parent()) diff --git a/widgets/tween_ex.gd b/widgets/tween_ex.gd index 234f996dc06227b314618e2a4c07fccd3069abc6..1f87d536835e28dde68c3752cbb2d830012c8919 100644 --- a/widgets/tween_ex.gd +++ b/widgets/tween_ex.gd @@ -7,7 +7,7 @@ func _ready() -> void: set_process_unhandled_input(false) func block() -> Tween: - connect("tween_all_completed", self, "_on_tween_all_completed") + connect("tween_all_completed", self, "_on_tween_all_completed", [], CONNECT_ONESHOT | CONNECT_REFERENCE_COUNTED) start() call_deferred("set_process_unhandled_input", true) return self