Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,112 Commits 4 Branches 180 Tags
aa3e7a8ef54707604b8ea845ac68586bcc4f3d77
Commit Graph
54 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Timmeey86 828661e9de More efficient way of retrieving ConsumePower subclasses 2018-12-15 23:49:46 +01:00
Timmeey86 f48a19a3bc Merged master into branch 2018-12-15 00:49:38 +01:00
Timmeey86 fed11db92e Buffered consumers now fill instantly 2018-12-15 00:47:47 +01:00
Timmeey86 23fb15fe78 Buffered consumers will no longer have their buffer reset when being unlinked 2018-12-14 21:14:19 +01:00
Timmeey86 511983e1ea Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-11 00:17:15 +01:00
Timmeey86 e50ff6b0a5 Merged current master and fixed conflicts 2018-12-09 22:40:33 +01:00
Timmeey86 41c6887f33 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-08 20:07:45 +01:00
Timmeey86 e6261a6bf8 Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger 2018-12-07 19:40:10 +01:00
Timmeey86 0a76647175 ForceProjector should now work properly 2018-12-07 19:38:14 +01:00
Timmeey86 787706b1f7 Set default minimum power to 50% and set four blocks to 100% 2018-12-07 19:37:51 +01:00
Timmeey86 e726d16094 Removed power bars from direct consumers 2018-12-06 19:49:49 +01:00
Timmeey86 5bda5124e6 Merged current master to branch 2018-12-06 19:48:01 +01:00
Timmeey86 57bebd3fb6 Removed file which was not supposed to be commited 2018-12-05 18:57:52 +01:00
Timmeey86 329dac77ee Consumers only draw power when all other required inputs are valid 2018-12-05 18:56:07 +01:00
Timmeey86 e5dabc63c2 Removed power bars from producers 2018-12-05 18:03:50 +01:00
Timmeey86 f8cf185db9 Fixed display of solar panel power generation 2018-12-02 12:43:18 +01:00
Timmeey86 034fab480d Most direct consumers now operate slower when not supplied with full power 2018-12-01 18:32:17 +01:00
Timmeey86 62c6d8e42d Fixed Arcs not firing 2018-12-01 16:49:30 +01:00
Timmeey86 14e057cf05 - Resolved all remaining TODOs 2018-12-01 16:13:03 +01:00
Timmeey86 982c9bf964 - Fixed double power production 
- Buffered consumers no longer request power when full
 2018-12-01 14:31:01 +01:00
Timmeey86 b4aba3d263 All power blocks now produce power as stated in v63 tool tips 2018-12-01 13:41:14 +01:00
Timmeey86 149f7a1d9d Merged current master into branch (with manual changes) 2018-11-30 21:33:09 +01:00
Timmeey86 074a6bfa87 Reverted accidental file push 2018-11-30 21:10:31 +01:00
Timmeey86 965fec5927 Continued work on power generators 2018-11-30 21:08:33 +01:00
Timmeey86 61210955bd Optimized power distribution implementation for buffered consumers 2018-11-30 18:45:40 +01:00
Timmeey86 28f73d0a76 Merged ItemGenerator, LiquidGenerator and ItemLiquidGenerator into a single class. 
Unit tests now test the ItemsOnly, LiquidsOnly and LiquidsAndItems cases
 2018-11-30 18:37:51 +01:00
Timmeey86 bcb9cfd2fe Synchronized Item/Liquid generator code 2018-11-30 00:03:53 +01:00
Timmeey86 1d57568322 All power distributors now update power graph 
Replaced manual power graph update by base implementation call so future changes in base class get applied to all subclasses automatically. Added the call where missing.
 2018-11-29 23:35:56 +01:00
Timmeey86 4cb72c1998 Resolved some of the power-related TODOs 2018-11-29 00:38:53 +01:00
Timmeey86 12ccc10e83 Restored SolarGenerator and adapted to new power system. 2018-11-28 23:56:11 +01:00
Timmeey86 ec631f3499 Changed test naming conventions as requested by Anuke 2018-11-28 23:54:26 +01:00
Timmeey86 2972780bed Initial Efficiency is now zero. Blocks display efficiency. 2018-11-28 13:19:52 +01:00
Timmeey86 cf3d2c3def Fixed handling of item duration 2018-11-28 11:59:58 +01:00
Timmeey86 1f8751054c Tested/fixed delta calculations 
Tests now use a fixed delta of 0.5 to make sure calculations work with deltas different from 1.0
 2018-11-28 11:04:08 +01:00
Timmeey86 739219c57b Finished first draft of ItemLiquidGenerator through TDD 2018-11-27 22:28:41 +01:00
Timmeey86 f56e1933a6 Fixed occassional crashes of Power Tests and continued TDD 2018-11-27 21:27:35 +01:00
Timmeey86 11e071289b Reorganized power tests ... 
... and changed creation of fake tiles so update() implementations have all required dependencies
 2018-11-27 08:51:19 +01:00
Timmeey86 a9517096f9 Merged current Anuke master into branch 2018-11-26 23:25:24 +01:00
Timmeey86 fc3f03425e Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger 2018-11-26 23:12:55 +01:00
Timmeey86 cd6880aff4 Merge branch 'master' of https://github.com/baltitenger/Mindustry into baltitenger 2018-11-26 21:59:25 +01:00
Timmeey86 f640494c1f PowerGraph now handles delta 
Also power bars are displayed for non-buffered consumers as well
 2018-11-26 10:26:49 +01:00
Timmeey86 77b9feb765 More Tests and fixes 
- Batteries will now get charged with no consumers
- Fixed stat display of power generators
 2018-11-26 09:24:08 +01:00
Timmeey86 99139dfcca Added unit tests for batteries... 
...and fixed battery distribution until all tests passed
 2018-11-26 08:58:16 +01:00
Timmeey86 560d388df4 Added Tests, fixed detected bugs and updated JUnit 2018-11-22 23:30:49 +01:00
Timmeey86 7683e86d8b Added two unit tests for bounds checking 2018-11-21 23:57:24 +01:00
Timmeey86 920491ddb2 MassDriver now properly displays the power per shot 2018-11-21 23:38:28 +01:00
Timmeey86 761728ac43 Fixed the ConsumePower constructors which got mixed up at some point 2018-11-21 23:04:18 +01:00
Timmeey86 d8ddb9dc82 Merged the three ConsumePower classes into a single one 2018-11-21 22:55:53 +01:00
Timmeey86 405f153439 Reverted/Adapted blocks to new Consume interfaces 2018-11-21 21:54:43 +01:00
Timmeey86 f789a35901 Readded buffered and direct consumers as three classes 2018-11-21 20:07:05 +01:00
Timmeey86 558c89cc30 Finished first unit test (equal power input and output) and fixed bugs detected by it 2018-11-21 00:04:26 +01:00
Timmeey86 222d41c84a Added Test stub 2018-11-20 22:58:13 +01:00
Timmeey86 f561768c67 Handled compiler errors by either resolving them or commenting & adding a TODO 2018-11-20 22:33:36 +01:00
Timmeey86 f5b8d8a60c Fixed compiler errors/typos in PowerGraph 2018-11-19 22:11:11 +01:00