From 44ba985fe907e25cc53cbba2eec3ea3455e2f6be Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Sat, 1 Dec 2018 22:27:34 +0900 Subject: [PATCH] Make the CircularMenu use the CombatAction's icon, add bilboshot icon closes #80 Update the changelog for v0.2.0 Add version number to the project --- CHANGELOG.md | 18 +++++++--- godot/assets/sprites/icons/bilboshot.png | Bin 0 -> 12154 bytes .../assets/sprites/icons/bilboshot.png.import | 31 ++++++++++++++++++ godot/combat/CombatAction.gd | 4 +-- .../interface/circular_menu/CircularButton.gd | 2 ++ .../circular_menu/CircularButton.tscn | 16 ++++----- godot/project.godot | 1 + 7 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 godot/assets/sprites/icons/bilboshot.png create mode 100644 godot/assets/sprites/icons/bilboshot.png.import diff --git a/CHANGELOG.md b/CHANGELOG.md index 907df17..fd38f5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,9 @@ All notable changes to this project will be documented in this file The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) -## [Unreleased] v0.2.0: Better Encounters ⚔🌟 +## v0.2.0: Better Encounters ⚔🌟 - 2018-12-01 -Expand the combat system and create a bite-sized, playable demo revolving around it. +This version brings a lot of new features and improvements to the project's codebase thanks to the help of @godofgrunts, @nhydock, @salvob41, @MarianoGnu, @henriiquecampos, and @guilhermehto! We did at least twice as much as we planned thanks to everyone's help 😄 ### New @@ -21,19 +21,29 @@ Expand the combat system and create a bite-sized, playable demo revolving around - Experience points are awarded at the end of battle to gain levels - The value of the characters' stats is based on Godot's curves - Battle Formations for monsters and the player's party, based on .tscn files +- Added support for multiple targets. The interface to do it from the game is not available yet but you can now pass pass multiple targets to any combat action/command and it will affect all of them +- Animated pop-up labels. They show how much damage a character to took or how much mana someone lost. There's also animations ready for healing effects. #### Map - Grid-based character movement + - Follower pawns follow the leader or playable one with a one-step delay - Dialogue system #### User Interface - Mana bars +- Circular menu: a radial menu you can use for battle, for the character to pick one of multiple CombatActions to use on its opponent. E.g. attack, a specific skill... #### Art -- Godette sprite +Added sprites for Godette, Robi, the porcupine, and the grasslands battle background sprites. There's also the first combat icon for Robi's base attack, the bilboshot. + +None of the art is animated yet. + +#### Audio + +There is now a battle theme and a placeholder victory fanfare ### Changed @@ -44,8 +54,6 @@ Expand the combat system and create a bite-sized, playable demo revolving around - Fixed incorrect indentation in Battler.gd - Improved Data persistence in and out of combat - - ## v0.1.0: Combat prototype ⚔ - 2018-11-04 Base combat prototype: the characters can only attack in a turn-based fashion. Health, damage, target selection, and winning and losing the fight are all present in a basic form. diff --git a/godot/assets/sprites/icons/bilboshot.png b/godot/assets/sprites/icons/bilboshot.png new file mode 100644 index 0000000000000000000000000000000000000000..bf02c752961f6db970f8adba2882ea2569101a34 GIT binary patch literal 12154 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 void: actor = battler diff --git a/godot/combat/interface/circular_menu/CircularButton.gd b/godot/combat/interface/circular_menu/CircularButton.gd index 69554ed..42a4898 100644 --- a/godot/combat/interface/circular_menu/CircularButton.gd +++ b/godot/combat/interface/circular_menu/CircularButton.gd @@ -2,6 +2,7 @@ extends Button onready var animation_player : = $AnimationPlayer as AnimationPlayer onready var tooltip : = $Tooltip as Control +onready var button_icon : = $Background/Icon as TextureRect var mouse_over : bool var active : bool @@ -12,6 +13,7 @@ func initialize(action : CombatAction, target_position : Vector2, active : bool) if disabled: modulate = Color("#555555") tooltip.initialize(self, action) + button_icon.texture = action.icon connect('mouse_exited', self, '_on_mouse_exited') connect('mouse_entered', self, '_on_mouse_entered') diff --git a/godot/combat/interface/circular_menu/CircularButton.tscn b/godot/combat/interface/circular_menu/CircularButton.tscn index 68a553a..85ee86d 100644 --- a/godot/combat/interface/circular_menu/CircularButton.tscn +++ b/godot/combat/interface/circular_menu/CircularButton.tscn @@ -255,15 +255,11 @@ size_flags_vertical = 1 texture = ExtResource( 6 ) stretch_mode = 0 -[node name="Icon" type="TextureRect" parent="."] -anchor_left = 0.5 -anchor_top = 0.5 -anchor_right = 0.5 -anchor_bottom = 0.5 -margin_left = -16.0 -margin_top = -16.0 -margin_right = 16.0 -margin_bottom = 16.0 +[node name="Icon" type="TextureRect" parent="Background"] +anchor_left = 0.0 +anchor_top = 0.0 +anchor_right = 1.0 +anchor_bottom = 1.0 rect_pivot_offset = Vector2( 0, 0 ) rect_clip_content = false mouse_filter = 2 @@ -271,7 +267,7 @@ mouse_default_cursor_shape = 0 size_flags_horizontal = 1 size_flags_vertical = 1 texture = ExtResource( 7 ) -stretch_mode = 0 +stretch_mode = 6 [node name="AnimationPlayer" type="AnimationPlayer" parent="."] root_node = NodePath("..") diff --git a/godot/project.godot b/godot/project.godot index 3c42b4a..e189574 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -167,6 +167,7 @@ _global_script_class_icons={ config/name="Turn-Based Combat" run/main_scene="res://Game.tscn" config/icon="res://icon.png" +config/version="0.2.0" [display] -- GitLab