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

292 Commits

Author SHA1 Message Date
Valansch
90abbb5650 Merge branch 'develop_fish_income' into develop
# Conflicts:
#	map_layout.lua
2017-10-29 12:18:03 +01:00
Valansch
182a166474 Merge branch 'dev_dimentions' into develop 2017-10-29 12:17:30 +01:00
Valansch
e7ffffac9f Chanced get_nice_surface_name call 2017-10-28 11:42:38 +02:00
Valansch
c3ad532058 Implemented 9th dimention: Nihil 2017-10-28 11:31:59 +02:00
TWLTriston
ccf34c51d1 Final tweaks to RSO based on playtesting 2017-10-28 05:07:41 -04:00
Valansch
8c98491577 Changed looking for players form distance to find_entities_filtered 2017-10-27 23:06:11 +02:00
Valansch
fe02be51da added death world wreck items dimention #103
added nuke to wreck items
2017-10-26 17:32:31 +02:00
Valansch
70a055a495 implemented debug outout and enable/disable for nuke_control.on_player_mined 2017-10-26 16:28:08 +02:00
Valansch
59a6a9cc5b Made portals independent of entity #103 2017-10-26 10:40:14 +02:00
Valansch
cbdae2e08f implemented portals and magic chests and added link commands 2017-10-25 22:24:10 +02:00
Valansch
66da00f1fb Thread logarithmic actions per tick increase proposal 2017-10-25 13:00:45 +02:00
Triston
92a505ecc4 Merge branch 'develop' into develop_swamp_threaded 2017-10-25 06:41:13 -04:00
TWLTriston
827e7d0455 Grass drawing fix 2017-10-25 06:25:56 -04:00
Valansch
2745b80ce8 Dimentions: Implemented Portal and different surfaces 2017-10-25 01:51:49 +02:00
TWLTriston
8f2ceaa383 Updates to allow threaded to run faster and fixed dagobah to be threaded 2017-10-23 07:24:05 -04:00
TWLTriston
ce54d23d5c Threaded updates 2017-10-23 06:45:46 -04:00
TWLTriston
87b933a9bc Adding missing maps and updating the first market 2017-10-23 06:27:36 -04:00
TWLTriston
2dfaa43d0c Initial start of cleanup for swamp threaded 2017-10-22 22:07:32 -04:00
TWLTriston
98820ddeb2 Red planet is now threaded 2017-10-21 07:14:50 -04:00
TWLTriston
8e38ebc8ed Updated regulars, added mona lisa gen 2017-10-18 05:29:49 -04:00
Valansch
bcdbfe4eed added death messages to mines.lua 2017-10-15 16:07:11 +02:00
Valansch
735c6b718a updated worms to call using string 2017-10-15 01:54:20 +02:00
Valansch
0d840b6e14 implemented mines 2017-10-15 01:53:39 +02:00
Valansch
348096bb87 Merge branch 'develop_island_threaded' into develop
# Conflicts:
#	locale/gen_combined/island_resort.lua
2017-10-14 23:47:36 +02:00
TWLTriston
4ea1c60465 Updated regular's list 2017-10-14 05:19:18 -04:00
TWLTriston
628b9d94b3 Changed setTiles to happen in one hit to avoid chunk edge problems 2017-10-11 11:37:03 -04:00
TWLTriston
41dbaeaa5f Changes to Island to Threaded 2017-10-11 11:01:27 -04:00
Valansch
65fd551e27 Merge pull request #86 from Valansch/develop_borg_threaded
Conversion of borg planet to threaded generation
2017-10-11 16:58:34 +02:00
Valansch
ef091f42f2 Merge pull request #85 from Valansch/dev_island_resort
Cleanup to island resort code, elseifs and whitespace mostly.
2017-10-11 16:58:09 +02:00
TWLTriston
d7ba450760 Additional updates to the way callbacks are handled, using "STRING" names instead of serializing the function seems to resolve the desync issues. 2017-10-10 12:21:04 -04:00
Triston
1949a9eb86 Merge pull request #84 from Valansch/dev_worms
Dev worms
2017-10-10 06:41:45 -04:00
TWLTriston
d6149e0fab Conversion of borg planet to threaded generation 2017-10-10 06:35:30 -04:00
TWLTriston
cbf618327c Cleanup to island resort code, elseifs and whitespace mostly.
Overall -- did not affect game stutter, however code is playtested.
2017-10-06 04:03:02 -04:00
Triston
2a42074a89 Merge pull request #83 from Valansch/dev_async_worker
Implemented Thread.queue_action
2017-10-06 04:00:10 -04:00
Valansch
059a80bbe6 Implemented worms 2017-10-06 02:14:38 +02:00
Valansch
adbb1b36be Implemented Thread.queue_action 2017-10-06 02:13:56 +02:00
Triston
8a678bdd4a Merge pull request #82 from Valansch/temp_ban
Temp ban
2017-10-05 19:01:33 -04:00
Valansch
4494fc0a6c Changed Animal case 2017-10-06 00:43:55 +02:00
Triston
310660695b Merge pull request #79 from Valansch/dev_autodecon
Implemented autodeconstruct. Closes #70
2017-10-02 18:11:59 -04:00
Valansch
96357fb0b3 Added animal as mod <3 2017-10-02 23:51:37 +02:00
Valansch
017eb88d9f Updated regulars 2017-10-02 23:43:57 +02:00
TWLTriston
84c9c57e4b Modified the pacman map generator to allow future additional map grids 2017-10-01 07:35:16 -04:00
TWLTriston
6891e3718c Update to the RSO default config, moved chunk grid to misc generation 2017-09-28 11:43:42 -04:00
TWLTriston
638eadc890 Changed implementation to be compatible with multiple miscs 2017-09-28 11:41:55 -04:00
TWLTriston
8e150d7fa3 Ship wreck loot 2017-09-28 11:41:55 -04:00
TWLTriston
ad36782c78 First iteration of pacman grid, uses a 0,1 array of pixel data to create an overlay, reuable for other ideas 2017-09-28 11:41:55 -04:00
Valansch
6363a77637 Merge pull request #68 from Valansch/develop_rso_ores
Develop rso ores
2017-09-28 12:35:15 +02:00
TWLTriston
736a6a0f8c Fixed the missing remoteTrees configuration option 2017-09-28 04:34:59 -04:00
TWLTriston
5fc1524112 Changed the debug to be a local function and not collide with other debugs. 2017-09-28 04:31:04 -04:00
TWLTriston
2ae539dea1 Rename of folder to RSO 2017-09-28 04:12:30 -04:00
Maik Wild
f153975301 Fixed indentations 2017-09-28 02:27:03 +02:00
Maik Wild
f44789c485 Implemented threaded spiral 2017-09-27 23:55:43 +02:00
TWLTriston
04a7829ea9 Modified OARC's RSO scenario code to genreate what we want. Removed biter logic and most of the non-RedMew specific stuff like infinite ores. 2017-09-26 17:18:47 -04:00
TWLTriston
76f1abc216 Initial commit of RSO feature set, start of soft mod changes 2017-09-26 09:04:58 -04:00
Valansch
7f64ed7591 updated regulars.lua 2017-09-24 14:14:54 +02:00
TWLTriston
f5fac7ce70 Added chunk grid terrain generation 2017-09-23 13:12:49 -04:00
Valansch
8fb3de797a Merge branch 'develop' into reconstruct_dev 2017-09-21 23:09:01 +02:00
TWLTriston
d694ccc3ea Whitespace style cleanups 2017-09-21 04:49:29 -04:00
TWLTriston
ccd810b008 Style updates 2017-09-21 04:48:34 -04:00
TWLTriston
5ec048903e Fixes to swap local to global
Moved init to a one time call function
Fixed bug with mixed ores that caused tiles to be skipped
2017-09-20 19:14:10 -04:00
TWLTriston
b419f5a426 Added sprinkle factor to allow for each ore entity to have a 1-100% chance of being swapped. 2017-09-20 16:43:49 -04:00
TWLTriston
1a3bf58abe Added glittery ores generation, there is tweaks for amount of ore generated 2017-09-20 16:26:50 -04:00
Valansch
1b16a979fe Added redplanet 2. All credit goes to @M3wM3w #3 2017-09-13 23:52:49 +02:00
Valansch
6ae85b5512 Made mods/regulars not case sensetive. 2017-09-10 16:26:37 +02:00
Valansch
05d24c94c3 Changing a user group member now updates a lua parsable file in the script output folder #42
- update regulars/mods list
- cleaned up config
2017-09-09 23:42:26 +02:00
James Gillham
b9c01295ae changed poke message 2017-09-09 11:59:34 +01:00
James Gillham
8830329ee0 changed poke message 2017-09-09 11:58:21 +01:00
James Gillham
6587263a04 moved regulars and mods 2017-09-09 11:55:18 +01:00
James Gillham
45716bc08e moved poke_messages and added more 2017-09-09 11:54:10 +01:00
James Gillham
ca0f1cc2bc moved band_roles 2017-09-09 11:53:06 +01:00
Valansch
38c10bdeb9 Merge pull request #50 from grilledham/rusky-pvp
Rusky pvp
2017-09-03 12:48:06 +02:00
James Gillham
1e688a0b88 moved rusky_pvp.lua to gen_misc 2017-09-03 11:43:25 +01:00
James Gillham
41ec0ec911 implemented rusky-pvp 2017-09-02 10:09:42 +01:00
James Gillham
05a0d9d049 updates to manhattan map 2017-08-29 10:28:45 +01:00
James Gillham
ca779cf0c3 changed data 2017-08-28 17:31:17 +01:00
James Gillham
b246d4768c manhattan preset 2017-08-28 12:26:35 +01:00
James Gillham
ed4e98dd9d removed test presets 2017-08-28 08:15:41 +01:00
James Gillham
f6cfa6889b mobuis_strip now handles spawn control 2017-08-28 07:09:15 +01:00
James Gillham
b07b659372 changed mobius strip size 2017-08-27 18:15:07 +01:00
James Gillham
a7c9e0a2ba changes to mobius_strip 2017-08-27 00:29:17 +01:00
James Gillham
df0b679e7c changed mobius_strip settings 2017-08-26 13:23:03 +01:00
James Gillham
fa78319b52 changes to mobius_strip 2017-08-25 15:35:53 +01:00
James Gillham
4328b449e6 added apply_effect function 2017-08-25 15:22:22 +01:00
James Gillham
9bc2198000 spawn control added 2017-08-25 10:18:28 +01:00
James Gillham
cb772ab84a new presets and bug fixes 2017-08-25 06:44:18 +01:00
James Gillham
5c5aca14f1 added project shape function 2017-08-25 06:41:13 +01:00
James Gillham
77ebc61180 Merge branch 'master' of https://github.com/Valansch/RedMew 2017-08-25 06:30:22 +01:00
M3wM3w
c57f9ae6d3 Add files via upload 2017-08-19 04:36:56 +02:00
James Gillham
9e8acd31b6 removed test.lua and picture_test.lua 2017-08-18 00:48:17 +01:00
M3wM3w
6b007cbb62 Add files via upload 2017-08-16 22:26:06 +02:00
halfdragon
1a2169de75 Add files via upload 2017-08-16 17:27:30 +02:00
halfdragon
1ba39bab5c MewMew´s swamp of yoda 2017-08-16 17:19:54 +02:00
halfdragon
e3afd938c5 MewMew´s Fluffy Rainbows 2017-08-16 16:58:45 +02:00
halfdragon
6cffb98f8c Add files via upload 2017-08-16 16:40:26 +02:00
James Gillham
6e377a8adb Added choose function to builders 2017-08-13 03:57:43 +01:00
James Gillham
6e3a3e9430 creation of adam preset 2017-08-13 03:57:08 +01:00
James Gillham
9cdec3a5b8 removed old code 2017-08-12 05:27:57 +01:00
grilledham
0eb01d43a5 Merge pull request #1 from grilledham/rewrite
Rewrite
2017-08-12 05:23:53 +01:00
James Gillham
b9b780ffac Merge branch 'master' of https://github.com/Valansch/RedMew 2017-08-12 05:14:29 +01:00
James Gillham
189b32337b preset changes 2017-08-12 04:19:59 +01:00
James Gillham
f0be94bdab bug fixes 2017-08-12 02:12:10 +01:00
James Gillham
cc9e37cbc0 Shape and pattern rewrite 2017-08-12 01:20:08 +01:00
James Gillham
3fddddba8d preset changes 2017-08-11 04:40:40 +01:00
Maik Wild
c839f7aa68 Merged dev_neko into develop 2017-08-10 20:08:24 +02:00
NekoBaron
cba455de24 Merge branch 'develop_neko' of https://github.com/Valansch/RedMew into develop_neko
# Conflicts:
#	map_layout.lua
Im CONFUSED BY CONFLICTS
2017-08-09 23:10:46 +01:00
NekoBaron
ac5843c8fd added new terrain type 2017-08-09 23:05:11 +01:00
James Gillham
25f4af16b5 added more presets 2017-08-08 12:34:42 +01:00
James Gillham
b3b1721e22 Added more presets and builders 2017-08-08 09:36:15 +01:00
James Gillham
ec6a67d261 initial commit 2017-08-06 00:05:53 +01:00
Valansch
95c718e879 added mews island resort 2017-08-04 23:31:52 +02:00
Valansch
8d530d01b2 Merge branch 'master' into develop 2017-08-02 10:18:24 +02:00
Valansch
d87637f2a6 added list_utils.lua 2017-08-02 10:12:57 +02:00
Valansch
6884d80495 mv x_map.lua x_shape.lua
mv x_infinite.lua lattice.lua
rm cross.lua
2017-07-31 00:37:02 +02:00
Valansch
221964a75a Merge branch 'develop_neko' into develop
# Conflicts:
#	map_layout.lua
2017-07-31 00:17:48 +02:00
Valansch
2131f08b8b changed infinite_mazes.lua maze to use pythagoras for distance not max(x,y) 2017-07-30 23:46:15 +02:00
Valansch
dcdb487360 changed infinite_mazes.lua resources amount function 2017-07-30 22:17:10 +02:00
Valansch
e4873e2797 included infinite_mazes.lua in map_layout.lua
Changed default maze size
Changed default ore amounts
Changed resource amount logic a bit.
2017-07-30 21:23:44 +02:00
Valansch
862f0db32a imported Hexicubes infinite_mazes.lua as is 2017-07-30 18:06:33 +02:00
NekoBaron
66ebfeb93c added 2 map shapes 2017-07-29 11:07:08 +01:00
Valansch
a9f794711e added cross made by neko 2017-07-27 11:25:10 +02:00
NekoBaron
ce9293d0da neko tries to work out tortoise svn 2017-07-24 20:54:08 +01:00
SilentSpike
ddddd79928 Improve Perlin noise implementation
- Optimise the gradient function
- Perform a bitwise AND operation instead of a modulo
- Comment code more clearly
- Store all the functions in the perlin table
2017-07-23 21:35:49 +01:00
Valansch
5114955d1b Merge branch 'master' into develop 2017-07-23 14:52:30 +02:00
Valansch
041aec19f0 Implemented Thread.set_timeout and changed /walkabout behavior 2017-07-23 14:51:20 +02:00
Valansch
ea5b3696b3 Fixed issue that caused linux users not to be able join the server 2017-07-23 10:05:58 +02:00
Valansch
a1309438e5 added rectangular_spiral.lua 2017-07-20 23:22:09 +02:00
Valansch
544e3e3da9 added rail grid 2017-07-18 21:54:54 +02:00
Valansch
428ecabbe7 remove junk files 2017-07-18 21:30:14 +02:00
Valansch
b2c79936e9 removed module bools 2017-07-18 21:29:12 +02:00
Valansch
a816b88278 moved perlin requires into files that acually call it. 2017-07-18 21:26:12 +02:00
Valansch
1c62f974fa Added donut and removed module boll call from map_layout.lua 2017-07-18 20:28:00 +02:00
Valansch
28f3c9c843 Merge branch 'master' into develop
# Conflicts:
#	map_layout.lua
2017-07-18 19:57:23 +02:00
Valansch
171c00bf0e Merge branch 'dev_maze' into develop
# Conflicts:
#	map_layout.lua
2017-07-18 19:56:05 +02:00
Valansch
c2c443e2ce Added maze 2017-07-18 19:47:48 +02:00
Valansch
f582cb862c deleted junk and changed maze name 2017-07-16 14:10:10 +02:00
Maik Wild
907d222cb4 added nekos gens 2017-07-14 20:17:01 +02:00
Valansch
82e63561d0 imported nekos stuff and changed map layout 2017-07-12 01:59:07 +02:00
Valansch
39d6be3a76 Fixed null pointer 2017-07-11 11:06:34 +02:00
Valansch
5e6435674d Fixed mymodule typo 2017-07-08 00:04:12 +02:00
Valansch
1fab5792ec -implemented map style framework
-Removed all map styles from map_layout
-Converted rail_grid.lua to be compatible with the framework
2017-07-08 00:03:07 +02:00
Valansch
aa0671928d moved map layout files into locale 2017-07-07 11:56:58 +02:00
Valansch
88ef604059 Initial commit. Imported RedMew 1.7 2017-06-13 13:16:07 +02:00