From 5a25d1cc4b77ed84242075b043ddc6e987dd17f4 Mon Sep 17 00:00:00 2001
From: Kevin Zheng <kevinz5000@gmail.com>
Date: Thu, 30 May 2024 08:09:07 -0800
Subject: [PATCH] Make mapping actions slightly more useable (#28394)

---
 Resources/mapping_actions.yml | 115 ++++++++++++++++------------------
 1 file changed, 54 insertions(+), 61 deletions(-)

diff --git a/Resources/mapping_actions.yml b/Resources/mapping_actions.yml
index 9498c3062a3..e7ab1b4bf3d 100644
--- a/Resources/mapping_actions.yml
+++ b/Resources/mapping_actions.yml
@@ -1,6 +1,5 @@
 - action: !type:InstantActionComponent
-    icon:
-      entity: ReinforcedWindow
+    icon: /Textures/Tiles/cropped_parallax.png
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -8,14 +7,41 @@
     autoPopulate: False
     temporary: True
     event: !type:StartPlacementActionEvent
-      placementOption: SnapgridCenter
-      entityType: ReinforcedWindow
+      placementOption: AlignTileAny
+      tileId: Space
   assignments:
-  - 0: 3
-  name: ReinforcedWindow
+  - 0: 8
+  name: space
+- action: !type:InstantActionComponent
+    icon: Interface/VerbIcons/delete.svg.192dpi.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      eraser: True
+  assignments:
+  - 0: 9
+  name: action-name-mapping-erase
+- action: !type:InstantActionComponent
+    icon: /Textures/Tiles/plating.png
+    keywords: []
+    checkCanInteract: False
+    checkConsciousness: False
+    clientExclusive: True
+    autoPopulate: False
+    temporary: True
+    event: !type:StartPlacementActionEvent
+      placementOption: AlignTileAny
+      tileId: Plating
+  assignments:
+  - 0: 7
+  name: plating
 - action: !type:InstantActionComponent
     icon:
-      entity: WallSolid
+      entity: Grille
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -24,13 +50,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: WallSolid
+      entityType: Grille
   assignments:
-  - 0: 0
-  name: WallSolid
+  - 0: 4
+  name: Grille
 - action: !type:InstantActionComponent
     icon:
-      entity: WallReinforced
+      entity: WallSolid
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -39,10 +65,10 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: WallReinforced
+      entityType: WallSolid
   assignments:
-  - 0: 1
-  name: WallReinforced
+  - 0: 0
+  name: WallSolid
 - action: !type:InstantActionComponent
     icon:
       entity: Window
@@ -60,7 +86,7 @@
   name: Window
 - action: !type:InstantActionComponent
     icon:
-      entity: Firelock
+      entity: WallReinforced
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -69,13 +95,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: Firelock
+      entityType: WallReinforced
   assignments:
-  - 0: 5
-  name: Firelock
+  - 0: 1
+  name: WallReinforced
 - action: !type:InstantActionComponent
     icon:
-      entity: Grille
+      entity: ReinforcedWindow
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -84,12 +110,13 @@
     temporary: True
     event: !type:StartPlacementActionEvent
       placementOption: SnapgridCenter
-      entityType: Grille
+      entityType: ReinforcedWindow
   assignments:
-  - 0: 4
-  name: Grille
+  - 0: 3
+  name: ReinforcedWindow
 - action: !type:InstantActionComponent
-    icon: Interface/VerbIcons/delete.svg.192dpi.png
+    icon:
+      entity: Firelock
     keywords: []
     checkCanInteract: False
     checkConsciousness: False
@@ -97,15 +124,11 @@
     autoPopulate: False
     temporary: True
     event: !type:StartPlacementActionEvent
-      eraser: True
+      placementOption: SnapgridCenter
+      entityType: Firelock
   assignments:
-  - 0: 9
-  - 1: 9
-  - 2: 9
-  - 4: 9
-  - 5: 9
-  - 6: 9
-  name: action-name-mapping-erase
+  - 0: 5
+  name: Firelock
 - action: !type:InstantActionComponent
     icon:
       entity: GasPipeStraight
@@ -1110,34 +1133,4 @@
   assignments:
   - 0: 6
   name: steel floor
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/plating.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Plating
-  assignments:
-  - 0: 7
-  - 1: 8
-  - 2: 8
-  name: plating
-- action: !type:InstantActionComponent
-    icon: /Textures/Tiles/cropped_parallax.png
-    keywords: []
-    checkCanInteract: False
-    checkConsciousness: False
-    clientExclusive: True
-    autoPopulate: False
-    temporary: True
-    event: !type:StartPlacementActionEvent
-      placementOption: AlignTileAny
-      tileId: Space
-  assignments:
-  - 0: 8
-  name: space
 ...