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

6256 Commits (master)

Author SHA1 Message Date
Lukas Werling 0ae6383937 Fix German translation of Goal_Expansion (#1967) 
Not sure why the US format string worked before, but not the DE one.
 2017-12-19 21:15:09 +01:00
Maikel de Vries 956108b415 fix scoreboard kills, deaths, etc. 
This is better done through the clonk death callback such that all deaths and not just last clonk deaths are registered.
 2017-12-03 20:56:51 +01:00
Maikel de Vries 752f086a0c fix dark mine relaunching for deathmatch mode (#1962) 2017-12-03 20:01:09 +01:00
Maikel de Vries 4abac1c6d6 interactions: do not show cycle message for interactions with a single object 2017-12-03 19:17:41 +01:00
Maikel de Vries 72093ffa7f fix switch target in horrid highway goal (#1960) 2017-11-30 18:54:46 +01:00
Maikel de Vries 7f0743a7b9 remove vehicle rotation alignment library 
This did not do anything and the functionality does not seem to be needed.
 2017-11-29 21:49:36 +01:00
Maikel de Vries 477bde5c88 airplane and airship use destructible library 2017-11-28 22:09:52 +01:00
Maikel de Vries 4b4e4a5522 structure library: fix for invincible objects and make health bar symmetric 2017-11-28 19:34:56 +01:00
Maikel de Vries 332016e6cc fix entry callback target for destructible library 2017-11-28 16:21:25 +01:00
Maikel de Vries 723a7767f6 add damage indication in interaction menu for destructible library 2017-11-28 15:20:39 +01:00
Mark 58b8a97734 For testing: Initial digging boost 
The shovel initially has a little more speed, making the overhead dig less fiddly
 2017-11-27 22:28:55 +01:00
Mark c7bb0785b6 For testing: Dive Jump 2017-11-27 21:57:17 +01:00
Clonkonaut 799bf97304 Forget this in my cable lorries work safe. 2017-11-27 00:46:30 +01:00
Clonkonaut e144bfd91f Clonk walk animations: smoother blending. 
This was a very old script todo. I don't really know if I made it better (but I think so).
 2017-11-26 14:28:04 +01:00
Mark f9cd3aa77e SwitchTarget: Single callback 2017-11-25 23:31:05 +01:00
Mark 43636c4941 Replace windows line endings 2017-11-25 22:55:53 +01:00
Mark 41d45db9c2 Library: Switch, SwitchTarget 
Standardized behavior for switches
 2017-11-25 22:16:47 +01:00
Maikel de Vries c50d3b84a2 fix missing construction site material info after loading game (#1740) 2017-11-25 16:52:15 +01:00
Lukas Werling 3d1caffcf6 Convert CRLF line endings to LF 
Now all files are LF again.
 2017-11-24 14:23:33 +01:00
Mark 06cd643d15 Clonk: Adjust mesh position while diving 
This matches the vertex position better
 2017-11-23 21:16:12 +01:00
Mark f8f9a38ee3 Clonk: Constants for SetMeshTransformation layers 2017-11-23 20:38:11 +01:00
Maikel de Vries e228d84670 make airship IsProjectileTarget failsafe as well 2017-11-22 17:18:41 +01:00
Maikel de Vries 5c11b703a9 Horrid Highway: add diamonds and remove debug log 2017-11-22 17:18:41 +01:00
Maikel de Vries 5bf83b7d3f IsProjectileTarget: make failsafe if projectile is nil and clean up 2017-11-22 17:18:41 +01:00
Mark 3e5de9eea9 For testing: More fluid hangling motion 
Removed the dead stop between hangling strokes/swings. Instead, the
Clonk keeps moving with half speed.
 2017-11-21 20:56:35 +01:00
Mark fd7eeecf2c For testing: Hangling with immediate stop 
Instead of continuing to swing forward the Clonk stops immediately while
hangling. Additionally the hangle animation keeps on playing with a
short delay before it changes to the hanging animation, so that the
motion looks nice if you move a short distance only.
 2017-11-21 20:49:41 +01:00
Clonkonaut 8cb3c6f6b3 New property, set for all buildings: FireproofContainer. 
A fireproof container shields all contents from incendiary material (lava mainly). Structures can now be submerged in lava and the contents will not burn up.
 2017-11-21 18:16:45 +01:00
Mark 5794e1bfb4 Removed ancient comments from the weapon code 2017-11-21 18:01:25 +01:00
Mark 877d5fc62a For testing: Constant digging speed 
As discussed on the forum.
 2017-11-20 20:42:59 +01:00
Maikel de Vries 7ba158521f fix invisible dynamite box igniter (#1955) 2017-11-17 11:24:26 +01:00
Maikel de Vries 7184109808 detach dynamite igniter only if fused 2017-11-17 09:58:55 +01:00
Maikel de Vries f6b15a9051 cancel current use action if pilot is removed (#1954) 2017-11-17 09:22:48 +01:00
Maikel de Vries bc3d0bb29d make bats not attack prey in containers 2017-11-16 12:47:39 +01:00
Maikel de Vries 0e6f1599c6 fix airplane control use coordinate forwarding 2017-11-15 20:30:14 +01:00
Maikel de Vries 3a47802702 airplane: add afterburner mode 
This reqruired some movement code clean up, replaced old effects with new effects.
 2017-11-15 18:49:47 +01:00
Maikel de Vries 181cfdfd6b fix flammable library now that (#1950) is fixed 2017-11-11 09:57:22 +01:00
Maikel de Vries 963285eee5 NoBurnDecay is a boolean 2017-11-11 09:49:52 +01:00
Maikel de Vries 2429ee6722 fix switching dynamite igniter while switching inventory (#1913) 2017-11-10 17:10:31 +01:00
Maikel de Vries ed41426ef8 fix line endings of some files in planet 2017-11-10 10:21:09 +01:00
Lukas Werling c0047bdc53 Fix a desync during runtime join (GH-58) 
This is a workaround for a more complex engine-side issue. See #1953
 2017-11-05 13:56:21 +01:00
Lukas Werling fb87db1579 Fix umlauts in engine strings 2017-11-05 13:56:21 +01:00
Mark 9cea6ed03c Fix documentation comment. 2017-11-04 11:40:13 +01:00
Mark ac0cf07e31 New assertion: Not empty 2017-11-04 11:31:12 +01:00
Mark 26e72eb489 AStar: Clarify the "todo" error 2017-11-02 17:36:31 +01:00
Mark aaed0b4d54 Fix the typo again 2017-11-02 17:29:43 +01:00
Clonkonaut b1902355f9 Cannon, Catapult, Lorry: use Library_Destructible (cannons and catapults are now destructible!). 2017-11-01 01:27:48 +01:00
Clonkonaut 5193f99d6c Library_Destructible: for destructible objects, mainly vehicles. 
Objects will be destroyed after local HitPoints has been reached in damage taken. Objects will explode into little burning bits, just like it is with lorries.
 2017-11-01 01:20:41 +01:00
Clonkonaut f6af52711a Catapult texture: removed some dark pixels around the draw wheel which showed because of stretching. 2017-11-01 00:56:14 +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 41676186a1 Library_Flammable: Logic for flammable objects / items. 
When ignited, the object will burn for a fixed time (BurnTime property, default is 70 frames) with no detriment to its function.
After that time, the object will change to a 'Burned Object', no longer useful for anything.
 2017-11-01 00:46:38 +01:00
Clonkonaut 5c45d7a08e Fix a script comment that Luchs complained about. 2017-10-29 11:39:07 +01:00
Clonkonaut 3084edcab7 Boomshire: fix arg_count_mismatch warning. 2017-10-29 11:34:53 +01:00
Martin Strohmeier 4d1a000ed8 Fix #1906: Rule_Relaunch is saved properly in Objects.c by using GetRelaunchRule() instead of CreateObject() 2017-10-27 18:51:14 +02:00
Clonkonaut 2c4aba74f0 Teleglove production: needs any one gem (diamond, ruby, amethyst) to produce (as discussed in #1505). 2017-10-27 13:25:34 +02:00
Clonkonaut fceda32505 Loam production: substitute sand for earth (#1148). 2017-10-27 13:22:37 +02:00
Clonkonaut 808e7fa866 Producer: allow construction material substitution for products via script. 
All item can now define substitute components like this:
public func GetSubstituteComponent(id component)
{
	if (component == Rock) // Rock is in the regular components
		return Metal; // Rock can be replaced by Metal, amount is the same

	if (component == Wood) // Wood is in the regular components
		return [Cloth, Wipf]; // Wood can be replaced by either Cloth or Wipf, amount is the same
}
 2017-10-27 13:19:59 +02:00
Clonkonaut 9d3e61e483 Nugget: more reddish colour, to fit the material (#1588). 2017-10-26 16:36:12 +02:00
Clonkonaut a3b387dc30 Treasure Hunt: fix goal description (Dagobert -> Scrooge) (#1912). 2017-10-26 01:20:03 +02:00
Fulgen301 ab3b6cc682 Treasure Hunt: NPC fixes * Make all NPCs except the AI invincible * Modify Jane's dialogue (before, the player clonk was amused about Tarzan's death ;) * AI clonk have now got names 2017-10-26 01:15:50 +02:00
Clonkonaut ea301d7289 Double elevator: transfer MoveTo calls to master case (#1708). 2017-10-26 01:05:37 +02:00
Clonkonaut df861d2654 Give visual feedback that loam is used (#1889). 2017-10-26 00:44:25 +02:00
Fulgen301 05ad28c4f1 Hideout/PyreGem: Fix possible null pointer error The PyreGem calls thrower->GetOwner() in its Hit() function. However, if the gem hits something before setting a thrower (e.g. when falling), it throws a null pointer error. Note: This only concerns custom scenarios which include this gem. 2017-10-25 15:25:14 +02:00
Clonkonaut 232a7deb5b Deep Sea Mining: added Diving Helmet (#1939). 2017-10-25 15:21:30 +02:00
Clonkonaut 2ca557a09c inherited(...); to inherited(); in Initialize since Initialize doesn't have any parameters. 2017-10-25 15:01:19 +02:00
Clonkonaut cbe536711c Boomshire: making sure the airplane will always be upright when reset. 2017-10-25 15:00:38 +02:00
Lukas Werling afa348ab21 Add comment next to all documented functions in System.ocg 
Many functions in System.ocg have proper documentation, but not next to
the code. When changing these functions, it is easy to forget updating
the docs. Nobody likes outdated documentation!
 2017-10-21 00:10:42 +02:00
Martin Strohmeier a0b131cefd Fix scoreboard not updating relaunches #1947 2017-10-15 23:54:39 +02:00
Clonkonaut 3c87d0f135 Work save regarding cable cars/lorries. 
Started to work on a few station configuration options and combining these with producers for requesting materials (which now kind of works).
 2017-10-04 01:19:46 +02:00
Mark 77bb9c91a6 Fix yet another typo 2017-09-10 20:07:38 +02:00
Mark 380d6202c7 Fixed typo 2017-09-10 19:34:29 +02:00
Mark 7f5ca45097 PowerSystem: Streamlined behavior of neutral network 
The check for several neutral networks is more strict now, however. Did
not report an error in the unit test, so it *should* be OK.
 2017-09-10 19:33:56 +02:00
Mark 6149f7de8a PowerSystem: Streamline method behaviour 
Linked flag changing now always updates all networks (which is not very
hard on the performance), special treatment for neutral network will be
removed with the next commit.
 2017-09-10 19:18:52 +02:00
Mark 0c148530a6 PowerSystem: Network creation as a function 2017-09-10 18:11:05 +02:00
Mark 28b22c6c62 PowerSystem: Use getter and setter internally 2017-09-10 15:43:19 +02:00
Mark cc21da2315 PowerSystem: Move network merging from flag to power library. 
This is not totally finished yet, but this far it is mere refactoring
without changing the system itself.
 2017-09-10 14:34:18 +02:00
Mark 4fab0cf47e PowerSystem: Make system overloadable 
Replaced hardcoded method calls with a wrapper function
 2017-09-10 12:54:11 +02:00
Mark 366ba86abc Fix #1940 All coconuts must be eaten! 2017-09-02 21:16:04 +02:00
Mark 4838093aaf Seed: Extract function for planting manually 
Makes it possible to plant manually if some object overloads ControlUse
 2017-09-02 21:15:38 +02:00
Julius Michaelis c4cd9dda63 Set VIS_Editor in Library_Goal to avoid forgetting it in future goals 
Fixes #1932
 2017-09-01 15:59:51 +02:00
Mark 2db1ae5de2 ConstructionSite: Fix compiler warning 2017-08-27 21:05:07 +02:00
Mark 3917964bf2 ConstructionSite: Fix possible nil access 
Code that works with that function expects an array to be returned.
 2017-08-27 12:19:38 +02:00
Mark d1996e45df Structure: Improved SetBasement 
The access to editor actions poses a problem sometime when deleting
basements.
 2017-08-27 10:40:44 +02:00
Mark 3e26d4258a ConstructionSite: Overloadable function for construction site preview 2017-08-26 13:36:31 +02:00
Julius Michaelis 9c3c6d1079 Windmill: Syntax error fix 2017-08-26 12:16:32 +02:00
Mark 86154ddd40 ConstructionSite: Interface for custom implementation 
Status update should be callable as such separately.
 2017-08-24 22:24:03 +02:00
Mark d27223f960 ConstructionSite: Interface for custom implementation 
Extracted some more functions to make overloading easier.
 2017-08-24 21:49:40 +02:00
Mark 7067192c63 ConstructionSite: Interface for custom implementation 2017-08-24 21:08:27 +02:00
Mark 929b31c4a3 ConstructionSite: Cleaned script 
I know that moving around functions is hell when merging, but I did it
anyway because the construction site is not being changed that often
anymore.
 2017-08-24 20:58:29 +02:00
Mark 0a20608f60 ConstructionSite: Remove unused function 
It did not really disallow taking stuff out, so I removed it.
 2017-08-24 20:45:55 +02:00
Mark c25c63179f Gold idol: New graphics and script 2017-08-24 20:27:45 +02:00
Maikel de Vries 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
Maikel de Vries cb1482d5a4 fix spamming balloons (#1709) 2017-08-19 16:11:04 +02:00
Maikel de Vries 2fa7aabcac prevent buildings from partially burning down (#1880) 2017-08-18 17:59:25 +02:00
Fulgen301 56d1c689d8 The Raid: Correct string table entry Clonko3 2017-08-14 14:49:45 +02:00
Fulgen301 f80e9dbd1a Display carry heavy objects on the clonk's back while swimming (#1764) 2017-08-14 14:49:45 +02:00
Mark eb1657c3e3 Wearable: Attachment flags 
Wearable items can have attachment flags, such as matching the target
skeleton
 2017-08-13 23:41:04 +02:00
Maikel de Vries bbdd38830e show keys to cycle between interaction objects 2017-08-12 22:14:54 +02:00
Armin Burgmeier 02fa5abc66 Fix material/texture selection in landscape shader (#1841) 2017-08-12 17:01:52 +02:00
Mark 5eaa5703a0 Golden statue: Getters for editor actions 2017-08-12 10:58:08 +02:00
Mark e4912b9fda Fight for Gidl: Statue uses a custom pose 2017-08-11 21:37:21 +02:00
Mark 22e05d7a8f Gold statue: Decorative items 
Can place items in the gold statue hands. In the future, it might be
actual items that get displayed correctly in the hands by themselves
(maybe I have to tinker with the model here, unless we want to have
custom transformation callbacks for every item).
 2017-08-11 21:29:52 +02:00
Mark daae41e61d Golden statue: Editor properties for pose 2017-08-11 15:34:36 +02:00
Mark 09eec4b53c MoltenMonarch: Moved materials to weapons 
Weapon materials are now defined in the basic objects, so that other
scenarios can use the alternate skins, too.
 2017-08-11 14:22:45 +02:00
Mark e0662bc206 Fight for Gidl: Adjust statue position 
Made the statue not movable, so there is no need to make it stuck in the
ground.
Other scenarios do not need an adjustment, because they use
CreateObjectAbove(), so the positions will be OK (tested with 3
scenarios).
 2017-08-10 22:43:09 +02:00
Mark be9f477a16 Gold statue: New graphics 
Added a new mesh with 6 different poses for the gold statue.
 2017-08-10 22:27:32 +02:00
Maikel de Vries 07a945ee8e playground: do not show plant library in spawn menu (#1911) 2017-08-05 16:17:28 +02:00
Maikel de Vries bb970f1d8c improve volcano escape atmosphere (#1566) 2017-08-05 10:49:54 +02:00
Mark e73c206bdd Constructor: Modular construction menu 
Makes it easier to overload the individual parts
 2017-07-28 23:01:19 +02:00
Mark f8e30e3a00 Animations: Parameter for rolling 
Certain packs/objects may want to restrict your ability to roll. The
parameter that distinguishes between rolling from a fall and rolling
while running is helpful here.
 2017-07-28 22:08:19 +02:00
Mark 349529fa02 ConstructionSite: Cleaned script 
Made the script a little more readable in some places
 2017-07-27 22:04:49 +02:00
Mark 3fcee70f60 Fix breathing sound 2017-07-27 21:51:07 +02:00
Mark 7f30f4d971 Fix #1930 
Contained clonks can interact with their container now. Changed the
order of issued calls around a little, but it should not create unwanted
effects.
 2017-07-23 20:37:53 +02:00
Maikel de Vries 81330d5b34 make lightning move to nearby lightning attractors 2017-07-23 10:47:16 +02:00
Fulgen301 d8579607ac Tutorial.ocf: Fix string tables 2017-07-23 10:00:22 +02:00
Fulgen301 69538d4962 Add rain drop effect and modify the stalactite in order to use this effect 
Squashed three commits, see https://github.com/openclonk/openclonk/pull/47
 2017-07-23 09:55:30 +02:00
Mark 62ff92aa97 Structure: Allow basement override 
Structures created basements with ID Basement, now the basement type can
be defined with the callback GetBasementID (default value is Basement)
 2017-07-22 23:47:16 +02:00
Mark ee4ac9e825 Structure: Callback for too much damage 
Added callback OnNoHitPointsRemaining() that is called if whenever the
structure is about to be removed because it took too much damage. Should
the callback return true, then the damage counts as handled and the
structure will not be removed.
 2017-07-22 23:47:15 +02:00
Maikel de Vries efe7dcf251 add Find_Cone to find objects in a cone 
The reason for an engine function for this is speed, an implementation in script needs Find_Func and ensures slowness.
 2017-07-19 22:04:43 +02:00
Maikel de Vries f5f8b18204 remove unused AttractLightning defcore entry 
Not used in either the engine or in script, script implementation of lightning can use a script defined property.
 2017-07-15 14:00:19 +02:00
Maikel de Vries 4a093b747e remove unused FireTop defcore entry 
This has been obsolete since fire is implemented in C4Script.
 2017-07-15 13:40:37 +02:00
Mark 2da7768a8e Remove if-block in Eat() 
The check should be made in the object that call Eat()
 2017-07-13 21:49:07 +02:00
Mark e20d5e87ae Library: Edible items 
All the functionality for food is bundled in one library now
 2017-07-13 21:48:36 +02:00
Maikel de Vries 12e8ee6636 fix lightning striking certain objects and loosing strength 2017-07-12 22:37:03 +02:00
Maikel de Vries 57c0aacbfa reduce lightning strength if an object is struck 
This prevents lightning to be an infinite path of destruction.
 2017-07-10 19:14:07 +02:00
Martin Strohmeier 2d0a178b87 HotIce: Fix Syntax error 2017-07-09 19:26:10 +02:00
Maikel de Vries 03b6024aca explode meteor when struck by projectile or lightning 2017-07-09 18:35:15 +02:00
Maikel de Vries cc92a58388 pass lightning object to OnLightningStrike for kill tracing 2017-07-09 18:35:15 +02:00
Maikel de Vries 906ccb6733 fix not playing thunder sound in lightning strikes when requested 2017-07-09 18:35:15 +02:00
David Dormagen c3fbdd538a coral: added comment 
The intention of the underscore was not clear at a first glance. To avoid people thinking it's a bug and accidentally renaming it, it's commented now.
 2017-07-09 17:56:12 +02:00
Maikel de Vries b1542a3338 horrid highway: resolve meteor spawn problem and adjust difficulty settings 2017-07-08 18:17:16 +02:00
Martin Strohmeier ea4aa3eae2 Hot Ice: Fix Clonks stuck in RelaunchContainer on classic spawn in first round 2017-07-08 15:06:47 +02:00
Clonkonaut c2f1d47f63 Added OnClonkEnteredRelaunch when the clonk enters the relaunch container (in accordance to OnClonkLeftRelaunch), request by the Knüppeln team. 
I also use this commit to shamefully hide the bugfix of the bug I previously committed.
 2017-07-07 00:52:23 +02:00
Clonkonaut 1144837e7e Make a positive return of the OnPlayerRelaunch game call suppress regular relaunch behavior. 
I suspect this was intended all along (compare to line #223) but not implemented by mistake.
 2017-07-07 00:27:08 +02:00
Maikel de Vries d34f0a689b add new world: horrid highway 2017-07-06 10:18:27 +02:00
Maikel de Vries d458b0a25a fix script error in relaunch rule when buying new clonk fails 2017-07-06 10:12:30 +02:00
Maikel de Vries f56e10c082 fix pump liquid selection menu entry for german language 2017-07-04 22:44:23 +02:00
Maikel de Vries b2a966150c pump: fix connecting already defined drain and source pipes 2017-07-04 15:19:31 +02:00
Maikel de Vries c20698060c airplane: allow changing direction while pushing, better landing, clean-up 2017-07-04 14:49:22 +02:00
Maikel de Vries 50221615b8 adapt clonkomotive scenario to new locomotive 2017-07-04 09:00:16 +02:00
Maikel de Vries 1775684038 locomotive: make liquid tank for easier use 2017-07-04 08:38:49 +02:00
Maikel de Vries 7d98d29b33 moved locomotive to main object folder 
Now it can be used by other scenarios as well.
 2017-07-03 16:05:58 +02:00
Martin Strohmeier a7c139bb68 Sandbox: Added object removing tool and feedback for invincibility tweak 2017-06-28 23:48:04 +02:00
Mark b7297c1358 Eat: Use existing function call instead of hardcoded comparison 
Should the criteria for walking change then eating will still work
 2017-06-28 19:36:39 +02:00
Mark 6208d99b98 Heal: Updated to new effect format, added variable interval 
The healing interval defaults to the old fixed value.
 2017-06-28 19:36:21 +02:00
David Dormagen 42b6e1f69c extra-slot display now shows object instead of definition (#1924) 
Showing the definition means that objects can not modify their display in the extra-slot. E.g. the arrows would always show their "full" state. Now the arrow count is correctly displayed in the extra-slot.
 2017-06-28 19:22:05 +02:00
Maikel de Vries 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
Maikel de Vries 0cd307a5f0 interaction menu: remove contents refresh effect if menu ordering has changed 
This can happen if an objects updates the menus without any callback function [UpdateInteractionMenus(callbacks)].
 2017-06-26 17:26:06 +02:00
Maikel de Vries a53bc7eb61 fix script error when fire arrow's incineration destroys an object 2017-06-26 17:20:22 +02:00
Maikel de Vries f98f12c863 defense boom attack: can be hit by more weapons 2017-06-26 17:19:13 +02:00
Mark 8720409fbf Colors: Breaking change - SplitRGBaValue 
Changed the return value from array to proplist. The proplist contains the values R, G, B, Alpha.
 2017-06-24 19:39:00 +02:00
Mark 56bf2eb06e Colors: Use constants where possible 
Did not use constants for the HSL values, because it did not seem worth to introduce them.
 2017-06-24 19:24:21 +02:00
Maikel de Vries ce0bb331f7 add function to set target to defense boom attack 2017-06-24 17:58:17 +02:00
Maikel de Vries 5d5cb709bc add functio to make cargo balloon floating 2017-06-24 17:58:17 +02:00
Mark 04b85e0719 More modular AI 
The AI was split up into a basic controller object that contains just the AI control effect and basic logic. The other components should work individually, and the final implementation of the AI can import these components individually.

Fixed AI catapults, so that they now fire even if the clonk has no items in the inventory.

Merged from gitMarky/openclonk, branch ai_backport.
 2017-06-24 12:00:22 +02:00
Mark fc4a1660da Debugging: Streamlined functions 
Another possible option was a parameter for the log level, but I decided against it, because differently named functions feel better than a string constant as a parameter.. Removed some annoying log outputs that I added before.

 Any suggestions for the function names are welcome, because I am not quite happy with the names yet. The distinction between normal output and warning is maybe not even necessary.
 2017-06-23 23:19:42 +02:00
Mark dddf5e223a Fix catapult not shooting 
The problem was in AI_TargetFinding, line 18: The clonk that has a vehicle, but not any contents, will never find any attack targets. The vehicle is saved as fx.weapon, so if the clonk has a weapon it asks that weapon first whether it is suitable, and only if not it consults the inventory.
 2017-06-23 22:32:17 +02:00
Mark fe9ef89cf4 Debugging: More log output 
Will streamline the two different functions later on. The difference is, that one function issues a warning, while the other merely provides information. Logging calls in components have to be called failsafe, because the cannot rely on the actual AI implementation including AI_Debugging.

This helps me understand why the catapult in AI test #7 does not fire. The solution is very interesting: The AI executes the idle strategy as long as it has no contents. After giving contents to the AI it executes the catapult strategy.
 2017-06-23 22:20:09 +02:00
Mark d9f7147dd3 Debugging: Use individual setting instead of definition setting 
This helps when debugging a certain AI-controlled Clonk's behavior
 2017-06-23 22:01:15 +02:00
Mark 6cb154fabd UseControl: Prevent possible call on null object 
This usually happens in the following case from ClonkControl.ocd/Script.c:

// Release commands are always forwarded even if contents is 0, in case we
// need to cancel use of an object that left inventory
if (contents || (status == CONS_Up && GetUsedObject()))
{
	if (ControlUse2Script(ctrl, x, y, strength, repeat, status, contents))
		return true;
}

It could also be necessary that, instead of contents, either "this", or GetUsedObject() should be passed. Not sure which one was intended.
 2017-06-21 00:06:12 +02:00
Mark 2553f5a388 Object: Variable placement for plants 
RootSurface() does not yield good results for all objects, so I think the function should have a parameter for movement range. Re-declarated the variable "i" in the second if-block; I always thought we had scoped variables, it surprises me that the previous version worked.
 2017-06-20 21:55:01 +02:00
Maikel de Vries 6b2cbf2ab2 add Place function to chippie 2017-06-20 18:25:27 +02:00
Maikel de Vries 30dd9c1d8f silence argument mismatch warning in rapid refining scenario 2017-06-20 18:24:41 +02:00
Maikel de Vries 968c5b9e68 clarify how to use hammer in tutorial 3 (#1888) 2017-06-17 21:16:38 +02:00
Maikel de Vries 48c17c1e54 clarify tutorial 2 loam message (#1887) 2017-06-17 21:08:45 +02:00
Maikel de Vries 6bfd967f40 add wealth display to tutorial 1 2017-06-17 20:56:03 +02:00
Fulgen301 73b52a15ce Remove StringToInteger function 2017-06-14 21:11:39 +02:00
Maikel de Vries bfe9449256 lava core: only have solid mask when frozen 
This causes less lag.
 2017-06-11 14:50:35 +02:00
Mark 16c2fd80d5 Animations: Rolling when hitting the landscape as a separate function 
The logic for rolling can now be overloaded. Runtime overload is not intended yet.
 2017-06-09 21:43:35 +02:00
Mark a4ad791969 Add help message to editor 
Still no idea why it was added to the list twice.
 2017-06-08 22:28:18 +02:00
Mark d252e839b5 Remove references to AI 
the basic AI should not be referenced in its components, so that they are independent of each other
 2017-06-08 21:58:37 +02:00
Mark df0a43a46b Stricter calls 
This is completely optional, as the calls do now cause an error and not just log a warning
 2017-06-08 21:44:32 +02:00
Mark c64670c7d5 Replace .control references 
Same argument as renaming the control effect. Is optional, though
 2017-06-08 21:35:04 +02:00
Mark 6440b16387 Minor script formatting 2017-06-08 21:25:11 +02:00
Mark a87eed5de1 Replace FxAI-references 
The hardcoded references make renaming the effect later a huge problem.
 2017-06-08 21:15:31 +02:00
Mark f204b959e7 Port from AI library project 
It seems that the vehicle AI is broken.
 2017-06-08 20:54:54 +02:00
Mark 8b149a5433 Preparation: Move files to a different folder 2017-06-08 20:32:36 +02:00
Maikel de Vries 7b4ba0245b fix script error on basement attachment to scaffold (#1917) 2017-06-03 15:41:03 +02:00
Maikel de Vries 2b88e77254 adapt System.ocg headers to style guidelines and small clean ups 2017-06-02 17:15:08 +02:00
Maikel de Vries f3cadedff1 add effects to block damage and fire 2017-06-02 17:15:08 +02:00
Mark b19e083495 Fixed a typo 2017-05-31 21:59:04 +02:00
Nicolas Hake 9d6d873156 Merge GH-43 from Fulgen301/OCMilestoneProject 
Torch: Add new mesh
  Torch: Emits light when held, remove DoKneel() animation
 2017-05-31 18:13:39 +02:00
Mark 3f9687c1a0 Assert: New assertion for definition context 2017-05-29 21:56:06 +02:00
Sven Eberhardt 04ec41b54c Hide Wearable and RangedWeapon libraries in object creator 2017-05-27 16:34:33 +09: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
Sven Eberhardt cb86124d78 Ladder: Add editor handles to drag length 2017-05-22 12:15:45 -04:00
Maikel de Vries 0ed4d484fc prevent kill logs rule from creating the relaunch rule 2017-05-15 12:17:17 +02:00
Maikel de Vries 9e9e664581 only show entering interaction if actually standing at the entrance of an object 2017-05-13 15:04:02 +02:00
Maikel de Vries 496c73a50f add a method to calculate the area to the shape library 2017-05-13 14:59:14 +02:00
Maikel de Vries fd734330d6 first try to enter pushed vehicle when entering objects 
There was no possibility to enter vehicles into yet, so this would be my first attempt to solve this, we can evaluate this and improve if needed.
 2017-05-12 14:38:36 +02:00
Mark 70a89ce4f8 GUI: More robust calculation 2017-05-11 21:52:20 +02:00
Mark 1362494790 Fixed accidental redeclaration existing constant 2017-05-11 21:19:47 +02:00
Sven Eberhardt 9abf0d156e Add editor drag handle to extend tunnel support decoration 2017-05-10 18:42:56 -04:00
Mark 739ddc2be3 Additional GUI layout 
I found it a lot easier to create GUIs with these functions, so I decided to add them. If something can be simplified, please tell me so.
 2017-05-10 22:33:38 +02:00
Mark 631c239717 Merge function for proplists 2017-05-10 22:03:57 +02:00
Mark 03dc2cb84f Some common assertions 
An attempt in reducing duplicate code :)
 2017-05-10 21:52:54 +02:00
Sven Eberhardt 1b4fd9abe3 Editor: Add translation overview table (Tools menu) 2017-05-09 22:43:56 -04:00
Sven Eberhardt 7d535ac6db Fix US name of Goal_RubyHunt 2017-05-07 15:29:42 -04:00
Sven Eberhardt fec7a7c084 Fix localized description display in script goal 2017-05-07 15:28:37 -04:00
Sven Eberhardt 94669cebe4 Merge branch 'master' of ssh://git.openclonk.org/openclonk 
Conflicts:
	src/editor/C4ConsoleQtPropListViewer.cpp
 2017-05-07 15:16:01 -04:00
Sven Eberhardt bc4425462c Add localization support for string evaluators, gravestone and signpost inscriptions and custom game goal texts 2017-05-07 15:03:11 -04:00
Sven Eberhardt 4fac960cf4 Editor: Add localized string support 2017-05-07 14:26:30 -04:00
Maikel de Vries 77dca569fe Switch: properly process and save editor actions 2017-05-06 18:55:27 +02:00
Fulgen301 2c15422c2e Torch: Add new mesh 2017-05-05 17:53:36 +02:00
Clonkonaut d750a57410 Hatch: combine with basements even if the construction preview hasn't been properly combined. 
The hatch will automatically attach itself onto basements it finds around its center after it has been built. This makes it easier to use since people probably tend to forget combining the construction preview. Especially since basements are very slim. The hatch will reposition itself in order to attach. This means it is not right where the player placed it. The alternative would be to move the basement and I guess that even more unwanted.
 2017-05-03 09:42:25 +02:00
Clonkonaut fd55514279 Fixed shape of tunnel supports. 2017-05-02 23:48:50 +02:00
Clonkonaut 861b0bc08e Added a simple static ladder to be used by scenario designers. 
This thing is a lot faster than the rope ladder.
 2017-05-02 22:57:01 +02:00
Clonkonaut 649c61cd2a New decoration object: tunnel support (graphics by Ringwaul, from a long time ago). 
Can be stretched using the Extend() function.
 2017-05-02 22:53:49 +02:00
Clonkonaut ad6a986d10 Scripted the Hatch that Ringwaul made ages ago. Can be built on top of basements (or without) to make a vertical opening. 2017-05-02 22:50:32 +02:00
David Dormagen 0d32d924dc InteractionMenu: fix script error when custom entry extra_data contains something different from a proplist 
The check was only meant for inventory menus (where extra_data always is a proplist); it was not in the right if-clause below, though.
 2017-05-02 19:13:48 +02:00
Maikel de Vries 34f736081c fix relaunch time and unwanted initial relaunch 2017-05-02 14:50:27 +02:00
Maikel de Vries 3e0f18f4f3 reinstate relaunch container functionality 
This has been used by external scenarios and there is no reason to put this into the relaunch rule script.
 2017-05-01 21:26:01 +02:00
Fulgen301 1d92b47141 Torch: Emits light when held, remove DoKneel() animation 2017-05-01 15:38:35 +02:00
Maikel de Vries cc480be3eb relaunch rule: add option to prevent round start relaunch 2017-05-01 11:46:34 +02:00
Maikel de Vries f3291bb84f clean up and document relaunch rule 
Also fix script errors in melting castle.
 2017-05-01 11:00:51 +02:00
Maikel de Vries 18057587d6 fix relaunching in CTFs 2017-04-30 18:42:44 +02:00
Maikel de Vries 0fead04978 fix relaunching problems in missions 2017-04-30 16:13:57 +02:00
Maikel de Vries 3b1ebdcdb0 do not move seaweed by tele glove or windbag 2017-04-25 20:12:44 +02:00
Maikel de Vries 6f1470dbbd correctly update barrel graphics when emptied onto existing stack 2017-04-25 14:04:43 +02:00
Maikel de Vries afe4d5a91e fix overcast teleport scroll (#1909) 2017-04-25 11:52:50 +02:00
Maikel de Vries cb68f9b26b fix parkour in combination with new relaunch rule 2017-04-25 10:26:27 +02:00
Maikel de Vries a863845ed4 add missing variable to relaunch rule 2017-04-25 09:45:12 +02:00
Maikel de Vries 7ffbeac9a9 Merge branch 'master' into Rule_Relaunch 2017-04-24 21:46:05 +02:00
Mark 2b56f55da5 DarkCastle: Fix #1907 
The name entries should be "Hörx" in German and "Harx" in English
 2017-04-24 15:10:06 +02:00
Maikel de Vries 4c8b236ea4 fix relaunch finding no spawn 
Use built-in FindLocation which works better and default to landscape center when really no place to spawn could be found.
 2017-04-23 18:30:15 +02:00
Fulgen301 750d52e06d Fix Missions.ocf scenarios in order to work with Rule_Relaunch 2017-04-22 21:08:40 +02:00
Fulgen301 7fed3ea1c0 Rule_Relaunch: Fix positioning and inventory transfer; add option to prevent initial "relaunch" 
# Conflicts:
#	planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
 2017-04-22 21:08:26 +02:00
Fulgen301 7064d4f6fb Rule_Relaunch: Fix return value in SetFreeCrew and SetInventoryTransfer 2017-04-22 21:06:08 +02:00
Fulgen301 38daafc99b Overcast: Fix script errors 2017-04-22 21:06:07 +02:00
Maikel de Vries 200780fba4 fix definition call to relaunch rule 2017-04-22 20:42:56 +02:00
Maikel de Vries c75ffe3978 improve lavacore solidmask 
This allows to stand on it more easily and should lead to less frustration for the player.
 2017-04-22 16:11:00 +02:00
Fulgen301 b77e9a7755 RelaunchContainer: Fix using wrong locals due to 52bf2e65bbe497e7d897988765e031f56ce4a980 2017-04-17 17:18:17 +02:00
Fulgen301 85cfbc4065 DarkMine: Fix relaunch handling 2017-04-17 17:18:10 +02:00
Maikel de Vries 7c444e7f96 add lava core animal (made by Win) 
Original by win, overhaul of script and behavior by Maikel.
 2017-04-17 16:05:20 +02:00
Fulgen301 6030299201 ThunderousSkies: Fix wrong relaunch position and wrong default relaunches 2017-04-17 15:08:47 +02:00
Nicolas Hake 0df79f5ba3 Rule_Relaunch: use correct casing for translations 2017-04-13 19:06:36 +02:00
Nicolas Hake fee85b8ddb Merge pull request GH#38 from Fulgen301/Rule_Relaunch 2017-04-13 19:05:02 +02:00
Fulgen301 f1efb134aa Remove hungarian notation and fix some errors 2017-04-13 18:58:10 +02:00
Fulgen301 9154ebf79f CaptureTheFlag: Fix script errors 2017-04-13 18:35:50 +02:00
Fulgen301 8042861f0b Rule_Relaunch: Fix several script errors 2017-04-13 18:35:43 +02:00
Fulgen301 bf43302da2 Rule_Restart: Fix handling return values of OnPlayerRestart 2017-04-13 09:54:52 +02:00
Nicolas Hake 23f6c74c4b Merge pull request GH#37 from Fulgen301/Rule_Relaunch 2017-04-12 17:45:51 +02:00
Clonkonaut 06a1ebe255 Fix RemoveReproductionEffect() in Animal Library. 2017-04-10 17:24:20 +02:00
Fulgen301 5cc3cf002a Fix Test.ocf/ColorfulLights.ocs 2017-03-30 20:55:08 +02:00
Fulgen301 25f77fd12c Remove Rule_Restart from Parkour.ocf 2017-03-30 20:55:08 +02:00
Fulgen301 22bf8ad1f7 Remove Rule_Restart from Goal_Parkour 2017-03-30 20:55:07 +02:00
Fulgen301 6405e50c80 Remove Rule_Restart from Defense.ocf 2017-03-30 20:55:07 +02:00
Fulgen301 d429e88dd2 Remove Rule_Restart from Arena.ocf (is replaced by Rule_Relaunch) 2017-03-30 20:55:07 +02:00
Fulgen301 00cc450331 Goal_Parkour: Fix searching Rule_Restart 2017-03-30 20:55:07 +02:00
Fulgen301 065655076e Modify Tutorials.ocf in order to work with Rule_Relaunch 2017-03-30 20:55:06 +02:00
Fulgen301 07005618aa Modify IAmRich in order to work with Rule_Relaunch 2017-03-30 20:55:06 +02:00
Fulgen301 69e4826a6f Rule_Relaunch: Modify DefaultRelaunchCount setting 2017-03-30 20:55:06 +02:00
Fulgen301 44ca079bf6 Modify Missions.ocf in order to work with Rule_Relaunch 
- Crash
- DarkCastle
- DeepSeaMining
- Raid
- TreasureHunt
 2017-03-30 20:55:05 +02:00
Fulgen301 b7108ff836 Modify Blunderbuss in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 b76cedbe7e Modify Bow in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 51d61d1b26 Modify GrenadeLauncher in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00
Fulgen301 76d8df9676 Modify ThunderousSkies in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00
Fulgen301 689e57d624 Modify ScorchedGardens in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00
Fulgen301 6e88fe5d2f Modify Ruins in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00
Fulgen301 c147781861 Modify RockBottom in order to work with Rule_Relaunch 2017-03-30 20:55:03 +02:00
Fulgen301 969cebd03a Modify Overcast in order to work with Rule_Relaunch 2017-03-30 20:55:03 +02:00
Fulgen301 f5e0aa4036 Modify MoltenMonarch in order to work with Rule_Relaunch 2017-03-30 20:55:03 +02:00
Fulgen301 b88137e97a Modify MeltingCastle in order to work with Rule_Relaunch 2017-03-30 20:55:03 +02:00
Fulgen301 8d69713ff2 Modify Hideout in order to work with Rule_Relaunch 2017-03-30 20:55:02 +02:00
Fulgen301 f14bfa418b Modify FrozenFortress in order to work with Rule_Relaunch 2017-03-30 20:55:02 +02:00
Fulgen301 568d04e7da Move RelaunchContainer 2017-03-30 20:55:02 +02:00
Fulgen301 d4b05c43ff RelaunchContainer: Rename folder 2017-03-30 20:55:02 +02:00
Fulgen301 b9f899a334 Move RelaunchContainer to Objects.ocd\Rules.ocd\Relaunch.ocd\Relaunch.ocd 2017-03-30 20:55:01 +02:00
Fulgen301 c1d998d93e RelaunchContainer: Modify OnPlayerLeftRelaunch() call 2017-03-30 20:55:01 +02:00
Fulgen301 9b04051e65 CaptureTheFlag: Fix wrong relaunch calls 2017-03-30 20:55:01 +02:00
Fulgen301 db6047c22a Remove Rule_Restart 2017-03-30 20:55:00 +02:00
Fulgen301 dcc240e01a Rule_Relaunch: Modify base respawn and add Rule_Restart functionality 2017-03-30 20:55:00 +02:00
Martin Strohmeier e62938b3e4 Add Sandbox to Tutorials.ocf 2017-03-28 16:09:35 +02:00
Maikel de Vries 5f30a6b428 make lava/acid bubble visible in editor so that it can created in sequences 2017-03-27 09:44:28 +02:00
Maikel de Vries c64e9b3814 scenario saving: fix position after movement by setting con and rotating 2017-03-27 09:44:28 +02:00
Maikel de Vries 7b676b083c boiling acid/lava: replace helper objects by dummy object 
This reduces the amount of unnecassary definitions we have ingame.
 2017-03-27 09:44:28 +02:00
Maikel de Vries 78d4fa4042 animal library: allow overloading reproductionconditions 2017-03-27 09:44:28 +02:00
Maikel de Vries a435a6db1a lava and acid bubbles do not explode at animals which resist corrosion 2017-03-27 09:44:28 +02:00
Fulgen301 731bf926c3 CaptureTheFlag: Use tabs for indentation 2017-03-25 14:34:43 +01:00
Fulgen301 f74ee93b5c DeathMatch: Use tabs for indentation 2017-03-25 14:34:32 +01:00
Fulgen301 294b393f7e RelaunchContainer: Use tabs for indentation 2017-03-25 14:34:23 +01:00
Fulgen301 13303c98af Add Rule_BaseRespawn which sets Rule_Relaunch to base respawn mode in order to prevent breaking scenarios 2017-03-25 14:34:11 +01:00
Fulgen301 a4eacd7937 Modify Rule_Killogs in order to work with Rule_Relaunch 2017-03-25 14:01:13 +01:00
Fulgen301 b0219b4614 Modify Scoreboard_Relaunch in order to work with Rule_Relaunch 2017-03-25 14:01:06 +01:00
Fulgen301 3de5261e8a LastManStanding: Remove relaunch functionality which is handled by Rule_Relaunch 2017-03-25 14:00:59 +01:00
Fulgen301 82f3883486 Modify RelaunchContainer in order to work with Rule_Relaunch 2017-03-25 14:00:05 +01:00
Fulgen301 b31355391b DeathMatch: Enable unlimited relaunches 2017-03-25 13:55:42 +01:00
Fulgen301 3a39ec9f94 CaptureTheFlag: Enable unlimited relaunches 2017-03-25 13:55:34 +01:00
Fulgen301 15cf813c1c Rename Rule_BaseRespawn to Rule_Relaunch and implement relaunch functionality 2017-03-25 13:55:21 +01:00
Julius Michaelis 70ad55ddf1 Add Windmill to farming knowledge in the Worlds folder. 
Semantically, that makes sense, but I haven't taken a look at all the maps.
 2017-03-19 14:03:11 +01:00
David Dormagen a561e15288 object interaction menu: made some comments clearer 
They were introduced in c37bc586e9
 2017-03-13 14:56:45 +01:00
Maikel de Vries 4211751f2f reset shaders when ambience object is deleted 2017-03-12 14:31:07 +01:00
David Dormagen 599509295d fixed some typos in German string tables 2017-03-12 11:18:35 +01:00
Maikel de Vries a49c283d67 prevent division by zero in catapult AI by setting a minimum power 2017-03-11 22:45:49 +01:00
Nicolas Hake 333cf9c4b6 Merge pull request GH #35 from Fulgen301:pullrequest 2017-03-11 12:31:39 +01:00
Sven Eberhardt a73cc5c948 Add missing DoorUnlock sound 2017-03-11 00:13:50 -05:00
Sven Eberhardt 10ab981b6f Add ambience editor props, user actions and scenario saving 2017-03-09 21:42:39 -05:00
Sven Eberhardt 3b90a0bf10 RoomDoor: Add editor props, user actions and scenario saving 2017-03-07 22:43:27 -05:00
Sven Eberhardt 7ffc1c5ffb Fix scenario saving of spawn action property in enemy spawns 2017-03-07 22:43:26 -05:00
Sven Eberhardt ae93236729 Fix typo in enemy spawn 2017-03-07 22:43:26 -05:00