Merge pull request #130 from C7-Game/DefaultZoomAndGrid

Default zoom and grid

Author: QuintillusCFC

C7/Game.cs

@@ -68,7 +68,8 @@ public override void _Ready()
 			Player = GetNode<KinematicBody2D>("KinematicBody2D");
 			//TODO: What was this supposed to do?  It throws errors and occasinally causes crashes now, because _OnViewportSizeChanged doesn't exist
 			// GetTree().Root.Connect("size_changed", this, "_OnViewportSizeChanged");
-			mapView.cameraZoom = (float)0.3;
+			mapView.cameraZoom = (float)1.0;
+			mapView.gridLayer.visible = false;
 			// If later recreating scene, the component may already exist, hence try/catch
 			try{
 				ComponentManager.Instance.AddComponent(new TurnCounterComponent());
@@ -407,9 +408,7 @@ public override void _UnhandledInput(InputEvent @event)
 					}
 				}
 			}
-			// I key toggles the grid. This should be CTRL+G to match the original game but that key combination gets intercepted by the
-			// unit action handler.
-			else if (eventKey.Scancode == (int)Godot.KeyList.I)
+			else if (eventKey.Scancode == (int)Godot.KeyList.G && eventKey.Control)
 			{
 				mapView.gridLayer.visible = ! mapView.gridLayer.visible;
 			}

C7/UIElements/UnitButtons/UnitButtons.cs

@@ -108,7 +108,7 @@ public override void _UnhandledInput(InputEvent @event) {
 				foreach (UnitControlButton button in buttonMap.Values)
 				{
 					if (button.Visible == true) {
-						if (eventKey.Scancode == button.shortcutKey) {
+						if (eventKey.Scancode == button.shortcutKey && !eventKey.Shift && !eventKey.Command && !eventKey.Control && !eventKey.Alt) {
 							this.onButtonPressed(button.key);
 							GetTree().SetInputAsHandled();
 						}