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

1049 Commits

Author SHA1 Message Date
plague006
73e7acab57 Add biter_attacks 2019-04-16 13:43:27 -04:00
grilledham
5e990cca2c
Merge branch 'map/terraforming_daner_ores' into develop 2019-03-31 15:59:23 +01:00
grilledham
48178f912d updates 2019-03-31 13:51:26 +01:00
TWLTriston
d378fd1387 - Modified the terrain tile generation to match the ore quadrants, smoothed the quadrant edges with some faux gradiant randomness 2019-03-30 08:58:17 -04:00
TWLTriston
44259be9d3 - Added scenario info and what's new into the map gen file to allow tracking and accountability to those who join the server. 2019-03-30 06:54:10 -04:00
TWLTriston
27e4c17268 - Increased the starting pond size to help control madness at spawn and visually reinforce the quandrant realities of the map 2019-03-30 06:32:55 -04:00
TWLTriston
880d154577 - Slight increase to uranium threshold to increase frequency based on playtesting. 2019-03-30 06:29:09 -04:00
TWLTriston
bcaedb4267 - Reduced min pollution level based on play testing. 2019-03-30 06:21:10 -04:00
TWLTriston
fbb8f17253 - Bug fix: Allow cars and tanks to be placed onto ore piles. 2019-03-30 06:20:49 -04:00
TWLTriston
ded03fdcbc Removed unused variables 2019-03-27 20:57:02 -04:00
TWLTriston
befa9253af Fix to unused global variables (commented out for now), small whitespace cleanup on game definition 2019-03-27 18:38:11 -04:00
TWLTriston
c41e296c95 * Modified the ore generation to be quadrant based with more balance towards .17
* upped minimum pollution to keep map smaller
* reduced base tech multiplier to 20
* removed pollution factor and increased time factor for enemy evolution
2019-03-27 18:17:41 -04:00
grilledham
9af73833fa roate refineries 2019-03-26 21:27:51 +00:00
Matthew Heguy
13c93425a7 Fix logic in entity_placement_restriction. Closes #875 2019-03-16 14:35:09 -04:00
grilledham
92d2ee4ae7 updates 2019-03-16 13:08:44 +00:00
Simon
4809f27bac
Fixing danger ores maps (#866)
* Fixed danger_ores, added behemoth worms

* Fiex terraforming_danger_ores

Added behemoth worms

* Decreased evolution rates
2019-03-15 20:08:22 +01:00
Matthew
4817a45266
Merge pull request #793 from R-Nukem/patch-1
Create HilbertSandTrap.lua
2019-03-13 14:08:18 -04:00
Ross Newcome
2e0d4db719
Update HilbertSandTrap.lua
added enable_water mapgen setting for use with grass_only
2019-03-13 09:53:54 -04:00
grilledham
f1949e2b87 only render market text when in map view 2019-03-09 14:00:16 +00:00
grilledham
e53d91cfcf removed unused variables 2019-03-08 17:49:06 +00:00
grilledham
41f2fc8c50 render text when hover over market 2019-03-08 17:31:00 +00:00
grilledham
c9cc32a1c0 use player.zoom_to_world in toasts 2019-03-08 17:30:28 +00:00
grilledham
a59089c496 artillery targets players 2019-03-07 21:07:33 +00:00
grilledham
4abe5c5b06 behemoth worms 2019-03-07 15:55:49 +00:00
Matthew
6ad8f8725e
Merge pull request #860 from plague006/fix_locale
Fix bad locale in crashsite
2019-03-06 19:07:06 -05:00
Matthew
2fa76ac85e
Merge pull request #853 from plague006/restrict_script
luacheckrc tweaks to script and commands
2019-03-06 16:44:18 -05:00
Matthew Heguy
2ab1d38c5d Add command aliases, fix doc in event 2019-03-06 16:35:38 -05:00
Matthew Heguy
3c4632be6c Fix bad locale 2019-03-05 10:34:32 -05:00
Simon
7b0156b1c9
Merge branch 'develop' into Quadrants 2019-03-05 15:11:27 +01:00
SimonFlapse
4fb657cbc3 Added localization 2019-03-05 00:51:56 +01:00
plague006
0f453a0562 Remove unused arg 2019-03-04 16:04:56 -05:00
plague006
b389c15cc5 luacheckrc tweaks to raise warnings when registering events through script, or registering a command through commands 2019-03-04 06:57:08 -05:00
Matthew
e43513fcc1
Merge pull request #849 from plague006/locale
The big localization push
2019-03-04 06:35:13 -05:00
SimonFlapse
25bbe67254 Forgot to remove this 2019-03-04 00:05:04 +01:00
plague006
891a863e68 Remove venus and its modules, silly_player names, walkabout, rusky_pvp and tempban 2019-03-03 17:22:01 -05:00
plague006
55aa7fd916 Command descriptions
Remove search_command
Overhaul meltdown commands
Localize some gui
2019-03-03 17:21:59 -05:00
SimonFlapse
57744116ef Reborn test.lua 2019-03-03 23:20:51 +01:00
SimonFlapse
7db27fdcce Remove custom event
Increased teleport range
Limiting bridges to 12 chunks
2019-03-03 23:20:04 +01:00
Simon
bad47f37ff
Added improved hydra scaling (#795)
* Added improved hydra scaling

Added min, max and trigger to config
Added online_player_scale to config

Made hail hydra chances a variable of: - number of online players (toggleable)
- evolution based on a custom formula that has a slow scaling until evolution 0.8

* Removed debug game.prints

* Backwards compatibility

Added conversion from old config to new

* Updated config to show -1 for unused

* Added locking chance

* Added improved hydra scaling

Added min, max and trigger to config
Added online_player_scale to config

Made hail hydra chances a variable of: - number of online players (toggleable)
- evolution based on a custom formula that has a slow scaling until evolution 0.8

* Removed debug game.prints

* Backwards compatibility

Added conversion from old config to new

* Updated config to show -1 for unused

* Added locking chance

* Added behemoth-worm-turret

* Removed old behemoth-biter

* Added new default configuration
2019-03-03 22:13:49 +01:00
SimonFlapse
1ad42550b7 Fixed gui bug 2019-03-03 19:22:01 +01:00
plague006
535c675028 Add generate_event_name to event module 2019-03-03 13:03:24 -05:00
SimonFlapse
e32802efb7 Fixed evolution factors 2019-03-03 16:48:38 +01:00
SimonFlapse
6781c6438d Fixed linting 2019-03-03 16:40:58 +01:00
SimonFlapse
9bf6bde27a Added train_crossings
Allowing for trains to cross.
Handles the player switcing force and more.

Reverting pushed config.lua
2019-03-03 16:32:08 +01:00
SimonFlapse
949e902101 Minor additions
Research message on research finished
Chart tags sync with all forces
- Needs refactoring
Quadrants labeled with a number
Evolution factors halved (except: Pollution from 150 -> 50)

Fixed linting

Added position to item_to_chest to override player position
2019-03-03 11:20:56 +01:00
SimonFlapse
8d7ca6e558 Fixes and minor additions
Player count
Where -> Were
How to Chat
Allowing pipes
Unminable chests explained by compilatron
Better too heavy message
Fixed auto shout formating

Initial code for Map tag sync
2019-03-03 02:17:13 +01:00
SimonFlapse
277a2c599d Revert "Merge remote-tracking branch 'origin/hydra-scaling' into Quadrants"
This reverts commit 80d56c2e4a, reversing
changes made to 92841bc13c.
2019-03-02 16:54:42 +01:00
SimonFlapse
bfa355e309 Linting fix and tooltip added 2019-03-02 16:52:13 +01:00
SimonFlapse
5e0598d35f More messages 2019-03-02 16:20:01 +01:00
SimonFlapse
79084a9cd3 Updated version 2019-03-02 16:14:39 +01:00
SimonFlapse
ead14ea88c Added player force to all_chat 2019-03-02 16:11:16 +01:00
SimonFlapse
b1e8231945 Removed shout message 2019-03-02 16:00:59 +01:00
SimonFlapse
74e8e58746 Colors and server protect 2019-03-02 15:59:18 +01:00
SimonFlapse
fea462cd93 Chat_fix 2019-03-02 15:50:18 +01:00
SimonFlapse
1694c920c5 All_chat 2019-03-02 15:42:41 +01:00
SimonFlapse
218523e419 Hail_hydra 2019-03-02 15:28:50 +01:00
SimonFlapse
80d56c2e4a Merge remote-tracking branch 'origin/hydra-scaling' into Quadrants 2019-03-02 15:18:00 +01:00
SimonFlapse
92841bc13c Hail hydra added, more help text 2019-03-02 15:17:19 +01:00
grilledham
5f9ceda8e9 fix localised string to not exceed limit 2019-03-02 14:16:54 +00:00
SimonFlapse
5b16c18a2b More text and removed game.print 2019-03-02 14:21:52 +01:00
SimonFlapse
1f98b4457e Fix ends -> end 2019-03-02 14:18:19 +01:00
SimonFlapse
0a3f45bcc2 Merge remote-tracking branch 'upstream/develop' into Quadrants 2019-03-02 14:15:51 +01:00
SimonFlapse
198fc7fcac Update for 0.17.4, Added Compilatron 2019-03-02 14:15:25 +01:00
plague006
58e231af5c Isolate rusky_pvp strings 2019-03-01 23:48:40 -05:00
SimonFlapse
3ec7b413a9 Added behemoth-worm-turret 2019-03-01 21:22:15 +01:00
SimonFlapse
a989c87c03 Added locking chance 2019-03-01 21:14:17 +01:00
SimonFlapse
1fe198843d Backwards compatibility
Added conversion from old config to new
2019-03-01 21:14:17 +01:00
SimonFlapse
49babc20ff Removed debug game.prints 2019-03-01 21:14:16 +01:00
SimonFlapse
342e5871d8 Added improved hydra scaling
Added min, max and trigger to config
Added online_player_scale to config

Made hail hydra chances a variable of: - number of online players (toggleable)
- evolution based on a custom formula that has a slow scaling until evolution 0.8
2019-03-01 21:14:16 +01:00
Matthew Heguy
096f72a849 Switch to builder function, turn cliffs down. 2019-03-01 14:18:41 -05:00
plague006
d58e2a7606 Add solid_rock 2019-03-01 14:18:41 -05:00
Matthew
e024c436ba
Merge pull request #812 from plague006/17/regenerate_decorative
[17][Enhancement] Drop unnecessary tables.
2019-02-28 17:08:13 -05:00
Matthew Heguy
ba8b4df879 Add doc related to water, add enable_water to grass_only maps (maintaining prior functionality) 2019-02-27 15:10:39 -05:00
SimonFlapse
6015c6c620 Update for 0.17.1 2019-02-27 15:28:47 +01:00
SimonFlapse
fb82e81802 Merge remote-tracking branch 'upstream/develop' into Quadrants 2019-02-27 14:05:46 +01:00
Matthew Heguy
21a3b9cea7 Fix map gen settings 2019-02-26 23:34:49 -05:00
Matthew Heguy
014b249f87 Wood gone, raw-wood to wood 2019-02-26 15:45:04 -05:00
Matthew Heguy
08371d5e06 high-tech-science-pack 2019-02-26 14:34:38 -05:00
Matthew Heguy
95ebb4a239 Sciences 2019-02-26 14:25:19 -05:00
Matthew Heguy
09ef833dd2 Remove steel-axe, iron-axe 2019-02-26 14:08:49 -05:00
plague006
6fab882c2f Fix for possible nil item in on_player_built_tile 2019-02-24 21:40:08 -05:00
plague006
dbe746ce8d Drop unnecessary tables. 2019-02-24 16:58:06 -05:00
Ross Newcome
a3092bd13f
Update HilbertSandTrap.lua
Combined ghost and tile-ghost handling
2019-02-24 15:02:18 -05:00
Ross Newcome
0fe69ee85c
Update HilbertSandTrap.lua 2019-02-24 14:31:59 -05:00
Ross Newcome
bfecb67c50
Update HilbertSandTrap.lua
Updated to include suggestions and hotfixes and generally clean up the code a little.
2019-02-24 13:14:17 -05:00
Ross Newcome
2ee83ea4d6
Update HilbertSandTrap.lua 2019-02-22 15:05:08 -05:00
Ross Newcome
80ac9aa954
Update HilbertSandTrap.lua 2019-02-22 14:46:40 -05:00
Ross Newcome
83eeeae5af
Update HilbertSandTrap.lua 2019-02-22 14:12:11 -05:00
Ross Newcome
b259741134
Create HilbertSandTrap.lua
Adding today's map so everyone has access.
2019-02-22 13:47:46 -05:00
Matthew
626fbef3b8
Merge pull request #686 from SimonFlapse/Modded-Diggy-Buffs
[Diggy] Restoring buffs every 61 ticks
2019-02-21 17:02:39 -05:00
Matthew
6d68639307
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:43:01 +01:00
Matthew
a271e9afac
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:42:48 +01:00
Matthew
944aaa15c7
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: SimonFlapse <44922798+SimonFlapse@users.noreply.github.com>
2019-02-21 22:42:35 +01:00
Matthew Heguy
184d5fa56d Add event toggles to debugger, increment version of debuggertron 2019-02-21 13:43:40 -05:00
SimonFlapse
1ff4cec8db Fixed spaces after braces 2019-02-21 13:02:15 +01:00
SimonFlapse
5fd207f81e Fixed minimum for old_modifier 2019-02-21 00:47:16 +01:00
SimonFlapse
166be595aa Fixed style and minimum for old_modifier 2019-02-21 00:39:49 +01:00
SimonFlapse
761b2094e2 Item to chest function
Converted builder usage to using any instead of combine
Added item_to_chest that empties the players inventory to a chest if toggled on.

The chest is deleted if emptied by a player
2019-02-20 23:29:10 +01:00
Matthew Heguy
16771be37b Fix typo 2019-02-20 16:58:59 -05:00
Matthew Heguy
3af411faa5 Switch to functions in table, adjust map_loader accordingly 2019-02-20 16:38:34 -05:00
Matthew
6984bfaf87
Merge pull request #724 from SimonFlapse/stash_prehistoric
Added groundhogs, updated dino_island
2019-02-20 09:32:00 -05:00
Matthew Heguy
de36eb81ac Restore uranium 2019-02-20 03:25:18 -05:00
Matthew Heguy
cb69555169 ipairs -> pairs and cleanup if/else for groundhogs 2019-02-20 03:17:09 -05:00
Matthew
0f9ad4b93f
Merge pull request #773 from theorangeangle/oldsci
Toxic_science_jungle.lua
2019-02-20 02:43:31 -05:00
Matthew Heguy
c0461ccf62 Final cleanup 2019-02-20 02:40:58 -05:00
SimonFlapse
fafbe1dd31 Fixed linting error
Caused by merge conflict
2019-02-20 08:26:06 +01:00
theorangeangle
6ac34ea1a5 flamethrower fix 2019-02-19 20:08:05 -06:00
theorangeangle
8fef499864 Added local config changes 2019-02-19 19:49:31 -06:00
SimonFlapse
d1355fb1ad Merge branch 'stash_prehistoric' of https://github.com/SimonFlapse/RedMew into stash_prehistoric 2019-02-19 20:35:06 +01:00
Matthew
74e724ab52
Merge pull request #774 from SimonFlapse/Diggy-fix-buffs
Tweaking level up formula for late late game
2019-02-19 14:24:27 -05:00
Matthew
16fe4a7345
Merge pull request #742 from plague006/apply_lifecycle
Apply lifecycle
2019-02-19 14:13:28 -05:00
plague006
3d8aecf4ae Add config options 2019-02-19 14:04:34 -05:00
plague006
c6bcb2f2c6 Clean up linting, use entity_placement_restriction 2019-02-19 14:04:34 -05:00
SimonFlapse
b16acecc46 Added groundhogs, updated dino_island 2019-02-19 14:04:34 -05:00
Matthew
5f283c90d8
Merge pull request #723 from plague006/entity_restriction
Add generic entity restriction module
2019-02-19 14:02:32 -05:00
grilledham
4696157555 return true for zero area bounding_box entities (bots) 2019-02-19 17:43:53 +00:00
SimonFlapse
34fd76592c Tweaking level up formula for late late game
Tweaking xp gained from infinite research to add 60% towards current level up progress.
Added max level for boosts
2019-02-19 17:24:21 +01:00
SimonFlapse
c72f8fe8ba Revert "Tweaking level up formula for late late game"
This reverts commit c00f786241.
2019-02-19 17:09:12 +01:00
SimonFlapse
c00f786241 Tweaking level up formula for late late game
Tweaking xp gained from infinite research to add 60% towards current level up progress.
Added max level for boosts
2019-02-19 17:02:07 +01:00
SimonFlapse
b5d14f08d9 Added toggle for groundhogs 2019-02-19 14:49:51 +01:00
theorangeangle
779986d458 added back in line 256 2019-02-19 00:41:45 -06:00
theorangeangle
5f593fe275 removed market duplicate (again) 2019-02-19 00:15:31 -06:00
theorangeangle
83cde6bba0 fixed steel axe config 2019-02-19 00:13:50 -06:00
plague006
17a356aa1e USe recipe_locker, remove duplicate line for create_standard_market 2019-02-19 00:51:34 -05:00
theorangeangle
72f1cb12fb
fixed player_force reference 2019-02-18 23:36:29 -06:00
theorangeangle
2004c431ac removed useless lines of code, damn you travis 2019-02-18 22:22:34 -06:00
theorangeangle
e7143988a9 info about what to do in config.lua 2019-02-18 21:58:11 -06:00
theorangeangle
0ac5f831e3 rename 2019-02-18 21:55:22 -06:00
theorangeangle
37e19eea73 fixed mining speed and my API goof 2019-02-18 19:07:09 -06:00
theorangeangle
d6495dcc47 added mapgen settings 2019-02-18 16:04:55 -06:00
theorangeangle
211e751854 removed flamethrowers from market 2019-02-18 15:45:29 -06:00
SimonFlapse
9f1594906c Fixed players being stuck on teleport 2019-02-18 22:36:54 +01:00
theorangeangle
fd826826d7 fixed market items 2019-02-18 15:06:16 -06:00
theorangeangle
afb07c0e11 it works but the market stuff still needs a fix 2019-02-18 12:36:45 -06:00
SimonFlapse
667a1c45e7 Fixed linting error 2019-02-18 14:32:01 +01:00
SimonFlapse
210eb45b39 Restricted build capabilities on other teams land 2019-02-18 14:12:14 +01:00
SimonFlapse
033101c0b0 Minor tweaking of ores 2019-02-18 12:35:58 +01:00
SimonFlapse
c5db1d984e Fixed linting errors 2019-02-18 12:13:14 +01:00
SimonFlapse
d00a2c685a Increased resources for quadrant 2
As per suggestion in #714
2019-02-18 11:23:51 +01:00
SimonFlapse
7cc4048627 Added chat information 2019-02-18 10:38:44 +01:00
SimonFlapse
c43dfa526c Updating map info
Preparation for test
2019-02-18 10:30:06 +01:00
SimonFlapse
dadd394901 Added oil for quadrant 3 2019-02-18 09:59:36 +01:00
SimonFlapse
81cdc736b3 Fixed new line at EoL 2019-02-18 09:38:41 +01:00
SimonFlapse
1c762eb502 Removed debugging logs
Forgot to remove writing to log
2019-02-18 09:36:43 +01:00
SimonFlapse
6238dbe09f Fixed multiplayer research 2019-02-18 09:33:05 +01:00
plague006
8ccfe43cef Make lifecycle more readable. 2019-02-18 01:43:59 -05:00
plague006
00991ba5c4 Remove standard market from 1000x 2019-02-18 01:17:14 -05:00
Matthew
06915dd5bb
Merge pull request #744 from plague006/1000x
Add 1000x
2019-02-18 00:50:08 -05:00
SimonFlapse
6d0df6a0fa Technology and research restrictions added 2019-02-17 23:10:41 +01:00
plague006
70d11a46ae Small optimizations, doc refining, scope narrowing 2019-02-17 00:32:43 -05:00