1
0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-12 10:04:40 +02:00
Commit Graph

3320 Commits

Author SHA1 Message Date
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
theorangeangle
7091e35c32
Merge pull request #976 from theorangeangle/mapmodify-3
fixed broken image sprite and replaced with a parity for diggy

 disabled landfill on connected dots, except light water tiles

 decreased the 83x pollution increase on danger ores

 added disclaimer on the default map, printed in chat

 Map description and info for fish islands

 Map description and info for fractal balls

 Map description and info for loading screen (previously "factory")

 Map preview for loading screen (previously "factory")

 Map description and info for fruit loops

 Map description and info for gears
2019-10-17 14:07:51 -05:00
Simon
fce544c2d1
Merge branch 'develop' into mapmodify-3 2019-10-17 20:27:42 +02:00
grilledham
23f1f976a4
Merge pull request #1000 from grilledham/crashsite_wall_bug
fix crashsite no wall bug
2019-10-14 19:11:48 +01: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
Soggs
a9560ffc2a Merge branch 'snakey_swamp' of https://github.com/Soggs/RedMew into snakey_swamp
# Conflicts:
#	map_gen/maps/snakey_swamp.lua
2019-10-14 12:26:33 +02:00
Soggs
e041cb47ef Changed snakey_swamp to use Builders.remove_map_gen_entities_by_filter. 2019-10-14 12:10:33 +02:00
Soggs
0fd02e11c8 Now disables Landfill with Event.on_init() 2019-10-14 12:04:10 +02:00
Soggs
1f4bd76451 Merge branch 'master' into snakey_swamp 2019-10-14 11:53:04 +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
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
1fe86c999e
Crowdin-Sync (2019-10-04) (#989) 2019-10-05 11:10:26 +02: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
grilledham
004bb0500f
Merge pull request #983 from curiosity-a/develop
Fix stress corruption caused by water #552
2019-09-17 18:36:20 +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
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
ef89b1fb8c
Merge pull request #978 from grilledham/diggy-fix_require
Fix require for Popup.player
2019-09-08 13:34:31 +01:00
grilledham
def7d53da2 fix require for Popup.player 2019-09-08 13:18:50 +01:00
theorangeangle
0f87f7040a Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene"
This reverts commit fc1d1af9d8, reversing
changes made to 7d56edd582.
2019-09-01 22:01:32 -05:00
theorangeangle
b8077ba60d fixed autofill config typo 2019-09-01 20:25:21 -05:00
theorangeangle
b7be1388cd Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
2019-09-01 20:23:37 -05:00
grilledham
dbf1af7e2f Merge pull request #974 from grilledham/crashsite/updates
reduce number of trees correctly
2019-09-01 20:23:36 -05:00
grilledham
16a0f3cb09 reduce number of trees correctly 2019-09-01 20:23:35 -05:00
grilledham
618c0da180 Merge pull request #973 from grilledham/crashsite/updates
Crashsite/updates
2019-09-01 20:23:34 -05:00
grilledham
48a4cd6d93 less trees 2019-09-01 20:23:33 -05:00