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

3148 Commits (master)

Author SHA1 Message Date
Lukas Werling f6fba582f3 Fix star placement on full map screenshots (#1454) 2019-01-30 22:50:23 +01:00
Mark a29d6f005c Added method for getting the connected object 2018-12-28 00:34:57 +01:00
Mark cd38671f61 Pipe control: Begin integrating limits into the library 
Not sure about air pipes yet, those should theoretically be either
source or drain, instead of a separate connection category?

See also:
https://bugs.openclonk.org/view.php?id=1871
 2018-12-28 00:14:54 +01:00
Mark 2a045a097b Renamed folder 2018-12-27 21:33:45 +01:00
Mark a8c475d212 Renamed pipe control internals 2018-12-27 21:31:36 +01:00
Mark 00b1b37787 Renamed Library_Tank to Library_PipeControl 
The library did not depend on the Library_LiquidContainer script at all,
removed that include and added it to the previous includers.
Removed the IsLiquidTank() identifier, because it was unused.
 2018-12-27 21:21:53 +01:00
Mark d0756e3b1c Producer: Allow overloading where the producer takes components from 2018-12-27 19:51:19 +01:00
Mark 68bb07f162 Allow more options for customization in the resource selection icons 2018-12-27 17:45:32 +01:00
Mark 3f2ee5080d Limit liquid input to the maximum available amount 2018-12-25 16:53:47 +01:00
Mark 1c9164b4be Collect cut pipes to Clonk inventory, if possible 2018-12-25 15:53:51 +01:00
Mark f5b1279cce Formatted code 2018-12-25 15:16:38 +01:00
Mark 431456d1fa Use new library in pump 2018-12-25 11:13:01 +01:00
Mark 8a26454f3c Library: Resource selection 
The resource/material selection from the pump was practical, maybe even
applicable for cable cars and the like. Extracted a separate library for
that.
 2018-12-25 11:11:44 +01:00
Mark bab1b7ee90 Extracted actual producer logic||Certain external projects have different systems and want to just use the logic on their own, without copy & paste of the file contents. 2018-12-21 21:29:45 +01:00
Mark cf7469043d Simplified logic for substitutes 
The production cost method returns an array of material cost arrays, but
their format has changed. Instead of
  [<default resource>, <cost>, <substitute(s)>]
it now returns an array of proplists
  [{Resource = optionA, Amount = costA}, {Resource = optionB, Amount =
costB}]
so that there are fewer cases to keep in mind: No "are there
substitutes?", but you can simply check all variants and pick the best.
This also allows different substitutions, for example "2 earth or 3
sand" is now possible.
 2018-12-21 16:54:43 +01:00
Mark 6bdb4275f7 Formatted code, no change in functionality 
Brackets, protected/private func => func, whitespaces
 2018-12-21 11:25:19 +01:00
Mark d9bc1d9142 Added callback for production progress 2018-12-21 11:08:10 +01:00
Mark 9deab8e6a9 Fix the logic again 
Otherwise you can exit containers without an entrance area.
 2018-12-21 09:56:19 +01:00
Mark ed514b7716 Added option for ignoring contents in the interaction menu 
Also ignore Clonks as "inventory items" if they are contained.
 2018-12-21 09:01:20 +01:00
Mark fcf2af1937 Fix not being able to exit a structure 
It seems that the default structures have the entrance close to the
offset, so that there is an overlap and can_be_entered is true even
inside the structure.

In my case the structure offset and entrance area do not overlap, so you
could unfortunately not leave the structure.
 2018-12-20 23:49:39 +01:00
Clonkonaut c6d5c5044f Rework interaction menu into a new style. Also, style overloads are easily possible. 
Because I did this in the test scenario first, it wasn't really possible to encapsulate different steps, sorry!
 2018-10-15 17:38:22 +02:00
Nicolas Hake 4c5dfac952 Remove or use unused variables in Objects, System 2018-07-24 14:19:26 +02:00
Nicolas Hake 1bb728b047 Fix variable_out_of_scope warnings in Objects 2018-07-23 12:12:23 +02:00
Nicolas Hake e024bef54b Fix suspicious_assignment warnings in Objects, System 2018-07-23 10:45:52 +02:00
Maikel de Vries ddc68d7ad3 column: proper rotation and allow smaller sizes 2018-07-04 08:30:53 +02:00
Maikel de Vries c3b114042d melt snow and ice much faster while submerged in lava 2018-07-04 08:17:11 +02:00
Maikel de Vries c47b790468 remove recently introduced debug logs 2018-06-25 08:49:10 +02:00
Maikel de Vries 7a933e81b7 windbag: scenario save full load to prevent air intake at scenario start 2018-06-23 15:36:20 +02:00
Maikel de Vries 5bb9fa228a ladder: climb up and down smoothly when grabbing ladder 
I don't know the reason for not having this, but now we mimic normal wall climbing behaviour which is much smoother and leads to faster game play.
 2018-06-23 10:05:45 +02:00
Maikel de Vries 446564f703 implement eternal flame saving 2018-06-23 10:05:45 +02:00
Maikel de Vries 899fbaa867 cable cars: let sawmill send empty hoist to pickup trees 2018-04-16 11:13:32 +02:00
Maikel de Vries a4d20d79d5 cable cars: extend order interface and let producer order more components at a time 2018-04-16 11:13:32 +02:00
Mark 75a82e172a Added a generic ambient sound object 
Is more versatile than Ambience_Zicadas. Could need some editor
functions. Backported from OC Classic.
 2018-04-14 14:12:52 +02:00
Maikel de Vries 1e060d6124 cable cars: improve deliveries and producer requests fuel 2018-04-12 09:21:00 +02:00
Maikel de Vries 618b4039b3 cable cars: fix finding crossing for power supply when previous fails 2018-04-12 09:21:00 +02:00
Maikel de Vries f4991f9705 remove base respawn rule 
Is deprecated in 8.0 and can be removed now, all functionality is implemented in the relaunch rule.
 2018-04-12 09:21:00 +02:00
Maikel de Vries c00a8cf3c3 fix a bunch of suspicious assignment warnings 2018-04-09 11:53:55 +02:00
Mark 5dc4282b56 Replaced old calls to GainMissionAccess 2018-04-05 19:36:50 +02:00
Sven Eberhardt 065c8b7d96 Fix zoom setting by PlayerStart object 2018-04-04 19:59:32 -07:00
Maikel de Vries a70ab8b843 cable cars: let steam engine request coal when needed 2018-04-01 20:54:12 +02:00
Maikel de Vries 3085bfd264 power system: add functions to check if production and consumption is registered 2018-04-01 20:54:12 +02:00
Lukas Werling 1382478774 Extract Goal_MultiRoundMelee from HotIce 
There are currently multiple multi-round scenarios in development that
all copy most of HotIce's >500-line scenario script for the multi-round
logic. This commit isolates that logic in a goal with an easy-to-use
interface.
 2018-03-31 16:08:29 +02:00
Mark 6aa72c1bdd Fix axe 2018-03-22 22:12:00 +01:00
Mark 21102bb4ef Melee Weapons: Code formatted for remaining melee weapons 
No actual changes, just added spaces and brackets for improved readability
 2018-03-20 21:13:45 +01:00
Mark 69d6b2e8d2 Melee Weapons: Code formatted 
No actual changes, just added spaces and brackets for improved readability
 2018-03-19 20:51:29 +01:00
Mark aea27f8758 Construction site: Take missing materials as interaction 2018-03-18 19:53:57 +01:00
Maikel de Vries 52d8fdbafd warn about deprecated use of base respawn rule 2018-03-16 18:16:05 +01:00
Maikel de Vries 81b060ffb3 fix king of the hill graphics in editor mode 2018-03-16 14:00:04 +01:00
Maikel de Vries 3da209462e moving brick: fix movement graph saving 
Did not test all corner cases but this improves the situation for sure.
 2018-03-14 17:54:25 +01:00
Maikel de Vries 6efb292fa7 flame: option to make eternal for editor mode 2018-03-14 16:50:57 +01:00