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

3405 Commits

Author SHA1 Message Date
Zahir Khan
43c2617171
Prevent character collision 2019-11-26 17:18:00 -05:00
Zahir Khan
cad7d9b784
one skip btn press needed
Added supporting changes to cutscene_controller.lua
2019-11-26 14:25:43 -05:00
Tarsassum
f662f12b79 Removed unnecessary comments and replaced useful comments on top of the lines. 2019-11-26 03:26:48 +01:00
Tarsassum
5461b3147f new file: map_gen/maps/terra.lua 2019-11-25 04:17:14 +01:00
theorangeangle
99ae9c0cf4 added map preview 2019-11-24 19:48:17 -06:00
Claude
0a1636161c
wrong folder 2019-11-24 20:23:37 +02:00
Claude
b6d53d2db6
Update 2019-11-24 20:22:59 +02:00
Claude
7ee39fc280
Create square_spiral_old 2019-11-24 20:13:12 +02:00
Claude
546694a8b2
update suare_spiral_old
Meybe this fix it
2019-11-24 19:49:00 +02:00
grilledham
a7eede9326 missing entity + desync fixes 2019-11-24 11:37:52 +00:00
Zahir Khan
0659a9a3fc
Condensed code 2019-11-20 22:43:03 -05:00
Zahir Khan
ba6cdf9c49
Added player valid check 2019-11-20 22:20:49 -05:00
Zahir Khan
9bea5a4439
Timing tweaks for the new strings. 2019-11-18 18:47:07 -05:00
Zahir Khan
e9c7bb0ce0
Added cutscene init 2019-11-18 18:22:14 -05:00
theorangeangle
d4cb84610c small changes to improve grammar and flow 2019-11-17 23:21:50 -06:00
Zahir Khan
42a4c90b20
Update cutscene.lua
minor addition
2019-11-18 00:08:27 -05:00
Zahir Khan
899d938174
Update scenario.lua 2019-11-17 23:34:07 -05:00
Zahir Khan
7785099753
Update cutscene.lua 2019-11-17 23:32:20 -05:00
Zahir Khan
94159211ee
Create cutscene.lua 2019-11-17 23:13:36 -05:00
Zahir Khan
e768989bf3
crashsite cutscene strings 2019-11-17 23:03:52 -05:00
Zahir Khan
80ba14762b
Added cutscene outpost 2019-11-17 23:01:33 -05:00
grilledham
da51264761
Merge pull request #1005 from Claude477/patch-2
Update creation_of_adam2.lua
2019-11-15 21:14:15 +00: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
grilledham
0041dc9340
Merge pull request #1004 from Claude477/patch-1
Update vanilla.lua
2019-11-12 19:20:02 +00: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
e341c6230e
Merge pull request #997 from Soggs/snakey_swamp
Added Snakey Swamp map script.
2019-11-01 16:14:45 +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
SimonFlapse
d812c71fe5 Merge remote-tracking branch 'upstream/develop' into diggy_cutscene 2019-10-18 23:41:21 +02:00
Simon
03f461da36
Merge branch 'develop' into map_description_fixes 2019-10-17 23:53:19 +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