marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
11,022 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

45 Commits (e3017ba4ac67cc004271b74af5ceab9af83bb5aa)

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
David Dormagen 6b797e300e inventory bar: stack count always falls back to contained object count 
Related to #1970 and 5fc07df757
This replaces the very hacky implementation just for the dynamite with a more general solution (and e.g. also works with the grenade launcher).
 2018-01-13 15:24:08 +01:00
Sven Eberhardt 5fc07df757 Fix dynamite stick display count within dynamite box in interaction menu. 2018-01-09 18:00:35 -08:00
Maikel de Vries 2807f36319 indicate which items are explosive 2017-02-02 21:47:57 +01:00
Sven Eberhardt a23e4f2707 Dynamite box fixes and improvements 
* Correctly save in scenario: Dynamite count and fuses
* Allow recollection and placement of dynamite sticks
* Allow recollection of dynamite sticks into the box, in which case fuses are automatically cut
* Implement with less duplicate state (removed count, wire, wires and dynamite_sticks variables)

This also allows placement of more than five dynamite sticks from a single box by collecting more sticks after some of them are already on the wire. I don't see why not; it's fun and cannot really be abused.
 2016-12-31 22:54:43 -05:00
Sven Eberhardt 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
Clonkonaut 07ea0fe438 Dynamite Box is now a container holding 5 sticks of dynamite. Can be taken out separately (and put back in). 2016-08-09 23:44:14 +02:00
Lukas Werling e6c483953a Dynamite: Make FuseTime a local to make changes possible 2016-08-08 01:43:19 +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
Maikel de Vries 3f085a0532 balance grenade launcher projectiles 
Decrease their mass to prevent too much damage when having a direct hit plus explosion. Also decrease the impact of the iron bomb explosion a bit to make it less overpowered.
 2016-04-25 21:27:22 +02:00
Maikel de Vries f46f38511a add function to determine if ironbomb and dynamite are fusing 2016-04-22 23:27:33 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Maikel de Vries a390f8f248 fuse and activate iron bomb on cannon shot, fuse dynamite as well 2016-02-01 00:10:23 +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
Maikel de Vries 7aaa5a6e32 killtracing: pass controller of igniter when fusing dynamite 2016-01-03 20:18:06 +01: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
David Dormagen d8ec703f82 dynamite: update description to hint at special use 
I just saw a let's play where the player had no clue that the real benefit of the dynamite was accurate mining by sticking it into the ground.
This should make it easier for new players to figure out this specialty. Also, we need to get rid of the notion that "Description" means "Funny Flavour Text". We also need to get rid of having TWO descriptions (aka "UsageHelp").
 2015-11-19 18:24:58 +01:00
Sven Eberhardt 8073fb3c07 Drop some fused and connected items on death when respawning with inventory. 2015-09-26 17:56:36 -04:00
Maikel de Vries 42a7f03788 kill tracing for incinerated dynamite (box) and iron bomb 2015-05-17 14:01:26 +02:00
Maikel de Vries f9e4b0568b improve dynamite box explosion in lava (delay) and igniter handling 2015-03-12 22:21:51 +01:00
Maikel de Vries 0ecd30ad9e dynamite after fusing not collectible, but can be put into containers 2015-01-07 20:05:25 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 8461fb9822 changed dynamite/dynamite box/powder keg fuse effect to use the new particle system 2013-11-28 23:29:25 +01:00
Clonkonaut 75cb0f2030 Added grenade launcher 
!!!!!!!!!!
 2013-05-24 21:21:07 +02:00
Russell 5782557a34 Clonk. Now with 65% better grammar. 2012-10-22 18:35:06 +01:00
Charles Spurrill f4c9bdabf2 Remove needless HasFuse() funcs. Shrapnel now has hitcheck 2012-08-07 12:00:18 -07:00
Felix Wagner 732bee449c Chemical Lab: Added Chemical Lab 
Changed the following items to IsChemicalProduct:
Boompack, Dynamite, DynamiteBox, PowderKeg
 2012-07-16 13:57:42 +01:00
Maikel de Vries 4a56f8d7c1 Replaced defcore values related to fire with properties 2012-04-28 16:17:38 +02:00
Tobias Zwick ad59d353af descriptions & usagehelp for materials and foodstuff 2012-03-28 20:16:12 +02: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
Armin Burgmeier 9d94b1da6e For scaled sprite graphics, don't interpret Picture coordinates as scaled 
Otherwise an object with a scale of 5 and a picture of 64x64 (such as the
Metal and the GoldBar objects) cannot properly set the picture rectangle.
 2012-02-25 17:35:24 +01:00
Maikel de Vries e1da36219f New implementation for the production menu, similar to contents menu 2011-12-29 16:59:07 +01:00
Armin Burgmeier d0e8e8c2f5 Add components for dynamite 2011-12-29 20:26:55 +01:00
Maikel de Vries 0d1260331b Explosives can be produced in the workshop until an alternative is available 2011-12-28 19:48:33 +01:00
Charles Spurrill a611d019ba HaseFuse() for objects that are lit to detonate. Only used by cannon for now. 2011-10-17 03:29:15 -07:00
Charles Spurrill dab09d89d6 Dynamite and dynamite box are IsAlchemyProduct() (and the igniter is not!) 2011-10-15 02:25:44 -07: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
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +02:00
Maikel de Vries 493bde32ad Fixed boomshire and jar of wind 2011-06-18 12:30:17 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00