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

3673 Commits

Author SHA1 Message Date
SimonFlapse
7ca4e61da9 New Description Generator GUI
Changes to the info gui to better communicate the max text width to support the server description in the server browser
2019-10-18 23:20:55 +02:00
SimonFlapse
268959331e Updated rich text generation gui 2019-10-18 14:49:33 +02:00
Simon
b6bcc70194
Merge branch 'develop' into patch-9 2019-10-17 23:54:40 +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
SimonFlapse
2a83ea5ad1 Fixed saved prices being synced between forces 2019-10-14 23:11:04 +02:00
SimonFlapse
5143a12d15 Fixed unlocking disabled research and the random research unlock 2019-10-14 22:54:15 +02:00
SimonFlapse
f0fe5ed20a Added "random" research unlocks in the market 2019-10-14 22:29:30 +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
SimonFlapse
21bb182644 Removed sand-1 beach 2019-10-14 17:25:13 +02:00
SimonFlapse
01fb65f323 Moved entity creation to a new function 2019-10-14 17:21:36 +02:00
SimonFlapse
09a565c115 Nice beach transition 2019-10-14 17:18:06 +02:00
SimonFlapse
f131b4d483 Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-14 15:43:52 +02: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
SimonFlapse
edc727da05 Changed cliff generation to allow map_gen cliffs 2019-10-13 13:55:18 +02:00
SimonFlapse
68744bc91a Disabled default cliff generation 2019-10-12 23:37:29 +02:00
SimonFlapse
1b317d2941 Fixed missing locals 2019-10-12 23:24:36 +02:00
SimonFlapse
ae3fc079a5 CLIFFS! 2019-10-12 23:23:54 +02:00
SimonFlapse
a128e0d234 Added player count to waiting gui 2019-10-12 16:57:31 +02:00
SimonFlapse
8a304ccb69 Fixed introduced bugs from last commit 2019-10-12 14:09:24 +02:00
SimonFlapse
6eb6574cc4 Refactoring + Changes from #996 2019-10-12 13:29:11 +02:00
SimonFlapse
ac7d60643b More tweaking 2019-10-11 21:07:16 +02:00
SimonFlapse
839019514b Result from first alpha run 2019-10-11 20:24:28 +02:00
SimonFlapse
505bc0cc53 Unused variable removal 2019-10-11 11:20:10 +02:00
SimonFlapse
8f51a726e1 Removed global from generate, causes desyncs 2019-10-11 11:19:10 +02:00
SimonFlapse
2afc4ac5f0 Made it easier to add a new surface to the generate function
You add a new surface by calling the get_surfaces() method in generate.lua
And then inserting a new value in the key, value format: [surface_name] = shape

Example

`local Generate = require 'map_gen.shared.generate'
game.create_surface('snake')
Generate.get_surfaces()['snake'] = b.rectangle(45, 4)
2019-10-11 10:54:27 +02:00
SimonFlapse
51dfa636fc Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-11 10:17:19 +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
SimonFlapse
f5b40ddd07 Market items now working 2019-10-09 21:36:11 +02:00
SimonFlapse
d6842d8e4a Fixed random desync (Static oil placement) 2019-10-09 13:25:43 +02:00
SimonFlapse
f0e147f39e Added markets and more 2019-10-09 02:02:48 +02:00