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

460 Commits

Author SHA1 Message Date
SimonFlapse
f4710e824a Changing seed 2019-10-27 12:36:05 +01:00
SimonFlapse
63d2b85407 New ore shapes 2019-10-27 12:21:08 +01:00
SimonFlapse
a9be1b46fa Minor fixes 2019-10-27 00:51:29 +02:00
SimonFlapse
bedcb2e1a9 v0.4 king of the hill 2019-10-27 00:45:28 +02:00
SimonFlapse
09d4d76359 Added custom mirrored ore generation + Refactoring 2019-10-26 22:09:32 +02:00
SimonFlapse
52f0fe2e5c Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-26 16:26:19 +02:00
SimonFlapse
350ab55fcc Changes from second playthrough 2019-10-21 17:20:28 +02: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
Simon
5b290676d4
Update map_gen/maps/space_race/cliff_generator.lua
Co-Authored-By: grilledham <jrdgillham@gmail.com>
2019-10-20 14:41:01 +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
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
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
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
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
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
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
SimonFlapse
301c57a536 Changed rail_grid_restrictions to use Token 2019-10-08 10:51:07 +02:00
SimonFlapse
1ecf72a86a Merge remote-tracking branch 'upstream/develop' into concrete_jungle 2019-10-08 10:48:30 +02:00
SimonFlapse
5182e21607 Initial commit of Space Race
Playable version 0.1
2019-10-07 22:44:17 +02:00
SimonFlapse
a9836b31f2 Moved containers to tier 1, new logic to prevent chest spilling
Regulars and above ignored by the anti grief
2019-10-06 22:59:09 +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
SimonFlapse
199c824ad7 Refactoring + Locales + Welcome message fix 2019-10-06 14:53:51 +02:00
SimonFlapse
f94fdcd660 Added info popup 2019-10-06 01:43:27 +02:00
SimonFlapse
5145b2ac26 Re-disable tile blueprints 2019-10-06 01:27:07 +02:00
SimonFlapse
1f34779c8e Fixed inventory entities losing items
Starting area enclosed by a circle with 4 bridges

Removed refined-hazard-concrete from market

Added 3x3 hazard-concrete to spawn for assembling machine mk2 to start producing concrete
2019-10-06 01:20:01 +02:00
SimonFlapse
428e298ae9 Added more info 2019-10-05 19:43:45 +02:00
SimonFlapse
d7a08fbdae Forgot a game.print 2019-10-05 19:39:26 +02:00
SimonFlapse
9608836a77 Fixed tile blueprinting 2019-10-05 19:36:49 +02:00
SimonFlapse
79aef55281 Preventing downgrading tiles 2019-10-05 19:14:27 +02:00
SimonFlapse
ffe6f0d965 Fixed hazard left and right names 2019-10-05 18:42:50 +02:00
SimonFlapse
a087fb84b4 fixed stack valid for read 2019-10-05 18:35:57 +02:00
SimonFlapse
dad86aeff2 Fixed ground stealing/cheating 2019-10-05 18:28:06 +02:00
SimonFlapse
a324bcd167 Tweaking game play 2019-10-05 17:14:01 +02:00
SimonFlapse
47bd5e4971 Minor improvements 2019-10-05 17:02:00 +02:00
SimonFlapse
712d6bd006 Fixed upvalues 2019-10-05 17:00:36 +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
SimonFlapse
9b6a9784ba Refactoring 2019-10-05 11:09:32 +02:00
SimonFlapse
5d7a319267 added map info 2019-10-05 02:37:35 +02:00
SimonFlapse
af07e81014 added messages 2019-10-05 02:14:57 +02:00
SimonFlapse
2437a886f9 Added more tiered entities 2019-10-05 01:37:33 +02:00
SimonFlapse
059e8cd274 Created concrete jungle map
Suggested by Sangria Louie (https://discordapp.com/channels/432567222481846283/432570869039104012/629791144846426122)

Initial edition

Starting area with a radius of 50 made with stone-path

Most entities can only be placed on top of stone-path or better.

Entities can be split up into three tiers making the "heaviest" entities banned from any tile except refined-concrete

Needs more tiered entities
2019-10-05 01:01:39 +02:00
SimonFlapse
b7511e1dc1 Reduced landfill pricing based upon feedback 2019-10-04 21:16:08 +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
SimonFlapse
fa4442d644 "Fixed" LuaPlayer being invalid messages 2019-10-04 20:59:32 +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
Jayefuu
e8083dcfe2 Added map preview 2019-09-09 23:29:34 +01:00
Jayefuu
8ddb0c4f8e
Updated maltease_crossings as per #906
Updated as per comments by @theorangeangle in #906 :
https://github.com/Refactorio/RedMew/issues/906#issuecomment-525123084

- Updated map description, name etc.
- Removed remove_tree function broken by Redmew surface
- Added automatic disabling of landfill on game init. Previously used a manual command.
- Moved spawn so market didn't appear on coal patch.
- Added map preview to data folder

Sorry for the several commits. I'll get smartgit set up again soon.
2019-09-09 22:55:01 +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
b7be1388cd Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
2019-09-01 20:23:37 -05:00
grilledham
16a0f3cb09 reduce number of trees correctly 2019-09-01 20:23:35 -05:00
grilledham
48a4cd6d93 less trees 2019-09-01 20:23:33 -05:00
grilledham
60cc102c7a 0.17.60 oil changes 2019-09-01 20:23:30 -05:00
grilledham
0bf02b92fd desert preset 2019-09-01 20:23:28 -05:00
grilledham
fc7ed1e735 refactor to allow multiple crashsite presets 2019-09-01 20:23:27 -05:00
grilledham
cf835fcf32 spawn market to neutral force 2019-09-01 20:23:25 -05:00
grilledham
b9354c614d reverted small oil refinery changes 2019-09-01 20:23:23 -05:00
grilledham
eac5daa56f increased advanced circuit output 2019-09-01 20:23:22 -05:00
grilledham
20e836c47e outpost balance 2019-09-01 20:23:21 -05:00
theorangeangle
c2b454a775 Merge pull request #953 from theorangeangle/mapmodify-3
Mapmodify 3
2019-09-01 20:23:20 -05:00
theorangeangle
fc1d1af9d8
Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
2019-08-31 20:52:28 -05:00
theorangeangle
616541bee9 fixed whitespace and added map preview for "loading screen" 2019-08-28 22:13:54 -05:00
theorangeangle
c5d09f50fa fixed broken image sprite and replaced with a parity 2019-08-28 21:40:27 -05:00
grilledham
3e28c29a70 reduce number of trees correctly 2019-08-03 14:26:34 +01:00
grilledham
afa2019faa less trees 2019-08-03 12:16:19 +01:00
grilledham
0eb844b17f 0.17.60 oil changes 2019-07-30 17:30:47 +01:00
grilledham
54ff569235 desert preset 2019-07-28 11:44:21 +01:00
grilledham
119ce340bb refactor to allow multiple crashsite presets 2019-07-28 11:44:13 +01:00
grilledham
3941937400 spawn market to neutral force 2019-07-27 12:00:18 +01:00
grilledham
bac91762a3 reverted small oil refinery changes 2019-07-25 16:21:56 +01:00
grilledham
5b6b46047e increased advanced circuit output 2019-07-25 16:21:26 +01:00
grilledham
c7c6120f55 outpost balance 2019-07-21 18:37:03 +01:00
theorangeangle
5607e7a50b
Merge pull request #953 from theorangeangle/mapmodify-3
Mapmodify 3
2019-07-17 04:38:50 -04:00
SimonFlapse
b431628b86 Removed game.print statements 2019-07-07 20:54:37 +02:00
SimonFlapse
d07ea062fe Merge remote-tracking branch 'origin/diggy_cutscene' into diggy_cutscene 2019-06-22 16:53:26 +02:00
SimonFlapse
40131895f0 Added ability to fit to edges based on the top left corner 2019-06-22 16:53:18 +02:00
Simon
890cdf12e7
Merge branch 'develop' into diggy_cutscene 2019-06-22 15:11:56 +02:00
grilledham
4bd81a89e0 set chest to be on player force 2019-06-22 09:45:09 +01:00
grilledham
869371cb2a added burner inserter to spawn 2019-06-22 09:41:45 +01:00
grilledham
2ba2086618 respawn power poles 2019-06-21 21:29:35 +01:00
theorangeangle
c7f57d257e fixed the shit i broke in the last commit, hopefully 2019-06-20 22:49:09 -05:00
theorangeangle
571b06eadb Revert "renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror."
This reverts commit b8d994a7f6.
2019-06-20 22:43:12 -05:00
theorangeangle
c2cbcc4a0b added map info and disabled landfill on DNA; added map preview and info for double beach 2019-06-20 22:35:51 -05:00
grilledham
fa2a62337a highlight top buttons 2019-06-20 12:39:18 +01:00
theorangeangle
a93ec511b9 added map descriptions for diagonal ribbon, bacon islands, and antfarm; fixed stone and coal generation in ribbon 2019-06-19 21:20:43 -05:00
theorangeangle
4481e86940
Merge pull request #915 from RCTheBlueWolf/develop
set day/night to bright and added preview image for the beach map.
2019-06-19 20:31:51 -05:00
theorangeangle
53281692dc renamed crosses3 to x-cross 2019-06-19 20:23:24 -05:00
theorangeangle
7451e2ae8c removed the crosses default map. 2019-06-19 20:20:34 -05:00
theorangeangle
b8d994a7f6 renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror. 2019-06-18 17:28:31 -05:00
SimonFlapse
f811da5b30 Fixed inverted height and width
Polygons are not being placed correctly
2019-06-14 23:19:21 +02:00
SimonFlapse
71044d6ade Refactoring + Rendering module from grilledham 2019-06-14 19:24:11 +02:00
theorangeangle
0e67d6ca99
Update beach.lua 2019-06-10 14:37:13 -05:00
SimonFlapse
7d32760bc2 Diggy cutscene tweaks 2019-06-10 19:29:14 +02:00
SimonFlapse
36f51bc2e5 Fixed rendering background
Minor tweaks to cutscene in diggy
2019-06-10 19:10:02 +02:00
SimonFlapse
6978cc0330 Fixed replay not working in MP 2019-06-10 16:32:13 +02:00
SimonFlapse
860ead05c0 Added localisation, Debug.Print and Cleanup
Also changed some parameters to the draw_text with background so that 'g' and similar letters are not outside the background
2019-06-10 15:15:14 +02:00
SimonFlapse
202e4c37b5 Fixed background parameters
Also added a new waypoint to Diggy with floating text
2019-06-10 01:04:14 +02:00
SimonFlapse
85fc38fd3a Minor changes to player_create
Allowing cutscenes to run before welcoming players via info gui and console messages.

Also includes a search limit for walls and rock to prevent the cutscene from running too far away from {0, 0}
2019-06-09 23:59:16 +02:00
SimonFlapse
f04b13f63a Added parameter passthrough to rendering module 2019-06-09 13:31:44 +02:00
SimonFlapse
de77c9601a Fixed players loosing control 2019-06-09 12:26:51 +02:00
SimonFlapse
3ca8e3f127 Cutscene Controller
Implemented for Diggy
2019-06-09 00:55:25 +02:00
Lynn
99890acdc2
Merge pull request #935 from linaori/cleanup-player-stats
Cleanup player stats
2019-06-02 17:16:55 +02:00
Lynn
f73e017e88 Optimize some reach distances 2019-06-01 17:11:17 +02:00
Lynn
cff6fe8db9 Added more controls to refine evolution config 2019-06-01 16:29:55 +02:00