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

598 Commits (544c1cbb4bb6da97d30571ff28772660c7ad5969)

Author SHA1 Message Date
Maikel de Vries 40e0ea7bfc fix door control for wooden cabin 2015-02-18 18:25:49 +01:00
Maikel de Vries d2988163f5 fix flag marker redrawing on owner change 2015-02-16 17:17:18 +01:00
Maikel de Vries 49997045f6 fixed burned wind generator radiusin Mine Rescue 2015-02-16 14:17:05 +01:00
Maikel de Vries 6cd3b9775c fixed power need symbol display for elevator 2015-02-15 09:34:45 +01:00
Maikel de Vries a5b6066f25 fix removal of ownership on flag movement 2015-02-14 00:16:32 +01:00
Maikel de Vries de8ee9d840 fix flag removal effect on power network 2015-02-11 22:42:35 +01:00
Maikel de Vries cba73bafca implement flag ownership and network change on team switch and hostility change 2015-02-11 00:02:45 +01:00
Maikel de Vries 45a8c02cd0 clean up the animal library 2015-02-11 00:02:45 +01:00
Maikel de Vries 7f79caade5 flag library: fix on owner change and clean up 2015-02-09 19:32:15 +01:00
Maikel de Vries b7b6b187f7 clean up gold seller library 2015-02-09 19:32:15 +01:00
Maikel de Vries e47a08aaf7 clean up more flag related libraries 2015-02-08 15:28:13 +01:00
Maikel de Vries 37eb7a0095 make flag marker id consistent with other libraries 2015-02-08 13:35:26 +01:00
Maikel de Vries f2794d335f move ownable library into flag group 2015-02-08 13:35:26 +01:00
Sven Eberhardt bcd821a786 Fix construction menu opened at wrong position. (#982). 
It was always opened at the last mouse position of the owner of the hammer. Fixed it to use the controlling player instead.
 2015-02-08 13:31:51 +01:00
Maikel de Vries ce37dc181e clean up of the flag library 
This might have fixed the appearance of flag markers at the flag's center.
 2015-02-08 13:07:56 +01:00
Maikel de Vries df58032aa8 deactivate producers of higher priority on overproduction 2015-02-06 21:16:48 +01:00
Maikel de Vries 1336bb36ee libraries clean-up: remove graphics and clean defcores 2015-02-06 19:44:22 +01:00
Maikel de Vries 5c29121600 correct inherited call in structure library 2015-02-05 17:56:14 +01:00
Maikel de Vries 4d773f4ee9 fixed mine rescue goal 2015-02-05 17:40:13 +01:00
Maikel de Vries b59141f905 remove debug logging from power library 2015-02-04 15:56:02 +01:00
Maikel de Vries a5155f6d88 fixed no power need rule 2015-02-04 12:40:29 +01:00
Maikel de Vries a0dd53227e fixed storage not being consumer and producer at the same time 2015-02-04 10:35:16 +01:00
Maikel de Vries 97900a1278 libraries: remove power system before ownership 2015-02-04 10:35:16 +01:00
Maikel de Vries 121af3459e remove obsolete keeping track of power balance 2015-02-04 10:35:16 +01:00
Maikel de Vries 369a290d99 power status symbol not visible in FoW 2015-02-04 10:35:16 +01:00
Maikel de Vries 13a72c65f0 improved power system callbacks 2015-02-04 10:35:16 +01:00
Maikel de Vries 75018e6a0c do not show power need symbol for storages 2015-02-04 10:35:16 +01:00
Maikel de Vries b7ba9f2eb1 correct updating after setting power level of storage 2015-02-04 10:35:15 +01:00
Maikel de Vries 5eef390b44 power priorities are updated before network balancing 2015-02-04 10:35:15 +01:00
Maikel de Vries 17c4049563 separate library for power storage 2015-02-04 10:35:15 +01:00
Maikel de Vries c0ff94eb75 normalize power values to multiples of ten 
This makes it easier for internal calculations and that value of 10 now represents a single light bulb. It is advisable to only use multiples of 10 for production and consumption values.
 2015-02-04 10:35:15 +01:00
Maikel de Vries 7f15d8646b simplify network power balancing 2015-02-04 10:35:15 +01:00
Maikel de Vries 9d0e079d7d power library local variables in a single proplist 
This prevents clashes, all libraries could use a single proplist named lib_*
 2015-02-04 10:35:15 +01:00
Maikel de Vries 4914d73a82 fix power balance on adding an active power consumer 2015-02-04 10:35:15 +01:00
Maikel de Vries febf1234a9 always register power need in producer library even if zero 2015-02-04 10:35:15 +01:00
Maikel de Vries f9f790cbd6 fixed callbacks from the power library to producers and consumers 2015-02-04 10:35:15 +01:00
Maikel de Vries eec38a9f17 reimplement power network handling by the flag library 2015-02-04 10:35:14 +01:00
Maikel de Vries ac5f9dbce7 correctly implement handling of steady power producers 2015-02-04 10:35:14 +01:00
Maikel de Vries 2d00588dff new power system (work in progress) 2015-02-04 10:35:14 +01:00
Sven Eberhardt caec5939b0 Fix right-click buying when many items are available. 2015-01-18 15:18:39 +01:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
David Dormagen bd04722553 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
	src/game/C4GraphicsSystem.cpp
	src/game/C4GraphicsSystem.h
	src/game/C4Viewport.cpp
	src/gui/C4GameMessage.cpp
 2015-01-15 19:57:01 +01:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214) 
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
 2015-01-11 19:02:03 +01:00
David Dormagen bc9697ab3a worked on making the order of items in the interaction menu and action bar more consistent; changed some minor things 2015-01-03 15:32:06 +01:00
David Dormagen 8a3c965e3e default to allow collection of objects into non-hand slots if Collect() is called by a script (#959) 2014-12-25 18:40:10 +01:00
David Dormagen d73799ab07 when a currently-used object is suddenly deleted, the usage is quickly cancelled (#899) 2014-12-25 18:04:19 +01:00
David Dormagen 5565c4401c adjusted construction menu to work with arbitrary resolutions 2014-12-25 17:21:39 +01:00
David Dormagen f89b8c8319 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/System.ocg/ClonkControl.c
	src/gui/C4MouseControl.cpp
	src/landscape/C4PXS.cpp
 2014-12-25 15:24:19 +01:00
Maikel de Vries 1e5d5b56da fix IsPowerAvailable function in power library 2014-12-21 20:20:25 +01:00
Maikel de Vries 2d1647ea77 improved prioritizing of power consumers 2014-12-19 21:47:08 +01:00
Maikel de Vries 289f59a872 moved consumer and producer library into power library folder 2014-12-19 14:59:46 +01:00
Maikel de Vries 22dfab63aa clean up scripts of power library 2014-12-19 14:56:01 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Maikel de Vries 856e37a360 fix c4script error in clonkcontrol library 2014-10-28 18:01:59 +01:00
Maikel de Vries dd239b97a5 fix c4script error when producer creates object that deletes itself 2014-10-28 18:01:12 +01:00
Maikel de Vries f05c5a3439 move ownership radius on movement of the flag 2014-10-20 20:27:14 +02:00
Maikel de Vries b2daf0453d power producers which include flag library are not staticback any more 2014-10-20 18:56:13 +02:00
Maikel de Vries 1d34c12431 fixed underwater dropping of second hand item (#1155) 2014-10-18 12:00:49 +02:00
David Dormagen 6a875a1b29 CustomGuis: renamed several script functions to be more consistent; removed Gui_AddMargin as it is obsolete 
All calls that reference an existing Gui window now start with "GuiUpdate" (exception: GuiClose). All other functions are always to be called DURING menu creation and layouting.
The "Margin" property replaces Gui_AddMargin.

find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiOpen/GuiOpen/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiClose/GuiClose/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiSetTag/GuiUpdateTag/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/CustomGuiUpdate/GuiUpdate/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddCloseButton/GuiAddCloseButton/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_UpdateText/GuiUpdateText/g'
find . -type f -name "*.c" -print0 | xargs -0 sed -i 's/Gui_AddSubwindow/GuiAddSubwindow/g'
 2014-10-11 11:51:26 +02:00
Sven Eberhardt fe59448c5d Reset cursor view on UnGrab control. 
This is to reset the view e.g. after controlling a switch.
 2014-10-03 22:34:35 +02:00
David Dormagen 952f06b173 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
 2014-09-29 11:47:09 +02:00
Sven Eberhardt e7ac00de4b Added BaseRespawn rule and neutral flagpoles to be used for consistent respawn handling in all missions. 
Also changed clonk destruction process to always kill player clonks before removal. This simplifies handling of death e.g. when clonks are contained in an object that falls out of the map.

BaseRespawn adapted from Maikel's base melee repository.
 2014-09-22 19:21:28 +02:00
Sven Eberhardt 2a698bb2d9 Fix scenario saving of NoPowerNeed effect 2014-09-22 19:21:28 +02:00
Sven Eberhardt 6766ac1526 Prevent NPCs from accidentally collecting things. 2014-09-21 16:18:43 +02:00
Sven Eberhardt 54dc25947f Fix construction site name. 
It was always "Construction Site: %s" without the %s filled in.
 2014-09-21 16:18:09 +02:00
Sven Eberhardt 31febf7a40 Fix HUD Adapter recreation on section change 2014-09-12 01:02:13 +02:00
Sven Eberhardt 764f0aedd0 Fix goal graphics in HUD if goal is using multiple graphics and SetGraphics. 
We don't have a GetGraphics() function at the moment, so use a small workaround.
 2014-08-20 18:06:18 +02:00
David Dormagen 5722339e83 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/gui/C4Gui.h
	src/gui/C4GuiDialogs.cpp
	src/gui/C4GuiWindow.cpp
 2014-08-13 11:52:41 +02:00
Sven Eberhardt 308f248421 Library_Tree: Make ChopDown overloadable at runtime. 2014-08-12 19:00:16 +02:00
Sven Eberhardt 32ca09a152 Coral, Fish and Piranha moved from Deep Sea Mining into Objects.ocd 2014-07-10 19:59:39 +02:00
Sven Eberhardt 28ba0ca4c5 DeepSeaMining scenario and game goal reworked. 
* Goal is now construction of a communication structure
* Map size halved
* Do not respawn fish in player view range

Constructor: Added some callbacks for custom construction sites
Rubies: Store used graphics in local variable
ContentsMenuController: Added safety checks when host object is deleted in callback
 2014-07-03 21:22:37 +02:00
Sven Eberhardt 49327c40a7 Construction site: Added function to disallow site cancellation. Added callback to structure for custom build preview. 2014-06-29 00:08:51 +02:00
Maikel de Vries 09a2033ec0 possibility to attach basement to existing structures 
TODO: increased preview size and costs.
 2014-05-30 15:18:25 +02:00
Maikel de Vries 7182acbd48 fixed structure energy bars 2014-05-30 10:17:03 +02:00
Maikel de Vries bd8f66d470 fixed construction blocking for below surface structures 2014-05-30 10:17:03 +02:00
Maikel de Vries 66f8454b67 allow for constructing just below surface 
Useful for basements and maybe also other structures in the future.
 2014-05-26 21:28:07 +02:00
Clonkonaut 0de885a0f7 New feat: Use snow or ice to create loam in the foundry. 
Two callbacks added:
IsLiquid - return a string with the material that this object consists of.
GetLiquidAmount - return how many material pixels this object is worth.
 2014-04-29 00:25:06 +02:00
Günther Brammer 22016e075f Replace some usages of C4ID with C4Def* 
In particular those that made the c4script shell depend on C4Id.cpp.
 2014-04-19 19:02:22 +02:00
Maikel de Vries 47fa8ef4a1 Implemented SetBase* for BaseMaterial library 2014-04-17 18:01:18 +02:00
Maikel de Vries 9b96ab2305 Cleaned up base material in library and engine 
* rename to cleaner *Base* instead of *HomeBase*
* fixed library implementation
* engine code is now obsolete
 2014-04-16 14:07:01 +02:00
Maikel de Vries 4ca1e2e9cb Construction menu now uses GUI_GridLayout 2014-04-09 22:48:06 +02:00
David Dormagen 89878f64ab Clonks can now exit things and do both interactions if an object can be grabbed and entered 2014-03-31 20:46:51 +02:00
David Dormagen 15316003a4 made the producer library do safe calls (->~) for functions like GetPowerNeed to silence compiler warnings if some parameters are not needed in the inheriting objects 2014-03-27 00:04:05 +01:00
David Dormagen 8b0e6e5292 interaction menu: further fixes and cleanups; external menus can now be integrated smoothly into the framework; the production menu is now shown in the interaction menu 2014-03-26 23:55:32 +01:00
David Dormagen afbaf8c6aa contents menu: fix not being able to put stuff into f.e. construction sites by ignoring the OCF check when collecting; allow Clonks to take stuff out of containers even if hand is full 2014-02-28 22:19:30 +01:00
Maikel de Vries c393ba0119 Script menu implementation for constructor library 2014-02-26 18:58:54 +01:00
David Dormagen 0da9293686 allow Clonk::SetMenu to also take a custom GUI ID; cleaned up some menu-related mess (like not handling unclosable menus correctly) 2014-02-26 12:03:27 +01:00
Maikel de Vries c075103bb9 Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 20:41:02 +01:00
Maikel de Vries 9a862835bb Added GetDescription to all goals 
This will be used by the new HUD on the controls branch.
 2014-02-17 19:22:35 +01:00
David Dormagen 06ac00ace8 Merge branch 'master' into Controls 
Conflicts:
	CMakeLists.txt
	Makefile.am
	planet/Objects.ocd/HUD.ocd/Controller.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Club.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	src/control/C4Control.cpp
	src/control/C4Control.h
	src/gamescript/C4GameScript.cpp
 2014-02-15 14:44:57 +01:00
David Dormagen acb35071ad Merge branch 'Controls-fix' into Controls 
Conflicts:
	planet/Objects.ocd/HUD.ocd/ObjectInteractionMenu.ocd/Script.c
 2014-02-15 14:42:35 +01:00
David Dormagen 50a6ca214c started work on a new interaction menu - currently only the inventory part works 
TODO: add production/buying/etc. - should be easily pluggable into the framework menu
 2014-02-15 14:40:53 +01:00
David Dormagen 6d3c42b5b1 added callbacks QueryRejectDeselection and QueryRejectDeparture 
removed internal variable Clonk.inventory.forced_ejection (hand never selects next item when throwing now)
 2014-02-15 14:32:53 +01:00
David Dormagen 07088b22bf added GetAimPosition which returns the current aiming-angle as a counterpart for SetAimPosition 2014-02-15 14:32:51 +01:00
David Dormagen f7f3420977 correct kill tracing when flinging enemies down cliffs with melee weapons and ApplyWeaponBash 2014-02-15 14:32:48 +01:00
David Dormagen 6a04337f7c intermediate changes [TO AMMEND] 2014-02-15 14:32:42 +01:00
Tobias Zwick ebd14e2339 fix #1012: Construction removed when all materials available 
+ Add localized error message when the underground changed and thus the construction cannot be created
+ Add a SetPosition to ensure the construction site is really exactly at the given position
 2014-01-25 16:20:27 +07:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
Sven Eberhardt 57463b61c4 Rework SolidMasks to be defined in a separate SolidMask.png graphics file instead of the main definition graphics. 2014-01-08 01:55:33 +01:00
Sven Eberhardt a7fe61bb36 Fix CrewSelector HUD for non-Clonk crew memebers 2014-01-04 14:21:44 +01:00
Sven Eberhardt e52fac76e3 Fix some null pointer errors in power system when objects are destructed. 2014-01-03 19:43:14 +01:00
Sven Eberhardt f12fe2a24a Call MaxContentsCount using this->MaxContentsCount() to allow runtime overload 2013-12-30 13:46:34 +01:00
Sven Eberhardt 649e06039f Fix null pointer in power helper object when power plant is destructed. 
The power system isn't written in a very failsafe way when it comes to object destruction. Why are "helper objects" needed now that we have proplists to store such things?
 2013-12-29 14:44:14 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
Martin Plicht d699ba80a5 script: Fix some minor nil/0/parameter passing issues, fix some <variable> = <variable> noop issue and convert some while loop into a for loop 2013-12-21 13:23:51 +01:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
Tobias Zwick 325053410f rename script callback UpdateTransferZone to OnSynchronized (#220) 2013-12-17 23:16:11 +07:00
Tobias Zwick 44f1887003 split up Plants library into crop (harvestable), tree (choppable) and plant (plant reproduction) 
This should make the plants not overloaded with functionality so that odd stuff like #904 can happen. I think the plants need more cleanup still.
 2013-12-05 11:23:22 +07:00
David Dormagen ef11d1d272 removed some commented-out particle creations 2013-11-26 21:25:05 +01:00
David Dormagen 2139e950f1 adapted Flash particle and usages to new particle system 2013-11-26 21:24:57 +01:00
David Dormagen a4d27cd9a9 replaced Dust and Dust2 usages with new particle system 2013-11-26 21:24:56 +01:00
Gabriel 166c193749 Added new construction site sign graphics. 
Each one is unique thanks to the unlimited power of random rotation. Hammer symbol as overlay for better customizability.

Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-11-11 02:24:20 +07:00
Sven Eberhardt fbdd4f7d6b Fix double-add of flags to linked flags list if flags make up a circle with an even number of elements >2. This would cause an error message somewhere in the power system. 
e.g.:
for (var a=0; a<360; a+=360/18) CreateObject(WindGenerator,Sin(a,450)+500,Cos(a,450)+500,player);

The algorithm is still weird. Why are three lists needed to traverse the graph of connected flags?
 2013-10-06 11:47:32 +02:00
Sven Eberhardt 2f37347b09 Auto-unstick produced vehicles from landscape by moving them upwards a bit. 
Thanks to Ann for reporting this!
 2013-10-05 16:11:03 +02:00
Sven Eberhardt 2be918dbde Remove superfluous debuglog. 2013-09-23 01:52:52 +02:00
Clonkonaut cd3f535522 Fixed plant reproduction (FindObject using local coords), Added SeedOffset 
The change of FindObject (and similar funcs like ObjectCount) from using always global coords to now use local coords made the search function in the plant library go wrong.
Also, the distance check in the library led to unnecessary removal of new plants. SeedOffset() will give the developer a better way of controling this.
 2013-09-22 22:39:43 +02:00
Sven Eberhardt e1b972f960 Added energy radius to power producing buildings. 
See forum discussion on flags / energy distribution.
 2013-09-16 22:39:56 +02:00
Sven Eberhardt a020cfc867 Fix construction preview of non-flagpole objects 2013-06-22 22:18:31 +02:00
Sven Eberhardt 58a0bf1c24 Flagpole construction: Show arrows pointing to neighboured flags that would be connected if the flagpole were built there. 
Allows the player to build his base more efficiently.
 2013-06-22 20:01:51 +02:00
Tobias Zwick 9027544c37 Merge branch 'master' into Controls 2013-06-04 20:13:35 +02:00
Tobias Zwick 855ba27d6f tried to refactor pump 2013-05-27 21:51:26 +02:00
David Dormagen 7eaef70af1 Merge branch 'master' into Controls 
Conflicts:
	planet/System.ocg/PlayerControls.txt
 2013-05-26 18:19:51 +02:00
Tobias Zwick 8f752d1d9e clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
David Dormagen de0b22ec1b removed ColorByOwner entry of the flag-marker to suppress warning 2013-05-26 15:21:16 +02:00
David Dormagen 0c23d1b9a6 reimplemented the action bar to use the custom GUIs 
action bar now only shows shortly after hitting Interact
 2013-05-26 14:59:19 +02:00
Martin Plicht a915cdb15f Make Eclipse happy by changing some zeros to nils and stuff 2013-05-26 00:01:08 +02:00
David Dormagen 6fe8b1719e changed the inventory bar to use the new custom gui system 
inventory bar is now at bottom of screen
 2013-05-25 21:28:33 +02:00
David Dormagen 00382611be fixed wrapping the hand position around when scrolling to the item before your first item 2013-05-24 23:24:33 +02:00
David Dormagen 2bf88cea5f Clonks' max contents count reduced from 7 to 5 2013-05-24 23:22:16 +02:00
David Dormagen 04c8ad1cac removed CON_Collect (now collects only into empty slots) 
fixed inventory shifting
 2013-05-24 20:09:19 +02:00
David Dormagen 6c861f9165 removed the hold-number-and-click-mouse controls 2013-05-24 00:00:18 +02:00
David Dormagen 6c64963f1f hammer (Library_Constructor) now uses correct interface 2013-05-23 23:59:50 +02:00
David Dormagen c1d27bc3e9 mouse-wheel now scrolls through inventory (zoom is on shift+mouse-wheel) 2013-05-23 22:46:23 +02:00
David Dormagen 20bfab48b6 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/GrappleBow.ocd/Script.c
 2013-05-23 17:53:41 +02:00
Sven Eberhardt aa79205da3 Fix power update when sleeping consumer changes consumed amount. 2013-04-28 13:57:53 +02:00
Sven Eberhardt c60220be27 Added some helper functions to Library_Map 2013-03-26 00:46:50 +01:00
Sven Eberhardt fcddb56b04 Some Library_Map extensions 2013-03-22 21:31:56 +01:00
Sven Eberhardt aeeedcd770 Fix script errors in scenarios that don't load Objects.ocd 2013-03-19 19:27:19 +01:00
Sven Eberhardt 57e63a5275 Added support for scripted maps (Map.c) and documentation. 2013-03-19 00:36:06 +01:00
Sven Eberhardt 8f429dc50f GoldSeller checks more frequently 2013-03-03 17:05:53 +01:00
Sven Eberhardt b8753d64f6 Fix flag ownership change to allies when original owner dies. 
Change OnOwnerRemoved engine callback to also pass the ally selected as successor for the dead player.

The flag had a callback OnOwnerChange implemented. However, we already have OnOwnerChanged in the engine to do the same thing.
 2013-03-02 23:38:29 +01:00
Sven Eberhardt d0933e71c7 Fix GoldSeller interval adjustment 2013-03-02 23:07:48 +01:00
Sven Eberhardt 8fde966ee5 LibraryStackable supports infinite stack counts for tutorials, AI enemies, etc. 
Also renamed internal Update() function to avoid name collisions with other scripts/libraries.
 2013-02-09 13:35:17 +01:00
David Dormagen 6f9a11b817 further improved the right-click info message for structures 2013-02-02 21:41:20 +01:00
David Dormagen 34fc771911 merged master into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Structure.ocd/Script.c
 2013-01-30 21:37:31 +01:00
David Dormagen e6487533c2 added first version of object information dialogue on right-click 2013-01-30 21:27:09 +01:00
David Dormagen 50fd0ebc39 added Rule_EnergyBarsAboveStructures and adjusted Krakatoa to use that 2013-01-22 18:44:29 +01:00
Tobias Zwick b85b08687f fix #907: name of the construction site is not localized 2013-01-13 14:16:43 +01:00
David Dormagen 299cc7e478 when not able to execute an Use-command (f.e. shield when not walking), the command is remembered and executed when possible 2012-12-29 18:42:19 +01:00
David Dormagen 80ac9a9503 more one-hand cleanups 2012-12-29 14:08:53 +01:00
David Dormagen d7eb93be1b split ClonkControl.ocd into five libraries 
Library_Inventory: handles slots and an arbitrary amount of hands, generic and not only Clonk-related
Library_InventoryControl: interactions between the user and the inventory
Library_CarryHeavyControl: interaction with carry-heavy-objects
Library_ClonkGamepadControl: gamepad-related stuff
Library_ClonkControl: general Clonk control library
 2012-12-25 12:19:23 +01:00
David Dormagen bc4fd5f9ed merged master into Controls 2012-12-23 15:17:23 +01:00
Sven Eberhardt 829e83dcdb Production menu shows missing components/liquids/materials/fuel in red 2012-12-17 14:32:48 +01:00
Nicolas Hake 2e71694710 Producers: consume required material (#885) 
Instead of just checking whether the material is available, also
consume it.

I'm not quite certain whether we should return the removed material
along with the amount removed (to match the return value of the barrel's
GetLiquid), but since the bucket is not currently accepting wildcards
I don't think it's necessary.
 2012-12-17 02:11:15 +01:00
Sven Eberhardt c3ad022a25 Skylands made a bit easier 2012-12-02 21:33:17 +01:00
David Dormagen 4cdb4a6f3d fixed possible zero pointer error 2012-11-12 18:58:39 +01:00
Charles Spurrill 162e125085 #374 Missing graphics: Scoreboard of Parkour and LastManStanding - Finished 2012-11-11 16:08:48 -08:00
David Dormagen 0b0058da0f removing and adding Rule_NoPowerNeed while consumers are active has now the expected behavior (#828) 2012-11-10 14:19:59 +01:00
Maikel de Vries 2de6c35658 Remove debug log from airship 2012-11-04 15:14:03 +01:00
David Dormagen df3caac0ac rewritten elevator case to be less hacky and adjusted its power-consumption-behavior 2012-11-03 16:17:30 +01:00
Bernhard Bonigl 1011c858cc Introduce QuickSwitch on Q (or Apostrophe for Dvorak) 
QuickSwitch changes the current selection of the Inventory to the last selected one.
 2012-10-07 15:44:01 +02:00
Bernhard Bonigl 89b035d35e Reduce the Clonks hand-slots to 1. 
That means the clonk can only have 1 active item now. The old 2-hand-stuff still
exists and can easily be activated through an appendto for scenarios etc.
 2012-10-07 15:12:36 +02:00
Maikel de Vries d2a327fef6 Fixed production menus: show knowledge of accessor (#850) 2012-10-30 21:15:51 +01:00
Charles Spurrill c838ccae94 Fixed flag markers not fading out 2012-10-27 22:05:23 -07:00
David Dormagen 96ac1c6f0d Clonks do not collect stuff when inside a container (f.e. a respawn-helper-object) 2012-10-27 16:34:19 +02:00
Tobias Zwick a2d55ceecc fix #436: throw objects into walls 2012-10-22 00:11:24 +02:00
David Dormagen 9753652821 power system's light bulbs are now in front of game-objects (f.e. trees) 2012-10-24 22:21:24 +02:00
Tobias Zwick 5ad59e3a59 fix #821: Can't release lorry 2012-10-21 21:49:37 +02:00
Maikel de Vries 95a8592b22 Removed debug log in construction site 2012-10-21 12:54:19 +02:00
Tobias Zwick 7498d0bb51 clonk can drop items in the water, similarly to how it worked in CR 2012-10-20 19:32:16 +02:00
Tobias Zwick c6641c9850 nicer lightbulb graphics 2012-10-14 21:51:16 +02:00
David Dormagen 2631e05daa added burned graphics for the Coniferous 2012-10-14 21:51:21 +02:00
David Dormagen 7ac3c30124 ignore successive calls to Library_PowerConsumer which do not change states 2012-10-14 20:30:15 +02:00
Tobias Zwick d7da19b031 fix needed material in construction sites only displayed for first player 2012-10-14 20:00:43 +02:00
Felix Wagner 4235b9f42e Added sickle for harvesting 
New callback in the plants library: SickleHarvesting
Set to false to allow harvesting via interact (e.g. Mushroom, Lichen)
 2012-10-14 15:43:00 +02:00
David Dormagen efa9aea411 power system indicators fade out a lot slower and display quick changes more consistently 2012-10-14 14:32:52 +02:00
David Dormagen 163ccd8e75 fixed Scoreboard_Relaunch's use of the conditional function of Scoreboard_Death. 
This might fix the relaunch elimination bug.
 2012-10-14 14:07:46 +02:00
Sven Eberhardt 8b6e697339 PowerConsumer: NoPowerNeed-effect can be used to exclude some buildings from energy need 2012-10-14 13:32:25 +02:00
David Dormagen e0d9a682e6 flag is now static-back on construction; no falling down anymore 2012-10-13 22:42:41 +02:00
David Dormagen b96cec3f26 power system uses small light bulbs as progress bar 2012-10-13 22:42:08 +02:00
Sven Eberhardt 8bd2beb164 Increase Clonk collection radius downwards (#810) 2012-10-13 18:47:31 +02:00
David Dormagen 068f08f34f fixed the sell-message at the flag 2012-10-13 13:45:52 +02:00
Bernhard Bonigl 51e61a485d Move free Objects at the bottom of a construction side up to the surface. 2012-10-10 19:33:51 +02:00
Charles Spurrill 1e85978c40 Fixed carry-heavy library from inserting items into ground on drop 2012-08-07 12:30:35 -07:00
Charles Spurrill a8ea9a0d38 Some fixes to AlignVehicleRotation script 2012-08-07 12:17:52 -07:00
Charles Spurrill e54673962a Added library allowing solidmasked vehicles to 'rotate' parented objects along the z-axis with their rotation. See airship 2012-08-03 14:22:06 -07:00
Günther Brammer 35a0d7b6cd Script: Get/SetGravity use 1/100 px/tick^2 instead of 1/500 
The old factor was chosen because the default gravity * 500 was exactly
100. But a lot of other engine interfaces use 1/100 px/tick or px/tick^2,
and that is a common scale for scripts to work in, too.
 2012-07-15 22:42:17 +02:00
Charles Spurrill 41f5f59ebf #765: Clonk stops moving when setting down heavy-objects 2012-07-22 17:35:27 -07:00
Koronis c57f05a44f improved tree falling animation and sound 2012-07-22 21:15:49 +02:00
Charles Spurrill 6a13a63ef0 #791: Chopped trees are displayed behind buildings 2012-07-21 09:15:47 -07:00
David Dormagen 8fb926bc0a flag can reset marker's color correctly 2012-07-13 22:32:09 +02:00
David Dormagen 5b4e8c887c when loading (f.e. bow and musket) the inventory slot displays a small loading bar 2012-07-05 20:09:32 +02:00
David Dormagen fdd4aa5553 power system: changed the floating messages on power change into progress bars (also only on power change) 2012-07-03 10:34:33 +02:00
David Dormagen da976b4770 added new scoreboard abstraction layer on top of the engine functions - it scales! 
for a complete description see the forum post
 2012-06-28 00:17:15 +02:00
David Dormagen 45eb8e16e5 added some zero-pointer safeties after calls to OnSlotFull 2012-06-21 23:40:27 +02:00
David Dormagen a697016c58 reset some more internal variables to nil when cancelling aiming 
they could get in the way when re-aiming quickly after a shot
 2012-06-19 21:30:14 +02:00
David Dormagen a28cf7008b allow successive calls of CancelAiming (which do not do anything) 2012-06-19 19:55:51 +02:00
Bernhard Bonigl b46e40d78e Experimental: Create Construction-Menu at cursor-position 2012-06-18 19:03:50 +02:00
David Dormagen 79928b4692 flag library: SetFlagRadius now behaves correctly in regards to area markers 2012-06-17 21:37:41 +02:00
David Dormagen a7a16e1f5b clonk control: zero pointer safety, check whether menu exist after trying to create it 2012-06-17 21:37:13 +02:00
Felix Wagner d4fa3e10f3 Added settings parameter to plants' default Place() 2012-06-07 18:29:00 +01:00
Felix Wagner a10ba81b3e Added Place() to plants library 2012-06-07 01:45:38 +01:00
Felix Wagner f77b4134b4 Removed GetConstructionDirection() 2012-05-13 20:54:24 +01:00
Bernhard Bonigl 0729c4577f Fixed Non-Inventory-Contents(CarryHeavy) using up Space in the ContentsMenu (#778) 2012-05-13 20:37:44 +02:00
Maikel de Vries 2710585eed String table for the producer library 2012-05-13 15:18:21 +02:00
Maikel de Vries eff20344d8 Moved construction direction to stucture library 2012-05-12 10:16:33 +02:00
Maikel de Vries 80e1abc808 Implemented a simple Damage>HitPoints -> Destruction mechanism for structures 2012-05-10 21:20:06 +02:00
Felix Wagner 2b83fc9ec9 Produce loam by using the bucket. Use 25 pixels of earth. 2012-05-11 15:07:03 +01:00
Bernhard Bonigl 8bd16da9c4 Added Stringtables to constructing and removed old unused stuff 2012-05-08 20:43:30 +02:00
Bernhard Bonigl c601231960 Added Interaction for flipping construction sites during placement 2012-05-08 20:27:24 +02:00
Bernhard Bonigl 43deb1fc37 Extra-Interactions can now be placed at every position in the actionbar 2012-05-08 20:26:50 +02:00
Bernhard Bonigl c5f4952f76 Carryheavy objects entered via script aren't dropped when lifting is cancelled anymore. 2012-05-07 23:06:19 +02:00
Bernhard Bonigl 90fdc232fa InteractionBar now can display additional interactions from the Clonk via GetExtraInteractions callback. 
Also moved carryheavy-dropping from hardcoded to that callback.
 2012-05-07 22:57:52 +02:00
Bernhard Bonigl 65c5dfd632 Moved setting of the Tooltip into the GUI-Elements instead the controllers. 2012-05-06 19:20:40 +02:00
Bernhard Bonigl 6a885d33aa Fixed incorrect Selection call to selected item when switching left and right hand. 
Sometimes also caused errors.
 2012-05-06 18:24:56 +02:00
Maikel de Vries 5c351a0eae Made plant reproduction is more realistic 
Plants don't grow as n! and prefer not to grow at the same location.
 2012-05-06 13:33:39 +02:00
Maikel de Vries 6fcc0f6d2e Removed TimerCall in favour of AddTimer script implementation 2012-05-05 12:09:44 +02:00
Bernhard Bonigl c576a7bd3f Allow turning while jumping during aiming 2012-04-29 18:09:37 +02:00
Maikel de Vries 5da0847a9a Materials inside the construction site don't burn due to incendiary materials 2012-04-29 16:57:38 +02:00
Bernhard Bonigl 5ae4496d7f Clonk now aborts usage if a related inventory-slot is changed. (e.g. when aiming the bow) 2012-04-29 16:26:32 +02:00
Bernhard Bonigl 38235f762a CarryHeavy doesn't play animation if clonk is inside 2012-04-29 15:05:41 +02:00
Bernhard Bonigl 56809d9e43 Fixed a carryheavy-bug with Collect(x,x, pos) 2012-04-29 15:05:29 +02:00
Bernhard Bonigl 981ce396ec Made ConstructionSite less filled. 2012-04-23 23:19:52 +02:00
Bernhard Bonigl 83ad05b3c0 GUI now takes inventory-size directly from the clonk. 
Renamed backpack-stuff to inventory in Controller.
 2012-04-23 21:07:11 +02:00
Bernhard Bonigl 12ffe6ab9c Removed overlooked Tube-Updates 2012-04-22 18:48:38 +02:00
Bernhard Bonigl b52dafc7b2 Cleaned up ClonkControls a bit and added more Comments. 
Removed unused function HUDShowItems
 2012-04-22 18:44:28 +02:00
Felix Wagner e9010b81e9 Construction preview: combining, Elevator: combine two for SUPER elevator 2012-04-22 00:00:41 +01:00
Bernhard Bonigl de19c7432e Made ConstructionSites display material below 
Added Stringtables for ConstructionSite
 2012-04-17 18:18:28 +02:00
Bernhard Bonigl fa46079626 Added wireframe preview for Construction Site 2012-04-17 18:08:39 +02:00
Bernhard Bonigl e8ef7a9537 Made ConstructionSite compatible with dir-flipping-preview 
Fixed ConstructionSite not removing on build fail
 2012-04-17 18:08:23 +02:00
Bernhard Bonigl 4c38caaf27 Merged default into Controls 2012-04-17 17:37:52 +02:00
Bernhard Bonigl c6fe70d251 Fixed plants continuing growing after beeing chopped down 2012-04-17 14:28:37 +02:00
Felix Wagner 5ba322b417 Fixed mixed up language 2012-04-16 21:36:52 +01:00
Felix Wagner 366d96680a Rotate your buildings in the construction preview using Space! 2012-04-16 16:31:38 +01:00
Bernhard Bonigl b7fba5ee29 Introduce RefuseTransfer(object) callback. Allows to refuse transfer out of a Container via ContentsMenu. 2012-04-15 18:32:38 +02:00
David Dormagen 6517b230e6 added NoPowerNeed rule, made requesting 0 power possible 2012-04-15 17:02:47 +02:00
Bernhard Bonigl 9236cde273 Fixed faulty productio-time in Producer-Library 2012-04-15 15:11:18 +02:00
Bernhard Bonigl 1c91495eb5 Merged default into Controls 2012-04-15 13:22:38 +02:00
Tobias Zwick cdaabca574 deleted descriptions for libraries 2012-04-15 13:13:41 +02:00
Tobias Zwick 038ef1b4b6 descriptions for structures 2012-04-15 13:13:14 +02:00
Bernhard Bonigl b5f099be79 Hardcoded Construction-Site Intersections. 2012-04-15 00:29:38 +02:00
Bernhard Bonigl a687b0f85c Added simple construction-site-blocking check 2012-04-14 23:37:12 +02:00
Bernhard Bonigl a56c684a19 Fixed Construction sites moving containers into them, instead of their contents. 2012-04-14 23:16:17 +02:00
Bernhard Bonigl 75ec1ed63c Changed ConstructionSite Icon 2012-04-14 22:54:18 +02:00
Bernhard Bonigl 9da6d67c80 Space now also closes menus 2012-04-14 22:53:36 +02:00
Bernhard Bonigl c4e782e713 Moved Close() into Menu.ocd 2012-04-14 22:53:17 +02:00
Bernhard Bonigl 83a972cced Introduced GetInteractionCount(object) to prevent infinite loops 2012-04-14 22:53:02 +02:00
Bernhard Bonigl fefb8b4de8 Added Multi-Interaction-Support for Script (Objects can have multiple interactions) 2012-04-14 22:30:02 +02:00
Bernhard Bonigl e025aed501 Merged default into Controls 2012-04-14 21:55:16 +02:00
Bernhard Bonigl b4fb51249e Controls now tries to handle first actionbar-item before using hardcoded behaviour on pressing Space 2012-04-14 18:41:56 +02:00