Combat base added

This commit is contained in:
gamer147
2026-04-02 08:29:24 -04:00
parent 470e89b15b
commit ce92c6e435
14 changed files with 402 additions and 18 deletions

View File

@@ -7,7 +7,7 @@
resource_name = "StartButton"
script/source = "extends Button
const COMBAT_SCENE = preload(\"res://scenes/combat_test.tscn\")
const COMBAT_SCENE = preload(\"res://scenes/strategy_phase.tscn\")
const UNIT_SCENE = preload(\"res://prefabs/unit.tscn\")
const PLAYER_ALLEGIANCE = preload(\"res://resources/allegiance_types/player_allegiance.tres\")
const ENEMY_ALLEGIANCE = preload(\"res://resources/allegiance_types/enemy_allegiance.tres\")

View File

@@ -1,26 +1,31 @@
[gd_scene format=3 uid="uid://wy7ur5r23ek3"]
[ext_resource type="PackedScene" uid="uid://cy7r0udfcsqbn" path="res://prefabs/combat_ui.tscn" id="1_5jbmu"]
[ext_resource type="PackedScene" uid="uid://dkhyh5ce4iuk3" path="res://prefabs/combat_map.tscn" id="1_7abyo"]
[ext_resource type="Script" uid="uid://csdcbi2gtwrly" path="res://scripts/camera_controller.gd" id="3_cam"]
[ext_resource type="Script" uid="uid://dfojm3n0em4ef" path="res://nodes/player_controller.gd" id="4_s5ga2"]
[ext_resource type="AudioStream" uid="uid://dsikulned64qt" path="res://assets/music/combat_bgm_01.OGG" id="6_0yobm"]
[ext_resource type="PackedScene" uid="uid://cy7r0udfcsqbn" path="res://prefabs/combat_ui.tscn" id="1_6gip4"]
[ext_resource type="PackedScene" uid="uid://dkhyh5ce4iuk3" path="res://prefabs/combat_map.tscn" id="2_iuoca"]
[ext_resource type="Script" uid="uid://dfojm3n0em4ef" path="res://nodes/player_controller.gd" id="3_esrqm"]
[ext_resource type="Script" uid="uid://csdcbi2gtwrly" path="res://scripts/camera_controller.gd" id="4_ww3c6"]
[ext_resource type="AudioStream" uid="uid://dsikulned64qt" path="res://assets/music/combat_bgm_01.OGG" id="5_ficdm"]
[ext_resource type="Script" uid="uid://cf4ivrcbky0s3" path="res://nodes/combat_system.gd" id="6_combat"]
[node name="CombatTest" type="Node2D" unique_id=855645983]
[node name="CombatUI" parent="." unique_id=329168107 instance=ExtResource("1_5jbmu")]
[node name="CombatUI" parent="." unique_id=329168107 instance=ExtResource("1_6gip4")]
[node name="CombatMap" parent="." unique_id=546780706 instance=ExtResource("1_7abyo")]
[node name="CombatMap" parent="." unique_id=546780706 instance=ExtResource("2_iuoca")]
[node name="PlayerController" type="Node" parent="." unique_id=774568109 node_paths=PackedStringArray("dl_map")]
script = ExtResource("4_s5ga2")
script = ExtResource("3_esrqm")
dl_map = NodePath("../CombatMap")
[node name="CombatSystem" type="Node" parent="." unique_id=1234567890]
script = ExtResource("6_combat")
[node name="Camera2D" type="Camera2D" parent="." unique_id=1739569732]
zoom = Vector2(1.5, 1.5)
script = ExtResource("3_cam")
script = ExtResource("4_ww3c6")
[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="." unique_id=1057500234]
stream = ExtResource("6_0yobm")
stream = ExtResource("5_ficdm")
autoplay = true
[connection signal="combat_requested" from="PlayerController" to="CombatSystem" method="process_combat"]

View File

@@ -8,6 +8,7 @@
shader = ExtResource("1_nd71p")
shader_parameter/flag_mask = ExtResource("2_7ddre")
shader_parameter/team_color = Color(0.84830123, 0.29993045, 0.292207, 1)
shader_parameter/chroma_threshold = 0.10000000475
[sub_resource type="AtlasTexture" id="AtlasTexture_j8ivh"]
atlas = ExtResource("1_g7g4h")