Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Select a group of enemy when entering a combat depending on map position #134

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
244aa29
Add enum with enemies and boss
Turtyo Sep 18, 2024
291cd95
Put all enemies in a single enum instead of making 3 enum
Turtyo Sep 18, 2024
bd88d3c
Add the EnemyGroup class
Turtyo Sep 18, 2024
9c2a07d
Change typing of some var in EnemyManager and related files
Turtyo Sep 18, 2024
2e851dc
Create new EnemyScene folder
Turtyo Sep 19, 2024
05a08a5
Add a function to calculate the height of the player in the map in pe…
Turtyo Sep 19, 2024
2017c81
Add enemy group selection
Turtyo Sep 19, 2024
b6a069d
Use a Scene as the EnemyManager
Turtyo Sep 19, 2024
cdda80a
make a test enemy group (with the red and green sapling)
Turtyo Sep 22, 2024
db178a4
Change back Array[Enemy] to Array[Entity]
Turtyo Sep 22, 2024
a6476ee
Add a debug variable to be able to summon the test group in tests
Turtyo Sep 22, 2024
a1628d8
Make tests work
Turtyo Sep 22, 2024
8358e50
Add images and golden cauldron as an enemy
Turtyo Sep 24, 2024
de542c7
Make shape local to scene to prevent influencing other scenes
Turtyo Sep 24, 2024
a119ff5
Add background and character sprite
Turtyo Sep 24, 2024
34e49e7
Change name to be correct in MoveState
Turtyo Sep 25, 2024
7de0efa
Change combat scene to allow bigger click zone
Turtyo Sep 25, 2024
af87b8e
change golden cauldron position
Turtyo Sep 25, 2024
d2ad073
Fix enemies click areas not being interacted with correctly
Turtyo Sep 26, 2024
aa6de83
Sort the enemy name enum alphabetically
Turtyo Sep 26, 2024
502b53d
Add motorized bears
Turtyo Sep 26, 2024
401d293
Change all enemies to use a polygon collision shape
Turtyo Sep 26, 2024
c72ed42
Change bear names
Turtyo Sep 26, 2024
a1a9740
Add a save data for enemyManager
Turtyo Sep 26, 2024
f216ea7
use a variable for the save_file_path
Turtyo Sep 26, 2024
8fab66c
Load data for enemies fought with the save file
Turtyo Sep 26, 2024
0d79100
Return the test group as a default instead of null when choosing an e…
Turtyo Sep 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions #Scenes/Events/mob/0.tscn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://sg1wi7uqvv25"]
[gd_scene load_steps=16 format=3 uid="uid://sg1wi7uqvv25"]

[ext_resource type="Script" path="res://#Scenes/SceneScripts/TestingScene.gd" id="1_nmgwp"]
[ext_resource type="PackedScene" uid="uid://bcpmrmofcilbn" path="res://Core/Battler.tscn" id="2_e6pjn"]
Expand All @@ -13,17 +13,25 @@
[ext_resource type="Texture2D" uid="uid://d4muqvs3etnr8" path="res://Art/Card_layout/discard_pile.png" id="12_0nlrw"]
[ext_resource type="Script" path="res://UI/DiscardPileUISetter.gd" id="13_8nsar"]
[ext_resource type="PackedScene" uid="uid://bam77cwf4emyr" path="res://#Scenes/TopBarOverlay.tscn" id="14_os5i4"]
[ext_resource type="Texture2D" uid="uid://by65g3tjujc72" path="res://Art/Background/1-1.png" id="15_5h66l"]
[ext_resource type="PackedScene" uid="uid://ruwidm3egyrx" path="res://#Scenes/xp_bar.tscn" id="15_r7cr8"]

[node name="TestingScene" type="Node2D"]
script = ExtResource("1_nmgwp")
metadata/_edit_vertical_guides_ = [1216.0]

[node name="Background" type="TextureRect" parent="."]
custom_minimum_size = Vector2(1920, 1080)
offset_right = 1920.0
offset_bottom = 1080.0
texture = ExtResource("15_5h66l")
expand_mode = 1

[node name="Battler" parent="." instance=ExtResource("2_e6pjn")]
position = Vector2(896, 364)

[node name="Player" parent="." instance=ExtResource("4_ss8ob")]
position = Vector2(986, 631)
position = Vector2(429, 677)

[node name="CanvasLayer" type="CanvasLayer" parent="."]

Expand Down Expand Up @@ -54,7 +62,7 @@ hover_offset_max = 100.0
max_rotation = 40.0
draw_pile_ui = NodePath("../DrawPile")
discard_pile_ui = NodePath("../DiscardPile")
play_at_height = 500.0
play_at_height = 800.0

[node name="EndTurnButton" type="Button" parent="CanvasLayer/UIControl"]
layout_mode = 1
Expand Down Expand Up @@ -171,6 +179,7 @@ main menu"

[node name="TopBarOverlay" parent="CanvasLayer/UIControl" instance=ExtResource("14_os5i4")]
layout_mode = 1
offset_bottom = -987.0

[node name="XP progress" parent="CanvasLayer/UIControl" instance=ExtResource("15_r7cr8")]
layout_mode = 1
Expand Down
1 change: 1 addition & 0 deletions #Scenes/SceneScripts/MainMenu.gd
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ func _on_continue_pressed() -> void:
CardManager.load_data()
InventoryManager.load_inventory()
SceneManager.load_scene_data()
EnemyManager.load_data()

func _on_button_hovered(button: TextureButton) -> void:
button.grab_focus()
Expand Down
221 changes: 0 additions & 221 deletions #Scenes/Tes281A.tmp

This file was deleted.

Binary file added Art/Background/1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Art/Background/1-1.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://by65g3tjujc72"
path="res://.godot/imported/1-1.png-525520126e2cc762e91f3f4f88560ca6.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Art/Background/1-1.png"
dest_files=["res://.godot/imported/1-1.png-525520126e2cc762e91f3f4f88560ca6.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Art/Character/concept_art_lighted.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Art/Character/concept_art_lighted.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ch03socwivjxp"
path="res://.godot/imported/concept_art_lighted.png-c29d06931b609c07a30a8b006d115e74.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Art/Character/concept_art_lighted.png"
dest_files=["res://.godot/imported/concept_art_lighted.png-c29d06931b609c07a30a8b006d115e74.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Binary file added Art/Enemies/golden_cauldron-finished.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions Art/Enemies/golden_cauldron-finished.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://dvr6ky4vqv4lf"
path="res://.godot/imported/golden_cauldron-finished.png-156cbc2011db8cbb6cf905d6952e3e9b.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Art/Enemies/golden_cauldron-finished.png"
dest_files=["res://.godot/imported/golden_cauldron-finished.png-156cbc2011db8cbb6cf905d6952e3e9b.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading