Skip to content

Commit

Permalink
Tech Tree readjustment 1 - Turret Classing & Descriptyion
Browse files Browse the repository at this point in the history
  • Loading branch information
Eschatologue committed May 23, 2023
1 parent 81168d8 commit 420f807
Show file tree
Hide file tree
Showing 19 changed files with 334 additions and 197 deletions.
29 changes: 26 additions & 3 deletions assets/bundles/bundle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
# [More lore needed], [Insert lore here] or anything of sort means it is not done yet, don't translate that, just leave it empty.
# ehe

techtree.uaw- = Unlimited Armament Works

# region Consumables

## Items
Expand Down Expand Up @@ -350,7 +348,7 @@ unit.uaw-carronade.details = [Lore needed]

unit.uaw-falconet.name = Falconet
unit.uaw-falconet.description = Armed with more point defence weapon along with even more devastating artillery.\n\nThe main artillery causes [white]repeating aftershocks[] in its affected area, [white]denying any building to be built[] while its still in effect.
unit.uaw-falconet.details= [Lore needed]
unit.uaw-falconet.details = [Lore needed]
## endregion Naval - Monitor Warship

## region Naval - Torpedo Destroyers
Expand Down Expand Up @@ -477,3 +475,28 @@ bar.inoperative = Inoperative
bar.uaw-item-efficiency = Item Efficiency {0}%
bar.uaw-tile-efficiency = Tile Efficiency {0}%
# endregion bars

## region TechTree

techtree.uaw-start = Unlimited Armament Works

content.typeid_UNUSED.name = Tech Research

typeid_UNUSED.uaw-start.name = The Beginning
typeid_UNUSED.uaw-start.details = Smokes and Thunder, Cordite and Steel\n\nWelcome to Unlimited Armament Works

typeid_UNUSED.uaw-turret.name = Turrets
typeid_UNUSED.uaw-turret.details = From the thunderous roar of machine guns to the devastating power of shot-cannons and the precision of artilleries, these formidable weapons form the bedrock of defences, delivering swift and severe retribution to any who dare trespass.

typeid_UNUSED.uaw-turret-mg.name = Machine Guns
typeid_UNUSED.uaw-turret-mg.description = Armaments akin to a vengeful blaze, where the mighty are rendered feeble as tow.\n\nWith a rapid-fire barrage spanning vast distances, this engineering marvel settles matters with quantity over precision.

typeid_UNUSED.uaw-turret-sg.name = Shot-cannons
typeid_UNUSED.uaw-turret-sg.description = Behold the thunderous symphony of devastation, where each blast disperses adversaries like chaff in the wind.\n\nThese formidable series of armaments embody untamed fury, striking terror into the hearts of all who dare approach near enough to its domain.

typeid_UNUSED.uaw-turret-art.name = Artilleries
typeid_UNUSED.uaw-turret-art.description = Majestic behemoths of war, crafted with meticulous artistry and endowed with awe-inspiring might.\n\nThese colossi of destruction, unleashes their spite with deadly payloads to distant realms, erasing all that is unfortunate enough to be in the receiving end.

typeid_UNUSED.uaw-turret-msl.name = Missile Launchers
typeid_UNUSED.uaw-turret-msl.description = The javelins and lances of the celestial realm, casting their judgement forth in guided aerial projectiles.\n\n With payloads of righteous retribution, they carry forth the weight of divine retribution upon those who stand in their destined path.
## endregion TechTree
Binary file added assets/sprites/entities/techtree/crafting.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/defence.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/start.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret-art.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret-en.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret-mg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret-msl.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret-sg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/sprites/entities/techtree/turret.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/UAW/UAWModLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import UAW.audiovisual.Sfx;
import UAW.content.*;
import UAW.content.techTree.*;
import arc.Events;
import mindustry.game.EventType.FileTreeInitEvent;
import mindustry.mod.Mod;
Expand All @@ -14,6 +15,7 @@ public UAWModLoader() {
@Override
public void loadContent() {
UAWStatusEffects.load();
TechTreeContent.load();
UAWBullets.load();
UAWUnitTypes.load();
UAWItems.load();
Expand Down
2 changes: 0 additions & 2 deletions src/UAW/content/UAWLiquids.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ public static void load() {
gasColor = UAWPal.phlogistonFront.a(0.4f);
canStayOn.add(Liquids.oil);



color = color.cpy();
color.a = 0.6f;
gasColor = color;
Expand Down
143 changes: 0 additions & 143 deletions src/UAW/content/UAWTechTree.java

This file was deleted.

2 changes: 1 addition & 1 deletion src/UAW/content/blocks/UAWBlocksProduction.java
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public static void load() {
}};

// Frackers
phlogistonBore = new UAWFracker("phlogiston-bore") {{
phlogistonBore = new ExplodingFracker("phlogiston-bore") {{
requirements(Category.production, with(
Items.copper, 150,
Items.graphite, 250,
Expand Down
32 changes: 32 additions & 0 deletions src/UAW/content/techTree/TechTreeContent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package UAW.content.techTree;

import mindustry.content.Items;

import static mindustry.type.ItemStack.with;

public class TechTreeContent {
public static TechTreeNode placeholder,

// Title
uawBegin,

// SubBranch - blockCategory
production, crafters, defence, power,

// SubBranch - turret
turret, turretMG, turretSG, turretART, turretMSL

// others
;

public static void load() {
uawBegin = new TechTreeNode("start");

turret = new TechTreeNode("turret"){{
}};
turretMG = new TechTreeNode("turret-mg");
turretSG = new TechTreeNode("turret-sg");
turretART = new TechTreeNode("turret-art");
turretMSL = new TechTreeNode("turret-msl");
}
}
70 changes: 70 additions & 0 deletions src/UAW/content/techTree/TechTreeNode.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package UAW.content.techTree;

import UAW.audiovisual.Outliner;
import arc.Core;
import arc.graphics.Color;
import arc.util.Nullable;
import mindustry.ctype.*;
import mindustry.graphics.*;
import mindustry.type.ItemStack;

public class TechTreeNode extends UnlockableContent {
public Color outlineColor = Pal.darkerMetal;
public int outlineThickness = 3;

public @Nullable
ItemStack[] researchCost;

@Nullable
public String iconName;

public TechTreeNode(String name) {
super(name);
hideDetails = false;
selectionSize = 128;
outlineThickness = 0;
}

@Override
public void loadIcon() {
fullIcon =
Core.atlas.find(getContentType().name() + "-" + (iconName == null ? name : iconName) + "-full",
Core.atlas.find((iconName == null ? name : iconName) + "-full",
Core.atlas.find((iconName == null ? name : iconName),
Core.atlas.find(getContentType().name() + "-" + (iconName == null ? name : iconName),
Core.atlas.find((iconName == null ? name : iconName) + "1")))));

uiIcon = Core.atlas.find(getContentType().name() + "-" + (iconName == null ? name : iconName) + "-ui", fullIcon);
}

@Override
public ItemStack[] researchRequirements() {
super.researchRequirements();
if (researchCost != null) {
return researchCost;
} else return ItemStack.empty;
}

@Override
public ContentType getContentType() {
return ContentType.typeid_UNUSED;
}

public void init() {
super.init();
}

@Override
public boolean isHidden() {
return true;
}

@Override
public void createIcons(MultiPacker packer) {
if (outlineThickness > 0) {
Outliner.outlineRegion(packer, fullIcon, outlineColor, (iconName == null ? name : iconName), outlineThickness);
}
super.createIcons(packer);
}

}

0 comments on commit 420f807

Please sign in to comment.