aa892171fb
update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt
2018-01-28 13:18:46 +01:00
41cecc6a6f
liquid tank: show to which object the pipe is connected in interaction menu
2018-01-25 13:44:57 +01:00
c3dfdc5894
fix connecting multiple pipes to the refinery drain
2018-01-13 15:28:41 +01:00
eb24079b2f
pump: add interaction menu entries for air pipes
2018-01-13 12:09:59 +01:00
3255b02728
pipes: fix attaching, cutting, swapping, messaging, and interface
2018-01-13 11:06:35 +01:00
84ad52251f
liquid library: fixes and typos
2018-01-13 11:06:35 +01:00
ee0917d7e8
Fix #1951 : Disabled putting water in airplane and lorry
...
Removing liquid collection from the lorry is a side effect, but it is not bad. The lorry behavior was weird anyway, because you could for example put lava and wood in it, without the wood burning etc.
2017-12-29 12:59:36 +01:00
fd42ddd823
add script option to block cutting of pipes
...
This allows scripters to place liquid containers with fixed pipes, so that players do not break scenarios.
2017-08-20 12:58:31 +02:00
3a2c68dcc9
interaction menu: add callback target for menu entries
...
This allows to forward menus of one object to its parent properly. A specific usecase is cannons, which are soon to come (hopefully).
2017-06-26 17:28:40 +02:00
efed830df3
fix liquid container accepting materials and show them in interaction menu
2017-01-02 18:33:14 +01:00
135a7d8aff
fix support for multiple liquids in liquid containers
2016-12-25 12:48:15 +01:00
ae40126dbb
implement pumping specific liquids only
2016-12-24 14:09:47 +01:00
c7afed1aeb
allow pumping liquids from container (foundry and steam engine)
2016-12-24 14:09:47 +01:00
d356d9db3d
Fix inherited() calls
...
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
2016-11-26 18:57:31 +01:00
94ec4e336b
Fix inherited(...) calls
...
The named parameters have to be handed down, because the ... operator only passes all the unnamed parameters.
2016-11-26 17:56:41 +01:00
89be9bd158
implement scenario saving for liquid tank, pump & pipe
2016-10-03 18:07:49 +02:00
db986e3dd7
Allow repeated ejection of infinite material stack counts in bucket and barrel
2016-09-05 20:08:30 -04:00
3330c592e3
Improve PlayerStart initial material setting to allow specification of weapon ammo, stackable stack count and liquid contents
2016-09-05 20:01:47 -04:00
788ba6e0c4
allow swapping source and drain pipe at the pump
2016-08-27 17:10:30 +02:00
bce903ee04
Merge branch 'master' into qteditor
...
Conflicts:
planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
2016-08-13 23:42:59 -04:00
df098d2840
pump only activates when drain is free or accepts liquid
2016-08-07 21:26:23 +02:00
36685a3119
Add HideInCreator=true to internal/helper/library definitions
2016-07-10 22:06:48 -04:00
c538a0d617
add missing neutral pipe interaction menu tooltips for liquid tank
2016-06-11 20:57:06 +02:00
d51a8cfa6d
Liquds: Liquids can be passed either as a string or as a definition
2016-06-05 12:05:48 +02:00
923ee485ec
Liquid container: PutLiquid(*, nil, *) inserts maximum amount of liquid
...
Added unit test.
2016-06-05 12:05:42 +02:00
ffcbdc7fd0
Fixed producers unit test #7
...
The problems here were:
- the foundry cannot take 400 water from ice if it has a fill limit
- the pump cannot pump anything into the object if it has no fill limit
2016-06-01 19:10:46 +02:00
ab5d92117a
Refactoring: Added parameter for container in CreateLiquid()
2016-03-25 19:44:36 +01:00
52542d7977
Refactoring: Liquids: Removed GetLiquidID() and changed CreateLiquid()
...
CreateLiquid() can be called from definition context now, to create a certain amount of liquid.
2016-03-25 19:34:36 +01:00
1c1ea38efa
Renamed the liquids IDs
...
Omitted the prefix "Liquid_".
2016-03-25 19:11:55 +01:00
ed75112715
Move liquids to the folder Items\Resources
2016-03-25 19:11:34 +01:00
a34eea41dc
Power: Fixed unit test 21
2016-03-25 16:24:43 +01:00
6b7dc6015d
Liquids: Fix liquids entering Clonks
2016-03-25 16:12:02 +01:00
332b899c54
Barrel: Fixed barrel liquid ejection
...
The barrel did not eject liquids with the correct angle when using the barrel, because the parameters were not used by the liquids.
2016-03-23 20:18:08 +01:00
02b8cf8422
Barrel: Fixed barrel getting filled with liquids
...
Barrels was not updating, and caused an error when getting filled with liquid.
2016-03-23 20:11:23 +01:00
274379ddc3
Producers: Fixed unit test 5
...
Added unit test 6 for fuel objects that do not behave correctly. Fuel should always return the current fuel amount if not parameter is passed.
2016-03-18 17:44:51 +01:00
8749300622
Fix unit tests: Some code adjustments were forgotten in the other commits.
2016-03-16 22:44:48 +01:00
7febb8fd91
Refactoring: Stackable: The size of stacks can be limited by a container now.
...
The function RejectEntrance() has two more callbacks to the object it should enter:
- CollectFromStack(object stack): The object can grab items from the stack, before the stack tries to merge with stacks in the object. This is necessary for barrels, so that a large liquid stack can fill an empty barrel.
- RejectStack(object stack): This is called after the stack is merged. Currently, the stack merging counts as handled only if the stack is removed. This callback allows the object to still reject the stack, for example if it accepts only one item, such as the barrel does.
2016-03-16 22:43:44 +01:00
ac8d40418c
Refactoring: Stackable: Renamed TryPutInto() to MergeWithStacksIn()
...
The previous name suggested that the object actually gets put into another object. In fact it merges the stack count with other stacks, and it does not only try to (and reverts the state if it fails), but it actually changes other objects even if the function returns false.
2016-03-16 18:19:55 +01:00
a785ca83da
Stackable: Added InitialStackCount()
...
For things such as the liquid object that starts with 1 item in the stack, so that the Construction() function does not have to be overloaded.
2016-03-03 22:13:27 +01:00
1786f5b3d9
Liquid objects: Fix unit test, Stackable
...
Addedv debugging logs, will remove them once all unit tests work. The stackable library function "TryPutInto" was changed slightly.
2016-03-03 17:10:43 +01:00
cbe8bbd8e8
Removed authors Ringwaul and ST-DDT from liquid container
...
They were not involved in the current script
2016-03-03 17:07:37 +01:00
a7ed516c39
Refactoring: Liquid container
...
The liquid container library was severely reduced by the changes that the liquid objects bring. The remaining unit tests nearly work.
2016-03-01 22:29:35 +01:00
f78890142c
Refactoring: Fuel
...
Added parameter to 'GetFuelAmount' that specified how much fuel is requested from this object. Oil is now fuel and only the needed amount is removed instead of removing the entire stack when a producer requests fuel.
2016-03-01 17:29:24 +01:00
4f51a75a20
Removed fuel object
...
Need for a fuel burner library is evident
2016-03-01 06:55:02 +01:00
0536520bc8
Refactoring: Liquid object stackable
...
Made the liquid object stackable again. Will replace component amounts in the next step.
2016-02-29 21:40:45 +01:00
7561779d8c
Producers handle fuel and liquid with liquid objects
2016-02-27 15:04:37 +01:00
7894fb0fc6
Steam Engine: Use fuel liquid, Work in progress
2016-02-27 12:41:46 +01:00
52884fb685
Removed liquid container logic from pump.
...
Previously, sharing the logic made sense, because both objects used variables to store the liquid. Now, the liquid container stores liquid in an object - this is not desirable in the pump because it would create and remove objects for no good reason (only so that it has a virtual liquid storage) every time it pumps. Consequently, liquid objects cannot enter a pump anymore.
2016-02-26 23:17:38 +01:00
351e61832c
Liquid Container: Fixed liquid objects remaining in existence after test.
2016-02-26 22:38:38 +01:00
af8e681ec8
Liquid Container: Let liquid object handle removing liquids
2016-02-26 22:11:11 +01:00
Maikel de Vries