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

1523 Commits

Author SHA1 Message Date
SimonFlapse
47617cc5e9
Merge branch 'develop' into Stone-Reward-Makeover 2018-11-14 13:26:31 +01:00
SimonFlapse
2a80a1ff5a Merge conflict for map_gen.Diggy.Config.lua solved 2018-11-14 13:20:38 +01:00
grilledham
3b9247fc90 more builder functions 2018-11-14 12:16:42 +00:00
Lynn
a366d3aaf9
Merge pull request #329 from Rdjrjqouqcu/dev_ore_weights
ore weights instead of chances
2018-11-14 09:56:01 +01:00
SimonFlapse
ac5f003322 Added luadoc for new files 2018-11-14 01:41:39 +01:00
SimonFlapse
f0a1c44d3d Fixed broken level up 2018-11-14 00:23:44 +01:00
grilledham
d4324c857e
Merge pull request #330 from Jayefuu/develop
Added maltease_crossings.lua preset.
2018-11-13 22:54:41 +00:00
grilledham
5a65a7caff maltease_crossing fixes 2018-11-13 22:53:03 +00:00
grilledham
ccb9f040ee Merge branch 'develop' of https://github.com/Jayefuu/RedMew into develop 2018-11-13 22:45:26 +00:00
SimonFlapse
c87511d0c0 Infinite levels, Configuable calculations and fixes
Added true infinite levels and the ability to configure the stone requirements calculation from the config.lua file.

Moved MarketUnlockables out ouf Diggy.feature, but needed to create another file to handle the formating of adding market items. Could maybe revert back to the longer format to remove the need for it. (Only possible now because I removed the stone setting from items and made MarketExhange calculate it everytime.)
2018-11-13 23:33:39 +01:00
Jayefuu
b8faa1bf51
Added maltease_crossings.lua preset. 2018-11-13 21:45:34 +00:00
Rdjrjqouqcu
3d776d3306 de-tab-ified and precalced weight sums 2018-11-13 13:06:13 -05:00
grilledham
01b27d6146 updated Builders.apply_effect 2018-11-13 16:21:08 +00:00
Rdjrjqouqcu
f210f7a828 converted chances in config to weights 2018-11-13 10:39:41 -05:00
Matthew
9923617fd6 Correct ALo's body color (#326) 2018-11-13 10:29:16 +01:00
Matthew
9f247e156e Move map info to config (#321)
* Move map info to config

* Move map info to config
2018-11-13 00:30:30 +01:00
SimonFlapse
e559187d87 Clarifying the assignment of MarketUnlockables 2018-11-12 22:06:48 +01:00
SimonFlapse
da82a748b1 Added the definition of unlockables back into config.lua
Also added a current level tool tip for the "Progress to next level:" label.

Removed some old comments I forgot
2018-11-12 22:02:18 +01:00
Lynn
2da98c856a
Merge pull request #323 from iltar/fix-oil-spawns
Fixed oil spawn in Diggy
2018-11-12 21:35:57 +01:00
Lynn
94a5a7a2d2 Fixed oil spawn 2018-11-12 21:33:22 +01:00
SimonFlapse
ae78bf47cc
Merge branch 'develop' into Stone-Reward-Makeover 2018-11-12 20:50:06 +01:00
SimonFlapse
2a09ff01c8 Clean-up and merged 2018-11-12 20:45:51 +01:00
SimonFlapse
4258568c90
Catching up (#2) (#3)
* Add creep spread mechanic

* Added bot ore islands, use bool flag to turn on.

* Added a noise based chest spawning system for artefacts

* Added coin loot from biters and mining

* Track artefacts launched into space

* Add Creepy map preset

* Update donators.lua

* Add scenario info for crashsite (#291)

* Split colors resources from colors code & catchup on donators (#288)

* Split colors resources from colors code

* Switch back to colors

* Added jail button

Moved parts of the jail command to report.lua

Made jailing possible from a users report.

closes #215

* Added sound for new reports

Admins now get a sound when a new report is created. Useful for admins that doesn't have Factorio as active window.

Currently set the sound_path as utility/tutorial_notice

* Split chat triggers from control

* Move cheat tracking outside of control.lua

* Remove player-specific code

* Split donator/on_join messages out of control

* Move features into features folder

* Indentation fix

I aimed to fix the troublesome indentation.

* Added a single indent

* Make sure biter modifiers are accessible for mods

* Consistency change regarding table access

* Added NightTime.lua

Split the time assignment into a new file NightTime.lua allowing for it to be disabled. (Restore normal day/night cycle)

Also added a popup when a player places a solar panel informing that they are purely cosmetic

Removed the recipe for portable solar panels because they are useless, but the technology is needed.

* Fixed debug print grid value to show non-rounded value

* added support for hidden tiles

* Add newline to eof

* Fixed no newline, indentation and scope of research

* crash_site outposts set hidden tile to 'grass-1'

* Log items spawned by crafting in cheat mode

* Newline to eof

* Put responses into table

* Use trigger as table key

* Change name of lattice to diagonal lattice (#297)

* Add Diagonal Ribbon to map presets (#294)

* Reorganize control (#312)

* Check for config before disabling fish market (#311)

* Force diggy biters to spawn, even if there's no space (#308)

* Fixed some small things from feedback and issues (#313)

* Update fractal_balls.lua

* Add ALo's message and color (#314)

* Add join message for ALo

* Add ALo's color

* Typo in donators.lua

* fixed tile corruption issus closes #310 (#317)

* Update player_list.lua

* Update diagonal_ribbon.lua (#322)

* Regulars: remove duplicates and sort alphabetically (#320)
2018-11-12 20:23:25 +01:00
Matthew
59adb7f5b0 Regulars: remove duplicates and sort alphabetically (#320) 2018-11-12 19:28:06 +01:00
Matthew
27513ddb62 Update diagonal_ribbon.lua (#322) 2018-11-12 19:25:28 +01:00
Valansch
f1d4bf739c
Update player_list.lua 2018-11-12 19:24:53 +01:00
SimonFlapse
565c4a4481 Isolated market items and buffs
Needs additional testing

I have changed the GUI, and implemented infinite stone progression. Created levels to mask the stone requirement.

Developed on a older branch!
2018-11-12 17:51:55 +01:00
Valansch
817768e59b
fixed tile corruption issus closes #310 (#317) 2018-11-12 15:03:21 +01:00
grilledham
bedb353991
Merge pull request #316 from Kristokaa/patch-1
Typo in donators.lua
2018-11-12 10:42:35 +00:00
Kristokaa
52f2e87cdf
Typo in donators.lua 2018-11-12 10:36:27 +01:00
Matthew
cc2fb368d5 Add ALo's message and color (#314)
* Add join message for ALo

* Add ALo's color
2018-11-12 09:38:05 +01:00
grilledham
d2ca20d93c
Merge pull request #278 from Jayefuu/develop
Added bot ore islands, use bool flag to turn on.
2018-11-11 22:29:28 +00:00
grilledham
078f677d51
Update fractal_balls.lua 2018-11-11 22:28:49 +00:00
Lynn
09df8dd723 Fixed some small things from feedback and issues (#313) 2018-11-11 22:36:00 +01:00
Lynn
3f700fc7b9 Force diggy biters to spawn, even if there's no space (#308) 2018-11-11 22:33:22 +01:00
Maik Wild
39125b1f24 merged #261 2018-11-11 22:31:46 +01:00
Maik Wild
d260addc2e merged PR #292 2018-11-11 22:18:46 +01:00
Matthew
c4eca72471 Check for config before disabling fish market (#311) 2018-11-11 22:02:13 +01:00
Matthew
2076f83601 Reorganize control (#312) 2018-11-11 22:02:04 +01:00
Maik Wild
f4a04b021e merged #293 2018-11-11 21:45:23 +01:00
Maik Wild
97e667ec16 Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2018-11-11 21:16:24 +01:00
Maik Wild
9ce662daf9 merged #295 2018-11-11 21:12:49 +01:00
Matthew
77eef06f06 Add Diagonal Ribbon to map presets (#294) 2018-11-11 20:54:57 +01:00
Maik Wild
1794bed816 merged #296 2018-11-11 20:52:53 +01:00
Matthew
c67408ea5a Change name of lattice to diagonal lattice (#297) 2018-11-11 20:42:11 +01:00
Valansch
dbe845db79
Merge pull request #299 from plague006/features_split
Move features into features folder
2018-11-11 20:37:16 +01:00
Lynn
0244e63213
Merge pull request #289 from iltar/coin-artefact-system
Added a "comeptitive" system, which lets Diggy "matches" compete
2018-11-11 19:39:07 +01:00
plague006
9c9a9b22f6 Use trigger as table key 2018-11-11 12:12:38 -05:00
plague006
fed64c47c6 Put responses into table 2018-11-11 11:59:04 -05:00
plague006
ec9819e723 Newline to eof 2018-11-11 11:08:05 -05:00