theorangeangle
0e52cb3519
Merge pull request #1012 from Zahir-Khan/turkey
...
Added random messages to print every 10 minutes to the turkey map
just in time!
2019-11-27 23:59:07 -06:00
theorangeangle
2225f5363f
added vauge documentation that will come back to haunt me later
...
local time 11:49 pm and travis better approve this by midnight!
2019-11-27 23:49:24 -06:00
theorangeangle
9e72495790
after playing whack a mole for 20 mins i think it's working now. local time 11:43pm
2019-11-27 23:43:45 -06:00
theorangeangle
bd8e289e58
i wanted to add the turkey ores from the 2018 map onto the 2019 terrain but can't clear out all the errors. going to have inebriate myself and see if that makes things better or worse. -11:10pm local
2019-11-27 23:10:50 -06:00
Zahir Khan
9a6e978a27
Update turkey.lua
2019-11-27 21:01:49 -05:00
Zahir Khan
837eedcc2c
Update turkey.lua
2019-11-27 20:39:26 -05:00
Zahir Khan
97be613e3d
Added random turkey message every 10min
2019-11-27 20:26:37 -05:00
theorangeangle
b0dd0b072c
Merge pull request #981 from Jayefuu/map_description_fixes
...
Updated map descriptions and landfill tech from maps named in issue #906
2019-11-27 11:29:04 -06:00
Claude
aca98f7098
Update creation_of_adam2.lua
...
This fix "map_gen.ores" path to "map_gen.entities"
2019-11-15 23:06:46 +02:00
Claude
8d0766cecc
Update vanilla.lua
...
This fix path for tiny_ores.lua start vanilla.lua
2019-11-12 18:48:37 +02:00
grilledham
71356cc504
Merge pull request #1003 from grilledham/crashsite/biters_to_worms
...
Crashsite: Change biters to spawn worms on death
2019-11-01 20:35:02 +00:00
grilledham
a7ec8e9856
Change biters to spawn worms on death
2019-11-01 16:04:43 +00:00
Soggs
b44ca8621b
Changes to Snakier_Swamp as proposed by grilledham.
2019-10-21 12:34:01 +02:00
Soggs
f1bfc70d43
Deleted Builders.remove_decoratives() from Builders.lua as it was a inferior duplicate of the newly added Builders.remove_map_gen_decoratives().
...
Swapped Snakey_Swamp and Snakier_Swamp to use Builders.remove_map_gen_decoratives() instead of Builders.remove_decoratives().
2019-10-21 12:21:54 +02:00
Soggs
f3ffc28512
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-21 12:15:26 +02:00
Simon
9a2e5e554f
Hilbert Water Trap + Fixes for Hilbert Sand Trap ( #998 )
...
* Initial commit of hilbert water trap
* Refactoring in features/market.lua
* Fixed ribbon for both Hilberts
* Added remove decoratives function to the builder
* Refactoring the new builder functions
* Simplifying create_standard_market
* remove_map_gen_decoratives_by_filter renamed
* Fixed documentation links having _edit in them
* Formating documents
2019-10-20 16:23:34 +02:00
Soggs
78dbd16b30
Added Builders.remove_decoratives(shape) to builders.lua
...
Builders.remove_decoratives(shape) removes any decoratives in the given shape.
Update the map scripts, snakey_swamp and snakier_swamp to use this to remove decoratives from the dividers.
2019-10-20 05:24:35 +02:00
Soggs
d360169ab7
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-20 05:16:18 +02:00
SimonFlapse
f85c434077
Fixed whitespace
2019-10-19 00:03:07 +02:00
Simon
03f461da36
Merge branch 'develop' into map_description_fixes
2019-10-17 23:53:19 +02:00
Simon
fce544c2d1
Merge branch 'develop' into mapmodify-3
2019-10-17 20:27:42 +02:00
grilledham
0f88751faf
fix crashsite no wall bug
2019-10-14 19:04:46 +01:00
Soggs
d3e82fb1fa
Purging the evil trailing whitespaces.
2019-10-14 13:10:57 +02:00
Soggs
dd544919c8
Snakier_Swamp Initial Commit
...
Adds another ribbon style map similar to Snakey Swamp with even windier paths.
2019-10-14 13:03:22 +02:00
SimonFlapse
4e4945f159
Changes to starting resources
2019-10-14 09:59:18 +02:00
SimonFlapse
31e534c502
Merge remote-tracking branch 'upstream/develop' into snakey_swamp
2019-10-14 09:45:10 +02:00
Simon
bf8cd265d2
[Builder] Simple entity removal ( #994 )
...
* Simple entity removal in Builders
Performance could be improved
* Removed rocks parameter
The increased radius caused simple-entity to work
* Added another way to remove units that should be more efficient
* Changed find_entities to use area instead of radius
* removed remove_units function
* changed function name from names to name
* added table.shallow_copy
* reworked 'remove_*' builders
* used remove_* builders for existing maps
* update .luacheckrc
* Added links to documentation for each public function
* Added links for new functions
2019-10-14 00:09:47 +02:00
Soggs
ef52016d25
Minor fixes to comply with automated testing.
2019-10-13 18:11:06 +02:00
Soggs
706e7bac11
Added Snakey Swamp map script.
...
Creates a ribbon works with a snakey path surrounded by water at the top and bottom.
2019-10-13 15:52:03 +02:00
Simon
ca29a047de
[Snake] Added on_snake_player_died event ( #995 )
...
* Added on_snake_player_died event and a snake_demo map
* Added score to the event
* Fixed entities being destructible
Changed comment
* Fixed cases where controller type wasn't god
* Changed players controller to spectator when their snake dies
* Changed start_game call away from remote.call
* Needed new call to show the snake button
* Changed start_game to use Snake.control
* removed snake event from demo map
* Update map_gen/maps/snake_demo.lua
2019-10-11 00:28:40 +02:00
SimonFlapse
153eaf03ac
Fix for #984
2019-10-10 11:39:41 +02:00
SimonFlapse
5122634a3a
Bunch of simple map descriptions
2019-10-10 11:29:28 +02:00
SimonFlapse
96eb160534
Added warning in default.lua to help guide newcomers
2019-10-10 11:10:30 +02:00
SimonFlapse
5975942db8
(Hoping to fix the removed cutscene changes)
...
Revert "Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene""
This reverts commit 0f87f7040a
2019-10-10 11:01:16 +02:00
SimonFlapse
16810d4a67
Fixed pollution and updated map_settings reference
2019-10-10 10:40:32 +02:00
SimonFlapse
4d33c46b76
Merge remote-tracking branch 'upstream/develop' into mapmodify-3
2019-10-10 10:25:16 +02:00
SimonFlapse
99fe5a8d88
Restricted landfill to 'water' (connected_dots)
2019-10-10 10:24:41 +02:00
Jayefuu
f905cbf4d9
Update map_gen/maps/grid_islands_rotated.lua
...
Co-Authored-By: Simon <44922798+SimonFlapse@users.noreply.github.com>
2019-10-06 17:24:36 +01:00
grilledham
c6fd8ec4ea
Merge pull request #980 from Jayefuu/branch
...
Added rail_grid map preset and preview
2019-10-05 11:45:11 +01:00
Simon
3997f6ffb3
Toxic Jungle Danger Ores Fixes ( #986 )
...
* Fixed danger ores and removed flamethrower ammo recipe
* disabled draw_resource_selection
Disabled map_gen ore, oil and cliffs.
Added map info
2019-10-04 21:01:11 +02:00
grilledham
661cd205a4
fixed comment
2019-09-28 14:33:27 +01:00
grilledham
ea7c027495
travis linting
2019-09-28 14:31:19 +01:00
grilledham
781cd11178
refactor rail_grid
2019-09-28 14:23:57 +01:00
curiosity
03dba62d30
Refactoring
2019-09-15 12:00:23 +03:00
curiosity
9dd4f8a3bb
Refactoring
2019-09-15 11:47:18 +03:00
curiosity
f3ebccce0b
Fix stress corruption caused by water #552
2019-09-14 19:40:43 +03:00
Jayefuu
6d9791beb4
Updated map descriptions and landfill tech from maps named in issue #906
2019-09-11 20:57:39 +01:00
grilledham
e96cbfa680
Added Builders.change_map_gen_tiles(shape, new_tile_map).
2019-09-11 20:51:04 +01:00
Jayefuu
1ad53c842d
Added rail_grid lua and png files. Suitable for vanilla but also used on modded.
2019-09-11 19:31:38 +01:00
grilledham
def7d53da2
fix require for Popup.player
2019-09-08 13:18:50 +01:00
