Commit Graph

35 Commits (bce903ee0434ffae24bf02c898ab456adee9ffdf)

Author SHA1 Message Date
Maikel de Vries df098d2840 pump only activates when drain is free or accepts liquid 2016-08-07 21:26:23 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Mark af2e4de6a1 Improved display of the connection status of pipes 2016-03-25 18:55:22 +01:00
Mark 96468023cf Fix line not updating on disconnect 2016-03-25 18:51:18 +01:00
Mark c0245be627 Merge: Changes from merge conflict 2016-03-25 17:20:54 +01:00
Mark 1f54927aee Unit test for line connections 2016-02-16 21:04:11 +01:00
Mark e985ffbd45 Changed pipe interface
- connect / disconnect callbacks do not include the line anymore
- the drain and source pipes are set to the pipe now, instead of the line
2016-02-16 21:03:43 +01:00
Mark 06f3e26ad5 Bugfix: Errors in UnitTest upon destruction of the pipe 2016-02-16 21:03:29 +01:00
Mark d6f600bbd2 Bugfix: Message displayed above clonk, instead of connected structure 2016-02-16 21:03:24 +01:00
Mark e99ab4471a Refactoring: Completely remodeled pipe interface
Pipes can connect to nearly anything now. The connecting object is responsible for rejecting the connection.
2016-02-16 21:03:20 +01:00
Mark 4d2a661763 Analysis: Pipe object
The pipe object is very convoluted at the moment. Worked out some requirements for the object and will implement many things in a clean way.
2016-02-16 21:03:15 +01:00
Mark 371fdaeaa6 Refactoring: Pump interface names
The pump uses the same function names as the liquid tank now. This is a preparation for the consolidation of the two.
2016-02-16 21:02:56 +01:00
Mark cc2b0aa15b Connection in Liquid Tank
The liquid tank can connect and deconnect lines properly now
2016-02-16 21:02:37 +01:00
Mark 97bdd342fc Refactoring: Pump, pipe, better menu handling
The pipe can be connected from the interaction menu now, too. Expanded the disconnection logic, because more problems arise when the pipe can still be connected to other structures - it would be sufficient to remove the line, but that could be annoying:
- if the pipe is connected to a container, then you can disconnect the pipe from that liquid tank and it will still be connected to the pump
- if you disconnect the pipe from the pump, then it will disconnect from the liquid tank as well

Maybe this is confusing to the user, we can still kick that out later again.
2016-02-16 21:02:32 +01:00
Mark fbdd5eeb09 Refactoring: Pimp, Pipe, SteamEngine
Now it is possible to connect lines from a pump to the steam engine. This is achieved by the steam engine being a liquid tank. It did not seem good to allow connection from pumps to all liquid containers (i.e. barrels). A liquid tank is also a liquid container, they share the same interface, but it is also a structure.

It is not yet possible to fill the steam engine with any liquid though, because it is not defined what kind of liquid it accepts. This will be oil in the future. Furthermore, the behaviour when the pump adds incompatible liquid is not defined yet.
2016-02-16 21:02:28 +01:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
2016-01-23 16:28:02 +01:00
Sven Eberhardt a34912d9c2 Individual stacking and name/desc of source and drain pipes. 2016-01-10 21:34:41 -05:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
2015-12-13 22:14:55 +01:00
Clonkonaut 0d969e8c7a Different graphics for drain and source pipe (#1230). 2015-10-06 01:34:28 +02:00
Sven Eberhardt 8073fb3c07 Drop some fused and connected items on death when respawning with inventory. 2015-09-26 17:56:36 -04:00
Sven Eberhardt dd690e62b9 Added anti-clogging mechanism to pump.
Now pipes cycle through several offsets before giving up on the pumping.
2015-09-05 13:10:55 -04:00
Sven Eberhardt 21500a81a9 Fix pump to clear the last row of pixels (#1057) and allow pumping from pump without source pipe.
ExtractMaterial has been changed to be able to slurp in from the most distant horizontal position rather than the closest to the extraction top center.

Also speed up ExtractMaterial for the common case of no required horizontal shifts.
2015-05-01 18:13:41 +02:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214)
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
2015-01-11 19:02:03 +01:00
David Dormagen fec0870133 fixed a message of the pipe to use the correct string-table-entry 2013-05-31 22:35:16 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
Sven Eberhardt 11438f7e02 Pump cannot destroy materials any more.
Before this patch, you could destroy materials by pumping them into earth (like you could in CR). This made scenario with acid/lava obstacles rather easy.
2013-03-02 22:33:56 +01:00
Tobias Zwick 4a6c53a700 descriptions for produceables: tools 2012-03-19 01:03:05 +01:00
Felix Wagner 38af458e05 Fixed/inserted various hit sounds. 2012-04-03 18:20:41 +01:00
Sven Eberhardt 9cd563c52e Lots of improvements on Crash.ocs
Pump: Make it possible to limit pumpable materials
2012-03-10 18:23:48 +01:00
Daniel 79d44490b6 Liquid Pipe System Update 2011-10-12 00:32:46 +02:00
Maikel de Vries 4f6ee17884 Objects: Weapons are armory products
Also boolean functions should return booleans
2011-10-14 00:03:55 +02:00
Julius Michaelis 0f12b3485e Find sounds with all extensions instead of only wav, so Sound() does no longer require .ogg extensions
Do not replace * with ? in sound name wildcards anymore, adjust scripts
2011-10-12 23:09:22 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00