games/spacetac
games/spacetac
1
0
Fork 0
Code Releases Activity

Refactored unit spawning

Browse source
This commit is contained in:
Michaël Lemaire 2020-02-18 23:32:33 +01:00
parent c31a4740ae
commit e0d56c91a9
4 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cards/base_card.gd
View file

@ -68,9 +68,7 @@ func play(anchor):
var unit var unit
if spawned_unit: if spawned_unit:
unit = spawned_unit.instance() unit = BattleHelper.spawn_unit(spawned_unit, anchor, hero.attacker if hero else false)
unit.attacker = hero.attacker if hero else false
anchor.set_content(unit)
emit_signal("played", self, anchor, unit) emit_signal("played", self, anchor, unit)

5
helpers/battle.gd
View file

@ -19,11 +19,10 @@ static func update_anchors(tree: SceneTree, position, acceptability) -> Anchor:
return selected_anchor return selected_anchor
static func spawn_unit(name: String, anchor: Anchor, attacker: bool) -> Node: static func spawn_unit(unit: PackedScene, anchor: Anchor, attacker: bool) -> Node:
""" Spawn a unit on an empty anchor """ Spawn a unit on an empty anchor
""" """
var scene = load("res://units/" + name + ".tscn") var node = unit.instance()
var node = scene.instance()
anchor.set_content(node) anchor.set_content(node)
node.attacker = attacker node.attacker = attacker
return node return node

14
screens/battle/battle.gd
View file

@ -4,6 +4,8 @@ const BattleHelper = preload("res://helpers/battle.gd")
export(PackedScene) var deck_attack export(PackedScene) var deck_attack
export(PackedScene) var deck_defend export(PackedScene) var deck_defend
export(PackedScene) var hero_unit_attack
export(PackedScene) var hero_unit_defend
export(Script) var defend_ai export(Script) var defend_ai
onready var deck_attack_cards = deck_attack.instance() onready var deck_attack_cards = deck_attack.instance()
@ -13,8 +15,8 @@ var hero_defend
var turn_attack = true var turn_attack = true
func _ready(): func _ready():
hero_attack = create_hero_unit("tomahawk", "attack_start", true) hero_attack = create_hero_unit(hero_unit_attack, "attack_start", true)
hero_defend = create_hero_unit("rhino", "defend_start", false) hero_defend = create_hero_unit(hero_unit_defend, "defend_start", false)
$hand_attack.connect("turn_end", self, "end_turn") $hand_attack.connect("turn_end", self, "end_turn")
$hand_defend.connect("turn_end", self, "end_turn") $hand_defend.connect("turn_end", self, "end_turn")
@ -32,12 +34,12 @@ func find_free_anchor(anchor_type: String):
return anchor return anchor
return null return null
func create_hero_unit(name: String, anchor_type: String, attacker: bool): func create_hero_unit(unit: PackedScene, anchor_type: String, attacker: bool):
var anchor = find_free_anchor(anchor_type) var anchor = find_free_anchor(anchor_type)
if anchor: if anchor:
var unit = BattleHelper.spawn_unit("heroes/" + name, anchor, attacker) var hero = BattleHelper.spawn_unit(unit, anchor, attacker)
unit.connect("combat_simulation", self, "_on_combat_simulation") _on_unit_created(hero)
return unit return hero
else: else:
return null return null

6
screens/battle/battle.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=10 format=2] [gd_scene load_steps=12 format=2]
[ext_resource path="res://screens/battle/mechanolith.ogg" type="AudioStream" id=1] [ext_resource path="res://screens/battle/mechanolith.ogg" type="AudioStream" id=1]
[ext_resource path="res://theme/ui.tres" type="Theme" id=2] [ext_resource path="res://theme/ui.tres" type="Theme" id=2]
@ -9,6 +9,8 @@
[ext_resource path="res://units/points.tscn" type="PackedScene" id=7] [ext_resource path="res://units/points.tscn" type="PackedScene" id=7]
[ext_resource path="res://ai/dumb.gd" type="Script" id=8] [ext_resource path="res://ai/dumb.gd" type="Script" id=8]
[ext_resource path="res://decks/all.tscn" type="PackedScene" id=9] [ext_resource path="res://decks/all.tscn" type="PackedScene" id=9]
[ext_resource path="res://units/heroes/tomahawk.tscn" type="PackedScene" id=10]
[ext_resource path="res://units/heroes/rhino.tscn" type="PackedScene" id=11]
[node name="view" type="Panel"] [node name="view" type="Panel"]
anchor_right = 1.0 anchor_right = 1.0
@ -21,6 +23,8 @@ __meta__ = {
} }
deck_attack = ExtResource( 9 ) deck_attack = ExtResource( 9 )
deck_defend = ExtResource( 9 ) deck_defend = ExtResource( 9 )
hero_unit_attack = ExtResource( 10 )
hero_unit_defend = ExtResource( 11 )
defend_ai = ExtResource( 8 ) defend_ai = ExtResource( 8 )
[node name="background" type="Sprite" parent="."] [node name="background" type="Sprite" parent="."]