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

492 Commits

Author SHA1 Message Date
Rdjrjqouqcu
57ca881864 allowed color code to work with string values, fixed a small bug with delta_colors parameter 2018-11-15 13:10:41 -05:00
Simon
cd1ce8e221 Redraw stone sent to surface GUI on stone sent (#339)
* Moved GUI to top left and removed focus

* redrawing stone gui on market update
2018-11-15 19:09:05 +01:00
Rdjrjqouqcu
201c5e1f45
Merge branch 'develop' into dev_diggy_compound_clusters 2018-11-15 03:22:24 -05:00
Rdjrjqouqcu
861794b09d modified ScatteredResources to add a compound_cluster mode which allows for different weight and generation settings to apply to different groupings of resources 2018-11-15 02:56:18 -05:00
Rdjrjqouqcu
4c8ed2ea85 Moved changes to a seperate function and converted the method to work generically with different colors 2018-11-14 22:31:44 -05:00
Lynn
ebc5b58320
Merge pull request #318 from SimonFlapse/Stone-Reward-Makeover
Isolated market items and buffs
2018-11-14 18:08:53 +01:00
Lynn
771ef0a79c
Merge pull request #335 from SimonFlapse/Diggy-Luadoc
Added Luadoc for NightTime.lua
2018-11-14 17:00:36 +01:00
SimonFlapse
f450b73204
Update NightTime.lua 2018-11-14 16:56:20 +01:00
Matthew
cf4b8fc73a Maltese crossings fixed (#332) 2018-11-14 16:40:31 +01:00
SimonFlapse
b32afe36c2 Updated LuaDoc 2018-11-14 13:45:36 +01:00
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
SimonFlapse
87b3ac197b Added Luadoc for NightTime.lua
Also added .gitignore for intellij /.idea folder
2018-11-14 13:08:47 +01: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
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
7b94bdeebc small tweak for rare exact cases 2018-11-13 11:15:28 -05:00
Rdjrjqouqcu
6803267b89 changed colors to go from green to red, and turn white on collapse 2018-11-13 11:13:22 -05:00
Rdjrjqouqcu
f210f7a828 converted chances in config to weights 2018-11-13 10:39:41 -05: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
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
27513ddb62 Update diagonal_ribbon.lua (#322) 2018-11-12 19:25:28 +01:00
Valansch
2cd0b397d5 implemented autojail on too many collapses 2018-11-12 17:59:25 +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
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
Matthew
c4eca72471 Check for config before disabling fish market (#311) 2018-11-11 22:02:13 +01:00
Matthew
77eef06f06 Add Diagonal Ribbon to map presets (#294) 2018-11-11 20:54:57 +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
Lynn
53d7a12216
Merge pull request #303 from SimonFlapse/NightTime-and-SolarPanel-Popup
Night time and solar panel popup
2018-11-11 17:00:41 +01:00
grilledham
9be688c92f crash_site outposts set hidden tile to 'grass-1' 2018-11-11 15:36:33 +00:00
SimonFlapse
0137bda0bd Fixed no newline, indentation and scope of research 2018-11-11 16:24:09 +01:00
grilledham
7fa2173e70 added support for hidden tiles 2018-11-11 15:08:35 +00:00
Lynn
8bce3e6b77 Fixed debug print grid value to show non-rounded value 2018-11-11 15:52:51 +01:00
SimonFlapse
1919a34aa0 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.
2018-11-11 15:47:51 +01:00
Lynn
095cf93233 Consistency change regarding table access 2018-11-11 15:11:47 +01:00
Lynn
44be58f19d Make sure biter modifiers are accessible for mods 2018-11-11 15:02:06 +01:00
plague006
818391707e Move features into features folder 2018-11-11 03:08:50 -05:00
Matthew
1f32919708 Add scenario info for crashsite (#291) 2018-11-11 03:35:58 +01:00
plague006
488a38f89b Add Creepy map preset 2018-11-10 16:04:48 -05:00
Lynn
306a0fda8f Track artefacts launched into space 2018-11-10 19:48:12 +01:00
Lynn
4e9fb07cbc Added coin loot from biters and mining 2018-11-10 19:35:19 +01:00
Lynn
44423f529b Added a noise based chest spawning system for artefacts 2018-11-10 19:33:35 +01:00
Valansch
d48676bcc5 [diggy] landfill now spanws dirt-[1-7] #276 2018-11-10 17:47:08 +01:00
SimonFlapse
3b6a3e1d6e Increased evolution
Increased evolution_factor by 50%. (0.0000008 -> 0.0000012)
Increased pollution_factor by 100% (0.00002 -> 0.00004)

Created on_init() in AlienSpawner and moved the pollution_factor here from StartingZone.on_init()

Fixes #281
2018-11-10 14:10:30 +01:00
Jayefuu
1267f0fcf3
Added bot ore islands, use bool flag to turn on. 2018-11-10 06:40:35 +00:00
Valansch
7624263d8c
Merge branch 'develop' into global_removal 2018-11-09 23:49:23 +01:00
Lynn
a4605041bb
Merge pull request #267 from iltar/noise-based-resource-spawning
Added noise based cluster resources
2018-11-08 18:57:19 +01:00
Lynn
36758c2fbe
Merge pull request #271 from iltar/character-item-modifier-text
Added scrolling text popups and UX for market chests
2018-11-08 18:57:02 +01:00
Lynn
20816d2898 Remove global sync as it's not used 2018-11-07 19:14:34 +01:00
Valansch
a80cddfc51
Merge pull request #269 from iltar/reduce-room-opening-frame-drops
Reduce cave opening frame drops
2018-11-07 11:59:48 +01:00
Lynn
675e8fb0f5 Added scrolling text popups and UX for market chests 2018-11-06 21:36:11 +01:00
Lynn
fd10db3915 Added landfill to the market 2018-11-06 19:27:55 +01:00
Lynn
8671258aa0 Reduce cave opening frame drops 2018-11-06 19:12:58 +01:00
Lynn
e132765537 Small optimizations 2018-11-06 18:53:29 +01:00
Lynn
bee981f367 Added noise based cluster resources 2018-11-06 18:48:58 +01:00
Valansch
66df4a9a67 made degrees local 2018-11-06 13:09:21 +01:00
Valansch
8562c2663e removed some _G entries 2018-11-06 12:55:52 +01:00
der-dave
5ce6341487 Update map_gen/Diggy/Feature/MarketExchange.lua
update #2
2018-11-05 19:19:23 +01:00
der-dave
cc33c95eac Update map_gen/Diggy/Feature/MarketExchange.lua
new progressbar and smaller improvements
2018-11-05 19:03:27 +01:00
Valansch
d2f6fecaf1
Merge pull request #260 from plague006/nightfall_desync_fix
Make certain variables in nightfall global to prevent desyncs
2018-11-02 00:43:07 +01:00
plague006
64788b7646 Add creep spread mechanic 2018-10-30 01:52:26 -04:00
plague006
d0f45ad253 Make certain variables global to prevent desyncs 2018-10-29 14:47:52 -04:00
grilledham
32c22d2197 Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2018-10-27 13:48:09 +01:00
Valansch
dd31190635
Players die on collapse now 2018-10-27 14:47:14 +02:00
grilledham
1db8b82cf3 Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2018-10-27 13:29:05 +01:00
Valansch
06479dba79
Merge pull request #248 from iltar/small-fixes-after-second-run
Balance changes and fixes based on the second play
2018-10-27 00:00:51 +02:00
Valansch
d1d62d9c5d
Merge branch 'develop' into nightfall 2018-10-26 23:56:37 +02:00
Valansch
19088ffd0a added on_interval 2018-10-26 23:45:34 +02:00
Matthew
7594d98600 Add the ability to lock players into cars (#250) 2018-10-26 16:58:03 +02:00
Valansch
904e15f8bd
Merge pull request #256 from der-dave/dev_diggy_bufflist
Improved version of diggy buff list
2018-10-26 16:57:17 +02:00
Lynn
5248e4b9b6 Reworked the documentation structure 2018-10-25 19:50:00 +02:00
der-dave
47aff764f0 Update map_gen/Diggy/Feature/MarketExchange.lua
3rd version
2018-10-25 17:53:14 +02:00
Steven Leibrock
07910b598d
Swapping Diggy readme installation instruction lines 2018-10-25 11:13:46 -04:00
der-dave
fd54e28198 Update map_gen/Diggy/Feature/MarketExchange.lua
2nd version
2018-10-25 15:30:56 +02:00
der-dave
45a8afc5d4 Update map_gen/Diggy/Feature/MarketExchange.lua
first checkin
2018-10-25 12:34:50 +02:00
plague006
27063e0eef Local count_entities_filtered 2018-10-23 22:12:25 -04:00
plague006
1ed2b884cb Local get_pollution 2018-10-23 22:11:21 -04:00
plague006
15d699babd Local insert 2018-10-23 21:55:44 -04:00
plague006
c076a707e9 Local random 2018-10-23 21:53:54 -04:00
plague006
d092b8f51f Time interval to prime number 2018-10-23 21:52:52 -04:00
plague006
27b179bd4f Tabs to spaces 2018-10-23 14:46:23 -04:00
Lynn
1c4dce0b86
Rename advanced diggy readme section to step 5 2018-10-23 18:30:58 +02:00