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

1501 Commits

Author SHA1 Message Date
Jayefuu
89f82d689f
Merge branch 'develop' into fish_munchers 2021-02-12 08:49:59 +00:00
grilledham
c26148b1e7
Merge pull request #1146 from Refactorio/entities_built_fix
Added player_built and player_crafted to the crash site awards ceremony
2021-02-11 19:26:34 +00:00
Jayefuu
d386dea2bf Updated as per suggestions 2021-02-11 11:25:39 +00:00
Jayefuu
ff29cc958d Fixed mistake with scenario display name conversion 2021-02-09 22:32:36 +00:00
Jayefuu
c2f2bf49e1 Updated with suggested corrections 2021-02-09 22:30:33 +00:00
Jayefuu
bb2da07962 Added recording and award for how many fish each player eats/uses 2021-02-09 18:08:03 +00:00
Jayefuu
1a72529e75 Updated behaviour for robot built entities
- Players get an increment to entities built when a robot they own builds something
- Players don't get an increment if they placed the blueprint and the base's roboport con bots build the entity OR if another players robots do the building.
2021-02-09 17:36:54 +00:00
Jayefuu
70fd9b50f8
Merge pull request #1170 from Refactorio/coin_spill_changes
Player kills deposit coins in inventory
2021-02-09 08:24:41 +00:00
Jayefuu
585b4e35e4 Updated as per suggestions 2021-02-08 22:53:59 +00:00
Jayefuu
c4d76243dc
Merge pull request #1167 from Refactorio/crash_site_outpost_pollution
Added configurable pollution to outposts for future testing
2021-02-08 22:47:49 +00:00
Jayefuu
28bcd68786 Updated as per review suggestions 2021-02-08 21:52:36 +00:00
Jayefuu
fed9388840 Fixed lua checks 2021-02-08 13:49:55 +00:00
Jayefuu
c9d8189218 Player kills deposit coins in inventory 2021-02-08 13:32:05 +00:00
Jayefuu
8754040a47 Updated as per suggestions 2021-02-08 13:00:34 +00:00
Jayefuu
3fb08af57c
Update map_gen/maps/crash_site/outpost_builder.lua
Co-authored-by: grilledham <jrdgillham@gmail.com>
2021-02-07 12:07:28 +00:00
Jayefuu
b186e7cc10 Updated artillery turret bot spawn balance 2021-02-06 09:05:40 +00:00
Jayefuu
a363a70f33 Whitespace 2021-02-05 15:26:09 +00:00
Jayefuu
20c21f9c9c Suggested changes 2021-02-05 15:24:18 +00:00
Jayefuu
0b1a030bfe Fixed lua checks 2021-02-03 10:59:47 +00:00
Jayefuu
759aef17b3 Updated as per suggestions and fixed furance to furnace
- Replaced furance with furnace in all files
- Attempted to fix global desync issue, but probably not right
- Added server_player so /get_pollution_multiplier can be called from server
2021-02-03 10:57:19 +00:00
Jayefuu
0cb766fd22
Update map_gen/maps/crash_site/outpost_builder.lua
Co-authored-by: grilledham <jrdgillham@gmail.com>
2021-02-03 08:24:38 +00:00
Jayefuu
c048a5f448 Update outpost_builder.lua 2021-02-02 18:33:54 +00:00
Jayefuu
d3aa8f18e0 Added configurable pollution to outposts
My plan is to make a harder crash site version where getting free resources from outposts creates pollution.

My intention is to balance it so it's still better to get items from outposts, but this commit is intended to give me a way to take saved games and test different amounts of pollution to check for balance. I don't intend to test this on live for a while but want to test it offline, this will give me the ability to turn it on half way through a game.

Need to consider how it doesn't take into account what the item is so it will be better to get free end-game items and probably limit how much iron we let into base later in the game. Might also create interesting meta where we are careful about what resources we take from outposts depending upon the pollution making setting.
2021-02-02 18:26:17 +00:00
Jayefuu
e02d851dea Updated max_range for projectiles used in bot spawn 2021-02-02 07:33:22 +00:00
Jayefuu
eafb3d8bdd
Merge pull request #1163 from Refactorio/make_destroyers_attack_arty_wagon
Update destroyer attack behaviour for artillery wagons
2021-02-01 17:28:07 +00:00
Jayefuu
8e8b7ee818 Update events.lua 2021-02-01 17:06:43 +00:00
Jayefuu
d53e3d320c Updated as per suggestions
- Added function to check distance between two entities as I couldn't find one in utils
- Added call to check how far from destroyer to wagon
- Since there's now a check I removed the 2 second wait between spawning and starting to fire in favour of using distance instead (384, 386)
2021-02-01 16:09:07 +00:00
Jayefuu
f4ca719296
Merge pull request #1164 from EigenMan-Factorio/develop
Multi-coordinate support for /spy and /strike.
2021-02-01 15:15:49 +00:00
James Gillham
a7ce905428 Remove dynamic requires from diggy. 2021-01-30 21:56:29 +00:00
EigenMan-Factorio
421ff0959f Made changes to address items found during review:
- fixed code indenting
- added comments to warm about potential issues with surface names
- modified check for chest containing poison so it only happens once per /strike command
2021-01-30 11:12:38 -07:00
EigenMan-Factorio
76ae7c6d19 Added a limit of 10 coordinates per strike command. 2021-01-29 10:38:18 -07:00
EigenMan-Factorio
537f9386bb Added multi-coordinate support to the /spy and /strike commands. Also
added help text to the /strike command.
2021-01-29 06:26:57 -07:00
Jayefuu
78a5c27dc1 Update events.lua 2021-01-29 13:07:30 +00:00
Jayefuu
6a3682a114 Update events.lua 2021-01-29 13:05:21 +00:00
Jayefuu
61c8b33f8a Updated as per requests. 2021-01-28 09:19:36 +00:00
Jayefuu
025f35e3ce Fixed callback crash when no position for worm found
- If it couldn't find a non-colliding position it errored when trying to use the worm position to spawn biters
- This would cause the callback to stop working and the roboport wouldn't spawn worms.
-  Fixed by adding check for nil worm position
2021-01-26 16:29:17 +00:00
Jayefuu
6973042ce6
Merge pull request #1159 from Refactorio/airstrike_improvements
Added some rendering to make airstrike nicer to use
2021-01-26 07:52:17 +00:00
Jayefuu
2412e544c2 Updated as per suggestions
- Removed surface and force hard coding
- Added floating text on surface so players don't need to use map view to see strike sender
2021-01-25 07:53:29 +00:00
Jayefuu
88f80aa8e3 Fixed the message for spy cost 2021-01-24 15:52:38 +00:00
Jayefuu
cd791e73eb Added some rendering to make airstrike nicer to use
- Shows all players where the airstrike was aimed
- Shows the user of airstrike the radius their strike will roughly cover
2021-01-24 14:47:39 +00:00
Jayefuu
ab8a21ec4b Reduced cost of spy. It wasn't being used since strike is available early to mid game 2021-01-23 17:44:05 +00:00
Jayefuu
91f91dc04a
Merge pull request #1154 from Refactorio/airstrike_message_cooldown
Made strike command less spammy, replaced map pings with tags
2021-01-20 19:32:56 +00:00
Jayefuu
5301cba3ad Update commands.lua 2021-01-20 19:20:32 +00:00
Jayefuu
e15d0806e3 Removed print to player
Feedback from Anubi5 asked for no print to player. I think he's right, it's much more peaceful now.
2021-01-20 13:35:16 +00:00
Jayefuu
d33a2c5ea4 Made strike command less spammy, replaced map pings with tags 2021-01-20 08:38:41 +00:00
James Gillham
1032010907 Fix ore values + luacheck. 2021-01-13 21:14:00 +00:00
James Gillham
c0de80df29 Gradient danger ores 2021-01-13 21:08:32 +00:00
Jayefuu
df3230a8a4 Update scenario.lua 2021-01-11 20:31:42 +00:00
Jayefuu
cb2b142e42
Merge pull request #1144 from Refactorio/crash_site_dunes
Crash Site Arrakis
2021-01-08 19:13:45 +00:00
Jayefuu
c728304a10 Added discord prints to rocket tank and airstrike spawn market upgrades 2021-01-08 15:29:35 +00:00
Jayefuu
d67928ac30 Updated crash site upgrade toasts to include player name
It's handy to know who's doing the upgrading so I've added their name to all the crash site toasts. This branch depends on the arrakis/dunes one as in that branch I moved some things into a features folder.
2021-01-08 14:46:57 +00:00
Jayefuu
67ce804c64 Updated as per requests 2021-01-08 14:10:25 +00:00
Jayefuu
43260be5a3 fixed lua checks 2021-01-08 12:37:24 +00:00
Jayefuu
565249ff1b Added player_built and player_crafted to the crash site awards ceremony 2021-01-08 12:34:51 +00:00
Jayefuu
dec40ab588 Added entity validity checks 2021-01-06 09:03:03 +00:00
Jayefuu
d1c5c8e366 Changed balance and updated as per requests
sandworms.lua
- Added feedback to player that places the roboport
- Added floating text *thump* as warning when roboport placed and 30 seconds before attack
- Changed worm/biter spawn balance
- Fixed failed lua check
- Changed spawn time to 5 to 15 minutes instead of 6 to 20 minutes

repair_cars.lua:
- Removed surplus else statement as requested
- Added ability for tanks to repair. Cars were very underwhelming past medium worms, their health is too low to be useful.

others:
- Fixed multiline strings in ScenarioInfo
2021-01-05 16:03:08 +00:00
Jayefuu
e77ae7fb9d Updated as per suggestions 2021-01-05 15:12:00 +00:00
Jayefuu
d57c498d64 Updated as per requests 2021-01-04 17:05:59 +00:00
Jayefuu
4667786cc9 Fixed failed lua checks 2021-01-04 10:46:57 +00:00
Jayefuu
1eb5f26559 Calculate awards and print to discord upon crash site restart 2021-01-04 10:44:31 +00:00
Jayefuu
87a6f2fd49 Fixed lua check fails 2021-01-03 15:42:54 +00:00
Jayefuu
ad4591a13f Crash Site Arrakis 2021-01-03 15:35:53 +00:00
Jayefuu
0089075f9c
Merge pull request #1138 from Refactorio/player_stats_kill_tracking
Player data types updated and saved to server on restart
2021-01-03 08:53:04 +00:00
grilledham
b0ffbe43db
Merge pull request #1143 from grilledham/danger_ore_balance
terraforming danger ore balance updates
2021-01-02 23:42:08 +00:00
James Gillham
820b1e6995 terraforming danger ore balance updates 2021-01-02 23:40:30 +00:00
James Gillham
0e768ec608 Expose PlayerStats names publicly. 2021-01-02 12:00:21 +00:00
Jayefuu
50bf98f8f2 Updated as per suggestions
- Added small fixes to commands.lua
- Added logic to player_stats.lua to count kills made with vehicles. Tested on S10 with a passenger.
2021-01-02 11:37:53 +00:00
Jayefuu
9b39e35d0d Player data types updated
- Saves more kill data to Scoreboard
- Displays total kills in score board
- Saves player data to crash site scenario data set
- Added scenario name to data set so that if we later want to add data for danger ores we can filter it out
2021-01-02 11:37:16 +00:00
grilledham
b18dad52cb
Merge pull request #1137 from grilledham/server_start_data
Add server start_data.
2021-01-01 18:22:45 +00:00
James Gillham
9564d51dcc Add server start_data. 2020-12-30 20:19:22 +00:00
Jayefuu
58eaa07add Updated price after balance testing 2020-12-30 15:16:28 +00:00
grilledham
b7ad574517
Merge pull request #1131 from grilledham/danger_ore_restart
Danger ore: Add simple rocket launch condition and restart command.
2020-12-29 12:58:32 +00:00
James Gillham
8f7d040c12 Change locale danger_ore->danger_ores 2020-12-29 12:38:25 +00:00
Jayefuu
7b4ac037f7 Updated crash site data save location
Changed  data_set name that crash site data is stored in from test set to real.
2020-12-29 06:29:42 +00:00
James Gillham
e55d8987e8 Add simple rocket launch condition and restart command. 2020-12-28 22:28:21 +00:00
Jayefuu
a93eb2d4ea
Merge pull request #1128 from Refactorio/rocket-tanks
Crash site rocket tanks
2020-12-28 08:32:17 +00:00
Jayefuu
903a78de54 Updated rocket tank balance
- Reduced intervals for each level from 3, 2, 1, 0.5 seconds to 2, 1.5, 1, 0.5 seconds.
- Reduced cost from 7500 per level to 4000 per level.

These changes should make the tank useful in the period of the game for which it's designed. I will watch the next few games to check balance and adjust if it's too OP.
2020-12-28 08:25:24 +00:00
James Gillham
2f53b43165 Send report to discord. 2020-12-27 15:57:22 +00:00
James Gillham
b6221a57c2 Fix broken item.name check 2020-12-27 14:17:42 +00:00
James Gillham
7501c7b28c Fix lua check 2020-12-27 14:07:06 +00:00
James Gillham
a127196e9c Updates:
- update .luacheckrc.
- Add stack limits to airstrike and rocket tank market items.
- Refactor rocket_tanks.lua
2020-12-27 14:03:18 +00:00
Jayefuu
deefaa6892 Final updates
- Made changes suggested by grilledham
- Disabled market item when research levels complete so that the tooltip can still be seen
- Changed cost to 7500 extra per level
2020-12-27 07:30:15 +00:00
Jayefuu
674fe5dd43 Updated as per grilledham's comments. 2020-12-27 07:07:53 +00:00
Jayefuu
81bf3dec1d Rocket tanks first draft 2020-12-26 17:08:59 +00:00
Jayefuu
f28f76157e Update commands.lua 2020-12-26 08:48:07 +00:00
Jayefuu
a27b428583 Fixed lua warnings 2020-12-24 11:40:17 +00:00
Jayefuu
d32fcefe0d Added additional statistics to JSON scenario data
Previously we couldn't tell if a restart was due to game win or fail. Statistics are now saved that include the start and end epoch, the game time in ticks (so we can gauge activity), how many biters, worms and nests were killed, how many enemy_entities remain (so we can tell if the map was cleared) and how many players participated in total.
2020-12-24 06:52:14 +00:00
James Gillham
663f40e6d9 Ping map-promotion channel on crashsite restart. 2020-12-23 16:08:20 +00:00
Jayefuu
2e1b2651cb Update events.lua 2020-12-14 19:27:08 +00:00
Jayefuu
c758b6d4a8
Merge pull request #1116 from Refactorio/artillery-pickup-bug-fix
Fixed artillery pickup exploit
2020-12-13 16:06:18 +00:00
Jayefuu
c078cc1b4d Update events.lua
Final comment update.
2020-12-13 16:05:23 +00:00
Jayefuu
7b248dc2d9 Update events.lua
- Updated comments to be accurate
- Changed balance after discussion with grilledham
2020-12-13 15:53:58 +00:00
Jayefuu
b3a0665566 Updated strike cost
The strike count and cost described by the market was correct but the actual number of capsules sent and the number of capsules removed from the chest was wrong. Bug due to starting index, have now updated the maths to be correct.

Tested and the market description, number of shots fired and the number of capsules removed from the chest are now correct.
2020-12-13 15:40:32 +00:00
Jayefuu
80675bf928 Updated logic order following discussion
Rearranged the order of the code so that it's more performant and added comments to further explain the logic and reasons for the complications, ie. the cheesing with artillery.
2020-12-13 14:49:49 +00:00
Jayefuu
09f25b2b05 Updated strike max range 2020-12-09 18:33:33 +00:00
Jayefuu
c79cbca22d Fixed /strike command range issue
Previously the airstrike was not reaching the corners of the map. There was a default max_range value of 1000 that limited how far the poison capsules could travel. Have set it to 1400 so that it can reach the corners of the map.

THIS NEEDS PLAY TESTING. Please don't merge until I've confirmed I've play tested it.
2020-12-08 09:12:12 +00:00
Jayefuu
052c6f17cc Update events.lua 2020-12-08 08:18:31 +00:00
Jayefuu
f42367bb7c whitespace 2020-11-29 21:54:15 +00:00
Jayefuu
fcca5de12a Logic change and lua check fixes 2020-11-29 21:52:41 +00:00
Jayefuu
ecff8f86eb Fixed part of artillery pickup exploit
- Current behaviour is that when destroyers/defenders are created their target position is set to the entity that killed them.
- If a player picks up the artillery after the capsules spawn then they lose their cause.target and stop, not reaching the cause of the turret death.
- I've changed this behaviour so that if the target.cause is artillery then it spawns a defender/destroyer projectile NOT an entity. The projectile target can therefore be a position not an entity. So the capsules won't stop if the artillery is picked up.
- If the cause is not artillery turret or wagon then a destroyer/defender capsule entity is spawned instead of a projectile because a projectile cannot track the player.
- If the player picks up the artillery turret before the projectile that kills a turret arrives then the event cause.name will be missing and no bots spawn at all. I have changed the behaviour so that "if not cause" then we assume they're doing something fucky. We won't have the entity cause name or position, so let's just spawn double the normal amount of destroyers and just send them at 0, 0 since we know nothing else to do with them.
2020-11-29 21:26:01 +00:00