Patrick 'Quezler' Mounier
2e3f7d8db2
Merge branch 'master' into crater
2020-01-27 18:40:51 +01:00
Patrick 'Quezler' Mounier
883a2a9b59
Bruteforce crater emoji
2020-01-27 18:40:40 +01:00
Patrick 'Quezler' Mounier
9a289c83e6
Fuse with conveyor optimization
...
# Conflicts:
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-27 18:06:48 +01:00
Patrick 'Quezler' Mounier
6e970cb84d
Fix tech tree entry
2020-01-24 20:26:49 +01:00
Patrick 'Quezler' Mounier
58a79d8631
Update to v103
...
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
# core/src/mindustry/content/Blocks.java
# core/src/mindustry/content/TechTree.java
# core/src/mindustry/world/blocks/distribution/ItemConveyor.java
2020-01-24 20:25:03 +01:00
Patrick 'Quezler' Mounier
ed765ad10a
Merge branch 'master' into crater
...
# Conflicts:
# core/assets/sprites/block_colors.png
# core/assets/sprites/sprites.atlas
# core/assets/sprites/sprites.png
# core/assets/sprites/sprites3.png
# core/assets/sprites/sprites5.png
2020-01-10 12:02:07 +01:00
Patrick 'Quezler' Mounier and Anuken
4a94a6c059
Update dutch localization ( #1315 )
...
* Run gradle tools:updatebundles for nl
* Update 🇳🇱 bundle
Wow this took several hours, didn’t expect that. 🙈
* Implement @TsjipTsjip’s review
* Oops
* 〃
* 〃
* 〃
* 〃
* 〃
* 〃
* 〃
2020-01-08 10:52:43 -05:00
Patrick 'Quezler' Mounier and Anuken
406c11a14d
Make rebuildable a block attribute ( #1338 )
2020-01-08 10:28:28 -05:00
Patrick 'Quezler' Mounier
5f047603bf
Revert "Blend prototype"
...
This reverts commit 35afc94d34
2020-01-08 12:17:28 +01:00
Patrick 'Quezler' Mounier
5c485eff04
Ressurect OG corner
2020-01-08 10:58:05 +01:00
Patrick 'Quezler' Mounier
0f2f8f2411
Revert "Stash cursed loading dock"
...
This reverts commit 9bdf475049
2020-01-08 10:42:34 +01:00
Patrick 'Quezler' Mounier
9bdf475049
Stash cursed loading dock
2020-01-08 10:41:09 +01:00
Patrick 'Quezler' Mounier
35afc94d34
Blend prototype
2020-01-08 10:27:06 +01:00
Patrick 'Quezler' Mounier
8fc84fad0a
Scale foobar correctly with different capacities
2020-01-07 10:48:31 +01:00
Patrick 'Quezler' Mounier
12c3b22b7c
Fix poofing ¬ working if conveyor was backed up
2020-01-07 10:44:37 +01:00
Patrick 'Quezler' Mounier
252817abb7
Bar
2020-01-07 10:33:58 +01:00
Patrick 'Quezler' Mounier
781fbb6255
Foo
2020-01-07 10:33:04 +01:00
Patrick 'Quezler' Mounier
add19ed7f1
Start rotating 50% through reload
2020-01-07 10:17:24 +01:00
Patrick 'Quezler' Mounier
ecae603f50
Prevent (world border) crash
...
Learned my lesson from the diode :)
2020-01-06 18:13:40 +01:00
Patrick 'Quezler' Mounier
0b3d4da92d
Block trading
2020-01-06 18:12:10 +01:00
Patrick 'Quezler' Mounier
6e8ba927dd
Final cleanup before the draft phase ends ❤️
2020-01-06 18:09:19 +01:00
Patrick 'Quezler' Mounier
9b55eeaa38
Rename batches to something simpler
2020-01-06 18:04:56 +01:00
Patrick 'Quezler' Mounier
1a177ef239
Rephase dotted
2020-01-06 18:00:43 +01:00
Patrick 'Quezler' Mounier
207d95dbd8
Refractor away throughput stat
2020-01-06 17:57:14 +01:00
Patrick 'Quezler' Mounier
78951113d6
Remove maxunits stat entry
2020-01-06 17:55:02 +01:00
Patrick 'Quezler' Mounier
58e5931b83
Fix caveat of 〃
2020-01-06 17:51:12 +01:00
Patrick 'Quezler' Mounier
9891e971ea
Only unload if its ¬ the tile it spawned on
...
¬ loading if it both start & end plays weird
¬ unloading if it both start & end plays weird
——
so only unloading if the origin tile is ¬ the unload tile is the only smooth option
sadly this does block player feeding the conveyor at the last tile in the chain
2020-01-06 17:47:22 +01:00
Patrick 'Quezler' Mounier
6b3dc669eb
Merge branch 'master' into crater
2020-01-06 17:37:47 +01:00
Patrick 'Quezler' Mounier and Anuken
dd3c4d06ac
Mass driver place range assist ( #1331 )
2020-01-06 11:32:18 -05:00
Patrick 'Quezler' Mounier
c6299c8f2c
Add throughput stat entry
2020-01-05 15:28:28 +01:00
Patrick 'Quezler' Mounier
76fa8bef81
Add fixme
2020-01-05 10:37:32 +01:00
Patrick 'Quezler' Mounier
2ce30ece6c
Prevent smoke while placing
2020-01-05 10:35:15 +01:00
Patrick 'Quezler' Mounier
2b4401c753
Prevent accepting items from the front
2020-01-05 10:32:58 +01:00
Patrick 'Quezler' Mounier
4494503e6b
Get rid of computed boolean
2020-01-05 10:31:51 +01:00
Patrick 'Quezler' Mounier
2948738e33
Refractor away overhead
2020-01-05 10:28:43 +01:00
Patrick 'Quezler' Mounier
095c65f36c
Remove crater from bundle
2020-01-04 21:10:09 +01:00
Patrick 'Quezler' Mounier
7adf8cfdef
Merge branch 'master' into crater
2020-01-04 20:05:50 +01:00
Patrick 'Quezler' Mounier and Anuken
eb70283355
Use current directory explicitly for bundle updator ( #1316 )
2020-01-04 12:40:12 -05:00
Patrick 'Quezler' Mounier
2666b564c2
Revamp comment
2020-01-03 20:19:44 +01:00
Patrick 'Quezler' Mounier
0ae627c56b
Revert "Tweak next tile treshold"
...
This reverts commit a629aeef75
2020-01-03 19:03:34 +01:00
Patrick 'Quezler' Mounier
81de3d2c7d
Fix typo
2020-01-03 18:49:33 +01:00
Patrick 'Quezler' Mounier
57cd03c0c2
Remove crater inactivity
2020-01-03 18:43:06 +01:00
Patrick 'Quezler' Mounier
a629aeef75
Tweak next tile treshold
2020-01-03 18:35:51 +01:00
Patrick 'Quezler' Mounier
b8e32304a3
Purge newline
2020-01-03 17:45:29 +01:00
Patrick 'Quezler' Mounier
e2d0ab5161
Move bundle entries around
2020-01-03 17:42:05 +01:00
Patrick 'Quezler' Mounier
73040de839
Change bundle description
2020-01-03 17:41:05 +01:00
Patrick 'Quezler' Mounier
097334726d
Change respawn & idle from frames to integers
2020-01-03 17:36:05 +01:00
Patrick 'Quezler' Mounier
6efcbe69a0
Get rid of compressable
2020-01-03 17:29:08 +01:00
Patrick 'Quezler' Mounier
f6af699428
Revert " 🎩 "
...
This reverts commit 10e4268dd5
2020-01-03 17:26:19 +01:00
Patrick 'Quezler' Mounier
5a21387762
Add inb4
2020-01-03 17:23:57 +01:00
Patrick 'Quezler' Mounier
1f6d3dca0e
Give craters surfboards to stream
2020-01-03 17:18:48 +01:00
Patrick 'Quezler' Mounier
0b0007502f
Revert "Differentiate texture from armored conveyor"
...
This reverts commit 59451fcc0b
2020-01-03 17:09:13 +01:00
Patrick 'Quezler' Mounier
59451fcc0b
Differentiate texture from armored conveyor
...
By removing the turtleshell it looks less armored while still somewhat high-tech (ish)
2020-01-03 17:09:06 +01:00
Patrick 'Quezler' Mounier
12b034d16b
Tweak default conveyor stats
2020-01-03 16:47:37 +01:00
Patrick 'Quezler' Mounier
68dca82ab8
Refractor for readability
2020-01-03 16:42:28 +01:00
Patrick 'Quezler' Mounier
edbe50d8c4
Get rid of track enum
2020-01-03 16:20:23 +01:00
Patrick 'Quezler' Mounier
644d54c3f1
Move drawer back from crater to tile
2020-01-03 16:12:38 +01:00
Patrick 'Quezler' Mounier
f4a7f98b0b
Fix blending
2020-01-03 16:00:58 +01:00
Patrick 'Quezler' Mounier
315bb483f2
Replace headless check with inactivity
2020-01-03 12:30:55 +01:00
Patrick 'Quezler' Mounier
d843f29e09
Make crater speed configurable
2020-01-03 12:19:33 +01:00
Patrick 'Quezler' Mounier
0807e1bd25
List boostable item capacity in stats
2020-01-03 12:13:33 +01:00
Patrick 'Quezler' Mounier
4aaaf3292e
Add cooldown after crater moved
2020-01-03 11:56:29 +01:00
Patrick 'Quezler' Mounier
8c7d8abddd
Inflate crater properties
2020-01-03 11:40:45 +01:00
Patrick 'Quezler' Mounier
aa64dcfe27
Update target before launch
...
So it has the chance to make room before it receives the crater from the caller.
2020-01-03 11:28:46 +01:00
Patrick 'Quezler' Mounier
f94c7e6105
Move launch checks
2020-01-03 11:23:47 +01:00
Patrick 'Quezler' Mounier
7b0456a227
Launch only when full
2020-01-03 11:11:54 +01:00
Patrick 'Quezler' Mounier
cad13b61bb
Merge branch 'master' into crater
...
# Conflicts:
# core/src/mindustry/mod/ClassAccess.java
2020-01-03 08:01:22 +01:00
Patrick 'Quezler' Mounier
4a238cff77
Begone 🔭
2020-01-02 22:09:12 +01:00
Patrick 'Quezler' Mounier
3f754116d8
Tweak crater movement
2020-01-02 22:06:41 +01:00
Patrick 'Quezler' Mounier
13e378c7d3
Birth base conveyor class
2020-01-02 22:06:18 +01:00
Patrick 'Quezler' Mounier
e289f13d27
- newline
2020-01-02 21:40:04 +01:00
Patrick 'Quezler' Mounier
f0bfe24008
Remove crater bundle entry
2020-01-02 21:34:56 +01:00
Patrick 'Quezler' Mounier
0ae6527584
Sacrifice hivemind to convert craters to drawings
...
Sad, yes, but crater units would never sync well over the net in its current state, so faking them unto conveyors is the only real option.
Forgive me future ai overlord <3
2020-01-02 21:29:19 +01:00
Patrick 'Quezler' Mounier
10e4268dd5
🎩
...
Leaving this here until it gets merged or something :)
2020-01-02 09:02:37 +01:00
Patrick 'Quezler' Mounier
317f40eecd
Use tree score instead of looping each crater twice
2020-01-02 08:51:49 +01:00
Patrick 'Quezler' Mounier
ec32f65646
Avoid recursion
2020-01-02 08:11:37 +01:00
Patrick 'Quezler' Mounier
f1a455d7f1
Uproot the way the update order works
2020-01-02 07:57:32 +01:00
Patrick 'Quezler' Mounier
481c5753e7
Fixes a crash somehow
2020-01-01 22:23:10 +01:00
Patrick 'Quezler' Mounier
7f434fb625
❤️
...
https://youtu.be/gzkItR1jkKY?t=105
2020-01-01 20:55:20 +01:00
Patrick 'Quezler' Mounier
5c31009495
Remove unused alteration
2020-01-01 20:54:29 +01:00
Patrick 'Quezler' Mounier
549efa472a
Always keep moving towards its purpose
2020-01-01 20:51:26 +01:00
Patrick 'Quezler' Mounier
70b43ee31c
Keep unloading if it succeeds
2020-01-01 20:45:22 +01:00
Patrick 'Quezler' Mounier
2fcdae4c7e
Dirty, but works even better <3
2020-01-01 20:32:09 +01:00
Patrick 'Quezler' Mounier
15311fa4ed
This looks acceptable
2020-01-01 20:31:01 +01:00
Patrick 'Quezler' Mounier
0ce1164ffa
Brainstorm dibs logic
2020-01-01 20:29:14 +01:00
Patrick 'Quezler' Mounier
12f51d477e
Purge anti collision
2020-01-01 20:17:52 +01:00
Patrick 'Quezler' Mounier
00933f0e30
Merge branch 'master' into crater
2020-01-01 20:13:21 +01:00
Patrick 'Quezler' Mounier
197118e16e
Doesn’t really close the gap
2020-01-01 20:13:07 +01:00
Patrick 'Quezler' Mounier
b8cede1cf5
Start reworking tile assigner
2020-01-01 20:07:22 +01:00
Patrick 'Quezler' Mounier
163bf15930
Rework dibs into hivemind
...
Imperfect, will require tweaking.
2020-01-01 20:06:47 +01:00
Patrick 'Quezler' Mounier
1bcfc69206
Tweak stat pages
2020-01-01 14:01:54 +01:00
Patrick 'Quezler' Mounier
c3186b63ce
Rename compression to plastanium
...
Breaking change.
2020-01-01 13:43:14 +01:00
Patrick 'Quezler' Mounier
8cd03c8a06
Add techtree entry
2020-01-01 13:34:08 +01:00
Patrick 'Quezler' Mounier
fd5f914845
Holy sh*t this looks smooth
2020-01-01 11:47:36 +01:00
Patrick 'Quezler' Mounier
07d23b4489
Merge branch 'master' into crater
2020-01-01 11:40:55 +01:00
Patrick 'Quezler' Mounier
6f2dd3b708
Make its movement a bit more robotic
...
Far from smooth, but its better than a mass suicide orgy.
2019-12-31 22:32:41 +01:00
Patrick 'Quezler' Mounier
c6c3357979
Stash revised 〃
2019-12-31 21:28:59 +01:00
Patrick 'Quezler' Mounier
ed0809515e
Revert "Experiment with reserving tiles"
...
This reverts commit b46455642a
2019-12-31 21:10:17 +01:00
Patrick 'Quezler' Mounier
b46455642a
Experiment with reserving tiles
2019-12-31 21:10:12 +01:00
Patrick 'Quezler' Mounier
9c1eca6d31
Merge remote-tracking branch 'anuken/master' into crater
2019-12-31 18:55:06 +01:00
