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

549 Commits

Author SHA1 Message Date
Lynn
a52e9f710c Improved biter spawning algorithm (#408)
* Improved biter spawning algorithm

* HAIL HYDRA, biter hell
2018-11-21 15:26:04 +01:00
Matthew Heguy
e6dda20e41 All tabs to spaces 2018-11-21 08:42:39 -05:00
Matthew
8b74f104fc Formatting (#420) 2018-11-21 14:35:47 +01:00
Matthew
691d47cbd0 Cleanup map_gen/shared (#421)
* Cleanup whitespaces+tabs

* Tabs to spaces
2018-11-21 14:34:19 +01:00
Matthew
c9369c3d14 Features cleanup (#414)
* Fix scoping, var names, unused functions, etc.

* Autoformat
2018-11-20 11:46:19 +01:00
Lynn
bb05785c79 added cause and force to the entity died 2018-11-18 19:21:39 +01:00
Lynn
7b51db1ac0 Prevent rocks from dying and spilling on dmg taken 2018-11-18 19:15:45 +01:00
Valansch
7fa48bc583
Changed all windows style line endings to unix style line endings (#393) 2018-11-18 17:12:00 +01:00
Simon
bdfd122f3c Changed first popup from full inventory to ping (#392) 2018-11-18 17:06:23 +01:00
Lynn
74fa8009fa Mining related improvements (#391)
* Fixed manual mining overflow hints

* Smaller memory footprint for collapse message
2018-11-18 16:48:28 +01:00
Lynn
3ac668c731
Merge pull request #390 from SimonFlapse/Diggy-Market-Text
Changed the level up chat messages for diggy
2018-11-18 16:42:17 +01:00
SimonFlapse
cb0daa31bf Changed Debug to Diggy specific debug.print() 2018-11-18 16:40:37 +01:00
SimonFlapse
e399370292 Less prints at level up 2018-11-18 16:25:56 +01:00
Lynn
988713d258 Fixed room loot spill (close to permanently) (#388) 2018-11-18 16:23:25 +01:00
SimonFlapse
7adcc96de3 Changed the level up chat messages 2018-11-18 15:53:25 +01:00
Lynn
247b1df7f4
Merge pull request #377 from Valansch/dev_diggy_antigrief
fixed report desyncs
2018-11-18 13:22:18 +01:00
Matthew
654216f149 Add day/night cycle options (#360)
* Add day/night cycle options

* txt to markdown and fix formatting errors
2018-11-18 13:00:22 +01:00
Maik Wild
1e5ea9c58f Revert "Removed unused config (#378)"
This reverts commit 230600cf5c.
2018-11-18 12:56:45 +01:00
Valansch
58a74fe13a added Antigrief.lua 2018-11-18 12:56:03 +01:00
Lynn
dd7b546caa
Merge pull request #385 from SimonFlapse/Diggy-Market-Item-Fix
Added iron-axe to market
2018-11-18 11:48:07 +01:00
Rdjrjqouqcu
19e278bba0 Fixes how generating big rocks causes multiple ores to be spawned on the same tile 2018-11-17 22:58:18 -05:00
Lynn
ddbe32bf70
Merge pull request #380 from damium/patch-1
Move level up logic outside of unlock check loop
2018-11-17 20:55:30 +01:00
Lynn
230600cf5c Removed unused config (#378) 2018-11-17 20:48:33 +01:00
damium
af8b2b6bc8
Move level up logic outside of unlock check loop 2018-11-17 11:07:20 -08:00
SimonFlapse
50062fbce8 Added iron-axe 2018-11-17 15:56:52 +01:00
Valansch
4e34d33dcd Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2018-11-17 15:15:52 +01:00
Valansch
0909cdfff8 merged #319 2018-11-17 15:15:49 +01:00
Valansch
af8c00ea43 converted newlines to unix 2018-11-17 15:07:36 +01:00
Lynn
f249cab9df Updated readme and minor perf fix 2018-11-17 14:52:56 +01:00
Valansch
028095f135 changed autojail #319 2018-11-17 14:47:59 +01:00
SimonFlapse
c9b4e596cc Removed prefix for admin and moderator 2018-11-17 14:22:51 +01:00
Lynn
8ad66f70b3
Merge pull request #369 from SimonFlapse/Diggy-Market-Items
[Diggy] Armor items in market
2018-11-17 13:36:10 +01:00
Simon
47fe6c8dc0
Removed gold fish reminder 2018-11-17 13:36:04 +01:00
Jayefuu
c48f31fbe6 Added grid_islands_rotated.lua to map presets. (#363) 2018-11-17 13:33:23 +01:00
SimonFlapse
7dab50d72a Added more items (NUKE!) and spread it further out
Nuke shouldn't be used, thus the high price. It's almost purely for SP and to give players an achievement feeling at level 100
2018-11-17 13:27:02 +01:00
Rdjrjqouqcu
a2ab7d06fd resolved indentation issues 2018-11-17 07:24:26 -05:00
Rdjrjqouqcu
0e6e879347 changes, courtesy of BlueTemplar 2018-11-17 07:17:49 -05:00
Lynn
b33e75570d Fixed unused requires 2018-11-17 12:35:05 +01:00
Lynn
bd54efd1ac
Merge pull request #341 from Rdjrjqouqcu/dev_diggy_compound_clusters
Created a compound cluster mode for scattered resources.
2018-11-17 12:19:57 +01:00
Rdjrjqouqcu
8084e7b029 Forgot to tweak minimum distance from origin for tendrils so all ores started >30 tiles away from the start 2018-11-17 05:55:35 -05:00
Rdjrjqouqcu
9ac3f0a370 Seperated the configs to be defined in a different file, reducing the length of the main config file 2018-11-16 20:55:42 -05:00
Rdjrjqouqcu
027bbe4498 Updated the configs so you can optionally define a color for the debug print ore location config 2018-11-16 20:37:33 -05:00
SimonFlapse
9967684194 Added multi item prices and new items
Also spread out the item unlock further
2018-11-17 00:33:10 +01:00
Rdjrjqouqcu
8ff0fd64cc updated configs to give approximately the same resource concentrations as the original map. Changed default mode to tendrils only 2018-11-16 17:50:01 -05:00
SimonFlapse
bede8be09a on_nth_tick update for ArtefactHunting GUI 2018-11-16 23:08:31 +01:00
Lynn
bbff4e512b
Merge pull request #367 from SimonFlapse/Diggy-Gui-Fix
Fixed Diggy GUIs and more
2018-11-16 22:52:10 +01:00
Lynn
2613471da1
Merge pull request #366 from iltar/small-fixes
Some small artefact fixes
2018-11-16 22:44:51 +01:00
SimonFlapse
9a64bb3a1b Fixed Diggy GUIs and more 2018-11-16 22:43:41 +01:00
Lynn
52c818f9dd Some small artefact fixes 2018-11-16 22:32:16 +01:00
Lynn
21bd95137d Fixed some typos 2018-11-16 20:20:59 +01:00
der-dave
57955cdd86 fixes 2018-11-16 19:36:29 +01:00
der-dave
3299280c64 Added basic scoretable GUI and moved comma_value to utils 2018-11-16 17:13:45 +01:00
Rdjrjqouqcu
01a80062ea Added tendril generation modes, removed old cluster generation method 2018-11-15 21:01:08 -05:00
Rdjrjqouqcu
2f87fce7bb Merge branch 'develop' into dev_diggy_compound_clusters 2018-11-15 20:10:43 -05:00
Simon
218f50d574 Diggy - Gamebreaking fix (#352)
* Fix for market being stuck at level 3, 11, 13, 16 and 30

* Reverted assignment of current_level to prevent progressbar to bug out
2018-11-16 00:20:21 +01:00
Matthew
263b8fb680 Diagonal_ribbon postmortum (#348) 2018-11-15 21:01:46 +01:00
Valansch
9b102a898d
Merge pull request #328 from Rdjrjqouqcu/dev_diggy_stress_colors
Dev diggy stress colors
2018-11-15 20:02:06 +01:00
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