Commit Graph

136 Commits (c00a8cf3c3a33a88c5a8aba152d06d9f483921a5)

Author SHA1 Message Date
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00
Maikel de Vries 84ad52251f liquid library: fixes and typos 2018-01-13 11:06:35 +01:00
Clonkonaut 6acea8930b Various objects: include library flammable
Increased burn time (140 frames) for: axe, bucket, grapple bow, hammer, pickaxe, shovel, sickle. So useful items will burn a little bit longer.
Coal will burn for 245 frames and then just burst into ashes and not change into a Burned Object.
2017-11-01 00:54:24 +01:00
Clonkonaut fceda32505 Loam production: substitute sand for earth (#1148). 2017-10-27 13:22:37 +02:00
Clonkonaut 9d3e61e483 Nugget: more reddish colour, to fit the material (#1588). 2017-10-26 16:36:12 +02:00
Clonkonaut df861d2654 Give visual feedback that loam is used (#1889). 2017-10-26 00:44:25 +02:00
Sven Eberhardt 9c2fa297ca Move LavaChunk from volcano to items/resources
This simplifies editor placement
2017-05-27 16:33:22 +09:00
Sven Eberhardt a2d6b65668 Add Title.txt for group folders in Objects.ocd and Decoration.ocd 2017-05-27 16:31:46 +09:00
Maikel de Vries 2807f36319 indicate which items are explosive 2017-02-02 21:47:57 +01:00
Sven Eberhardt 218961f6a8 Add DuroLava liquid object #1879
The extra object is called "Magma" to distinguish it from Lava and has a slightly different color on the symbol. In the pump menu, only "Lava" is shown and magma is turned on/off with it automatically.

It would be nice to have only one object and control a flag somehow. However, this is bound to cause us headaches later on (combining materials, etc.). This solution is probably least error-prone.
2017-01-16 12:54:34 -05:00
Maikel de Vries 0d0a61d4b0 change concrete production time to enable continuous pumping 2016-12-24 15:30:20 +01:00
Maikel de Vries d03ac67807 snow is not a liquid
We can make it a liquid if we want it to be used in the foundry, or adapt the foundry. But that should be done properly.
2016-12-24 14:09:47 +01:00
Maikel de Vries c7afed1aeb allow pumping liquids from container (foundry and steam engine) 2016-12-24 14:09:47 +01:00
Maikel de Vries caef28c7f6 add concrete object (#1572)
This still needs some work to fully function with pumps and pipes.
2016-12-19 21:09:22 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark 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
Sven Eberhardt bcf782a5a8 Improve diamond+socket scenario saving and editor visibility 2016-11-20 13:14:57 -05:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Maikel de Vries e004006fdc add descriptions to liquid objects 2016-06-02 13:02:25 +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 b6b5f5a79f Merge branch 'master' into liquid_container 2016-04-11 21:23:28 +02:00
Mark 89718f35a4 Vendor: Allow rebuy
Added a callback QueryRebuy(int for_player, object base) in the vendor library. If an object that will be sold returns true in that function then the object will not be added to the base material of the selling player.
Currently the only objects that are sellable are Diamond, GoldBar, Nugget, Ruby. They cannot be rebought, just as in the previous implementation.
2016-04-11 21:21:41 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Mark bc9538200c Merge branch 'master' into liquid_container 2016-03-29 20:06:14 +02:00
Clonkonaut fb761fbd58 Removed parentheses after 'this'. 2016-03-29 18:17:05 +02:00
Mark 1c1ea38efa Renamed the liquids IDs
Omitted the prefix "Liquid_".
2016-03-25 19:11:55 +01:00
Mark ed75112715 Move liquids to the folder Items\Resources 2016-03-25 19:11:34 +01:00
Mark dd7bf3e89e Merge remote-tracking branch 'origin/master' into liquid_container
Conflicts will be merged in the next commit:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/PipeLine.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
2016-03-25 17:15:39 +01:00
Mark 18ad5894e2 Producers: Producers can convert ice to water
This special case is a relic, because I do not know whether this is actually a use case that is required in a scenario. All unit tests in the producers test pass now.
2016-03-24 16:19:15 +01:00
Maikel de Vries bf1b65c8bd fix loam usage bar margins 2016-03-22 22:12:36 +01:00
Mark a95694ea23 Bugfix: Earth is not initialized properly.
This bug did previously not appear, because the stack count did always return a minimum of 1. May add unit test with all stackable items later.
2016-03-17 22:42:49 +01:00
Mark 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
Mark 072f599cdb Refactoring fuel: Removed the 'get_partial' parameter.
This was used inconsistently and without regard to correctness, so it is better removed altogether. In case of incomplete objects, the incomplete object always returns the reduced amount.
2016-03-01 17:19:39 +01:00
Mark 3591681f32 Liquid objects: Removed check liquid logic from producer
The liquid objects cannot be converted from one to another. The fuel object will be removed again, it does not make sense that "burnt fuel" can be transferred from one object to another.
2016-03-01 06:47:12 +01:00
Mark 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
Maikel de Vries 4be356f4d9 diamonds: add option to place them not in groups 2016-02-19 22:13:09 +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
David Dormagen 0ad1cdbf89 loam: made bridges smoother
..by continuing the material drawing exactly where it was stopped the last frame. Previously, just some unconnected rectangles were drawn which were often times filled with gaps. Especially on angled bridges.
2016-01-09 13:53:34 +01:00
David Dormagen 0c73ae29e7 loam: fixed turning while digging and added some particles
This were supposed to be two commits. Meh.
Also, I can't really test how the particles looks because everything is black for me - ck? :(
2016-01-08 21:05:09 +01:00
David Dormagen b6436783bb loam: disable free turning of Clonk
From bug report out of http://forum.openclonk.org/topic_show.pl?tid=3233
2016-01-07 10:09:39 +01:00
Maikel de Vries 69cf94127a removed unused Sulphur object
Material is gone, object has no use, therefore removed. Can be added again if there is a need for it.
2015-12-28 10:21:49 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
David Dormagen d5221656c3 added spark sounds for slow flints hitting (by ala) 2015-12-18 08:18:14 +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
David Dormagen 5770466aa9 Coal is not made from Wood anymore (related to #1481)
The sawmill can saw wooden objects back into wood. Since the coal was made from wood, you could refine a coal back into two wood.
I know of nothing that actually produces coal from two wood and thus the components were rather arbitrary anyway.
2015-12-07 20:36:26 +01:00
Sven Eberhardt c5f12523aa Fix ruby sale goal counting gems twice (#1489). 2015-12-06 21:45:06 -05:00
Sven Eberhardt 51651b5b87 Add fuel value to cotton seed. 2015-12-06 17:26:16 -05:00
David Dormagen 2e7f44f141 made cotton seed's mesh use transparency (#1456) 2015-11-30 10:18:20 +01:00
David Dormagen a8f7dc6c5e moss: renamed dry moss to "Dry Moss" and fixed stacking dry and wet moss
This gives the player at least SOME feedback about why one can be used as fuel and the other can't.
2015-11-10 19:13:01 +01:00