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

440 Commits

Author SHA1 Message Date
Matthew Heguy
1aed64f717 Fix lint 2019-01-30 19:21:46 -05:00
Matthew Heguy
1d8e315900 Add revive ghosts 2019-01-30 19:17:21 -05:00
Matthew Heguy
cd501c4ff7 Resolve circular dep 2019-01-30 18:54:33 -05:00
Matthew Heguy
acfe478207 Use removable events to decrease load 2019-01-30 18:54:33 -05:00
Matthew Heguy
52932308d7 Create public method to check if player is on walkabout
Respect config option inside walkabout
2019-01-30 18:54:33 -05:00
Matthew Heguy
f93a544914 Move into Global 2019-01-30 18:54:13 -05:00
plague006
ebca4daa55 Fix walkabout not returning player from walkabout if they rejoin before timer expired, update refs to global.walking 2019-01-30 18:54:13 -05:00
Matthew
765a91cc56
Merge pull request #696 from plague006/improve_versioning
Improve versioning
2019-01-30 18:43:13 -05:00
plague006
9a61c854e7 Refine the build script, change the specifics of how version.lua works 2019-01-30 18:42:56 -05:00
plague006
e260af2a3b Rename command from color-redmew to redmew-color 2019-01-30 18:42:30 -05:00
Matthew
2911794b7e
Merge pull request #706 from plague006/blueprint_helper_refactor
refactor blueprint_helper to not call Token directly and to correct lint warnings
2019-01-30 18:26:14 -05:00
Matthew
334d9d13a7
Merge pull request #682 from plague006/info_push_changelog
Add ability to modify changelog in-game
2019-01-30 18:25:52 -05:00
Matthew Heguy
4738f3e043 Fix missing dep 2019-01-30 18:20:11 -05:00
Matthew
214257b007
Merge pull request #716 from grilledham/debug_token
Debugger
2019-01-30 18:19:13 -05:00
Matthew Heguy
b936a37296 Remove identifier 2019-01-30 18:17:55 -05:00
SimonFlapse
dabb86541d Brainfarted, forgot to change a variable 2019-01-31 00:15:09 +01:00
SimonFlapse
5ac2f66e2a fixing lint warnings 2019-01-31 00:05:53 +01:00
grilledham
2df4aeee45 debugger 2019-01-30 22:32:43 +00:00
plague006
cb6578dd7b refactor blueprint_helper to not call Token directly and to correct lint warnings
(cherry picked from commit 1beef8ba6a)
2019-01-28 17:52:10 -05:00
Lynn
52d4ec0b84 Do not show a fish at > 0.901 evo 2019-01-28 21:27:05 +01:00
Lynn
53fad1a75b Added a GUI element + toasts to notify of biter evolution 2019-01-28 21:21:33 +01:00
plague006
3d24f023c0 Remove deprecated tp commands
Refine messaging for deprecated commands
2019-01-27 16:44:45 -05:00
Matthew
129b6b031b
Merge pull request #677 from plague006/action_warnings
Action warnings
2019-01-27 15:24:36 -05:00
Matthew
b9be14ccf5
Merge pull request #690 from plague006/name_change_notice
Tell players how to change name in SP
2019-01-27 15:24:18 -05:00
Matthew
dbae27b37b
Merge pull request #694 from grilledham/alternative_toast
Alternative toast implmentation
2019-01-27 12:44:05 -05:00
grilledham
cce5defeff
Merge branch 'develop' into crashsite_0.5 2019-01-27 17:29:19 +00:00
grilledham
cc25ebe36e removed redundant code 2019-01-27 16:32:58 +00:00
grilledham
4a51c22f8a Added Public.close_toast_name 2019-01-27 16:02:58 +00:00
grilledham
b615408894 update documentation 2019-01-27 15:43:09 +00:00
grilledham
627463f251 alternative_toast 2019-01-27 15:34:40 +00:00
Matthew
112341bcf2
Merge pull request #693 from plague006/nightly_releases
Have travis issue nightly releases
2019-01-27 10:33:39 -05:00
plague006
5ab96fddf8 Have travis issue nightly releases
Add version command
2019-01-27 02:10:46 -05:00
plague006
17e79663ec Fixes from testing, drop on_leave hook 2019-01-26 10:05:16 -05:00
Lynn
ed5b376ddc Fixed a bug where gui data might not be a table 2019-01-26 15:43:01 +01:00
Lynn
8bf932e5a7 Added template support and force/all player support 2019-01-26 15:08:24 +01:00
Matthew
81979aee7b Performance update for active toasts 2019-01-26 14:47:16 +01:00
Lynn
5fd0d82834 Make GLobal forward compatible with #688 2019-01-26 10:43:39 +01:00
plague006
03d277453c Tell players how to change name in SP 2019-01-25 18:50:01 -05:00
Lynn
a16744787e Added a toast feature 2019-01-25 21:16:39 +01:00
SimonFlapse
ae94823df9 Allowing sprite paths instead of icon_id
Added a pass-through for sprite paths while keeping the 14 "quick" access icons.
2019-01-25 19:31:21 +01:00
plague006
69592e85c3 Don't upload unless something has changed 2019-01-25 11:48:54 -05:00
plague006
d1fbdac4bc Prevent triggered on open and close 2019-01-25 11:38:58 -05:00
plague006
4ab5fd3371 Localize global calls, make sure we don't upload the default message 2019-01-25 11:32:49 -05:00
plague006
c6fa42a82a Autoformat 2019-01-25 11:24:13 -05:00
plague006
54e33c114e Split tokenized function apart 2019-01-25 11:23:06 -05:00
Simon
341dec702a
Merge branch 'develop' into Popup-Extended 2019-01-25 17:19:10 +01:00
SimonFlapse
d7aafbf285 Porting to fix merge conflict 2019-01-25 17:18:02 +01:00
SimonFlapse
c40412d871 Extra features for popup gui
Added 13 new icons to the popup gui
Added the ability to change title

Updated popup-update commands wording, title and icon.
2019-01-25 17:05:12 +01:00
Matthew
2f679e737e
Merge pull request #655 from linaori/lazy-bastard
Added a Lazy Bastard feature with player limit for market items
2019-01-25 09:05:17 -05:00
Matthew
47c6e5b333
Merge pull request #684 from plague006/expand_performance
Expand performance scaling to affect mining and crafting speeds
2019-01-25 08:33:15 -05:00
Lynn
8b8d17fbbf
Update features/performance.lua
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-01-25 08:22:20 -05:00
Lynn
43d0742412
Update features/performance.lua
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-01-25 08:22:14 -05:00
Lynn
e64ad7eca0
Update features/performance.lua
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-01-25 08:22:06 -05:00
Matthew Heguy
b1647641c8 Use on_data_set_changed instead of nth tick 2019-01-25 08:15:58 -05:00
grilledham
2dd235fcb2 Merge branch 'develop' of https://github.com/grilledham/RedMew into crashsite_0.5 2019-01-25 11:24:12 +00:00
grilledham
d5c1b14b6e fix bug: toggle score gui button 2019-01-25 11:23:42 +00:00
grilledham
9252c41add allow LocalisedStrings 2019-01-25 00:13:25 +00:00
Matthew Heguy
5fa97079fa Expand performance to affect mining and crafting speeds 2019-01-24 18:41:32 -05:00
Matthew
9e05721170
Merge pull request #660 from plague006/seeds
Add seeds command
2019-01-24 18:14:47 -05:00
Matthew
e74daef19a
Merge pull request #668 from plague006/advertise_colors
Print message when someone saves a color
2019-01-24 18:14:37 -05:00
Matthew
87691f0fbd
Merge pull request #670 from plague006/table_get_random_dictionary_entry
Remove get_random, add get_random_dictionary_entry
2019-01-24 18:14:27 -05:00
Matthew
397f8e47a9
Merge branch 'develop' into maps/grid_bot_islands 2019-01-24 18:05:39 -05:00
Matthew Heguy
7a3418262e Add ability to modify changelog in-game 2019-01-24 17:45:57 -05:00
grilledham
91c17432fd Merge branch 'develop' of https://github.com/grilledham/RedMew into crashsite_0.5 2019-01-24 13:40:21 +00:00
grilledham
4e8fa9d54a
Merge pull request #672 from grilledham/score_update
Score update
2019-01-24 13:39:40 +00:00
grilledham
fc32446215 refresh score on all launches 2019-01-24 13:38:17 +00:00
Matthew Heguy
d5be21a990 Chaaaaaaange places 2019-01-23 23:37:11 -05:00
Matthew Heguy
b9c985e386 Use action_warning 2019-01-23 19:55:15 -05:00
Matthew Heguy
54eb1b08ba Use event.rocket, check force, don't print every launch 2019-01-23 18:33:43 -05:00
Matthew Heguy
2ce35ada6a Add action warnings 2019-01-23 15:54:46 -05:00
grilledham
e6a547a386 updates 2019-01-23 19:15:28 +00:00
Matthew Heguy
2f203a435c Add seeds command 2019-01-23 10:54:01 -05:00
grilledham
54d30216d1 fixed looting corpse message 2019-01-22 16:06:36 +00:00
grilledham
f20e812919 removed global, changed styles, added total coins spent 2019-01-21 20:37:07 +00:00
grilledham
43197de20a added total coins spent 2019-01-21 20:36:32 +00:00
plague006
f4ec6aa196 Remove get_random, add get_random_dictionary_entry, and may we never speak of it again. 2019-01-21 14:28:21 -05:00
grilledham
ba27be7433 add messages on looting corpse 2019-01-21 15:54:14 +00:00
plague006
7e565beb21 Remove redundant function 2019-01-21 10:42:38 -05:00
plague006
746d8d8df9 Print message when someone saves a color 2019-01-21 10:39:15 -05:00
grilledham
06f7d59f09 added check for chance == 0 2019-01-20 22:58:46 +00:00
Jayefuu
f955688c46 Added grid_bot_islands map preset
Moved entity_drop_amount from market.lua to config.lua
Added chance to entity_drop_amount table to allow map makers to configure coin drop chances for biters, spitters, worms and nests.
2019-01-20 20:58:12 +00:00
grilledham
1981dd6c0f fix errors 2019-01-20 18:25:53 +00:00
grilledham
7b393ed65c changed button sprite 2019-01-20 17:18:01 +00:00
grilledham
eaab7b9b3c removed stats tracking for damage. 2019-01-20 16:59:07 +00:00
grilledham
b45b4b3dce score rewrite 2019-01-20 16:50:10 +00:00
Matthew
0927a839b8
Fix linting (#657)
Fix linting warnings
2019-01-19 11:34:29 -05:00
Lynn
3206728501 secure power source 2019-01-19 14:17:23 +01:00
Lynn
703a3fea53 Added a 7 minute powersource to ensure the bootstrapping works well 2019-01-19 14:17:23 +01:00
Lynn
1e67b974e4 Fixed market desync and more control over limits 2019-01-19 14:17:22 +01:00
Lynn
8e9f48eab4 Some general fixes related to todays bugs 2019-01-19 14:17:22 +01:00
Lynn
b2042f2e1f Added missing require 2019-01-19 14:17:21 +01:00
Lynn
ccda13c12c Added a Lazy Bastard feature with player limit for market items 2019-01-19 14:17:21 +01:00
grilledham
167cda342a Send own join and leave messages 2019-01-17 14:00:15 +00:00
Matthew
3f8be3151a
Add redmew_surface (#631)
* Add redmew_surface

* Change map_layout to have all maps use redmew_surface

* Maps: switch hardcoded nauvis refs to redmew_surface

* Features: switch hardcoded nauvis refs to redmew_surface

* Per discussion, removal of RSO

* Changes to files based on linting warnings/errors

* ent_functions: remove functions from global scope, ignore remaining linting warnings (~100 remaining)

* borg_planet: ignore linting warnings (88 remaining)

* mazes refactored

* Changed global.lua so events are run in the order they are registered
2019-01-16 13:44:55 -05:00
Matthew
91e18a7a96
Merge pull request #652 from grilledham/loaders
Loaders
2019-01-15 11:13:47 -05:00
grilledham
cdde0d6967 moved loaders to redmew_qol 2019-01-15 15:10:31 +00:00
Matthew
934adaa9f6
Merge pull request #653 from plague006/fix/qol
Check that entities are valid in redmew_qol
2019-01-15 09:52:13 -05:00
Matthew
5dd9ce9f90 Remove math and table as globals. (#647)
* Remove math and table as globals.
Create exceptions for table.lua and math.lua to modify respective globals and add returns for respective globals.

* Fix lint errors from table and math
2019-01-15 14:27:48 +01:00
Matthew Heguy
229e3e7f25 Check that entities are valid 2019-01-14 17:25:14 -05:00
grilledham
d7d7737b4b added loaders 2019-01-14 11:39:11 +00:00
Matthew
746d31dc14 Add quality of life features (#625)
* Add quality of life features: random train colors, restrict chests, backer_names, ghost_ttl

* Expand ghost_ttl

* Make val smile
2019-01-12 14:43:41 +01:00
Matthew
055ca8487f
Merge pull request #644 from grilledham/crashsite_0.4
Crashsite 0.4
2019-01-11 16:40:41 -05:00
Valansch
7fa83bae6c Add Tetris (#605)
Somehow nailed everything on the first try. What a pro.
2019-01-11 13:31:23 -05:00
Valansch
a8a777bcc5
Update market.lua 2019-01-10 16:28:34 +01:00
grilledham
e46a4983db Merge branch 'develop' of https://github.com/Valansch/RedMew into crashsite_0.4 2019-01-10 14:35:25 +00:00
Maik Wild
1eebea55e8 renamed fish_market.lua to market.lua and market_item to currency 2019-01-10 15:18:55 +01:00
Valansch
3ab26ea014
Fixed sticklers complaints 2019-01-10 14:53:03 +01:00
Valansch
73a3b7756b
Merge branch 'develop' into event-fixes 2019-01-10 14:38:55 +01:00
grilledham
f093fee5ab fixed bugs 2019-01-09 22:30:05 +00:00
Lynn
c84dec2aaa Fixed some market related hacks 2019-01-09 18:29:20 +01:00
Lynn
cb97ea54f3 Removed undefined variable 2019-01-09 18:29:19 +01:00
Lynn
57c4ae2519 Fish market with new GUI and stack limit 2019-01-09 18:29:18 +01:00
Matthew Heguy
018cab89b6 Fix linting, add comments 2019-01-08 15:58:12 -05:00
grilledham
5ee7a62464 fixed \n escaping + small optimizations (#635)
* fixed \n escaping + small optimizations
2019-01-07 13:30:59 +01:00
grilledham
84597ea1fe Merge branch 'develop' of https://github.com/Valansch/RedMew into event-fixes 2019-01-06 12:40:39 +00:00
Lynn
0ebe857532 Fixed volunteer references 2019-01-05 18:13:49 +01:00
Lynn
cb68f0c340 Fixed the infamous task desync and typos 2019-01-05 18:04:31 +01:00
Matthew
8ce3010da5
Merge pull request #628 from Jayefuu/patch-7
Added market remove instructions
2019-01-04 21:44:23 -05:00
plague006
4d929248b7 Use player from function rather than game.player 2019-01-04 16:31:34 -05:00
plague006
503a3843fb Clear space characters 2019-01-04 15:09:16 -05:00
plague006
bcd95662b6 Redirect all dependencies 2019-01-04 15:02:55 -05:00
Jayefuu
2df0e27fe6
Added market remove instructions
Users downloading the scenario were asking for instructions on how to remove the market (in #mapgen). Adding this reply will also help admins and others using the scenario to generate maps.
2019-01-04 19:59:37 +00:00
Matthew
cb9e1e9792 Have info pull changelog from server (#621)
* Have info pull changelog from server

* Use on_server_started and create a proper function to pass to event
2019-01-04 14:45:37 +01:00
Jayefuu
ec2687accd Score spelling correction (#627) 2019-01-04 12:56:25 +01:00
Matthew
dab49c6f6c Yet another camera fix (#626) 2019-01-04 12:56:12 +01:00
grilledham
8e56eba51a removed init function 2019-01-03 17:24:18 +00:00
Valansch
da8d60df5b
Update redmew_commands.lua 2019-01-03 18:16:50 +01:00
Valansch
2fd78cbc5c
Update redmew_commands.lua 2019-01-03 18:09:26 +01:00
Matthew
a84dcfdd91 Overhaul commands (#576)
* Split admin-only commands out of custom commands
Remove free item logging

* Overhaul commands remaining in custom_commands

* Overhaul commands in remaining files

* Change custom_commands to redmew_commands

* Remove follow.lua
2019-01-02 16:34:17 +01:00
Matthew
b43eef96e7 Fix not being able to switch targets without first closing camera (#574) 2019-01-02 14:42:31 +01:00
Matthew
c2234505f3 Implement server-side color saving (#566)
* Implement server-side color saving

* Add set_and_return to core utils
2019-01-02 14:42:18 +01:00
grilledham
14a81aedb4 Bug fixes (#620)
* fixed error on empty regular list

* fixed train kill count
2019-01-01 22:26:57 +01:00
Matthew Heguy
e37511e68d Change to comment block 2019-01-01 09:59:24 -05:00
Lynn
23af703bc8 Added some basic docs about the Retailer 2018-12-31 18:08:14 +01:00
Lynn
a62fed2b78
Merge branch 'develop' into market-gui-tweaks 2018-12-31 09:22:26 +01:00
Matthew
17c54eb136
Merge pull request #579 from iltar/retailer-in-crash-site
Uses the retailer in crash site for markets
2018-12-30 17:21:46 -05:00
Matthew
77846c1d66
Merge pull request #604 from plague006/use_color_presets
Change custom colors to presets
2018-12-30 17:20:15 -05:00
plague006
494648f35c Change custom colors to presets 2018-12-29 12:39:20 -05:00
Lynn
444b107190 Refresh player market GUI when something changes 2018-12-29 14:30:20 +01:00
Lynn
91b4b0f007 Added a distance check for the Retailer market GUI to close 2018-12-29 14:09:26 +01:00
Lynn
377ad8a25a
Merge pull request #603 from iltar/disabled-market-items
Ability to disable market items without removal
2018-12-29 14:07:38 +01:00
Matthew
486effcab7 Remove spaces in extant names and modify name function to remove spaces to prevent future mistakes (#581)
* Remove spaces in extant names and modify name function to remove spaces to prevent future mistakes

* Remove regulars hack and map_layout entry
2018-12-29 02:20:23 +01:00
Matthew
8f4c99cc43 Restore ability to set map_extra_info (#588) 2018-12-29 02:19:55 +01:00
plague006
62d7ebda30 Use preset colors 2018-12-28 18:17:44 -05:00
Lynn
14e814d47f Ability to disable market items without removal 2018-12-28 21:31:08 +01:00
Matthew
69e675ffeb Beach and paint typos (#601)
* correct a typo, re-scope a couple vars, remove unused require

* Add typo in paint
2018-12-28 17:21:09 +01:00
Lynn
3cebeb4233 Added a market event to do non-item related stuff (#577)
* Added a market event to do non-item related stuff

* Moved variable up

* v-align center on market text
2018-12-27 00:42:06 +01:00
Matthew Heguy
d381ee1a03 Update to new config structure 2018-12-23 11:36:34 -05:00
Lynn
7ec2380989 Retailer can generate a unique identifier 2018-12-23 13:33:54 +01:00
Lynn
511fe1a1f7 Uses the retailer in crash site for markets 2018-12-22 17:30:25 +01:00