Merge pull request #8 from Jeremi360/master

Add can_save variable to Rakugo and use it in gui and combat

rakugo-rpg/addons/Rakugo/main.gd

@@ -83,6 +83,7 @@ var can_alphanumeric := true
 var emoji_size := 16
 var skipping := false
 var current_dialogs := {}
+var can_save := true
 
 const skip_types := [
 	StatementType.SAY,

rakugo-rpg/game/rpg/CombatArea/CombatArea.gd

@@ -63,3 +63,7 @@ func spawn_party(array: Array) -> Array:
 
 func spawn_enemies(array: Array) -> Array:
 	return spawn("Enemy", array)
+
+# turn off saveing during combat
+func _on_CombatArea_visibility_changed():
+	Rakugo.can_save = !visible

rakugo-rpg/game/rpg/CombatArea/CombatArea.tscn

@@ -297,6 +297,7 @@ margin_bottom = 286.0
 size_flags_horizontal = 4
 text = "Close"
 icon = ExtResource( 6 )
+[connection signal="visibility_changed" from="." to="." method="_on_CombatArea_visibility_changed"]
 [connection signal="toggled" from="CombatPanel/HBox/SkillTypesGrid/Attack" to="CombatPanel" method="_on_Attack_toggled"]
 [connection signal="toggled" from="CombatPanel/HBox/SkillTypesGrid/Magic" to="CombatPanel" method="_on_Magic_toggled"]
 [connection signal="toggled" from="CombatPanel/HBox/SkillTypesGrid/Special" to="CombatPanel" method="_on_Special_toggled"]

rakugo-rpg/game/rpg/CombatArea/SpawnPoint.tscn

@@ -342,7 +342,7 @@ tracks/7/keys = {
 position = Vector2( 180.203, 433.823 )
 script = ExtResource( 5 )
 __meta__ = {
-"_gizmo_extents_": 104.7
+"_gizmo_extents_": 50.0
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]

rakugo-rpg/gui/Screens/Screens.gd

@@ -15,6 +15,7 @@ export onready var qyes_button = $QuitBox/HBoxContainer/Yes
 var current_node: Node = self
 var in_game_gui: Node
 var viewport_con : Control
+
 onready var new_game_button: Button = get_page("NewGame")
 onready var continue_button: Button = get_page("Continue")
 onready var return_button: Button = get_page("Return")
@@ -126,9 +127,11 @@ func history_menu():
 func _on_visibility_changed():
 	blur_shader.set_shader_param("radius", 0)
 	if visible:
-
+		
 		if Rakugo.started:
 			blur_shader.set_shader_param("radius", 5)
+
+			save_button.disabled = !Rakugo.can_save
 
 		get_tree().paused = true
 		in_game_gui.hide()
@@ -205,7 +208,7 @@ func _on_Quests_pressed():
 
 # if press "yes" on quit page
 func _on_Yes_pressed():
-	if Rakugo.started:
+	if Rakugo.started and Rakugo.can_save:
 		Rakugo.savefile("auto")
 		Rakugo.save_global_history()
 

rakugo-rpg/gui/Screens/Screens.tscn

@@ -1,6 +1,6 @@
 [gd_scene load_steps=23 format=2]
 
-[ext_resource path="res://themes/question/question.tres" type="Theme" id=1]
+[ext_resource path="res://themes/rpgm_like/rpgm_like.tres" type="Theme" id=1]
 [ext_resource path="res://gui/Screens/Screens.gd" type="Script" id=2]
 [ext_resource path="res://ubuntu-font-family/UB32outline.tres" type="DynamicFont" id=3]
 [ext_resource path="res://addons/Rakugo/nodes/controls/rakugo_var_label.gd" type="Script" id=4]
@@ -16,10 +16,6 @@
 [ext_resource path="res://gui/Labels/dialogue_text.tscn" type="PackedScene" id=14]
 [ext_resource path="res://gui/Screens/QuitBox.tscn" type="PackedScene" id=15]
 
-
-
-
-
 [sub_resource type="ButtonGroup" id=1]
 
 [sub_resource type="Animation" id=2]
@@ -4292,8 +4288,8 @@ rect_min_size = Vector2( 100, 40 )
 size_flags_horizontal = 3
 size_flags_vertical = 3
 bbcode_enabled = true
-bbcode_text = "[right]Rakugo 2.0.0"
-text = "Rakugo 2.0.0"
+bbcode_text = "[right]Rakugo [rakugo_version]"
+text = "Rakugo [rakugo_version]"
 script = ExtResource( 5 )
 rakugo_text = "{right}Rakugo [rakugo_version]"
 vars_names = [ "rakugo_version" ]
@@ -4525,10 +4521,11 @@ margin_bottom = 457.0
 focus_mode = 0
 size_flags_horizontal = 3
 size_flags_vertical = 3
+bbcode_text = ""
+text = ""
 scroll_active = true
 selection_enabled = false
 script = ExtResource( 5 )
-rakugo_text_file = "res://addons/Rakugo/credits.txt"
 
 [node name="QuitBox" parent="." instance=ExtResource( 15 )]
 visible = false