Matthew Heguy
bdc5d2ae77
Revert change to utils.task refs
2018-11-27 17:08:27 -05:00
Matthew Heguy
3fa0091971
Change existing code to use new utility functions
2018-11-27 17:08:26 -05:00
Matthew Heguy
c7201e119b
Rename utils and fix requires
2018-11-27 17:08:26 -05:00
SimonFlapse
d971075da0
admin mentions now require pre, or postfix
2018-11-27 20:12:50 +01:00
Matthew Heguy
40f20bd2d3
Use string.format
2018-11-27 13:39:08 -05:00
Matthew
06a1a1927a
Merge branch 'develop' into chat_triggers
2018-11-27 13:39:05 -05:00
grilledham
6667ab3e11
updated docs
2018-11-27 16:54:41 +00:00
grilledham
5585c0357b
fixed printing regulars and donators to all players
2018-11-27 16:51:15 +00:00
grilledham
3e56fe32b8
removed defines.events.on_server_started
2018-11-27 14:48:45 +00:00
grilledham
031c8b82d9
added nil check for regulars and donators fetched from web
2018-11-27 14:47:37 +00:00
Matthew Heguy
7cbf650e63
Add explicit luacheck ignore when defining on_server_started
2018-11-27 07:50:07 -05:00
James
f010eb0119
moved server and serverCommands module to features + added more documentation to server
2018-11-27 12:32:33 +00:00
Matthew
2bc69414e0
Merge branch 'develop' into server-module
2018-11-26 21:12:36 -05:00
Matthew
b142939c5f
Overhaul config and global.scenario usage ( #466 )
2018-11-27 01:09:52 +01:00
grilledham
cb9b8e3ecc
changed logic to remove regular's old name
2018-11-26 19:39:51 +00:00
Lynn
d80becdc9b
I need Herr Stickler's approval
2018-11-26 18:11:32 +01:00
Lynn
8fe49e8930
Added a market retailer to manage the markets
2018-11-26 18:11:32 +01:00
grilledham
4e000efbb8
added missing server require
2018-11-26 16:55:12 +00:00
grilledham
420b584228
removed unused function donators
2018-11-26 16:50:38 +00:00
grilledham
7a4700052c
Merge branch 'develop' of https://github.com/Valansch/RedMew into server-module
2018-11-26 16:10:08 +00:00
Matthew Heguy
17af2498f8
Have get_player return nil if no index/player
2018-11-26 10:50:06 -05:00
grilledham
218f53da83
fixed donator_messages
2018-11-26 12:40:38 +00:00
Matthew
6697f4cb99
Delete features/silly_player_names.lua -- fixes 508f75c4b9 ( #462 )
2018-11-26 13:11:38 +01:00
Matthew
b5477034b7
Move infinite storage ( #463 )
2018-11-26 13:11:26 +01:00
Matthew
1332ad5a8d
Move spawn control ( #456 )
2018-11-26 13:10:37 +01:00
grilledham
018675c9c4
user_groups to sync regulars with server
2018-11-26 11:44:27 +00:00
Matthew Heguy
de87998299
Break chat_trigger functions apart
2018-11-26 01:52:43 -05:00
grilledham
297c99d204
Merge branch 'develop' of https://github.com/Valansch/RedMew into server-module
2018-11-25 19:18:58 +00:00
grilledham
3768a6a3ca
merge develop
2018-11-25 11:54:06 +00:00
SimonFlapse
b240b278f6
Minor changes based on feedback
2018-11-25 12:53:05 +01:00
SimonFlapse
7b031a7c9d
Tweaking Diggy controls
...
Fixed rockets not giving experience and converted it to 1% of total experience.
Decreased player died deduct to 0.2%
Increased xp from rocks by 1 every fifth level
Increased xp from bots by about 1 every tenth level.
Increased early science XP reward (doubled for red and green, 50% for black and blue)
Level 100 is not 19,990,000 XP (Down from 30 million)
Starting XP is 400.
2018-11-25 02:27:41 +01:00
Matthew
caca778ec5
Merge pull request #446 from Refactorio/bot_removal
...
Delete bot.lua
2018-11-24 10:49:02 -05:00
Valansch
cc17b0205e
Delete bot.lua
2018-11-24 14:25:49 +01:00
Lynn
1d876ed1ff
Fixed merge and cleanups
2018-11-24 13:53:06 +01:00
Simon
22c21011ab
Diggy - New leveling system ( #402 )
...
* Basic setup for Force Control
* Buffs transitioned to new level system
Implemented level up buffs (Also made a double value avaliable at certain levels)
Added experience for research, rocket launched, mined rocks
Removing experience on player death. 0.5% of total experience
Added total_experience to ForceControl.lua
Refactored util/game.lua
* Transfered market item unlocks
Made Market Items unlock through the force control system.
Removed stone from mined stone
* Initial conversion of market items to coins
* Started biter killing giving XP
* XP for killing enemies. GUI update
* Made ForceControl.remove_experience return the actual removed experience
* Got my head and mind back, also fixed progress bar saying long numbers
* Changed get_market()
* Brand new formula, CI review changes
* Update CHANGELOG.md
2018-11-24 10:45:43 +01:00
Jayefuu
1940b56ddf
Added /find command to act the same as find_player ( #417 )
...
* Added /find command to act the same as find_player
* Remove find-player, fix case of /regular demote
2018-11-24 10:42:53 +01:00
Matthew
55aaf19b48
Add player renaming ( #428 )
...
* Add player renaming from auto-generated names
* Give admins IDs on name changes
2018-11-23 18:08:44 +01:00
Matthew
b9e360ce3a
Shift command logging to free_item_logging, fix cases of server as actor ( #427 )
...
Shift command logging to free_item_logging, fix cases of server as actor
2018-11-23 18:07:44 +01:00
grilledham
163f04789d
Merge branch 'develop' of https://github.com/grilledham/RedMew into server-module
2018-11-23 11:44:20 +00:00
Matthew
8db491634d
Fix nil ref in train_station_names Closes #440 ( #441 )
2018-11-23 01:03:15 +01:00
plague006
af9fe138fb
Fix null ref (event.player_index nil if server)
2018-11-22 07:17:07 -05:00
plague006
857baf6c5e
Don't define global as a local
2018-11-21 17:56:52 -05:00
plague006
7f8eb83e55
Add check in case walkabout.lua isn't loaded.
2018-11-21 17:56:23 -05:00
Matthew Heguy
e6dda20e41
All tabs to spaces
2018-11-21 08:42:39 -05:00
Matthew Heguy
9b064af399
Change wording to be more clear
2018-11-21 07:53:00 -05:00
Matthew
57d24e68e1
Resources cleanup ( #412 )
...
* Export single quotes instead of double
* Autoformat (with quote-changing disabled)
2018-11-20 11:47:46 +01:00
Matthew
96ab772393
Autoformat ( #415 )
2018-11-20 11:46:32 +01:00
Matthew
c9369c3d14
Features cleanup ( #414 )
...
* Fix scoping, var names, unused functions, etc.
* Autoformat
2018-11-20 11:46:19 +01:00
Matthew Heguy
026b3b96c9
Remove add_command for walkabout in custom_commands
2018-11-19 15:39:03 -05:00
grilledham
01a2d61f9d
merge develop
2018-11-19 20:13:40 +00:00
Lynn
e10371784f
Merge pull request #404 from plague006/market
...
Fish market: split messages out, cover cases of no character and disconnected player
2018-11-19 20:12:08 +01:00
Matthew
aff0452fd8
Merge pull request #398 from plague006/walkabout
...
Split walkabout from custom_commands
2018-11-19 13:35:58 -05:00
Matthew Heguy
8a9da5eaad
Use variable after checking it rather than before
2018-11-19 13:35:21 -05:00
plague006
d460dceed8
Fish market: split messages out, cover cases of no character and disconnected player
2018-11-19 12:08:26 -05:00
grilledham
4f99e1353c
merge develop
2018-11-19 16:07:15 +00:00
Matthew
5a60a55a64
Merge pull request #400 from plague006/fix/jail_shooting
...
Fix order of operations in jailing
2018-11-19 10:24:41 -05:00
grilledham
196db1914f
Utils.player_print -> Game.player_print
2018-11-18 23:49:58 +00:00
Simon
e25412d0d9
Merge pull request #387 from SimonFlapse/Chat-Mention-Fix2
...
Added @ to mention triggers also allowed the prefix as a postfix. Case insensitive mentions.
2018-11-18 22:42:32 +01:00
SimonFlapse
ae46cc447b
Made mentions case insensitive
2018-11-18 22:41:24 +01:00
plague006
ee717872a3
Fix formatting
2018-11-18 16:26:43 -05:00
plague006
12f1b607dc
Change jail order of operations
2018-11-18 16:26:13 -05:00
SimonFlapse
4ef7de7898
"Go to bed simon"
2018-11-18 21:49:43 +01:00
SimonFlapse
8e770f6052
Setting shooting state seems not to work.
...
Locks the player into shooting.
Moved the logic above the permission setting
2018-11-18 21:45:02 +01:00
SimonFlapse
662398069d
changed output
2018-11-18 21:29:05 +01:00
SimonFlapse
0e6ba3e2cb
Prevents walking when jailed
2018-11-18 21:24:35 +01:00
SimonFlapse
3876402e87
Second attempt to fix server crash
2018-11-18 21:23:19 +01:00
SimonFlapse
11038fcda2
Attempt to fix server crash on server jail/unjail
2018-11-18 21:13:45 +01:00
SimonFlapse
08b54e44af
Added jail to playerlist report for admins and toggle jail in showreports
2018-11-18 20:34:18 +01:00
plague006
f2fbd45374
Make local copy of walking_storage
2018-11-18 14:07:03 -05:00
plague006
3a83d4182a
Split walkabout from custom_commands
...
Fix walkabout edge cases
Closes #22
2018-11-18 14:03:33 -05:00
Valansch
7fa48bc583
Changed all windows style line endings to unix style line endings ( #393 )
2018-11-18 17:12:00 +01:00
Lynn
1c91520160
Added force_control.lua to track force levels ( #338 )
...
* Added force_control.lua to track force levels
* Allow force only registration for level ups
2018-11-18 17:05:45 +01:00
Simon
00c5f8c8ab
Fish Market update. Better description for boosts and train savior item ( #389 )
...
* Changed small-plane
* Updated boost description
* Clarified train savior item from market
* Fixed SHIFT click on train savior item
2018-11-18 16:23:51 +01:00
SimonFlapse
5c5c59c396
Added @ to mention triggers also allowed the prefix as a postfix
...
Avaliable triggers now:
admin moderator @SimonFlapse #SimonFlapse SimonFlapse@ SimonFlapse#
(@SimonFlapse might trigger discord)
2018-11-18 13:26:15 +01:00
Lynn
247b1df7f4
Merge pull request #377 from Valansch/dev_diggy_antigrief
...
fixed report desyncs
2018-11-18 13:22:18 +01:00
Valansch
11c297c31d
Update custom_commands.lua
2018-11-18 13:21:08 +01:00
Maik Wild
ab04ac5b4c
fixed dual use of same variable name 'target' in custom_commands.lua:jail
2018-11-18 13:19:41 +01:00
Valansch
4a27ab0545
Changed command logging ( #386 )
2018-11-18 13:10:11 +01:00
Matthew
5beaee7144
Comments to luadoc ( #355 )
...
Add logging to many commands, admin chat notices for a few commands
Overhaul print_admins
2018-11-18 12:59:52 +01:00
Valansch
77df65014b
fixed report desyncs
2018-11-18 12:56:03 +01:00
grilledham
9160612e9c
updates
2018-11-17 18:56:05 +00:00
Lynn
bbd201d2d0
Merge pull request #375 from plague006/fix/player_create
...
Use player print not game print for on join messages
2018-11-17 16:57:29 +01:00
Matthew Heguy
a742c115ba
Make box for new features larger
2018-11-17 09:56:22 -05:00
Matthew Heguy
a76175ad97
Use player print not game print for on join messages
2018-11-17 09:46:14 -05:00
Valansch
0909cdfff8
merged #319
2018-11-17 15:15:49 +01:00
Valansch
028095f135
changed autojail #319
2018-11-17 14:47:59 +01:00
SimonFlapse
ed46ed2b5b
Changed how the player not found works for moderators and admins
2018-11-17 14:28:21 +01:00
SimonFlapse
c9b4e596cc
Removed prefix for admin and moderator
2018-11-17 14:22:51 +01:00
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
Matthew
fe84d14aa8
Shift elements around, remove "other servers", add train savior info ( #356 )
2018-11-17 12:59:51 +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
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
SimonFlapse
98d8a1ae6f
Fixed chat mentions for MP
2018-11-16 21:32:38 +01:00
grilledham
ad4d1e20d3
merge develop
2018-11-16 16:34:37 +00:00
Matthew
5523cc50d8
Create player fix ( #350 )
...
* Finish removing admin promote
* Fix errors from merge
2018-11-15 23:58:21 +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
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
SimonFlapse
3e6b0c32c4
Unnested if statement
2018-11-15 16:54:16 +01:00
SimonFlapse
f17f4ea312
Added admin and moderator mentions
2018-11-15 16:46:04 +01:00
SimonFlapse
7a0a945da8
Changed trigger to #, preventing discord mentions
2018-11-15 16:26:40 +01:00
SimonFlapse
948ed4ab1f
Minor text changes and _DEBUG options
2018-11-15 16:03:46 +01:00
SimonFlapse
560cf2575c
Added logic for detecting a @mention in chat
2018-11-15 15:06:03 +01:00
Matthew
bb3100e28c
Remove local ref for submit button ( #331 )
2018-11-14 16:41:15 +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
Valansch
f1d4bf739c
Update player_list.lua
2018-11-12 19:24:53 +01:00
Valansch
2cd0b397d5
implemented autojail on too many collapses
2018-11-12 17:59:25 +01:00
Maik Wild
d260addc2e
merged PR #292
2018-11-11 22:18:46 +01:00
Maik Wild
f4a04b021e
merged #293
2018-11-11 21:45:23 +01:00
Maik Wild
9ce662daf9
merged #295
2018-11-11 21:12:49 +01:00
Maik Wild
1794bed816
merged #296
2018-11-11 20:52:53 +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
plague006
bd6ac80b09
Log items spawned by crafting in cheat mode
2018-11-11 11:02:38 -05:00
plague006
27bc52680e
Add newline to eof
2018-11-11 10:12:04 -05:00
plague006
818391707e
Move features into features folder
2018-11-11 03:08:50 -05:00
plague006
cf95bcfc62
Split donator/on_join messages out of control
2018-11-10 23:58:57 -05:00
plague006
e64a0fa3e9
Remove player-specific code
2018-11-10 23:52:04 -05:00
plague006
48dcdc1a34
Move cheat tracking outside of control.lua
2018-11-10 23:49:36 -05:00
plague006
d45a486cde
Split chat triggers from control
2018-11-10 23:00:33 -05:00
