Fix 107 Merge River Deltas into Tilemaps

.gitignore

@@ -20,7 +20,6 @@ data_*/
 
 # Below here are ignores imported from Puppeteer's project
 sav/
-*.png
 *.pcx
 *.flc
 *.mp4
@@ -43,7 +42,7 @@ project.lock.json
 *.sln.docstates
 C7.ini
 log.txt
-*.csproj.old
+*.csproj.old*
 
 # Build results
 [Dd]ebug/

C7/AnimationManager.cs

@@ -90,19 +90,19 @@ public string getUnitFlicFilepath(UnitPrototype unit, MapUnit.AnimatedAction act
 	// The flic loading code parses the animations into a 2D array, where each row is an animation
 	// corresponding to a tile direction. flicRowToAnimationDirection maps row number -> direction.
 	private static TileDirection flicRowToAnimationDirection(int row) {
-		switch (row) {
-			case 0: return TileDirection.SOUTHWEST;
-			case 1: return TileDirection.SOUTH;
-			case 2: return TileDirection.SOUTHEAST;
-			case 3: return TileDirection.EAST;
-			case 4: return TileDirection.NORTHEAST;
-			case 5: return TileDirection.NORTH;
-			case 6: return TileDirection.NORTHWEST;
-			case 7: return TileDirection.WEST;
-		}
 		// TODO: I wanted to add a TileDirection.INVALID enum value when implementing this,
 		// but adding an INVALID value broke stuff: https://github.com/C7-Game/Prototype/issues/397
-		return TileDirection.NORTH;
+		return row switch {
+			0 => TileDirection.SOUTHWEST,
+			1 => TileDirection.SOUTH,
+			2 => TileDirection.SOUTHEAST,
+			3 => TileDirection.EAST,
+			4 => TileDirection.NORTHEAST,
+			5 => TileDirection.NORTH,
+			6 => TileDirection.NORTHWEST,
+			7 => TileDirection.WEST,
+			_ => TileDirection.NORTH,
+		};
 	}
 
 	public static void loadFlicAnimation(string path, string name, ref SpriteFrames frames, ref SpriteFrames tint) {
@@ -123,10 +123,9 @@ public static void loadFlicAnimation(string path, string name, ref SpriteFrames
 		}
 	}
 
-	public static void loadCursorAnimation(string path, ref SpriteFrames frames) {
+	public static void loadCursorAnimation(string path, string name, ref SpriteFrames frames) {
 		Flic flic = Util.LoadFlic(path);
 		int row = 0;
-		string name = "cursor";
 		frames.AddAnimation(name);
 
 		for (int col = 0; col < flic.Images.GetLength(1); col++) {
@@ -247,4 +246,8 @@ public double getDuration() {
 		double frameCount = flicSheet.indices.GetWidth() / flicSheet.spriteWidth;
 		return frameCount / 20.0; // Civ 3 anims often run at 20 FPS   TODO: Do they all? How could we tell? Is it exactly 20 FPS?
 	}
+
+	public override string ToString() {
+		return $"{unit.name}: {action}";
+	}
 }

C7/AnimationTracker.cs

@@ -4,7 +4,6 @@
 using System.Threading;
 using System.Linq;
 using C7GameData;
-using C7Engine;
 
 public partial class AnimationTracker {
 	private AnimationManager civ3AnimData;
@@ -22,12 +21,9 @@ public struct ActiveAnimation {
 		public C7Animation anim;
 	}
 
-	private Dictionary<string, ActiveAnimation> activeAnims = new Dictionary<string, ActiveAnimation>();
+	public Dictionary<string, ActiveAnimation> activeAnims = new Dictionary<string, ActiveAnimation>();
 
-	public long getCurrentTimeMS()
-	{
-		return DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
-	}
+	public long getCurrentTimeMS() => DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
 
 	private string getTileID(Tile tile)
 	{
@@ -45,8 +41,9 @@ private void startAnimation(string id, C7Animation anim, AutoResetEvent completi
 		if (activeAnims.TryGetValue(id, out aa)) {
 			// If there's already an animation playing for this unit, end it first before replacing it
 			// TODO: Consider instead queueing up the new animation until after the first one is completed
-			if (aa.completionEvent != null)
+			if (aa.completionEvent is not null) {
 				aa.completionEvent.Set();
+			}
 		}
 		aa = new ActiveAnimation { startTimeMS = currentTimeMS, endTimeMS = currentTimeMS + animDurationMS, completionEvent = completionEvent,
 			ending = ending, anim = anim };
@@ -110,19 +107,19 @@ public bool hasCurrentAction(MapUnit unit)
 
 	public void update()
 	{
-		long currentTimeMS = (! endAllImmediately) ? getCurrentTimeMS() : long.MaxValue;
+		long currentTimeMS = !endAllImmediately ? getCurrentTimeMS() : long.MaxValue;
 		var keysToRemove = new List<string>();
 		foreach (var guidAAPair in activeAnims.Where(guidAAPair => guidAAPair.Value.endTimeMS <= currentTimeMS)) {
 			var (id, aa) = (guidAAPair.Key, guidAAPair.Value);
-			if (aa.completionEvent != null) {
+			if (aa.completionEvent is not null) {
 				aa.completionEvent.Set();
 				aa.completionEvent = null; // So event is only triggered once
 			}
-			if (aa.ending == AnimationEnding.Stop)
+			if (aa.ending == AnimationEnding.Stop) {
 				keysToRemove.Add(id);
+			}
 		}
-		foreach (var key in keysToRemove)
-			activeAnims.Remove(key);
+		keysToRemove.ForEach(key => activeAnims.Remove(key));
 	}
 
 	public MapUnit.Appearance getUnitAppearance(MapUnit unit)
@@ -158,9 +155,6 @@ public MapUnit.Appearance getUnitAppearance(MapUnit unit)
 	public C7Animation getTileEffect(Tile tile)
 	{
 		ActiveAnimation aa;
-		if (activeAnims.TryGetValue(getTileID(tile), out aa))
-			return aa.anim;
-		else
-			return null;
+		return activeAnims.TryGetValue(getTileID(tile), out aa) ? aa.anim : null;
 	}
 }

C7/Art/Title_Screen.jpg.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://ds3dwrouk7g55"
+uid="uid://bkxkefpbld468"
 path="res://.godot/imported/Title_Screen.jpg-067f940f7a89fae79632e2159c786062.ctex"
 metadata={
 "vram_texture": false

C7/C7Game.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=14 format=3 uid="uid://cldl5nk4n61m2"]
+[gd_scene load_steps=15 format=3 uid="uid://cldl5nk4n61m2"]
 
 [ext_resource type="Script" path="res://Game.cs" id="1"]
+[ext_resource type="Script" path="res://Map/MapViewCamera.cs" id="2_xrlqh"]
 [ext_resource type="Script" path="res://UIElements/Advisors/Advisors.cs" id="3"]
 [ext_resource type="Script" path="res://UIElements/UpperLeftNav/MenuButton.cs" id="4"]
 [ext_resource type="Script" path="res://UIElements/UpperLeftNav/CivilopediaButton.cs" id="5"]
@@ -61,12 +62,19 @@ _data = {
 [node name="C7Game" type="Node2D"]
 script = ExtResource("1")
 
+[node name="MapViewCamera" type="Camera2D" parent="."]
+script = ExtResource("2_xrlqh")
+
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="Advisor" type="CenterContainer" parent="CanvasLayer"]
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
+offset_left = -574.0
+offset_top = -322.0
+offset_right = -574.0
+offset_bottom = -322.0
 grow_horizontal = 2
 grow_vertical = 2
 theme = ExtResource("10")
@@ -86,6 +94,7 @@ script = ExtResource("9")
 
 [node name="Control" type="Control" parent="CanvasLayer"]
 layout_mode = 3
+anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 10.0
@@ -173,12 +182,14 @@ text = "End Turn"
 
 [node name="SlideOutBar" type="Control" parent="CanvasLayer/Control"]
 layout_mode = 1
+anchors_preset = 11
 anchor_left = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_top = 50.0
-offset_right = -10.0
-offset_bottom = -200.0
+offset_left = -108.0
+offset_top = 80.0
+offset_right = -108.0
+offset_bottom = -170.0
 grow_horizontal = 0
 grow_vertical = 2
 mouse_filter = 1
@@ -248,7 +259,6 @@ libraries = {
 [connection signal="TurnStarted" from="." to="CanvasLayer/Control/GameStatus" method="OnTurnStarted"]
 [connection signal="BuildCity" from="CanvasLayer/PopupOverlay" to="." method="OnBuildCity"]
 [connection signal="HidePopup" from="CanvasLayer/PopupOverlay" to="CanvasLayer/PopupOverlay" method="OnHidePopup"]
-[connection signal="Quit" from="CanvasLayer/PopupOverlay" to="." method="OnQuitTheGame"]
 [connection signal="UnitDisbanded" from="CanvasLayer/PopupOverlay" to="." method="OnUnitDisbanded"]
 [connection signal="BlinkyEndTurnButtonPressed" from="CanvasLayer/Control/GameStatus" to="." method="OnPlayerEndTurn"]
 [connection signal="pressed" from="CanvasLayer/Control/ToolBar/MarginContainer/HBoxContainer/AdvisorButton" to="CanvasLayer/Advisor" method="ShowLatestAdvisor"]