Cable quality update #896

OmegaHaxors · 2019-02-05T20:51:59Z

Adds Resistive dust, which replaces the function of coal dust in resistors. Crafts from coal dust in a ratio of 1:8

Improved the power draw of 200V machines to 1,000 so they're actually worth the upgrade cost

Added custom registering system for cables which cleans up the code plenty. This also adds 3 new types of Cable Quality: Shoddy with half capacity, Quality with double capacity, and Perfect with 10x the capacity.

Renamed 'normal' cables to Standard cables to be consistant with the naming scheme of the new cables

Complex crafting chain to make Pure Copper, used to craft Quality cables. (Known issue: The bucket and lead is consumed in the process)

Glorious Copper which requires excessive folding of Pure Copper which makes Perfect Cables.

Turrets track faster and cost more to run passively, no longer target dead enemies, remark "gotcha" upon killing an enemy, and generally are better at aiming and killing their targets

Batteries are cheaper to recycle and have realistic battery capacity
Life Batteries have higher resistance so they are no longer a direct upgrade

Added recipe to macerate silicon from flint

- Crafts to and from Coal dust in a ratio 1:8 - Old Coal Dust still functions but can no longer be added # Conflicts: # src/main/java/mods/eln/Eln.java

Added Resistive dust to make resistance cheaper on coal # Conflicts: # src/main/java/mods/eln/Eln.java

OmegaHaxors · 2019-02-05T21:22:59Z

Apologies, I should have tested to see if it compiled before attempting to push the update.
Since you had removed CableRSFactor yet some of my code still used it, I simply removed any reference to it and now things should work properly.

+Shoddy, Quality, and Perfect cable types added Half, Double, and Quadruple current limits respectively +Added Copper refining Chain +Added Pure Copper to make Quality Cables +Added Glorious Copper Plate (folded 1000 times) to make Perfect Cables Very High Voltage Quality/Perfect Cables have Extremely Expensive Recipes # Conflicts: # src/main/java/mods/eln/Eln.java

Compiles properly now. Removed half-implemented features and updated localization files

OmegaHaxors · 2019-02-05T21:59:18Z

Did a lot of compatibility changes. It compiles now and I haven't noticed any errors.

src/main/java/mods/eln/Eln.java

OmegaHaxors · 2019-02-13T03:06:05Z

I hope you've liked the changes I did to the wire registry, I worked really hard on it

Replaced the old mess with a beautiful state machine

Castone22 · 2019-02-13T04:28:15Z

Given what it was, massive improvement

…

On Tue, Feb 12, 2019, 10:06 PM OmegaHaxors ***@***.*** wrote: I hope you've liked the changes I did to the wire registry, I worked really hard on it — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#896 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AL5CDbbT6smlta1tLQNFqU3_GbJA7m1Rks5vM4EigaJpZM4akDHT> .

jrddunbr

I've noticed that your editor is using tabs a lot. You should really configure the soft-tab functionality of your text editor to use 4 spaces instead. I have not commented everywhere that there is a tab or a failure to indent properly, but there are 341 tabs in this document that shouldn't be there (and most are probably not yours).

src/main/java/mods/eln/Eln.java

src/main/java/mods/eln/sixnode/resistor/ResistorContainer.java

jrddunbr · 2019-02-13T10:55:37Z

src/main/java/mods/eln/transparentnode/electricalmachine/ArcFurnaceDescriptor.java

+import org.lwjgl.opengl.GL11;
+
+public class ArcFurnaceDescriptor extends ElectricalMachineDescriptor {
+    private float tyOn;


what on earth are these.

Yes, please explain. By comment.

.gitignore

jrddunbr · 2019-02-13T11:05:40Z

Your code also failed the Travis build because you're not using the new functions Baugh set up for those pesky variables we had problems with a few weeks back.

OmegaHaxors · 2019-02-13T12:23:24Z

That should address any issue that were had.

OmegaHaxors · 2019-02-13T12:51:08Z

I will need help with one bit though, the localization on the new cables seems to fail and i'm not quite sure why.

OmegaHaxors · 2019-02-13T14:23:44Z

Confirmed now not to cause any regressions when updating.
That said, this feature pack won't contain any of the newer things (such as the arcmetal/clay blocks) so make sure you have those in there when building.

Enemies should slip through a lot less often.

# Conflicts: # src/main/java/mods/eln/Eln.java

No longer track dying enemies Will stop firing when an enemy dies Upon killing an enemy, remark "Gotcha!"

Magnetiser is spelled with a Z on the main branch

Life Batteries now have a small downside: Less efficiency

src/main/java/mods/eln/Eln.java

Baughn · 2019-02-16T14:39:39Z

src/main/java/mods/eln/Eln.java


+    /*public ElectricalCableDescriptor creativeCableDescriptor;
+    public ElectricalCableDescriptor T2TransmissionCableDescriptor;
+    public ElectricalCableDescriptor T1TransmissionCableDescriptor;*/
    public ElectricalCableDescriptor veryHighVoltageCableDescriptor;


Change the 'normal' qualities to start with 'normalQuality'.

Also, do not start variable names with capital letters. That's for constants only.

I note that these variables still start with capital letters. Let me be more specific: Use the alpacaCase pattern, e.g. lqVeryHighVoltageCableDescriptor.

src/main/java/mods/eln/Eln.java

OmegaHaxors · 2019-02-16T15:28:40Z

EDIT: Alright that should be everything taken care of. Just have to test everything and make sure there isn't any issues, then I will push the update and it will be ready for merging.

…le loop) Fixed minor regressions Code cleanup Removed unnecessary/unused additions Normal Quality cable Renamed to Standard Single-Use Batteries and Weak 50V Chargers now use Shoddy Cables

This did come at the cost of the 8 Copper plate -> Pure Copper Arc Furnace recipe, though

OmegaHaxors · 2019-02-16T17:05:05Z

Thank you for being patient, that should be everything.

Baughn · 2019-02-16T18:40:51Z

src/main/java/mods/eln/Eln.java


+    /*public ElectricalCableDescriptor creativeCableDescriptor;
+    public ElectricalCableDescriptor T2TransmissionCableDescriptor;
+    public ElectricalCableDescriptor T1TransmissionCableDescriptor;*/
    public ElectricalCableDescriptor veryHighVoltageCableDescriptor;


I note that these variables still start with capital letters. Let me be more specific: Use the alpacaCase pattern, e.g. lqVeryHighVoltageCableDescriptor.

src/main/java/mods/eln/Eln.java

Baughn · 2019-02-16T19:46:47Z

src/main/java/mods/eln/transparentnode/electricalmachine/ArcFurnaceDescriptor.java

+import org.lwjgl.opengl.GL11;
+
+public class ArcFurnaceDescriptor extends ElectricalMachineDescriptor {
+    private float tyOn;


Yes, please explain. By comment.

src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java

Removed unnecessary Scala Import Fixed long-standing spelling error in 'meduim' cables Documenting old changes: Buffed stone furnaces' heat capabilities to 4k Buffed stone furnaces' heat chamber upgrade slot to fit 8 Buffed 200V machines speed to 1kW Coding cleanup Updated Localization

… better match value (It will NEVER go higher than this) Shoddy cables require dirt instead of gravel Macerator recipes are more sane and balanced: Smoothstone replaces dirt as the recipe to make sand and costs 5x more power Gravel to Flint recipe requires 1/4 less power 4 Flint replaces sand as the recipe to make silicon dust 32 Cobblestone macerates into 1 gravel VERY slowly (to encourage finding it) Diamond Dust requires far more time to craft (to reflect its value)

…lues and better match value (It will NEVER go higher than this)" This reverts commit 152147e.

… better match value (It will NEVER go higher than this) Shoddy cables require dirt instead of gravel Macerator recipes are more sane and balanced: Smoothstone replaces dirt as the recipe to make sand and costs 5x more power Gravel to Flint recipe requires 1/4 less power 4 Flint replaces sand as the recipe to make silicon dust 32 Cobblestone macerates into 1 gravel VERY slowly (to encourage finding it) Diamond Dust requires far more time to craft (to reflect its value)

…lues and better match value (It will NEVER go higher than this)" This reverts commit 00e8188.

… better match value (It will NEVER go higher than this) Added alternative recipe to obtain silicon from flint Signal Processor now uses Adv Chip instead of Basic Chip

src/main/java/mods/eln/Eln.java

OmegaHaxors · 2019-02-19T14:56:00Z

Alright I think that's everything.

Baughn

Also, you really need to update the PR description to describe everything that's in it.

.gitignore

src/main/java/mods/eln/transparentnode/turret/TurretSlowProcess.java

Adjusted a comment to be consistent with its neighbors Minor tweaks for readability

Added Elite Chip, which is used to make E-Diamond and future high tier machines Added sprite for upcoming E-Module Buffed 200V machines to run at 2kW up from 1kW Added LED Plate, crafted from 1 Silicon Plate and 1MJ in a Plate Machine Nerfed LED Bulbs to require 1 LED plate instead of 3 Silicon Ingots Nerfed Solar Panels to now require 3 LED Plates in place of 1 Silicon Plate Buffed crafting output for Incandescent Bulbs to 64 Buffed crafting output for Carbon Incandescent Bulbs to 16 Eco and Farming bulbs are unchanged, at 4 and 2 respectively Nerfed crafting output for LED Bulbs down to 1 Generally; lower tier bulbs burn out more but are cheap to craft, and high tier bulbs are expensive but last much longer requiring far less effort to maintain.

Base efficiency of batteries dropped down to 76% to bring renewables more in line with burners Battery life can now drop to 0% as batteries can now be recycled Capacity Oriented Batteries have gotten their power ratings halved again to discourage spamming Voltage Oriented Batteries now have slightly improved power and efficiency to make them worth using (double and 85.88% respectively) Current Oriented Batteries are unchanged as they already fill an ideal niche Life-oriented Batteries are no longer infinite life, but instead have a 95% efficiency and 8x battery life over stock Single Use Batteries have gotten a large cut to their efficiency, down to 57.76% Added new battery: Crypto Capacitor. It's just a capacitor that looks like a battery. Sneaky. Crypto Capacitor has stats and cost equal to a capacitor. It's just a capacitor in a battery shell.

OmegaHaxors added 2 commits February 5, 2019 12:45

Resistors now use Resistive Dust

eda1c9e

- Crafts to and from Coal dust in a ratio 1:8 - Old Coal Dust still functions but can no longer be added # Conflicts: # src/main/java/mods/eln/Eln.java

Buffed 200V machine power draw from 400 to 200*5

e0cf4af

Added Resistive dust to make resistance cheaper on coal # Conflicts: # src/main/java/mods/eln/Eln.java

OmegaHaxors added 2 commits February 5, 2019 13:36

Re-added Arc Furnace as it is a dependency for the update

7713a09

Compiles properly now. Removed half-implemented features and updated localization files

Castone22 reviewed Feb 12, 2019

View reviewed changes

src/main/java/mods/eln/Eln.java Outdated Show resolved Hide resolved

Massive rework to the wire registering

310035c

Replaced the old mess with a beautiful state machine

jrddunbr suggested changes Feb 13, 2019

View reviewed changes

Cleaned up the code for release

37fe490

OmegaHaxors added 5 commits February 13, 2019 07:15

Turrets track much faster but cost more to run

74661c8

Enemies should slip through a lot less often.

Added Ender Pearl -> 20 Experience Bottle recipe to magnetizer

da5c686

# Conflicts: # src/main/java/mods/eln/Eln.java

Turrets now do the following:

98dd335

No longer track dying enemies Will stop firing when an enemy dies Upon killing an enemy, remark "Gotcha!"

Imported Arc Furnace code over to the main branch

b2ae1ba

Magnetiser is spelled with a Z on the main branch

Battery recycle a lot cheaper now

9b0a966

Life Batteries now have a small downside: Less efficiency

Baughn requested changes Feb 16, 2019

View reviewed changes

OmegaHaxors added 2 commits February 16, 2019 08:37

Improved Cable Registry state machine (uses nested for instead of whi…

079adca

…le loop) Fixed minor regressions Code cleanup Removed unnecessary/unused additions Normal Quality cable Renamed to Standard Single-Use Batteries and Weak 50V Chargers now use Shoddy Cables

Removed all traces of the Arc Furnace from this branch.

5c34db0

This did come at the cost of the 8 Copper plate -> Pure Copper Arc Furnace recipe, though

Baughn requested changes Feb 16, 2019

View reviewed changes

OmegaHaxors added 3 commits February 16, 2019 12:54

Revert "Perfect cables increased from 4x to 10x to match realistic va…

de416a2

…lues and better match value (It will NEVER go higher than this)" This reverts commit 152147e.

OmegaHaxors added 3 commits February 18, 2019 06:58

Revert "Perfect cables increased from 4x to 10x to match realistic va…

2c3c35b

…lues and better match value (It will NEVER go higher than this)" This reverts commit 00e8188.

Perfect cables increased from 4x to 10x to match realistic values and…

43f6018

… better match value (It will NEVER go higher than this) Added alternative recipe to obtain silicon from flint Signal Processor now uses Adv Chip instead of Basic Chip

Baughn reviewed Feb 19, 2019

View reviewed changes

Baughn requested changes Feb 19, 2019

View reviewed changes

OmegaHaxors added 3 commits February 19, 2019 07:49

Removed Gravel/Dirt cost from Shoddy Cables (it's just blank space now)

6197168

Adjusted a comment to be consistent with its neighbors Minor tweaks for readability

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cable quality update #896

Cable quality update #896

OmegaHaxors commented Feb 5, 2019 •

edited

Loading

OmegaHaxors commented Feb 5, 2019

OmegaHaxors commented Feb 5, 2019

OmegaHaxors commented Feb 13, 2019

Castone22 commented Feb 13, 2019 via email

jrddunbr left a comment

jrddunbr Feb 13, 2019

Baughn Feb 16, 2019

jrddunbr commented Feb 13, 2019

OmegaHaxors commented Feb 13, 2019

OmegaHaxors commented Feb 13, 2019 •

edited

Loading

OmegaHaxors commented Feb 13, 2019

Baughn Feb 16, 2019

Baughn Feb 16, 2019

OmegaHaxors commented Feb 16, 2019 •

edited

Loading

OmegaHaxors commented Feb 16, 2019

Baughn Feb 16, 2019

Baughn Feb 16, 2019

OmegaHaxors commented Feb 19, 2019

Baughn left a comment

Cable quality update #896

Are you sure you want to change the base?

Cable quality update #896

Conversation

OmegaHaxors commented Feb 5, 2019 • edited Loading

OmegaHaxors commented Feb 5, 2019

OmegaHaxors commented Feb 5, 2019

OmegaHaxors commented Feb 13, 2019

Castone22 commented Feb 13, 2019 via email

jrddunbr left a comment

Choose a reason for hiding this comment

jrddunbr Feb 13, 2019

Choose a reason for hiding this comment

Baughn Feb 16, 2019

Choose a reason for hiding this comment

jrddunbr commented Feb 13, 2019

OmegaHaxors commented Feb 13, 2019

OmegaHaxors commented Feb 13, 2019 • edited Loading

OmegaHaxors commented Feb 13, 2019

Baughn Feb 16, 2019

Choose a reason for hiding this comment

Baughn Feb 16, 2019

Choose a reason for hiding this comment

OmegaHaxors commented Feb 16, 2019 • edited Loading

OmegaHaxors commented Feb 16, 2019

Baughn Feb 16, 2019

Choose a reason for hiding this comment

Baughn Feb 16, 2019

Choose a reason for hiding this comment

OmegaHaxors commented Feb 19, 2019

Baughn left a comment

Choose a reason for hiding this comment

OmegaHaxors commented Feb 5, 2019 •

edited

Loading

OmegaHaxors commented Feb 13, 2019 •

edited

Loading

OmegaHaxors commented Feb 16, 2019 •

edited

Loading