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

294 Commits (master)

Author SHA1 Message Date
Sven Eberhardt 51d34c0c66 Fix typo in raid mission. 2015-02-05 20:50:06 +01:00
Maikel de Vries 4d773f4ee9 fixed mine rescue goal 2015-02-05 17:40:13 +01:00
Sven Eberhardt a9ba6a3eb3 Gyro name change due to copyright considerations. 
Also commit missing dialogue file.
 2015-02-03 21:18:01 +01:00
Sven Eberhardt d7b9027a32 Add another NPC to crash landing. 
Gyro talks about catapult usage. Dialogue by Pyrit.
 2015-02-03 20:39:17 +01:00
Sven Eberhardt 7eab59df4f Crash Landing: Minor landscape rework. (#1138) 
It's the second mission so it's supposed to be easy. But the huge firestone reservoir just beside the bottom granite were just inviting to blast through there.

Also removed some brick areas to make the pumping path less forced. You can now also reroute the lava lake into your starting caves if you want (although this is quite dangerous because you need a lot of space and you're screwed if it fails).
 2015-01-28 23:05:19 +01:00
Sven Eberhardt c5415aa330 DarkCastle: Fix cannoneer grabbing cannon in intro. (#1248) 2015-01-22 20:44:01 +01:00
Sven Eberhardt 9ac3bd6c1b Some new weapons for DarkCastle enemies. 2015-01-18 19:21:48 +01:00
Sven Eberhardt caec5939b0 Fix right-click buying when many items are available. 2015-01-18 15:18:39 +01:00
Sven Eberhardt 763f9de0ec Fix player knowledge in DeepSeaMining (#1239) 
The section is switched when the first player joins, so the second player will initialize from the Scenario.txt of the intro section.
 2015-01-17 23:10:55 +01:00
Sven Eberhardt 49c5b22591 Remove some empty graphics files. 2015-01-17 18:22:06 +01:00
Maikel de Vries 4ea0cb0ca6 make ContainBlast a property instead of DefCore entry 2015-01-15 17:46:53 +01:00
Sven Eberhardt 92ce539b69 DarkCastle: Add FireArrow, BombArrow, GrenadeLauncher and Torch to construction plans. 
Also removed a bogus line from DarkCastle scenario script.
 2015-01-13 00:07:57 +01:00
Mark d7a88eea62 Use CreateObject() in scripts (#1214) 
Objects with id Rule_*, Goal_*, and Environment_* are created with CreateObject() now.
 2015-01-11 19:04:42 +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
Sven Eberhardt 1213a2eef5 Torch knowledge for Golden Mountain. 2015-01-09 00:03:28 +01:00
Maikel de Vries 36b29fd32e adapt scenarios to rank->branch change 2015-01-07 00:04:44 +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 1fa2cffe4b moved crashed airplane skin to Decoration.ocd 
This allows other scenarios to use the skin besides DarkCastle
 2014-10-24 18:05:03 +02:00
Maikel de Vries add7f23251 moved plane crash sound to plane object 
This makes it usable in other scenarios besides DarkCastle
 2014-10-24 17:50:55 +02:00
Tobias Zwick d662d5001e DarkCastle: correct German translation of game goal 2014-10-04 23:23:52 +02:00
Sven Eberhardt 5c72ed090d DarkCastle map rework. 
Make it harder to get into the castle.
 2014-10-04 22:57:50 +02:00
Sven Eberhardt d3ac2789cb DarkCastle intro sequence added. 2014-10-04 22:40:17 +02:00
Sven Eberhardt 77f4170b5a Raid made more failsafe: Wood barrel respawn and removed a deadly gap in the landscape. 2014-10-04 11:33:45 +02:00
Sven Eberhardt 91e285a39d Fix typo in Deep Sea Mining intro 2014-10-04 11:24:58 +02:00
Sven Eberhardt 5d81d27669 Fix outro in Deep Sea Mining. 
The Crystal Communicator didn't even start D:
 2014-10-04 11:24:58 +02:00
Sven Eberhardt 0b0fb55b0f Fix NextMission buttons in missions folder. 2014-10-04 11:24:53 +02:00
Armin Burgmeier 6d0daba7b6 Fix another typo in Raid.ocs 2014-10-04 00:03:15 -04:00
Sven Eberhardt b0af163c24 Better wheat placement in Crash Landing. 2014-10-04 00:59:24 +02:00
Tobias Zwick c271ccc564 fix some typos in Raid.ocs, convert to utf8 2014-10-04 00:47:05 +02:00
Sven Eberhardt 6d3bbcfee1 FightForGidl star achievement added. 
In the future, we might want to have different achievements for different waves reached.
 2014-10-03 19:59:28 +02:00
Sven Eberhardt 54e47cdcf3 FightForGidl difficulty adjusted. 
So it's not on top of the list.
 2014-10-03 19:59:28 +02:00
Sven Eberhardt 257840893a Moved FightForGidl to missions. 2014-10-03 18:33:18 +02:00
Sven Eberhardt f71b465adf Move "Done" achievement from individual missions to parent folder. 
Conflicts:
	planet/Missions.ocf/ParameterDefs.txt
	planet/Missions.ocf/StringTblDE.txt
 2014-10-03 13:30:07 +02:00
Sven Eberhardt 7513045d6c Move "Done" achievement from individual missions to parent folder. 2014-10-03 12:17:58 +02:00
Sven Eberhardt 005f484771 Fix bomb drop sound played as music in Rais.ocs. 2014-10-03 00:50:27 +02:00
Sven Eberhardt f919c31c9b Treasure hunt: Fixes and achievements. 
* Music fix (#1115)
* Some string fixes
* Disallow gold bar production
* Add gold bar achievement for side goal
 2014-10-03 00:49:03 +02:00
Armin Burgmeier ac3fbc1a6a Raid.ocs: Fix a typo 2014-10-02 17:24:19 -04:00
Sven Eberhardt c991f156b6 Added German translation for FloodedVeins. 2014-10-02 22:15:27 +02:00
Sven Eberhardt 03cb37eb12 Added German translation for Chine. 2014-10-02 22:15:26 +02:00
Sven Eberhardt 5a2edc425d Raid: Fix dialogue and effects. 2014-09-25 15:26:30 +02:00
Sven Eberhardt cde41733f8 Add "Done"-achievement to all missions. 2014-09-25 15:25:33 +02:00
Sven Eberhardt 14168fb5a5 Implement Rule_BaseRespawn rule for missions: Crash Landing, Dark Castle, Deep Sea Mining, The Raid, Treasure Hunt. 2014-09-22 19:52:34 +02:00
Sven Eberhardt 84cc072405 TreasureHunt storyline integration: Intro, Outro, NPCs 2014-09-21 21:49:03 +02:00
Sven Eberhardt dfa6050cd0 Put missions above worlds in scenario selection 2014-09-21 16:39:07 +02:00
Sven Eberhardt 4d36f3a2d2 Some missions fixes/adjustments 
* Plane with same color in all missions
* Sequence multiplayer fix
* Heavy smoke is a particle parameter
* Goal graphics fix
* Fix rocky pick direction after dialogue initiation from left
* Dialogue supports sections
* Hat moved to decoration for other missions
 2014-09-21 16:36:05 +02:00
Sven Eberhardt ca582692d4 Missions storyline expanded to Deep Sea Mining. Added short intro in extra section. 
Also adjusted icons, NextMission and MissionAccess in some scenarios and added a split marker between missions within and missions outside the connected storyline.
 2014-09-12 01:02:13 +02:00
Sven Eberhardt addac19062 Crash landing intro/dialogues/outro improved for storyline integration. 2014-08-26 16:07:30 +02:00
Maikel de Vries 46386e9644 fixed some typos in Raid.ocs dialoges 2014-08-22 17:15:03 +02:00
Sven Eberhardt a91332f42e Crash landing tweaked to serve as followup mission for raid. 
Pilot name and color, mission access.
 2014-08-21 21:01:11 +02:00
Sven Eberhardt 0966404db7 Raid: Fix multiplayer balloon deployment and remove balloons after intro. 
The balloons serve no purpose here and the scenario should be kept as simple as possible.
 2014-08-21 21:00:08 +02:00
Sven Eberhardt 78d2f71843 Minor Raid mission improvements. 
* More loam below lava lakes
* Grass
* Dora and Pyrit give hints to ask Newton for oil (Newton will point the player to Mave)
* Some typos fixed
 2014-08-21 15:27:58 +02:00
Sven Eberhardt 5955ab146e Add new mission "raid". 2014-08-20 18:06:20 +02:00
Maikel de Vries a4a57a3dd6 added pump knowledge to golden mountain 2014-07-14 18:51:16 +02:00
Sven Eberhardt 7db507921a Added attention symbol to dialogues 2014-07-12 16:03:23 +02:00
Sven Eberhardt 0d17310a7a Ruby and Amethyst material moved to main Material.ocg 2014-07-12 12:33:01 +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 5857be16d5 Deep Sea Mining moved to missions folder 2014-07-10 19:54:36 +02:00
Sven Eberhardt 5cd9b915b0 Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics. 
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
 2014-07-05 15:25:30 +02:00
Sven Eberhardt f70fbf9284 Fix invisible loam in DarkCastle. 2014-06-01 20:14:32 +02:00
Kevin Zheng df523d502c Fix typo in Crash.ocs scenario description 2014-05-27 00:31:40 +02:00
Maikel de Vries 6ba0164c5b removed unnecessary defcore Value entries 
Completely unneeded for structures and many other objects.
 2014-05-26 21:38:32 +02:00
Sven Eberhardt 68c297c210 Sorted decoration from scenarios into main decoration folder. 2014-05-11 16:27:13 +02:00
Sven Eberhardt cd8ab67c14 Copy static variables assigned in Objects.c to the scensario script to avoid problems in savegames. 
Static variables in Objects.c are problematic because Objects.c is deleted in savegames.
 2014-05-11 10:09:11 +02:00
Sven Eberhardt 93ea6cb6c2 DarkCastle: Fixed object duplication and solidmasks in some decoration objects 2014-05-11 10:02:04 +02:00
Sven Eberhardt ba23c6e022 TreasureHunt moved from experimental to missions 2014-05-04 19:19:45 +02:00
Apfelclonk 4ecca08a20 Fix scaffold's solid mask 2014-04-26 19:22:02 +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 fa6795370f Decoration.ocd added and includes ruins from DarkCastle 
Please start using this folder for decorative objects other developers might want to use as well.
 2014-04-06 15:50:06 +02:00
Sven Eberhardt 9451a29768 Fix GoldenMountain multiple goal activation 2014-03-16 21:44:04 +01:00
Sven Eberhardt fe20ef43a7 Fix AcidDrilling goal (#1038) 2014-02-18 22:56:44 +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
Sven Eberhardt 085ec9de27 Fix DarkCatle null pointers and intro (#1034) 2014-02-16 13:55:46 +01:00
Maikel de Vries addf28a0ab Fix issues with Crash.ocs intro (#951) 2014-02-02 18:03:54 +01:00
Maikel de Vries 6ff632e2f2 Moved Dialogue to Helpers.ocd to avoid copies 2014-02-02 18:03:54 +01:00
Pyrit c33ef06909 Fix sky scrolling for several scenarios. 
SkyScrollMode=1 in Scenario.txt is broken, so I used  SetSkyParallax() in the script.
 2014-01-26 17:39:11 +01:00
Armin Burgmeier 814b97c6ad Fix the MtBrame intro, and make the lower right corner a bit larger 2014-01-26 17:19:58 +01:00
Tobias Zwick 44f0cc7205 move RubyCave to Worlds for now 2014-01-26 22:56:31 +07:00
Sven Eberhardt 94a17c534c AcidDrilling: Power crystals block building construction (#1009) 2014-01-26 14:27:27 +01:00
Tobias Zwick acba8cad36 update the descriptions for missions and world to hopefully make the distinction between the two more apparent 2014-01-26 20:01:50 +07:00
Sven Eberhardt 8368ec8c0f MtBrame: Fix object planes 2014-01-26 13:59:29 +01:00
Tobias Zwick 4713437503 MtBrame: use Objects.c 2014-01-26 18:31:21 +07:00
Tobias Zwick baed75b2f6 fix invalid landscape 2014-01-26 17:53:57 +07:00
Tobias Zwick a423a62bb2 Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Tobias Zwick e1a417bc97 make the story of MineRescue more believable (so the "trapped" clonks can't climb, eh?) 2014-01-25 22:05:11 +07:00
Sven Eberhardt fef07b324b MineRescue: Convert Game.txt to Objects.c (#1008) 2014-01-22 18:20:26 +01:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07: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
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01: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 30619ae7fd removed unused particle definitions & cleaned up Particle.txt of LightningBolt particle 2013-11-28 23:44:24 +01:00
David Dormagen b7cb5dc74a adapted remaining usages of old particle system in Missions.ocf to the new one 2013-11-26 22:43:28 +01:00
David Dormagen 6dc707b203 moved ObjectRestorer from Storm/Tutorials into Helpers.ocd 
It was used by more than one scenario already and the two versions already diverged. We should not do that in our own repository.
 2013-11-26 22:42:52 +01:00
Maikel de Vries 994f45f521 Fix a runtime error in DarkCastle 2013-10-25 17:32:53 +02:00
Maikel de Vries 7f9f40a1f5 Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00