CactiChameleon9/Quit-Rolling-Around-gmtk-jam-2022
1
0
Fork 0
Code Issues 6 Pull Requests Projects 1 Releases Wiki Activity

Fix the movement amount calculation

Browse Source
This commit is contained in:
CactiChameleon9 2022-07-17 17:01:38 +01:00
parent a0ddbdae43
commit 6b2007ee1a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Scenes/BattleScene.gd
View File

@ -53,6 +53,13 @@ func _physics_process(delta):
yield(get_tree().create_timer(0.1), "timeout") #TODO BAD WORKAROUND yield(get_tree().create_timer(0.1), "timeout") #TODO BAD WORKAROUND
$UI/DiceView.selected = false $UI/DiceView.selected = false
$UI/CardView.selected = true $UI/CardView.selected = true
# if all 3 parts are done, select the DiceView again
if ($UI/DiceView.selected == false and
$UI/CardView.selected == false and
self.player_to_move == false):
$UI/DiceView.selected = true
func player_movement_input(): func player_movement_input():

7
UI/Card.gd
View File

@ -126,6 +126,12 @@ func run_card():
damage += card_info.damage_dice_multiplyer * dice_number damage += card_info.damage_dice_multiplyer * dice_number
emit_signal("do_damage", damage, card_info.effect_damage_range) emit_signal("do_damage", damage, card_info.effect_damage_range)
# calculate the damage amount
var movement = card_info.move_amount_addition
for dice_number in input_dice:
movement += card_info.move_dice_multiplyer * dice_number
emit_signal("do_movement", movement)
# do any utility dice returns # do any utility dice returns
for dice_number in input_dice: for dice_number in input_dice:
@ -176,7 +182,6 @@ func run_card():
for effect in card_info.effects: for effect in card_info.effects:
emit_signal("do_effect", effect, card_info.effect_damage_range) emit_signal("do_effect", effect, card_info.effect_damage_range)
emit_signal("do_movement", card_info.movement)
#clear the input dice #clear the input dice
input_dice = [] input_dice = []

3
UI/CardView.gd
View File

@ -69,8 +69,7 @@ func _physics_process(delta):
current_cards[hovering_card].dice_inputted(currently_holding_dice) current_cards[hovering_card].dice_inputted(currently_holding_dice)
current_cards[hovering_card].hovering_dice = null current_cards[hovering_card].hovering_dice = null
selected = false selected = false
func draw_card(specific_card : String = ""): func draw_card(specific_card : String = ""):
# make a new card instance and add it to the grid container # make a new card instance and add it to the grid container