unit: Added the 'Blend Master' with 'Camouflage'

xescugc · Jun 6, 2024 · 68313c1 · 68313c1
1 parent 8cfd9df
commit 68313c1
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 25 deletions.
diff --git a/assets/assets.go b/assets/assets.go
@@ -55,11 +55,11 @@ var ButterflyWalk_png []byte
 //go:embed ninja_adventure_asset_pack/Actor/Monsters/Butterfly/Faceset.png
 var ButterflyFaceset_png []byte
 
-//go:embed ninja_adventure_asset_pack/Actor/Characters/NinjaMasked/SeparateAnim/Walk.png
-var NinjaMaskedWalk_png []byte
+//go:embed ninja_adventure_asset_pack/Actor/Characters/CamouflageRed/SeparateAnim/Walk.png
+var BlendMasterWalk_png []byte
 
-//go:embed ninja_adventure_asset_pack/Actor/Characters/NinjaMasked/Faceset.png
-var NinjaMaskedFaceset_png []byte
+//go:embed ninja_adventure_asset_pack/Actor/Characters/CamouflageRed/Faceset.png
+var BlendMasterFaceset_png []byte
 
 //go:embed ninja_adventure_asset_pack/Actor/Characters/RobotGrey/SeparateAnim/Walk.png
 var RobotWalk_png []byte

diff --git a/assets/units.json b/assets/units.json
@@ -51,12 +51,13 @@
     "environment":"aerial",
     "movement_speed": 30
   },
-  "ninja_masked":{
+  "blend_master":{
     "health": 10,
     "gold": 15,
     "keybind":"8",
     "environment":"terrestrial",
-    "movement_speed": 50
+    "movement_speed": 40,
+    "abilities":["camouflage"]
   },
   "robot":{
     "health": 5,

diff --git a/store/lines.go b/store/lines.go
@@ -934,20 +934,37 @@ func (ls *Lines) moveLineUnitsTo(lstate LinesState, lid int, t time.Time) {
 			var (
 				minDist     float64 = 0
 				minDistUnit *Unit
+
+				// The potential Camouflage units
+				minDistCam     float64 = 0
+				minDistCamUnit *Unit
 			)
 			for _, u := range l.Units {
 				if !tw.CanTarget(unit.Units[u.Type].Environment) || u.HasBuff(buff.Burrowoed) || u.HasBuff(buff.Resurrecting) {
 					continue
 				}
 				d := tw.PDistance(u.Object)
-				if minDist == 0 {
-					minDist = d
-				}
-				if d <= tower.Towers[tw.Type].Range && d <= minDist {
-					minDist = d
-					minDistUnit = u
+				if u.HasAbility(ability.Camouflage) {
+					if minDistCam == 0 {
+						minDistCam = d
+					}
+					if d <= tower.Towers[tw.Type].Range && d <= minDistCam {
+						minDistCam = d
+						minDistCamUnit = u
+					}
+				} else {
+					if minDist == 0 {
+						minDist = d
+					}
+					if d <= tower.Towers[tw.Type].Range && d <= minDist {
+						minDist = d
+						minDistUnit = u
+					}
 				}
 			}
+			if minDistUnit == nil && minDistCamUnit != nil {
+				minDistUnit = minDistCamUnit
+			}
 			if minDistUnit != nil {
 				// Tower Attack
 				if minDistUnit.Shield != 0 {

diff --git a/unit/ability/ability.go b/unit/ability/ability.go
@@ -9,4 +9,5 @@ const (
 	Burrow
 	Resurrection
 	Hybrid
+	Camouflage
 )
diff --git a/unit/ability/ability_string.go b/unit/ability/ability_string.go
diff --git a/unit/type.go b/unit/type.go
@@ -12,7 +12,7 @@ const (
 	Mole
 	SkeletonDemon
 	Butterfly
-	NinjaMasked
+	BlendMaster
 	Robot
 	MonkeyBoxer
 )
diff --git a/unit/type_string.go b/unit/type_string.go
diff --git a/unit/unit.go b/unit/unit.go
@@ -56,7 +56,7 @@ var (
 		Mole:          assets.MoleWalk_png,
 		SkeletonDemon: assets.SkeletonDemonWalk_png,
 		Butterfly:     assets.ButterflyWalk_png,
-		NinjaMasked:   assets.NinjaMaskedWalk_png,
+		BlendMaster:   assets.BlendMasterWalk_png,
 		Robot:         assets.RobotWalk_png,
 		MonkeyBoxer:   assets.MonkeyBoxerWalk_png,
 	}
@@ -69,7 +69,7 @@ var (
 		Mole:          assets.MoleFaceset_png,
 		SkeletonDemon: assets.SkeletonDemonFaceset_png,
 		Butterfly:     assets.ButterflyFaceset_png,
-		NinjaMasked:   assets.NinjaMaskedFaceset_png,
+		BlendMaster:   assets.BlendMasterFaceset_png,
 		Robot:         assets.RobotFaceset_png,
 		MonkeyBoxer:   assets.MonkeyBoxerFaceset_png,
 	}