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

1694 Commits

Author SHA1 Message Date
SimonFlapse
0541682b1a Merge branch 'develop' of https://github.com/SimonFlapse/RedMew into Chat-Mention-Fix2 2018-11-17 13:47:33 +01:00
SimonFlapse
d89bac1510 Removed prefix for mentions
Add a prefix to avoid mention
2018-11-17 13:46:23 +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
Lynn
9e04cc8e8a
Merge pull request #373 from Rdjrjqouqcu/dev_diggy_huge_rocks
changes, courtesy of BlueTemplar
2018-11-17 13:32:14 +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
Matthew
fe84d14aa8 Shift elements around, remove "other servers", add train savior info (#356) 2018-11-17 12:59:51 +01:00
Matthew
70130ef500 Update regulars (#370) 2018-11-17 12:57:28 +01:00
Matthew
b24801a8ec Extend tables library, split on_create and hodor messages from functions (#357)
* Add table.get_random and table.get_random_weighted

* Rewrite and randomize the messages from on_create

* Split hodor messages resource from function

* Return variable directly instead of adding an extra step

* Change to luadoc
2018-11-17 12:56:03 +01:00
Lynn
f82e64110c
Merge pull request #372 from iltar/fix-requires
Fixed unused requires
2018-11-17 12:48:51 +01: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
SimonFlapse
dc1cdba17a Allowing a single character after a mention
%S is the opposite of %s (space characters) and the plus sign combines all the characters. Names like der-dave.com should work.

Tested expression using: https://regexr.com/
2018-11-17 11:10:11 +01: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
Lynn
8386a10be9
Merge pull request #368 from SimonFlapse/Diggy-Gui-Fix2
on_nth_tick update for ArtefactHunting GUI
2018-11-16 23:13:43 +01: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
b0dd0eaa73
Merge pull request #365 from SimonFlapse/Chat-Mention-Fix
Fixed chat mentions for MP
2018-11-16 22:45:54 +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
2312139494
Merge pull request #362 from iltar/typo-fixes
Fixed some typos
2018-11-16 22:28:20 +01:00
SimonFlapse
98d8a1ae6f Fixed chat mentions for MP 2018-11-16 21:32:38 +01:00
Lynn
21bd95137d Fixed some typos 2018-11-16 20:20:59 +01:00
Lynn
7437b9b835
Merge pull request #361 from der-dave/develop
fixes
2018-11-16 19:39:24 +01:00
der-dave
57955cdd86 fixes 2018-11-16 19:36:29 +01:00
Lynn
bec3fe932a
Merge pull request #359 from der-dave/develop
Added basic scoretable GUI and moved comma_value to utils
2018-11-16 19:26:49 +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
Matthew
8d4f6940ea Add Raiguard's color (#353) 2018-11-16 00:59:35 +01: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
Jayefuu
a508a967d1 Updated from changes to regulars on Server 1 and Server 2 (#347) 2018-11-16 00:00:49 +01:00
Matthew
5523cc50d8 Create player fix (#350)
* Finish removing admin promote

* Fix errors from merge
2018-11-15 23:58:21 +01:00
Matthew
263b8fb680 Diagonal_ribbon postmortum (#348) 2018-11-15 21:01:46 +01:00
Valansch
abab0858e1
Merge pull request #346 from SimonFlapse/Chat-Mentions
Notification sound if mentioned by other players
2018-11-15 20:59:51 +01:00
Matthew
f3f0673ff0 Split create_player from control (#333)
* Split create_player from control

* Remove auto-promote
2018-11-15 20:53:28 +01:00
Simon
f525ba0b06 Made info.gui display on player_created (#340)
* Made info.gui display on player_created

Removed old welcome message and replaced it with a short reminder on how to change keybinding to enable chat.

* removed whitespace
2018-11-15 20:04:03 +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
Simon
6fe10e6e92 Moved report function to cmd_report in report.lua (#337)
* Moved report function to cmd_report in report.lua

* Tried to fix indentation of printed string

* Moved unjail_player out of custom_commands.lua

Also added colors to two messages from the jail/unjail functions. Feedback appreciated

* Added output line to seperate important messages
2018-11-15 19:12:19 +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
SimonFlapse
3e6b0c32c4 Unnested if statement 2018-11-15 16:54:16 +01:00