Skip to content

Commit a8050fc

Browse files
AureusStratusAureusStratus
committed
Turrets and other stuff
1 parent 4548564 commit a8050fc

3 files changed

Lines changed: 124 additions & 8 deletions

File tree

‎src/exogenesis/content/ExoUnitTypes.java‎

Lines changed: 86 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1790,23 +1790,23 @@ public static void load() {
17901790
prayer = new VanstarUnitType("prayer"){{
17911791
constructor = UnitEntity::create;
17921792
outlineColor = ExoPal.empyreanOutline;
1793-
17941793
shadowElevation = 2;
17951794
speed = 6.8f;
17961795
circleTarget = true;
1797-
hitSize = 10f;
1796+
hitSize = 14f;
17981797
health = 360f;
17991798
flying = true;
18001799
drag = 0.08f;
18011800
accel = 0.09f;
18021801
faceTarget = true;
1803-
lowAltitude = true;
1802+
lowAltitude = false;
18041803
armor = 1;
18051804
trailLength = 8;
18061805
trailColor = engineColor = ExoPal.empyreanIndigo;
18071806
rotateSpeed = 3.7f;
18081807
engineSize = 1.7f;
18091808
engineOffset = 8;
1809+
/*
18101810
parts.add(
18111811
new ShapePart() {{
18121812
mirror = true;
@@ -1833,7 +1833,6 @@ public static void load() {
18331833
triLengthTo = triLength = 4f;
18341834
}}
18351835
);
1836-
/*
18371836
weapons.add(new RepairBeamWeapon("prayer") {{
18381837
mirror = rotate = false;
18391838
shootY = 8;
@@ -1849,7 +1848,7 @@ public static void load() {
18491848
}});
18501849
*/
18511850

1852-
weapons.add(new Weapon("soul") {{
1851+
weapons.add(new Weapon("flame weapon") {{
18531852
mirror = false;
18541853
x = 0;
18551854
baseRotation = 45;
@@ -1858,15 +1857,95 @@ public static void load() {
18581857
shootSound = Sounds.torch;
18591858
showStatSprite = false;
18601859
continuous = true;
1861-
shoot = new ShootSpread(4, 90);
18621860
shake = 1f;
18631861
shootY = 0;
18641862
recoil = 0;
18651863
bullet = new ContinuousFlameBulletType() {{
18661864
hitColor = ExoPal.empyreanIndigo;
18671865
drawFlare = false;
18681866
lifetime = 80;
1869-
damage = 3.5f;
1867+
damage = 1.5f;
1868+
pierceCap = 3;
1869+
length = 55f;
1870+
hitEffect = ExoFx.hitMeltColor;
1871+
oscScl = 6;
1872+
width = 3.4f;
1873+
colors = new Color[]{ExoPal.empyreanIndigoDark.cpy().a(0.4f), ExoPal.empyreanIndigo, ExoPal.empyreanPinkLight, Color.white};
1874+
smokeEffect = Fx.none;
1875+
shootEffect = Fx.none;
1876+
}};
1877+
}});
1878+
weapons.add(new Weapon("flame weapon") {{
1879+
mirror = false;
1880+
x = 0;
1881+
baseRotation = -45;
1882+
shootCone = 360;
1883+
reload = 80;
1884+
shootSound = Sounds.torch;
1885+
showStatSprite = false;
1886+
continuous = true;
1887+
shake = 1f;
1888+
shootY = 0;
1889+
recoil = 0;
1890+
bullet = new ContinuousFlameBulletType() {{
1891+
hitColor = ExoPal.empyreanIndigo;
1892+
drawFlare = false;
1893+
lifetime = 80;
1894+
damage = 1.5f;
1895+
pierceCap = 3;
1896+
length = 55f;
1897+
hitEffect = ExoFx.hitMeltColor;
1898+
oscScl = 6;
1899+
width = 3.4f;
1900+
colors = new Color[]{ExoPal.empyreanIndigoDark.cpy().a(0.4f), ExoPal.empyreanIndigo, ExoPal.empyreanPinkLight, Color.white};
1901+
smokeEffect = Fx.none;
1902+
shootEffect = Fx.none;
1903+
}};
1904+
}});
1905+
weapons.add(new Weapon("flame weapon") {{
1906+
mirror = false;
1907+
x = 0;
1908+
baseRotation = 135;
1909+
shootCone = 360;
1910+
reload = 80;
1911+
shootSound = Sounds.torch;
1912+
showStatSprite = false;
1913+
continuous = true;
1914+
shake = 1f;
1915+
shootY = 0;
1916+
recoil = 0;
1917+
bullet = new ContinuousFlameBulletType() {{
1918+
hitColor = ExoPal.empyreanIndigo;
1919+
drawFlare = false;
1920+
lifetime = 80;
1921+
damage = 1.5f;
1922+
pierceCap = 3;
1923+
length = 55f;
1924+
hitEffect = ExoFx.hitMeltColor;
1925+
oscScl = 6;
1926+
width = 3.4f;
1927+
colors = new Color[]{ExoPal.empyreanIndigoDark.cpy().a(0.4f), ExoPal.empyreanIndigo, ExoPal.empyreanPinkLight, Color.white};
1928+
smokeEffect = Fx.none;
1929+
shootEffect = Fx.none;
1930+
}};
1931+
}});
1932+
weapons.add(new Weapon("flame weapon") {{
1933+
mirror = false;
1934+
x = 0;
1935+
baseRotation = -135;
1936+
shootCone = 360;
1937+
reload = 80;
1938+
shootSound = Sounds.torch;
1939+
showStatSprite = false;
1940+
continuous = true;
1941+
shake = 1f;
1942+
shootY = 0;
1943+
recoil = 0;
1944+
bullet = new ContinuousFlameBulletType() {{
1945+
hitColor = ExoPal.empyreanIndigo;
1946+
drawFlare = false;
1947+
lifetime = 80;
1948+
damage = 1.5f;
18701949
pierceCap = 3;
18711950
length = 55f;
18721951
hitEffect = ExoFx.hitMeltColor;

‎src/exogenesis/content/ExoVanstarBlocks.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ public static void load(){
209209
}};
210210
oltuxiumBattery = new Battery("oltuxium-battery"){{
211211
requirements(Category.power, with(ExoItems.oltuxium, 10, ExoItems.cobolt, 1));
212-
consumePowerBuffered(2000f);
212+
consumePowerBuffered(1000f);
213+
scaledHealth = 280;
213214
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
214215
emptyLightColor = Color.valueOf("5eb1c1");
215216
fullLightColor = Color.valueOf("8deee2");
@@ -218,6 +219,7 @@ public static void load(){
218219
oltuxiumBatteryLarge = new Battery("oltuxium-battery-large"){{
219220
requirements(Category.power, with(ExoItems.neodymium, 20, ExoItems.oltuxium, 90, ExoItems.cobolt, 50, ExoItems.exoSilicon, 30));
220221
size = 3;
222+
scaledHealth = 280;
221223
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
222224
consumePowerBuffered(35000f);
223225
emptyLightColor = Color.valueOf("5eb1c1");
@@ -228,6 +230,7 @@ public static void load(){
228230
requirements(Category.power, with(ExoItems.cobolt, 30, ExoItems.oltuxium, 60));
229231
attribute = ExoAttribute.power;
230232
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
233+
scaledHealth = 280;
231234
minEfficiency = 0f;
232235
powerProduction = 16f;
233236

@@ -259,6 +262,7 @@ public static void load(){
259262
requirements(Category.power, with(ExoItems.cobolt, 80, ExoItems.oltuxium, 160, ExoItems.iron, 50));
260263
attribute = ExoAttribute.power;
261264
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
265+
scaledHealth = 280;
262266
minEfficiency = 0f;
263267
powerProduction = 16f;
264268

@@ -296,6 +300,7 @@ public static void load(){
296300
requirements(Category.crafting, with(ExoItems.cobolt, 30, ExoItems.exoMetaglass, 30, ExoItems.oltuxium, 60));
297301
attribute = ExoAttribute.power;
298302
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
303+
scaledHealth = 280;
299304
minEfficiency = 0f;
300305
powerProduction = 4f;
301306
effectChance = 0;
@@ -326,6 +331,7 @@ public static void load(){
326331
requirements(Category.crafting, with(ExoItems.cobolt, 80, ExoItems.exoMetaglass, 80, ExoItems.oltuxium, 160, ExoItems.iron, 50));
327332
attribute = ExoAttribute.power;
328333
envEnabled = ExoEnv.stormWorld | Env.terrestrial;
334+
scaledHealth = 280;
329335
minEfficiency = 0f;
330336
powerProduction = 4f;
331337
effectChance = 0f;

‎src/exogenesis/world/ExoTeams.java‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package exogenesis.world;
2+
3+
import arc.graphics.Color;
4+
import mindustry.game.Team;
5+
6+
public class ExoTeams {
7+
//Credits to Slotterfleet / team oct as I heavily referenced that (I also tooka big chunk for the icon loading)
8+
public static Team empyrean, geoComplex, legion, gaiaProtocol;
9+
10+
public static void load() {
11+
empyrean = newTeam(20, "empyrean", Color.valueOf("f7bc28"));
12+
geoComplex = newTeam(70, "geoComplex", Color.valueOf("e61f2f"));
13+
legion = newTeam(71, "legion", Color.valueOf("23b0ff"));
14+
gaiaProtocol = newTeam(73, "gaiaProtocol", Color.valueOf("24d049"));
15+
}
16+
private static Team newTeam(int id, String name, Color color) {Team team = Team.get(id);
17+
team.name = name;
18+
team.color.set(color);
19+
20+
team.palette[0] = color;
21+
team.palette[1] = color.cpy().mul(0.75f);
22+
team.palette[2] = color.cpy().mul(0.5f);
23+
team.palette[3] = color.cpy().mul(0.5f);
24+
25+
for(int i = 0; i < 3; i++){
26+
team.palettei[i] = team.palette[i].rgba();
27+
}
28+
return team;
29+
}
30+
31+
}

0 commit comments

Comments
 (0)