Randomized map generator

#Scenes/TestingScene.tscn

@@ -1,10 +1,18 @@
-[gd_scene load_steps=9 format=3 uid="uid://87fedoq257xg"]
+[gd_scene load_steps=17 format=3 uid="uid://b60uabg68ra1l"]
 
 [ext_resource type="PackedScene" uid="uid://clmg3l3n28x38" path="res://Entity/Player/Player.tscn" id="3_4psp7"]
 [ext_resource type="PackedScene" uid="uid://dpjfy4pv0vxst" path="res://Cards/CardContainer.tscn" id="3_e7sws"]
+[ext_resource type="Resource" uid="uid://dxgoopi1roxu4" path="res://Cards/Resource/Card_Damage.tres" id="4_wvn3v"]
+[ext_resource type="Resource" uid="uid://0x385c3nuq8f" path="res://Cards/Resource/Card_DamageAll.tres" id="5_j1lqt"]
+[ext_resource type="Resource" uid="uid://5yn4t13kwwoo" path="res://Cards/Resource/Card_DamageHealth.tres" id="6_4124l"]
+[ext_resource type="Resource" uid="uid://d4lugn62mmlep" path="res://Cards/Resource/Card_DrawCards.tres" id="7_smkw8"]
 [ext_resource type="PackedScene" uid="uid://bcpmrmofcilbn" path="res://Core/Battler.tscn" id="8_qtw1k"]
 [ext_resource type="Script" path="res://UI/DrawPileUISetter.gd" id="8_voref"]
+[ext_resource type="Resource" uid="uid://ctx8jsvac84so" path="res://Cards/Resource/Card_Poison.tres" id="8_x6t2k"]
+[ext_resource type="Resource" uid="uid://d12g33rc6c3u5" path="res://Cards/Resource/Card_Heal.tres" id="9_ojxic"]
 [ext_resource type="Script" path="res://UI/DiscardPileUISetter.gd" id="10_pqly7"]
+[ext_resource type="Resource" uid="uid://3s4aet1ciesh" path="res://Cards/Resource/Card_damage_and_poison.tres" id="10_w0xgm"]
+[ext_resource type="Resource" uid="uid://bsrdu33ukb1ym" path="res://Cards/Resource/Card_EnemyAttack.tres" id="11_3k5t2"]
 [ext_resource type="Texture2D" uid="uid://caemucaya30wh" path="res://Cards/draw_pile.png" id="11_pw70x"]
 [ext_resource type="Texture2D" uid="uid://d4muqvs3etnr8" path="res://Cards/discard_pile.png" id="12_kxw48"]
 [ext_resource type="Script" path="res://UI/EndTurnButton.gd" id="14_dpe64"]
@@ -16,8 +24,6 @@
 [node name="Player" parent="." instance=ExtResource("3_4psp7")]
 position = Vector2(595, 284)
 
-[node name="CardContainer" parent="." instance=ExtResource("3_e7sws")]
-
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="UIControl" type="Control" parent="CanvasLayer"]
@@ -29,6 +35,25 @@ grow_horizontal = 2
 grow_vertical = 2
 mouse_filter = 2
 
+[node name="CardContainer" parent="CanvasLayer/UIControl" node_paths=PackedStringArray("draw_pile_ui", "discard_pile_ui") instance=ExtResource("3_e7sws")]
+layout_mode = 1
+anchors_preset = 7
+anchor_left = 0.5
+anchor_top = 1.0
+anchor_right = 0.5
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 0
+default_deck = Array[Resource("res://Cards/CardBase.gd")]([ExtResource("4_wvn3v"), ExtResource("5_j1lqt"), ExtResource("6_4124l"), ExtResource("7_smkw8"), ExtResource("9_ojxic"), ExtResource("8_x6t2k"), ExtResource("10_w0xgm"), ExtResource("11_3k5t2")])
+starting_hand_size = 10
+max_hand_width = 900.0
+min_card_separation = 90.0
+max_card_separation = 120.0
+hover_offset_max = 100.0
+max_rotation = 40.0
+draw_pile_ui = NodePath("../DrawPile")
+discard_pile_ui = NodePath("../DiscardPile")
+
 [node name="EndTurnButton" type="Button" parent="CanvasLayer/UIControl"]
 layout_mode = 1
 anchors_preset = 3

.github/workflows/CI.yml

@@ -5,9 +5,13 @@ name: CI
 on:
  # Triggers the workflow on push or pull request events but only for the master branch
  push:
- branches: [ main ]
+ branches:
+ - main
+ - map-implementation
  pull_request:
- branches: [ main ]
+ branches:
+ - main
+ - map-implementation
 
  # Allows you to run this workflow manually from the Actions tab
  workflow_dispatch:

CONTRIBUTING.md

@@ -6,21 +6,36 @@ If you want to help with code, first check that there is no issue already opened
 
 For bigger tasks that might need multiple people working on it, a branch for that specific task will be opened. Pull request will be made to this branch and not the main.
 
+## Commits
+
+Make commits in the following way:
+- Write a clear title. If for example you decide to change a function you wrote previously, don't just write "changed function X", but explain what you changed in the function. If it's too long in a single title, it might mean you can break your commit in multiple commits. If not you can use the commit description.
+- Commits should be of the minimal size possible. If you change multiple files in a single commit and the changes made don't influence each other, please break down your commit in multiple commits.
+
 ## Pull requests
 
-Please use the pull request template located at .github/pull_request_template.md . Please link to the issue that the pull request is related to. Here is a (non exhaustive) list of reasons for which your pull request can be closed :
+Please use the pull request template located at .github/pull_request_template.md . Please link to the issue that the pull request is related to. **One Pull Request = One Issue.**
+
+Here is a (non exhaustive) list of reasons for which your pull request can be closed :
 - you didn't use the pull request template.
-- you didn't open an issue related to the code you wrote.
+- you didn't open an issue related to the code you wrote or the code you wrote is not compliant with the issue.
 - you didn't synchronise your fork after another pull request has been merged and that creates a lot of merge issues. Please deal with those problems locally before opening a pull request.
 - you made few very big commits. Please break down your big commits in smaller and more manageable commits if possible.
 
+If you are the last one to approve a pull request, there are no unresolved conversations and the tests are passing, you can merge the pull request yourself.
+
 ## Tests
 
-If you are writing code that implements something new, please provide test files written in GDScript (that can be run on GUT), as they will be useful to test future PR.
+If you are writing code that implements something new, please provide test files written in GDScript (that can be run on GUT), as they will be useful to test future PR. If you do not know what to write tests on, don't hesitate to ask.
 
 ## Code formatting
 
 As of the writing of this CONTRIBUTING.md there is no code formatter for Godot, even though it might come later. Try to follow the code conventions of the [GDScript style guide](https://docs.godotengine.org/en/stable/tutorials/scripting/gdscript/gdscript_styleguide.html)
 
-- Use static typing whenever possible.
+- Use static typing whenever possible (for functions parameters, variables and return types).
 - Add # @Override for children classes that implement a function declared in a parent class.
+- Write class name LikeThis and not like_this.
+- Write function name like_this and not LikeThis.
+- Write the parent class name as SomethingBase (for example, the base of the cards is `CardBase`)
+- If you have C child of B and B child of A, B should not follow the previous convention, only A should. This rule may have exceptions.
+- Writing multiple smaller lines is better than writing one big line.

Cards/Card.tscn

@@ -3,25 +3,26 @@
 [ext_resource type="Script" path="res://Cards/CardWorld.gd" id="1_4el5m"]
 [ext_resource type="Texture2D" uid="uid://nheutko3fha3" path="res://Cards/card.png" id="2_k6rq5"]
 [ext_resource type="Script" path="res://Input/ClickHandler.gd" id="3_du4nn"]
-[ext_resource type="Script" path="res://Helpers/LerpComponent.gd" id="4_ujyje"]
 [ext_resource type="Script" path="res://UI/CardUISetter.gd" id="5_hkyxd"]
 [ext_resource type="Texture2D" uid="uid://bdc5r0w6lyh34" path="res://Cards/card_image.png" id="6_p357x"]
+[ext_resource type="Script" path="res://Cards/CardMovementComponent.gd" id="6_qvt2l"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_ooxvf"]
 font_color = Color(0, 0, 0, 1)
 
-[node name="Card" type="Node2D"]
+[node name="Card" type="Control"]
+layout_mode = 3
+anchors_preset = 0
 script = ExtResource("1_4el5m")
 
-[node name="ClickHandler" type="Node2D" parent="."]
+[node name="ClickHandler" type="Node" parent="."]
 script = ExtResource("3_du4nn")
 
-[node name="LerpComponent" type="Node2D" parent="."]
-script = ExtResource("4_ujyje")
-lerp_speed = 7.0
+[node name="CardMovementComponent" type="Node" parent="."]
+script = ExtResource("6_qvt2l")
 
 [node name="CardUI" type="Control" parent="." node_paths=PackedStringArray("title_label", "description_label", "key_art")]
-layout_mode = 3
+layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5

Cards/CardBase.gd

@@ -13,7 +13,6 @@ class_name CardBase
 ## wish to take damage in some contexts.
 ## For example, consider the card: "Deal 10 damage to all enemies, but take 3 damage"
 
-
 @export var damage_to_apply_to_target: float = 0.0
 @export var damage_to_apply_to_caster: float = 0.0
 @export var status_to_apply_to_target: Array[StatusBase]
@@ -27,18 +26,35 @@ class_name CardBase
 @export var card_key_art: ImageTexture = null
 @export var card_description: String = "NULL"
 
+@export var card_effects_data: Array[EffectData] = []
+
+func _ready() -> void:
+ card_effects_data = []
+
+# Need a parser of some sort to read a plainform card data and translate it to EffectData
+# This will call EffectData.add_effect_data() in a loop for every new effect
+
+@warning_ignore("unused_parameter")
+func parse_card_data(card_data: Dictionary) -> void:
+ # TODO
+ pass
+
+func _apply_all_effects(target: Entity) -> void:
+ for effect_data: EffectData in card_effects_data:
+ effect_data.apply_effect_data(target)
+
 
 func can_play_card(caster: Entity, target: Entity) -> bool:
- if caster.get_party_component().can_play_on_entity(application_type, target):
- return true
- return false
+ return caster.get_party_component().can_play_on_entity(application_type, target)
 
 
 func on_card_play(caster: Entity, target: Entity) -> void:
+ _apply_all_effects(target)
  _deal_damage(caster, target)
  _apply_status(caster, target)
  _draw_cards()
  _discard_random_cards()
+ CardManager.on_card_action_finished.emit(self)
  # TODO add other functionality that lots of cards may share (eg: restore AP)