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

343 Commits (3b0891ba89f7a75f832032036a6aefa2573e325d)

Author SHA1 Message Date
Mark 431456d1fa Use new library in pump 2018-12-25 11:13:01 +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 c6254c2512 Added more producer tests 2018-12-21 14:05:30 +01:00
Mark 2ed69b96a5 Added producer test for substitute components 2018-12-21 11:57:39 +01:00
Mark b73169616b Fix producer test 
Updating the values for substitutions was forgotten in 808e7fa, leading
to a failing test 5.
 2018-12-21 11:49:56 +01: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 1e060d6124 cable cars: improve deliveries and producer requests fuel 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 a70ab8b843 cable cars: let steam engine request coal when needed 2018-04-01 20:54:12 +02:00
Maikel de Vries 816754a3de cable cars: improve tests and script clean up 2018-03-31 11:32:42 +02:00
Maikel de Vries a28b3b9ca1 cable cars: fix network recreation when cable has broken 2018-03-30 10:54:41 +02:00
Maikel de Vries d8736a56ac cable cars: improve network deletion and recreation + clean up 
This is a rather chaotic commit and does not solve all problems of network creation yet, but is an improvement over the old system where deletion of a cable line would fail the network. However, we probably need a cleaner method to construct a network properly.
 2018-03-29 21:28:07 +02:00
Maikel de Vries 49d03e52c6 improve cable car test scenario 2018-03-29 21:28:07 +02:00
Maikel de Vries abfeb86e30 add cable cars test scenario 2018-03-29 21:28:07 +02:00
Lukas Werling 53f29ccb96 Update remaining Version entries from 7 to 8,0 
Maikel missed some in aa89217 ("update version to 8.0 in DefCore.txt,
Scenario.txt and Version.txt").
 2018-01-28 23:09:06 +01:00
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
Mark 4db6300789 Test #1974: Improved test 
The test can now actually reproduce the bug before it was fixed, and proves that it does not appear anymore now that it is fixed.
 2018-01-15 22:19:05 +01:00
Mark 88aac09064 Test for #1974 
The test cannot reproduce the bug at the moment, so consider it a prototype.
 2018-01-14 13:34:27 +01:00
Maikel de Vries 187b887cdf ensure license abidance for liquid tank placeholder image 2018-01-13 18:11:14 +01:00
Maikel de Vries dc541620b5 add new liquid tank structure (graphics needed) 2018-01-13 11:06:35 +01:00
Mark 5aea227504 Improved unit test 
The unit test does not really pass for now (it never did before, because it is not finished yet and used for testing the different transfer function behavior only)
 2017-12-29 12:34:00 +01:00
Mark 67ee58d4d7 Fix unit test: Forgot adding materials for TeleGlove 2017-12-29 12:09:01 +01:00
Mark c3122b4890 Fix unit test 
The test was not broken, but I added ending conditions to tests 4 and 5
 2017-12-27 21:56:56 +01:00
Mark fc6c48078f Fix unit test: Liquid container 
Adjusted some return values - it turned out that the test was actually wrong in these cases
 2017-12-27 20:32:45 +01:00
Mark 41d45db9c2 Library: Switch, SwitchTarget 
Standardized behavior for switches
 2017-11-25 22:16:47 +01:00
Mark f204b959e7 Port from AI library project 
It seems that the vehicle AI is broken.
 2017-06-08 20:54:54 +02:00
Fulgen301 5cc3cf002a Fix Test.ocf/ColorfulLights.ocs 2017-03-30 20:55:08 +02:00
Maikel de Vries 8159d73be6 ai: implement airship 2017-02-02 21:47:56 +01:00
Maikel de Vries 706f4455d4 ai: add protection using the club 2017-02-02 21:47:55 +01:00
Maikel de Vries 8ad872930b rework AI: new effects, use effect target 
This is a big change but does make it possible to separate the different scripts into different definitions.
 2017-02-02 21:47:55 +01:00
Maikel de Vries c5590d851a add liquid test which causes an error on material change 2017-01-02 09:17:54 +01:00
Maikel de Vries 525caa069a properly implement air pumping: no source needed, only pump on air need 2016-12-25 18:53:43 +01:00
Maikel de Vries 42c8dbc2c8 make producer continue directly after production finishes 2016-12-25 17:48:07 +01:00
Maikel de Vries 0d0a61d4b0 change concrete production time to enable continuous pumping 2016-12-24 15:30:20 +01:00
Maikel de Vries b9aaa2fda4 pump: implement gui interface for selecting materials to pump 2016-12-24 15:12:14 +01:00
Maikel de Vries ae40126dbb implement pumping specific liquids only 2016-12-24 14:09:47 +01:00
Maikel de Vries 203e8b8d1d add a test scenario for liquid systems 2016-12-24 14:09:47 +01:00
Maikel de Vries 60dfc86c55 fix power system test 22 2016-12-17 17:37:26 +01:00
Maikel de Vries 5846d33692 add another test with pumps to the power system tests 2016-12-17 17:30:18 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark 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
David Dormagen 8a8593e0ba Script GUI: added TightGridLayout style (requirement of #1842) 
The TightGridLayout fills spaces more aggressively. This is slower but makes for a tighter layout. Finding the best layout is NP-complete. This here is just O(N^2) or so.
 2016-11-05 15:35:15 +01:00
Sven Eberhardt 9299ec4223 Fix max energy in AI test scenario 2016-10-01 10:26:43 -04:00
Maikel de Vries fa977149e9 make firefly use insect swarm library 2016-09-30 18:58:42 +02:00
Maikel de Vries e18cee3a46 turn musket into blunderbuss 
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
 2016-08-22 16:32:48 +02:00
Maikel de Vries 45bb9ab550 rename lead shot to lead bullet and clean up script 2016-08-22 16:32:47 +02:00
Sven Eberhardt c14721523c Make standard goals and rules visible as icons in editor 2016-08-04 19:32:57 -04:00
Sven Eberhardt 35a5df6c9b Revert accidental commit from master merge 2016-07-25 01:08:49 -04:00
Sven Eberhardt 534e4cc745 Merge branch 'master' into qteditor 
Conflicts:
	src/script/C4AulParse.cpp
 2016-07-24 10:23:57 -04:00
Mark d51a8cfa6d Liquds: Liquids can be passed either as a string or as a definition 2016-06-05 12:05:48 +02:00