Added conversion from object oriented fight to array-of-rounds

scenes/Global/API.gd

@@ -20,9 +20,7 @@ var _all_characters: Dictionary = {}
 var _techniques: Dictionary = {}
 var _techniques_array : Array = []
 
-
+func initialize_api():
-# Called when the node enters the scene tree for the first time.
-func _ready():
 	_http_request.base_address = "http://localhost:8000"
 	_http_request.auth_token = "_sGFrChRV6ML0eWZC2qSUZzEGNLPbAhP4dwmnWhQ5bQ9xIi2pwHWQ1CzybFPDLeK8dTNx6GgWdR-Jcz-Z9_aC0hlY2h0fDIwMjQtMDYtMTNUMTk6MTU6MzkrMDA6MDA="
 
@@ -44,6 +42,10 @@ func _ready():
 	user_name = chunks.slice(64).get_string_from_utf8().split('|')[0]
 	
 
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	initialize_api()
+
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(_delta):
 	pass

scenes/Global/FightLib.gd

@@ -1,78 +1,165 @@
 extends Node
 
-class Motion:
+class Someone extends Object:
-	pass
+	var name : String
-
-class Recover extends Motion:
-	''' Animation '''
-	pass
-
-class Action extends Motion:
-	pass
-
-class ActionOnSelf extends Action:
-	pass
-
-class Wait extends ActionOnSelf:
-	''' Animation '''
-	pass
 	
-class Buff extends ActionOnSelf:
+	func _init(name : String) -> void:
-	''' Animation '''
+		self.name = name	
-	pass
 
-class ActionOnOpponent extends Action:
+class Motion extends Object:
-	pass
+	var originator : Someone
+	var animation : String
+	var stamina_change : float
 	
-class Attack extends ActionOnOpponent:
+	func _init(originator : Someone, animation : String, stamina_change : float = 0) -> void:
-	''' Animation '''
+		self.originator = originator
-	func get_damage() -> int:
+		self.animation = animation
-		return 0
+		self.stamina_change = stamina_change
 
-class Debuff extends ActionOnOpponent:
+class Recover extends Motion:
 	''' Animation '''
 	pass
 
 class Reaction extends Motion:
-	pass
+	var hp_change : float
+
+	func _init(originator : Someone, animation: String, stamina_costs: float, hp_change : float):
+		super._init(originator, animation, -stamina_costs)
+		self.hp_change = hp_change
 
 class Counter extends Reaction:
-	''' Animation '''
+	var damage : float
-	pass
+
+	func _init(originator : Someone, animation: String, stamina_costs: float, damage : float):
+		super._init(originator, animation, -stamina_costs, 0)
+		self.damage = damage
 
 class Defense extends Reaction:
-	func was_successful() -> bool: 
+	var successful : bool
-		return true
+
+	func _init(originator : Someone, animation: String, stamina_costs: float, hp_change : float):
+		super._init(originator, animation, -stamina_costs, hp_change)
+		self.successful = hp_change == 0.0
 
 class Block extends Defense:
-	''' Animation '''
+	func _init(originator : Someone, animation : String, stamina_costs: float, hp_change : float):
-	pass
+		super._init(originator, animation, stamina_costs, hp_change)
 
 class Evade extends Defense:
-	''' Animation '''
+	''' Successfully, evaded? '''
+	
+	func _init(originator : Someone, animation : String, stamina_costs: float, hp_change : float):
+		super._init(originator, animation, stamina_costs, hp_change)
+
+class Absorb extends Reaction:
+	''' Actually, accept being hit '''
+		
+	func _init(originator : Someone, animation: String, stamina_costs: float, hp_change : float):
+		super._init(originator, animation, -stamina_costs, hp_change)
+
+
+class Action extends Motion:
 	pass
 
-class Round:
+class ActionOnSelf extends Action:
 	pass
 
-var actions = ["Attack", "Block", "Evade"]
+class Wait extends ActionOnSelf:
-
+	func _init(originator : Someone, animation : String, stamina_gain : float):
-var rounds : Array[Round] = [
+		super._init(originator, animation, stamina_gain)
-	Round.new(),
+
-	Round.new(),
+class Buff extends ActionOnSelf:
-	Round.new(),
+	func _init(originator : Someone, animation : String) -> void:
-	Round.new(),
+		super._init(originator, animation, 1.0)
-	Round.new(),
+
-	Round.new(),
+class ActionOnOpponent extends Action:
-	Round.new(),
+	var opponent : Someone
-	Round.new(),
+	var reaction : Reaction
-	Round.new(),
+
-	Round.new(),
+	func _init(originator : Someone, animation : String, opponent : Someone, stamina_costs : float, reaction : Reaction) -> void:
-	Round.new(),
+		super._init(originator, animation, -stamina_costs)
-	Round.new(),
+		self.opponent = opponent
-	Round.new(),
+		self.reaction = reaction
-	Round.new(),
+
-	Round.new(),
+class Attack extends ActionOnOpponent:
-	Round.new(),
+	var damage : float
-	Round.new(),
+	
-]
+	func _init(originator : Someone, animation : String, opponent : Someone, stamina_costs : float, reaction : Reaction) -> void:
+		super._init(originator, animation, opponent, stamina_costs, reaction)
+
+class Debuff extends ActionOnOpponent:
+	func _init(originator : Someone, animation : String, opponent : Someone, stamina_costs : float, reaction : Reaction) -> void:
+		super._init(originator, animation, opponent, stamina_costs, reaction)
+
+class PlayerAnimation extends Object:
+	var animation : String
+	var hp_change : float 
+	var stamina_change : float
+
+class Round extends Object:
+	var action: int
+	var animations : Array[PlayerAnimation]
+
+func convertReaction2PlayerAnimation(reaction : Reaction) -> PlayerAnimation:
+	if reaction == null:
+		return null
+	var a = PlayerAnimation.new()
+	a.animation = reaction.animation
+	a.hp_change = -reaction.hp_change
+	return a
+
+func getReaction(motion : Motion) -> Reaction:
+	if motion is ActionOnOpponent:
+		return motion.reaction
+	
+	return null
+
+func convertMotion2PlayerAnimation(motion : Motion) -> PlayerAnimation:
+	var a = PlayerAnimation.new()
+	a.animation = motion.animation
+	a.stamina_change = motion.stamina_change
+	return a
+
+func convertMotion2Round(lhs : Someone, rhs : Someone, motion : Motion) -> Round:
+	var round = Round.new()
+
+	round.action = 0 if motion.originator == lhs else 1
+	round.animations.append(convertMotion2PlayerAnimation(motion))
+	var reaction = getReaction(motion)
+	round.animations.append(convertReaction2PlayerAnimation(reaction))
+
+	if reaction is Counter:
+		round.animations[0].hp_change = -reaction.damage
+	
+	return round
+
+# TODO: breakdown to a simpler transferable class
+func convert(lhs : Someone, rhs : Someone, motions : Array[Motion]) -> Array[Round]:
+	var rounds : Array[Round] = []
+	for motion in motions:
+		rounds.push_back(convertMotion2Round(lhs, rhs, motion))
+		
+	return rounds
+
+func _init() -> void:
+	var player1 : Someone = Someone.new("John")
+	var player2 : Someone = Someone.new("Joe")
+
+	var rounds : Array[Motion] = [
+		Attack.new(player1, "Kick", player2, 1.0, Absorb.new(player2, "Hit", 1, 12.0)),
+		Buff.new(player2, "SSJ"),
+		Attack.new(player1, "Punch", player2, 2.0, Block.new(player2, "Block", 1.0, true)),
+		Wait.new(player2, "Wait", 5.0)
+	]
+
+	var r2 = self.convert(player1, player2, rounds)
+	
+	for r in r2:
+		var activeIndex = r.action
+		var reactiveIndex = 0 if r.action == 1 else 0
+		var orientation = "Left" if r.action == 1 else "Right"
+		
+		print("%s Player {'Animation': '%s', 'hp_change': %f, 'stamina_change': %f}" % [orientation, r.animations[0].animation, r.animations[0].hp_change, r.animations[0].stamina_change])
+		if r.animations[1] != null:	
+			print("Other Player {'Animation': '%s', 'hp_change': %f, 'stamina_change': %f}" % [r.animations[1].animation, r.animations[1].hp_change, r.animations[1].stamina_change])
+		print()

scenes/Main/FightSetup.tscn

@@ -0,0 +1,6 @@
+[gd_scene load_steps=2 format=3 uid="uid://bmid6fvrq22bj"]
+
+[ext_resource type="Script" uid="uid://bwchifcb7bh05" path="res://scenes/Main/fight_setup.gd" id="1_l4m47"]
+
+[node name="FightSetup" type="Node2D"]
+script = ExtResource("1_l4m47")

scenes/Main/fight_setup.gd

@@ -0,0 +1,7 @@
+extends Node2D
+
+const FightLib = preload("res://scenes/Global/FightLib.gd")
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	FightLib.new()

scenes/Main/fight_setup.gd.uid

@@ -0,0 +1 @@
+uid://bwchifcb7bh05