admin/peggle-roguelike
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fourth commit

Browse Source
This commit is contained in:
admin
2026-05-28 21:35:06 -04:00
parent 4266625390
commit 617c6cc233
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Enemy.cs
+1 -1
View File
@@ -8,7 +8,7 @@ public partial class Enemy : StaticBody2D
public int _damage = 1, _health = 2; public int _damage = 1, _health = 2;
public Vector2 _speed = Vector2.Up, _range = Vector2.Up; public Vector2 _speed = Vector2.Up, _range = Vector2.Up;
public float _movement = 0; public float _movement = 0;
public GridMap _grid; public GridMap2D _grid;
public GridMarker _gridMarker; public GridMarker _gridMarker;
public Commander _commander; public Commander _commander;
public override void _PhysicsProcess(double delta) public override void _PhysicsProcess(double delta)
GridMap.cs → GridMap2D.cs
+4 -2
View File
@@ -2,8 +2,10 @@ using Godot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
public partial class GridMap : Node2D public partial class GridMap2D : Node2D
{ {
[Export]
public bool _showMarkers = true;
public int _cellSize = 16; public int _cellSize = 16;
public Area2D _playArea; public Area2D _playArea;
public GridMarker _gridMarker; public GridMarker _gridMarker;
@@ -24,7 +26,7 @@ public partial class GridMap : Node2D
GridMarker newGridMarker = (GridMarker)_gridMarker.Duplicate(); GridMarker newGridMarker = (GridMarker)_gridMarker.Duplicate();
newGridMarker._address = new Vector2(j, i); newGridMarker._address = new Vector2(j, i);
newGridMarker.Position = new Vector2(_playArea.Position.X - bounds.Shape.GetRect().Size.X / 2 + (j+.5f)*_cellSize, _playArea.Position.Y - bounds.Shape.GetRect().Size.Y / 2 + (i+.5f)*_cellSize); newGridMarker.Position = new Vector2(_playArea.Position.X - bounds.Shape.GetRect().Size.X / 2 + (j+.5f)*_cellSize, _playArea.Position.Y - bounds.Shape.GetRect().Size.Y / 2 + (i+.5f)*_cellSize);
newGridMarker.Modulate = new Color((i+j)%2 == 0 ? "#ffffff" : "#000000"); newGridMarker.Modulate = new Color(((i+j)%2 == 0 ? "#ffffff" : "#000000")+(_showMarkers ? "ff" : "00"));
_gridMarkers[i].Add(newGridMarker); _gridMarkers[i].Add(newGridMarker);
AddChild(newGridMarker); AddChild(newGridMarker);
} }
GridMap.cs.uid → GridMap2D.cs.uid
View File
Main.cs
+2 -2
View File
@@ -7,7 +7,7 @@ public partial class Main : Node
{ {
public bool _isCommanderTurn = true; public bool _isCommanderTurn = true;
public Commander _commander; public Commander _commander;
public GridMap _grid; public GridMap2D _grid;
public PackedScene _enemyScene = GD.Load<PackedScene>("res://Enemy.tscn"); public PackedScene _enemyScene = GD.Load<PackedScene>("res://Enemy.tscn");
public List<Enemy> _enemies = new(); public List<Enemy> _enemies = new();
public Random _rng = new(); public Random _rng = new();
@@ -15,7 +15,7 @@ public partial class Main : Node
{ {
base._Ready(); base._Ready();
_commander = GetNode<Commander>("Commander"); _commander = GetNode<Commander>("Commander");
_grid = GetNode<GridMap>("GridMap"); _grid = GetNode<GridMap2D>("GridMap2D");
_commander.GlobalPosition = _grid.GlobalPosition; _commander.GlobalPosition = _grid.GlobalPosition;
_commander.TurnDone += ChangeTurn; _commander.TurnDone += ChangeTurn;
AddEnemy(); AddEnemy();
grid_map.tscn → grid_map_2d.tscn
+2 -3
View File
@@ -1,13 +1,12 @@
[gd_scene format=3 uid="uid://la8pwcc0tjuu"] [gd_scene format=3 uid="uid://la8pwcc0tjuu"]
[ext_resource type="Script" uid="uid://bnaxgcafcvtfv" path="res://GridMap.cs" id="1_lq4m8"] [ext_resource type="Script" uid="uid://bnaxgcafcvtfv" path="res://GridMap2D.cs" id="1_lq4m8"]
[ext_resource type="PackedScene" uid="uid://bxqhci3fya80t" path="res://grid_marker.tscn" id="2_gc0wv"] [ext_resource type="PackedScene" uid="uid://bxqhci3fya80t" path="res://grid_marker.tscn" id="2_gc0wv"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_q4dkg"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_q4dkg"]
size = Vector2(1600, 800) size = Vector2(1600, 800)
[node name="GridMap" type="Node2D" unique_id=1123610167] [node name="GridMap2D" type="Node2D" unique_id=1123610167]
position = Vector2(960, 510)
script = ExtResource("1_lq4m8") script = ExtResource("1_lq4m8")
[node name="PlayArea" type="Area2D" parent="." unique_id=1719758298] [node name="PlayArea" type="Area2D" parent="." unique_id=1719758298]
main.tscn
+3 -2
View File
@@ -2,12 +2,13 @@
[ext_resource type="Script" uid="uid://cg1m762ed04kv" path="res://Main.cs" id="1_ig7tw"] [ext_resource type="Script" uid="uid://cg1m762ed04kv" path="res://Main.cs" id="1_ig7tw"]
[ext_resource type="PackedScene" uid="uid://c78e3u1owgiek" path="res://commander.tscn" id="2_0xm2m"] [ext_resource type="PackedScene" uid="uid://c78e3u1owgiek" path="res://commander.tscn" id="2_0xm2m"]
[ext_resource type="PackedScene" uid="uid://la8pwcc0tjuu" path="res://grid_map.tscn" id="3_h2yge"] [ext_resource type="PackedScene" uid="uid://la8pwcc0tjuu" path="res://grid_map_2d.tscn" id="3_h2yge"]
[node name="Main" type="Node" unique_id=535208469] [node name="Main" type="Node" unique_id=535208469]
script = ExtResource("1_ig7tw") script = ExtResource("1_ig7tw")
[node name="Commander" parent="." unique_id=203629164 instance=ExtResource("2_0xm2m")] [node name="Commander" parent="." unique_id=203629164 instance=ExtResource("2_0xm2m")]
[node name="GridMap" parent="." unique_id=1123610167 instance=ExtResource("3_h2yge")] [node name="GridMap2D" parent="." unique_id=1123610167 instance=ExtResource("3_h2yge")]
position = Vector2(960, 510) position = Vector2(960, 510)
_showMarkers = false