From 2ec3eee13888dfefa9af646e1f42a76fdb3a8360 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 24 Oct 2020 15:02:36 -0700 Subject: [PATCH 1/4] Custom Base Support --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 58abb26b12..1a394fe074 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -65,7 +65,7 @@ public abstract class Turret extends ReloadTurret{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load("block-@size") TextureRegion baseRegion; + public @Load("@-base", fallback = "block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90); From 8ad4349d18adc691c1e63ba0f0078a926060daad Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 24 Oct 2020 17:12:44 -0700 Subject: [PATCH 2/4] test this --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 1a394fe074..540ba37d1d 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -65,7 +65,7 @@ public abstract class Turret extends ReloadTurret{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load("@-base", fallback = "block-@size") TextureRegion baseRegion; + public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90); From 062b319ab3884b72f75cc6400ec86312cd77e519 Mon Sep 17 00:00:00 2001 From: MEEP of Faith <54301439+MEEPofFaith@users.noreply.github.com> Date: Sat, 24 Oct 2020 17:16:56 -0700 Subject: [PATCH 3/4] ok, then try this? --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 540ba37d1d..71d813eb0c 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -65,7 +65,7 @@ public abstract class Turret extends ReloadTurret{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion; + public @Load(value = "block-@", fallback = "block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90); From 2c035169980b974292799ed8cea3a0850e49814f Mon Sep 17 00:00:00 2001 From: MEEP of Faith Date: Sat, 24 Oct 2020 17:27:01 -0700 Subject: [PATCH 4/4] I thought this failed. I guess not.. --- core/src/mindustry/world/blocks/defense/turrets/Turret.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java index 71d813eb0c..fc55a5fde1 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java @@ -65,7 +65,7 @@ public abstract class Turret extends ReloadTurret{ protected Vec2 tr = new Vec2(); protected Vec2 tr2 = new Vec2(); - public @Load(value = "block-@", fallback = "block-@size") TextureRegion baseRegion; + public @Load(value = "base-@", fallback = "block-@size") TextureRegion baseRegion; public @Load("@-heat") TextureRegion heatRegion; public Cons drawer = tile -> Draw.rect(region, tile.x + tr2.x, tile.y + tr2.y, tile.rotation - 90);