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

979 Commits

Author SHA1 Message Date
plague006
d58e2a7606 Add solid_rock 2019-03-01 14:18:41 -05:00
Matthew
e024c436ba
Merge pull request from plague006/17/regenerate_decorative
[17][Enhancement] Drop unnecessary tables.
2019-02-28 17:08:13 -05:00
Matthew Heguy
ba8b4df879 Add doc related to water, add enable_water to grass_only maps (maintaining prior functionality) 2019-02-27 15:10:39 -05:00
SimonFlapse
6015c6c620 Update for 0.17.1 2019-02-27 15:28:47 +01:00
SimonFlapse
fb82e81802 Merge remote-tracking branch 'upstream/develop' into Quadrants 2019-02-27 14:05:46 +01:00
Matthew Heguy
21a3b9cea7 Fix map gen settings 2019-02-26 23:34:49 -05:00
Matthew Heguy
014b249f87 Wood gone, raw-wood to wood 2019-02-26 15:45:04 -05:00
Matthew Heguy
08371d5e06 high-tech-science-pack 2019-02-26 14:34:38 -05:00
Matthew Heguy
95ebb4a239 Sciences 2019-02-26 14:25:19 -05:00
Matthew Heguy
09ef833dd2 Remove steel-axe, iron-axe 2019-02-26 14:08:49 -05:00
plague006
6fab882c2f Fix for possible nil item in on_player_built_tile 2019-02-24 21:40:08 -05:00
plague006
dbe746ce8d Drop unnecessary tables. 2019-02-24 16:58:06 -05:00
Ross Newcome
a3092bd13f
Update HilbertSandTrap.lua
Combined ghost and tile-ghost handling
2019-02-24 15:02:18 -05:00
Ross Newcome
0fe69ee85c
Update HilbertSandTrap.lua 2019-02-24 14:31:59 -05:00
Ross Newcome
bfecb67c50
Update HilbertSandTrap.lua
Updated to include suggestions and hotfixes and generally clean up the code a little.
2019-02-24 13:14:17 -05:00
Ross Newcome
2ee83ea4d6
Update HilbertSandTrap.lua 2019-02-22 15:05:08 -05:00
Ross Newcome
80ac9aa954
Update HilbertSandTrap.lua 2019-02-22 14:46:40 -05:00
Ross Newcome
83eeeae5af
Update HilbertSandTrap.lua 2019-02-22 14:12:11 -05:00
Ross Newcome
b259741134
Create HilbertSandTrap.lua
Adding today's map so everyone has access.
2019-02-22 13:47:46 -05:00
Matthew
626fbef3b8
Merge pull request from SimonFlapse/Modded-Diggy-Buffs
[Diggy] Restoring buffs every 61 ticks
2019-02-21 17:02:39 -05:00
Matthew
6d68639307
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:43:01 +01:00
Matthew
a271e9afac
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:42:48 +01:00
Matthew
944aaa15c7
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:42:35 +01:00
Matthew Heguy
184d5fa56d Add event toggles to debugger, increment version of debuggertron 2019-02-21 13:43:40 -05:00
SimonFlapse
1ff4cec8db Fixed spaces after braces 2019-02-21 13:02:15 +01:00
SimonFlapse
5fd207f81e Fixed minimum for old_modifier 2019-02-21 00:47:16 +01:00
SimonFlapse
166be595aa Fixed style and minimum for old_modifier 2019-02-21 00:39:49 +01:00
SimonFlapse
761b2094e2 Item to chest function
Converted builder usage to using any instead of combine
Added item_to_chest that empties the players inventory to a chest if toggled on.

The chest is deleted if emptied by a player
2019-02-20 23:29:10 +01:00
Matthew Heguy
16771be37b Fix typo 2019-02-20 16:58:59 -05:00
Matthew Heguy
3af411faa5 Switch to functions in table, adjust map_loader accordingly 2019-02-20 16:38:34 -05:00
Matthew
6984bfaf87
Merge pull request from SimonFlapse/stash_prehistoric
Added groundhogs, updated dino_island
2019-02-20 09:32:00 -05:00
Matthew Heguy
de36eb81ac Restore uranium 2019-02-20 03:25:18 -05:00
Matthew Heguy
cb69555169 ipairs -> pairs and cleanup if/else for groundhogs 2019-02-20 03:17:09 -05:00
Matthew
0f9ad4b93f
Merge pull request from theorangeangle/oldsci
Toxic_science_jungle.lua
2019-02-20 02:43:31 -05:00
Matthew Heguy
c0461ccf62 Final cleanup 2019-02-20 02:40:58 -05:00
SimonFlapse
fafbe1dd31 Fixed linting error
Caused by merge conflict
2019-02-20 08:26:06 +01:00
theorangeangle
6ac34ea1a5 flamethrower fix 2019-02-19 20:08:05 -06:00
theorangeangle
8fef499864 Added local config changes 2019-02-19 19:49:31 -06:00
SimonFlapse
d1355fb1ad Merge branch 'stash_prehistoric' of https://github.com/SimonFlapse/RedMew into stash_prehistoric 2019-02-19 20:35:06 +01:00
Matthew
74e724ab52
Merge pull request from SimonFlapse/Diggy-fix-buffs
Tweaking level up formula for late late game
2019-02-19 14:24:27 -05:00
Matthew
16fe4a7345
Merge pull request from plague006/apply_lifecycle
Apply lifecycle
2019-02-19 14:13:28 -05:00
plague006
3d8aecf4ae Add config options 2019-02-19 14:04:34 -05:00
plague006
c6bcb2f2c6 Clean up linting, use entity_placement_restriction 2019-02-19 14:04:34 -05:00
SimonFlapse
b16acecc46 Added groundhogs, updated dino_island 2019-02-19 14:04:34 -05:00
Matthew
5f283c90d8
Merge pull request from plague006/entity_restriction
Add generic entity restriction module
2019-02-19 14:02:32 -05:00
grilledham
4696157555 return true for zero area bounding_box entities (bots) 2019-02-19 17:43:53 +00:00
SimonFlapse
34fd76592c Tweaking level up formula for late late game
Tweaking xp gained from infinite research to add 60% towards current level up progress.
Added max level for boosts
2019-02-19 17:24:21 +01:00
SimonFlapse
c72f8fe8ba Revert "Tweaking level up formula for late late game"
This reverts commit c00f786241.
2019-02-19 17:09:12 +01:00
SimonFlapse
c00f786241 Tweaking level up formula for late late game
Tweaking xp gained from infinite research to add 60% towards current level up progress.
Added max level for boosts
2019-02-19 17:02:07 +01:00
SimonFlapse
b5d14f08d9 Added toggle for groundhogs 2019-02-19 14:49:51 +01:00
theorangeangle
779986d458 added back in line 256 2019-02-19 00:41:45 -06:00
theorangeangle
5f593fe275 removed market duplicate (again) 2019-02-19 00:15:31 -06:00
theorangeangle
83cde6bba0 fixed steel axe config 2019-02-19 00:13:50 -06:00
plague006
17a356aa1e USe recipe_locker, remove duplicate line for create_standard_market 2019-02-19 00:51:34 -05:00
theorangeangle
72f1cb12fb
fixed player_force reference 2019-02-18 23:36:29 -06:00
theorangeangle
2004c431ac removed useless lines of code, damn you travis 2019-02-18 22:22:34 -06:00
theorangeangle
e7143988a9 info about what to do in config.lua 2019-02-18 21:58:11 -06:00
theorangeangle
0ac5f831e3 rename 2019-02-18 21:55:22 -06:00
theorangeangle
37e19eea73 fixed mining speed and my API goof 2019-02-18 19:07:09 -06:00
theorangeangle
d6495dcc47 added mapgen settings 2019-02-18 16:04:55 -06:00
theorangeangle
211e751854 removed flamethrowers from market 2019-02-18 15:45:29 -06:00
SimonFlapse
9f1594906c Fixed players being stuck on teleport 2019-02-18 22:36:54 +01:00
theorangeangle
fd826826d7 fixed market items 2019-02-18 15:06:16 -06:00
theorangeangle
afb07c0e11 it works but the market stuff still needs a fix 2019-02-18 12:36:45 -06:00
SimonFlapse
667a1c45e7 Fixed linting error 2019-02-18 14:32:01 +01:00
SimonFlapse
210eb45b39 Restricted build capabilities on other teams land 2019-02-18 14:12:14 +01:00
SimonFlapse
033101c0b0 Minor tweaking of ores 2019-02-18 12:35:58 +01:00
SimonFlapse
c5db1d984e Fixed linting errors 2019-02-18 12:13:14 +01:00
SimonFlapse
d00a2c685a Increased resources for quadrant 2
As per suggestion in 
2019-02-18 11:23:51 +01:00
SimonFlapse
7cc4048627 Added chat information 2019-02-18 10:38:44 +01:00
SimonFlapse
c43dfa526c Updating map info
Preparation for test
2019-02-18 10:30:06 +01:00
SimonFlapse
dadd394901 Added oil for quadrant 3 2019-02-18 09:59:36 +01:00
SimonFlapse
81cdc736b3 Fixed new line at EoL 2019-02-18 09:38:41 +01:00
SimonFlapse
1c762eb502 Removed debugging logs
Forgot to remove writing to log
2019-02-18 09:36:43 +01:00
SimonFlapse
6238dbe09f Fixed multiplayer research 2019-02-18 09:33:05 +01:00
plague006
8ccfe43cef Make lifecycle more readable. 2019-02-18 01:43:59 -05:00
plague006
00991ba5c4 Remove standard market from 1000x 2019-02-18 01:17:14 -05:00
Matthew
06915dd5bb
Merge pull request from plague006/1000x
Add 1000x
2019-02-18 00:50:08 -05:00
SimonFlapse
6d0df6a0fa Technology and research restrictions added 2019-02-17 23:10:41 +01:00
plague006
70d11a46ae Small optimizations, doc refining, scope narrowing 2019-02-17 00:32:43 -05:00
plague006
0ae4cbcf0c Get rid of deep copy 2019-02-16 18:12:49 -05:00
Matthew
e508c9133c
Merge pull request from plague006/create_market_on_launch
Create market on launch
2019-02-16 17:01:51 -05:00
Matthew
3526ccf1e4
Merge pull request from plague006/fix/apocalypse_hail_hydra_desync
Fix/apocalypse hail hydra desync
2019-02-16 16:48:41 -05:00
plague006
d8fea761f8 Add missing layer of table 2019-02-16 14:03:58 -05:00
plague006
a9e4e23024 Balance changes for variable tech costs 2019-02-16 13:58:27 -05:00
plague006
63ccee13c1 Update doc for tetris 2019-02-16 12:49:26 -05:00
plague006
72f68b95a0 Add maps that don't want automatic markets 2019-02-16 00:00:50 -05:00
plague006
39ad01b3fb Fix doc for redmew_surface use 2019-02-16 00:00:24 -05:00
plague006
35af187e63 Autoformat 2019-02-16 00:00:24 -05:00
Matthew Heguy
e4abc69bf2 Merge for rebase 2019-02-16 00:00:18 -05:00
Matthew Heguy
23121cd31d Fix desync
apoc: set data in token rather than relying on passed data to be valid
hydra: move data into Global to allow changes during runtime
2019-02-14 19:02:39 -05:00
Matthew Heguy
fbc57ef0e7 Add apocalypse 2019-02-14 11:44:05 -05:00
Matthew
d48946f357
Merge pull request from plague006/rank_system
Overhaul rank system, command, donator, add probation rank
2019-02-14 11:43:04 -05:00
Lynn
7dfd6e92c9
Merge pull request from plague006/digits
Change digit to string to prevent error (and desyncs)
2019-02-13 18:25:26 +01:00
Lynn
dd93821f51
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-02-13 12:18:40 -05:00
Jayefuu
737dc98a6a
Removed default ability to use landfill.
Landfill removes challenge of making train paths through ore circles. Used to be disabled by command after map creation but is important enough feature of map that it should be set on init.
2019-02-13 08:23:49 +00:00
SimonFlapse
937cdb5ec5 Switching teams added 2019-02-13 08:48:15 +01:00
Matthew Heguy
17cc882b04 Change digits to strings to prevent future errors 2019-02-13 01:10:26 -05:00
Matthew Heguy
cbe82d4edb Change digit to string to prevent error 2019-02-13 00:18:17 -05:00
plague006
a5fd1bce2e Fix outpost_builder, fix redmew_qol.
Add functions to donator and rank system to get full player tables.
2019-02-12 20:22:13 -05:00
Matthew Heguy
28daf88f21 Overhaul rank system, command, donator, add probation rank 2019-02-12 20:22:12 -05:00
Matthew Heguy
ba9409f363 Fix config location 2019-02-12 16:47:09 -05:00
Matthew Heguy
4c0c7ed41c Fix lifecycle mistakes 2019-02-10 22:44:54 -05:00
plague006
a6f6cb4a3f No don't log this, give me the logarithm! 2019-02-10 15:53:09 -05:00
plague006
bcaef1a570 Manually enable loaders in 1000x, improve doc redmew_qol 2019-02-10 15:34:40 -05:00
Matthew
552f8aab2e Merge branch 'develop' into 1000x 2019-02-10 15:34:38 -05:00
plague006
02c19de519 Add 1000x
Add infinite storage chest cost to config
2019-02-07 21:27:24 -05:00
plague006
e574a2dc36 Use lifecycle 2019-02-04 18:02:15 -05:00
grilledham
d3cc27be0c
Merge pull request from plague006/fix/chunklist
Chunklist: Create new table instead of writing to and passing the old event table
2019-02-04 20:46:11 +00:00
SimonFlapse
6e94e3ed5e Merge branch 'develop' of https://github.com/SimonFlapse/RedMew into Quadrants 2019-02-04 19:25:31 +01:00
plague006
9742261a52 Drop deepcopy 2019-02-04 13:22:58 -05:00
grilledham
be84bd1349
Merge pull request from linaori/pling-for-toast
Pling for toast
2019-02-04 16:48:23 +00:00
Matthew
47551adb85
Merge pull request from plague006/day_night
Refactor day_night
2019-02-03 14:15:50 -05:00
plague006
0bdacb7542 Set spawn positions for danger_ores maps 2019-02-03 12:17:43 -05:00
Lynn
9892d1a569 Added a notification sound for toast messages 2019-02-03 11:26:22 +01:00
Lynn
0179a1d96d
Merge pull request from plague006/table
Refine/add functions in Table
2019-02-03 11:17:24 +01:00
Lynn
16af651e10
Merge pull request from plague006/builder_efficiency!
Builder efficiency!
2019-02-03 10:55:11 +01:00
plague006
0a04f1d628 Logs to errors 2019-02-03 00:54:01 -05:00
plague006
8894a5e79d Refactor day_night 2019-02-03 00:54:01 -05:00
plague006
0cf4433034 rotten_apples: Military tech list to dictionary + Autoformat 2019-02-03 00:50:23 -05:00
plague006
37e0700115 Localize functions, get rid of inserts 2019-02-03 00:43:09 -05:00
plague006
d8e865b060 Revert formatting change 2019-02-03 00:18:55 -05:00
Matthew Heguy
6fafdd89bc So long, inserts! 2019-02-03 00:18:55 -05:00
Matthew Heguy
79a5c954fe Localize functions! 2019-02-03 00:18:55 -05:00
plague006
c565907408 Rename contra_spiral 2019-02-02 23:19:10 -05:00
plague006
194efa3d40 Debug removed 2019-02-02 23:08:14 -05:00
plague006
d6e37cdba7 Overhaul with debug included 2019-02-02 23:05:32 -05:00
plague006
f47f0807b0 Copy event table before writing to it. 2019-02-02 21:36:00 -05:00
plague006
3a2019aba8 Don't copy the event table 2019-02-02 18:45:04 -05:00
plague006
f173e06b55 Update doc 2019-02-02 18:29:20 -05:00
Matthew Heguy
25c27a8ac6 Use array_contains 2019-02-02 14:19:29 -05:00
Lynn
2b5405da08 Check if the cause is valid and has a force for hydra spawns 2019-02-02 20:01:39 +01:00
plague006
f944fe528a Change danger_ore_banned_entities to reflect changes in restrictentities
Make feedback clearer
2019-02-02 13:36:31 -05:00
plague006
c6e2e73318 Fixes for: typos, remove_ functions, sending invalid objects, logic for checking what entities to destroy
Change: logic function to keep_alive_callback
Add: on_pre_restricted_entity_destroyed event
2019-02-02 13:36:31 -05:00
plague006
76b9f54ce8 Change danger_ore 2019-02-02 13:36:31 -05:00
plague006
3928aa68c9 Add player to event details 2019-02-02 13:36:31 -05:00
plague006
bb6ca43f2c Add generic entity restriction 2019-02-02 13:36:31 -05:00
plague006
139b6a39b1 Change default map to match change to map_loading 2019-02-02 12:19:31 -05:00
plague006
d0072f8e28 Add case for non-function, non-true being returned 2019-02-02 11:22:53 -05:00
grilledham
786cb0e8cc load map selection first 2019-02-02 14:39:22 +00:00
plague006
3addcb6c99 Add config options 2019-02-02 00:01:35 -05:00
plague006
8f6f02b47c Move files to appropriate locations, tweak doc in control 2019-02-01 20:12:45 -05:00
plague006
dedfc52c98 Clean up linting, use entity_placement_restriction 2019-02-01 19:05:12 -05:00
SimonFlapse
71478d937e Added groundhogs, updated dino_island 2019-02-01 19:02:47 -05:00
plague006
fb84c3e684 Update diggy doc location 2019-01-31 20:17:41 -05:00
Matthew
6aed6d6317
Change map loading method ()
Add map loader
2019-01-31 20:15:41 -05:00
plague006
a7c7e6c6a2 Fix lint in crashsite 2019-01-31 19:23:26 -05:00
grilledham
5bc0e2087f removed unused variable 2019-01-31 17:19:05 +00:00
grilledham
370a17fe44 toast 2019-01-31 17:16:37 +00:00
Matthew Heguy
edbc81d81d Another try at fixing dimensions' lint warnings 2019-01-30 18:57:08 -05:00