feat: add pixel_w and pixel_z support (#341)

Author: Drulikar

internal/app/prefs/save.go

@@ -18,11 +18,13 @@ var SaveFormats = []string{
 }
 
 const (
-	SaveNudgeModePixel = "pixel_x/pixel_y"
-	SaveNudgeModeStep  = "step_x/step_y"
+	SaveNudgeModePixel    = "pixel_x/pixel_y"
+	SaveNudgeModeStep     = "step_x/step_y"
+	SaveNudgeModePixelAlt = "pixel_w/pixel_z"
 )
 
 var SaveNudgeModes = []string{
 	SaveNudgeModePixel,
 	SaveNudgeModeStep,
+	SaveNudgeModePixelAlt,
 }

internal/app/render/bucket/level/chunk/unit/unit.go

@@ -60,10 +60,12 @@ func Make(x, y int, i *dmminstance.Instance, iconSize int) Unit {
 	pixelY, _ := i.Prefab().Vars().Int("pixel_y")
 	stepX, _ := i.Prefab().Vars().Int("step_x")
 	stepY, _ := i.Prefab().Vars().Int("step_y")
+	pixelW, _ := i.Prefab().Vars().Int("pixel_w")
+	pixelZ, _ := i.Prefab().Vars().Int("pixel_z")
 
 	sp := dmicon.Cache.GetSpriteOrPlaceholderV(icon, iconState, dir)
-	x1 := float32((x-1)*iconSize + pixelX + stepX)
-	y1 := float32((y-1)*iconSize + pixelY + stepY)
+	x1 := float32((x-1)*iconSize + pixelX + stepX + pixelW)
+	y1 := float32((y-1)*iconSize + pixelY + stepY + pixelZ)
 	x2 := x1 + float32(sp.IconWidth())
 	y2 := y1 + float32(sp.IconHeight())
 	r, g, b, a := parseColor(i.Prefab())

internal/app/ui/cpwsarea/wsmap/pmap/pquickedit/pquickedit.go

@@ -64,18 +64,25 @@ func (p *Panel) ProcessV(instance *dmminstance.Instance) {
 
 func (p *Panel) showNudgeOption(label string, xAxis bool, instance *dmminstance.Instance) {
 	var nudgeVarName string
-	if p.app.Prefs().Editor.NudgeMode == prefs.SaveNudgeModePixel {
+	switch p.app.Prefs().Editor.NudgeMode {
+	case prefs.SaveNudgeModePixel:
 		if xAxis {
 			nudgeVarName = "pixel_x"
 		} else {
 			nudgeVarName = "pixel_y"
 		}
-	} else {
+	case prefs.SaveNudgeModeStep:
 		if xAxis {
 			nudgeVarName = "step_x"
 		} else {
 			nudgeVarName = "step_y"
 		}
+	case prefs.SaveNudgeModePixelAlt:
+		if xAxis {
+			nudgeVarName = "pixel_w"
+		} else {
+			nudgeVarName = "pixel_z"
+		}
 	}
 
 	pixelX := instance.Prefab().Vars().IntV(nudgeVarName, 0)

internal/app/ui/cpwsarea/wsmap/tools/move.go

@@ -45,10 +45,13 @@ func (t *ToolMove) onStart(util.Point) {
 		t.instance = hoveredInstance
 		t.lastMouseCoords = imgui.MousePos()
 		vars := t.instance.Prefab().Vars()
-		if ed.Prefs().Editor.NudgeMode == prefs.SaveNudgeModePixel {
+		switch ed.Prefs().Editor.NudgeMode {
+		case prefs.SaveNudgeModePixel:
 			t.lastOffsets = [2]int{vars.IntV("pixel_x", 0), vars.IntV("pixel_y", 0)}
-		} else {
+		case prefs.SaveNudgeModeStep:
 			t.lastOffsets = [2]int{vars.IntV("step_x", 0), vars.IntV("step_y", 0)}
+		case prefs.SaveNudgeModePixelAlt:
+			t.lastOffsets = [2]int{vars.IntV("pixel_w", 0), vars.IntV("pixel_z", 0)}
 		}
 	}
 }
@@ -62,6 +65,9 @@ func (t *ToolMove) process() {
 	if ed.Prefs().Editor.NudgeMode == prefs.SaveNudgeModeStep {
 		xAxis = "step_x"
 		yAxis = "step_y"
+	} else if ed.Prefs().Editor.NudgeMode == prefs.SaveNudgeModePixelAlt {
+		xAxis = "pixel_w"
+		yAxis = "pixel_z"
 	}
 	origPrefab := t.instance.Prefab()
 	mouseCoords := imgui.MousePos()