Merge pull request #5 from Jeremi360/master

Combat system finished

Author: Jeremi360

rakugo-rpg/game/rakugo.cfg

@@ -1,7 +1,7 @@
 [application]
 
 config/name="Rakugo RPG"
-run/main_scene="res://game/Start/Start.tscn"
+run/main_scene="res://game/rpg/Start/Start.tscn"
 rakugo/version="0.1.0"
 rakugo/game_credits="Jeremi {i}jebedaia360{/i} Biernacki"
 rakugo/debug=false

rakugo-rpg/game/Characters/Enemy.tscn renamed to rakugo-rpg/game/rpg/Characters/Enemy.tscn

@@ -1,8 +1,9 @@
 [gd_scene load_steps=3 format=2]
 
-[ext_resource path="res://RPGCharacter.gd" type="Script" id=1]
+[ext_resource path="res://game/rpg/Characters/RPGCharacter.gd" type="Script" id=1]
 [ext_resource path="res://game/assets/sprites/battlers/porcupine.png" type="Texture" id=2]
 
+
 [node name="Enemy" type="Node2D"]
 
 [node name="RPGCharacter" type="Node" parent="."]

rakugo-rpg/game/Characters/Godette.tscn renamed to rakugo-rpg/game/rpg/Characters/Godette.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://game/assets/sprites/battlers/godette.png" type="Texture" id=1]
-[ext_resource path="res://RPGCharacter.gd" type="Script" id=2]
+[ext_resource path="res://game/rpg/Characters/RPGCharacter.gd" type="Script" id=2]
 
 [node name="Godette" type="Node2D"]
 

rakugo-rpg/RPGCharacter.gd renamed to rakugo-rpg/game/rpg/Characters/RPGCharacter.gd

@@ -7,10 +7,20 @@ export (String, FILE, "*.png") var icon_path := ""
 export (String, "Hero", "Enemy", "NPC") var type := "Hero"
 
 export var level := 1
-# RakugoRangedVar.value is always clamped bettween min and max 
-var hp := RakugoRangedVar.new("hp", 100, 0, 100)
-var mana := RakugoRangedVar.new("mana", 100, 0, 100)
-var special := RakugoRangedVar.new("special", 100, 0, 100)
+
+# in enemy case it is max random gold limit that you get when enemy is defeated
+export var gold := 100
+# in enemy case it is max random exp limit that you get when enemy is defeated
+export var max_exp := 100
+export var max_hp := 100
+export var max_mana := 100
+export var max_special := 100 
+
+# RakugoRangedVar.value is always clamped bettween min and max
+var exp_points := RakugoRangedVar.new("exp_points", 0, 0, max_exp) # "exp" is keyword in GDScript
+var hp := RakugoRangedVar.new("hp", 100, 0, max_hp)
+var mana := RakugoRangedVar.new("mana", 100, 0, max_mana)
+var special := RakugoRangedVar.new("special", 100, 0, max_special)
 var unlocked_skills := ["sword attack", "special attack", "healing spell"]
 
 # this are just examples
@@ -24,6 +34,7 @@ var magic_skills := {
 var special_skills := {
 	"special attack": {"cost": 20, "targets": "enemies"}
 }
+
 var def := 0
 
 var hp_bar: ProgressBar
@@ -34,13 +45,24 @@ var hit_anim : AnimationPlayer
 
 func _ready():
 	# this stuff will be saved when player save game
+	stats["exp_points"] = exp_points
 	stats["hp"] = hp
 	stats["mana"] = mana
 	stats["special"] = special
 	stats["lvl"] = level
 	stats["unlocked_skills"] = unlocked_skills
 
 
+func get_max_exp() -> float:
+	exp_points.max_value = level * 100
+	return exp_points.max_value
+
+
+func get_random_gold() -> int:
+	randomize()
+	return randi() % gold
+
+
 func use_skill(skill: String, target: RPGCharacter = self) -> void:
 	# override this func in script extend form this one fit your heros and enemies
 	randomize()
@@ -61,32 +83,33 @@ func use_skill(skill: String, target: RPGCharacter = self) -> void:
 	if skill == "defense":
 		self.recive_attack("def", 5 * s, "def")
 
-	if skill == "flee":
-		# simple go back to prev dialog.
-		Rakugo.hide("CombatArea")
-		var prev = Rakugo.get_value("prev_dialog")
-		Rakugo.jump(prev[0], prev[1], prev[2])
-
 
 func recive_attack(attack_type: String, value: int, anim:String):
 	# minius will subtract from target hp/mana/def
 	# plus will add to target hp/mana/def
 
 	hit_label.text = str(value)
 
-	if value >= 0:
+	if value > 0:
 		hit_label.text = "+" + str(value)
 
-	hit_anim.play(anim)
-
+	if value == 0:
+		hit_label.text = ""
+	
+	else:
+		hit_anim.play(anim)
+	
+	# normal attack
 	if attack_type == "hp":
 		hp.value += value - def
 		hp_bar.value = hp.value
-
+	
+	# add/remove mana
 	if attack_type == "mana":
 		mana.value += value - def
 		mana_bar.value = mana.value
-
+	
+	# defense
 	def = 0
 
 	if attack_type == "def":

rakugo-rpg/game/CombatArea/AIManager.gd renamed to rakugo-rpg/game/rpg/CombatArea/AIManager.gd

@@ -4,17 +4,32 @@ extends Node
 export var combat_panel_path : NodePath
 export var visual_feedback_path : NodePath
 export var timer_path : NodePath 
+export var end_combat_panel_path : NodePath
 
 onready var combat_panel = get_node(combat_panel_path)
 onready var visual_feedback : RakugoTextLabel = get_node(visual_feedback_path)
 onready var timer : Timer = get_node(timer_path)
+onready var end_combat_panel : Panel = get_node(end_combat_panel_path)
+
 var enemy : RPGCharacter setget _set_enemy, _get_enemy
 
+var _enemy : RPGCharacter
+
 var party := []
 var enemies := []
 var skills := {}
-var _enemy : RPGCharacter
-var current_enemies_member := 0 
+
+var current_enemies_member := 0
+var active_party_size := 0 # number of alive party members
+var active_enemies_size := 0 # number of alive enemies
+
+func set_party_n_enemies(party_arr:Array, enemies_arr:Array) -> void:
+	party = party_arr
+	active_party_size = party_arr.size()
+
+	enemies = enemies_arr
+	active_enemies_size = enemies_arr.size()
+
 
 func _set_enemy(value:RPGCharacter) -> void:
 	_enemy = value
@@ -65,14 +80,34 @@ func use_random_skill() -> void:
 	_enemy.use_skill(skill, target)
 	visual_feedback.set_visual_feedback(_enemy, skill, target)
 
+	if target in party:
+		if target.hp.value == 0:
+			active_party_size -= 1
+
 	timer.start()
 	yield(timer, "timeout")
 
 	current_enemies_member += 1
-	if enemies.size() > current_enemies_member:
+	if active_enemies_size > current_enemies_member:
 		_set_enemy(enemies[current_enemies_member])
 
-	else:
+	elif active_party_size > 0:
 		current_enemies_member = 0
 		combat_panel._set_hero(party[0])
 		combat_panel.show()
+	
+	else: # players party lose
+		player_lose()
+
+
+func player_lose() -> void:
+	combat_panel.hide()
+	var gold := [] 
+	for p in party:
+		gold.append(0)
+
+	var exp_points := [] 
+	for p in party:
+		exp_points.append(0)
+	
+	end_combat_panel.set_result(false, party, gold, exp_points)

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

@@ -9,14 +9,12 @@ var temp_id := 0
 
 func start_combat(started_by:="party"):
 	Rakugo.hide("InGameGUI")
+	$EndCombatPanel.hide()
 	var party := spawn_party(Rakugo.get_value("party"))
 	var enemies := spawn_enemies(Rakugo.get_value("enemies"))
 
-	$CombatPanel.party = party
-	$CombatPanel.enemies = enemies
-
-	$AIManager.party = party
-	$AIManager.enemies = enemies
+	$CombatPanel.set_party_n_enemies(party, enemies)
+	$AIManager.set_party_n_enemies(party, enemies)
 
 	if started_by == "party":
 		$CombatPanel.current_hero = party[0]