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

1636 Commits

Author SHA1 Message Date
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
grilledham
e86cc2a8f5
Merge pull request #1114 from Refactorio/crash-site-air-strrike
Airstrike command
2020-11-29 19:47:27 +00:00
Jayefuu
2a6092d2e4 Added chest check 2020-11-29 18:39:32 +00:00
Jayefuu
fd047c7868 Update commands.lua 2020-11-25 21:35:16 +00:00
Jayefuu
4cee264d63 Changed find_entitieS_filtered to count_entities_filtered 2020-11-25 21:33:04 +00:00
Jayefuu
2dffbba928 woops 2020-11-25 21:19:35 +00:00
Jayefuu
fa70f1e832 Updated as per comments 2020-11-25 21:18:07 +00:00
Jayefuu
40d3b4e452 Uncommented admin print 2020-11-25 15:32:52 +00:00
Jayefuu
13a2c40acb Updated localisation and inconsistencies 2020-11-25 14:57:05 +00:00
James Gillham
89b3af7f15 Fix diggy gui button styles 2020-11-24 20:20:45 +00:00
James Gillham
4c227a14e8 luacheck - remove trailing whitespace 2020-11-24 20:20:26 +00:00
James Gillham
2bd3348287 ammo-category fixes 2020-11-24 17:45:07 +00:00
James Gillham
762d31d465 Gui fixes 2020-11-24 17:44:31 +00:00
James Gillham
171737e587 Remove removed items/entities. 2020-11-24 16:39:22 +00:00
James Gillham
0b95a25f1d Change train_saviour to use 'player-port' instead of 'small-plane'. 2020-11-24 16:39:22 +00:00
James Gillham
dd0ddd131e technology renames. 2020-11-24 16:39:22 +00:00
James Gillham
df4225eca1 clean_cursor -> clear_cursor 2020-11-24 16:39:21 +00:00
Jayefuu
45759bd39c Updated grief check
- Changed grief check to use xpos, ypos and radius
- Tested it works
2020-11-20 21:43:19 +00:00
Jayefuu
b25547c160 Update commands.lua 2020-11-20 00:29:45 +00:00
Jayefuu
5e78cb52d2 Fixed lua checks 2020-11-19 21:25:56 +00:00
Jayefuu
e33ba4462f Merge branch 'crash-site-air-strrike' of https://github.com/Refactorio/RedMew into crash-site-air-strrike 2020-11-19 21:19:32 +00:00
Jayefuu
8092086a94 Final airstrike features
- Added balance
- Updated market item descriptions
- Checked errors
- Added toasts
2020-11-19 21:19:26 +00:00
James Gillham
1d0aaabf58 Make spawn chest indestructible/unminable 2020-11-19 19:30:41 +00:00
James Gillham
473874be35 Add retailer event handler for airstrike. 2020-11-17 21:35:12 +00:00
Jayefuu
fdb0cf3469 WIP - airstrike command
- Type `/strike [gps=x,y,surface] to send a large cloud of poison into the enemy
- Searches a chest near spawn for poison capsules. Current cost for command is 100 capsules but could be balanced.
- Needs market items adding for technology research, bought with coins.
- Variables strikeCount and strikeRadius start low. As the market upgrades are made (start at 5k each?) the size of teh strike and amount of capsules increases.
- Should be balanced to allow use from mid-game onwards. Don't allow early game use as manual throwing is fine for early outposts. This should be to speed up the boring end-game clearing of worms.
2020-11-17 20:56:53 +00:00
Jayefuu
4e4b62a152 Spidertron artillery immunity fix
- Added spidetron to artillery_target_entities list
- Added code to fire a rocket at spidertrons as well as the non-damaging artillery
- Tested effect of 4 and 8 artillery rockets on spidertron. Kills shields quick but spidertron takes about a minute to die. Enough to deter them from staying too long but not too OP.
2020-11-17 18:03:59 +00:00
grilledham
b2f5cfb7c4
Merge pull request #1101 from Refactorio/crash-site-spy-command
Added a /spy command to allow players to reveal map
2020-11-10 21:04:59 +00:00
Jayefuu
2c744211b1 Add combat robots explode on artillery wagons.
When a combat robot expires and is targeting an artillery wagon, it will now explode. This is a work around for a factorio bug where combat robots do not attack artillery wagons.
2020-11-10 20:45:37 +00:00
Jayefuu
1afccaa664 Fixed as per requests
- fixed use of game.player
- if player surface contains a number, now won't fail.
2020-11-10 20:11:18 +00:00
Jayefuu
f2f2a6d766 Updated as per comments
- Changed get_inventory(1) to get_inventory(defines.inventory.character_main) to make it clearer which inventory we're getting.
- changed area charted to 3x3 full chunks cented on the chunk containing the pinged coordinate. Will now charta 96x96 tile area which is more reasonable considering the cost of /spy
2020-11-08 21:59:54 +00:00
grilledham
674e95993f
Revert "Crash Site: Enemy combat robots now explode when they timeout" 2020-11-07 19:26:09 +00:00
Jayefuu
f06d34ca48 Fixed failed checks 2020-11-06 18:56:42 +00:00
Jayefuu
358c13c8ca Changed as per description
- Updated local to be specific to player that used the command (woops!)
- Success message now prints to all players not the user.
2020-11-06 18:52:33 +00:00
Jayefuu
f19c399bc6 Updated as per suggestions 2020-11-05 18:28:34 +00:00
Jayefuu
6bce1ad294 Fixed failed checks. 2020-11-04 16:24:14 +00:00
Jayefuu
05828cba29 Added a /spy command to allow players to reveal map 2020-11-04 16:19:52 +00:00
Jayefuu
64d78f590c Enemy combat robots now explode when they timeout
Players were using remotely located artillery wagons in lakes to cheesily clear the map with no repercussions. Swarms of destroyer capsules would hover over the artillery but not target it. They would timeout and  the player could then refill the wagon with ammo.

I've changed the entity_died_events file to events.lua since it now has on_entity_died, on_player_died and on_combat_robot_expired.

I have added the on_combat_robot_expired event so that when the robots timeout they explode, damaging nearby entities.
2020-11-04 11:30:30 +00:00
Jayefuu
0c8a260bdf
Fixed failed checks 2020-10-29 16:38:14 +00:00
Jayefuu
f1956c7224
Begin logging crash site game time to scenario data
Added lines to store the unix time the restart happens as well as how many ticks the game lasted. Starting storing these now so I have some interesting data to use in a week or two.
2020-10-29 16:26:27 +00:00
Jayefuu
cd242aaa80
Update commands.lua 2020-10-24 11:43:31 +01:00
Jayefuu
073198530b
Update commands.lua
Added changed requested by grilledham:
- Used format_time function
- Added local var to show that text string was role ID.
- Added another commented var with the ID of a test role in case we want to test something and not ping @crash_site
- Added markdown to make printed string bold
2020-10-23 17:10:04 +01:00
Jayefuu
4b2b22b05c
Added Discord notification for "@crash site" when map restarts
Added discord notification for the @crash site role when crash site is restarted using the /restart command. Pings users with @Crash Site role and prints the map time to add to competitiveness.
2020-10-22 18:56:53 +01:00
Jayefuu
166186c11b
Update commands.lua
Added suggested text fixes and cleared up lua check failures.
2020-10-10 13:07:22 +01:00
Jayefuu
c674c1b5e5
Updated crashsite commands.lua to check total biter count
Allows players to restart if there are less than 20 biters left since they were struggling to find the last few.
2020-10-10 10:41:25 +01:00
James Gillham
3a3dcad250 Change crashsite cutscene surface to not spawn enemies. 2020-10-05 20:10:49 +01:00
Jayefuu
5840f143f2
Update map.lua
Uses new builder function to ensure there are no rocks in the position the silo will spawn.
2020-10-04 18:04:04 +01:00
Jayefuu
ff989b9c30
Updated to add Builders.remove_map_gen_simple_entity to remove rocks
Space race has a bug that sometimes a rock will spawn where the silo needs to be. But the code only removes trees. This will allow me to call a function to delete rocks.
2020-10-04 17:59:56 +01:00
grilledham
3e9b24fdf0
Merge pull request #1088 from Refactorio/Jayefuu-patch-1
Updated crash site /restart command so that auto trusted and regulars can call it when map is cleared
2020-10-03 21:07:51 +01:00
James Gillham
23bf630cc1 Fix non-admin restart
- Stop the entities count from counting entities on the 'nauvis' and 'cutscene' surfaces.
- Only print abort message to admins.
2020-10-03 15:32:57 +01:00
Jayefuu
ca483ed3c9
Update commands.lua
- Fixed LUA check failures
- Added suggestions by grilledham
- Tested /restart still works from server console
2020-10-01 21:52:47 +01:00
Jayefuu
467092cd6e
Update commands.lua
- Changed behaviour for non-admins. Now checks for spawners, biters and turrets but doesn't require walls and power structures to be destroyed for restart
- Added checks to limit non-admins from changing the scenario by using an argument after /restart. Now defaults to current scenario for non-admins.
2020-10-01 21:08:09 +01:00
Jayefuu
1684d8924a
Update commands.lua 2020-09-25 11:30:48 +01:00
James Gillham
4742ced9d6 danger_ore_deadlock_beltbox fix name and updates 2020-09-24 20:08:00 +01:00
Jayefuu
4b2510cc47
Updated crash site /restart command so that guests and regulars can call it when map is cleared
Updated crash site /restart command so that guests and regulars can call it when map is cleared
- Only admin can abort, once the map is cleared.
- Guests and Regular can both call /restart when all enemy units and structures are dead
- Tested on S10 by running this command:
/c local surface=game.player.surface
for key, entity in pairs(surface.find_entities_filtered({force="enemy"})) do
	entity.destroy()
end
- Need to merge into develop to test on live server in case conditions at the end of the game are different
- Thought about adding rocket launched condition but decided against it.
2020-09-23 11:14:36 +01:00
James Gillham
bffeb07ca3 Add missing utils.table require. 2020-09-16 20:07:31 +01:00
James Gillham
1487c55791 danger_ore_hub_spiral 2020-09-16 20:01:58 +01:00
James Gillham
2ba12674f2 Remove unused variable. 2020-09-13 14:10:02 +01:00
James Gillham
0c1dd6f1ff Terrafroming danger ore balance changes. 2020-09-13 13:59:36 +01:00
James Gillham
d47803796b Danger ore balance changes:
- Less trees.
- Increase purity of ores.
2020-09-03 14:15:29 +01:00
James Gillham
3cb3809b75 Danger ore - dump container's content as coal ore 2020-09-02 15:04:50 +01:00
James Gillham
d804d29617 terraforming_danger_ore always day 2020-09-02 13:21:16 +01:00
James Gillham
7f8de881f5 Fix seed issue 2020-09-02 13:21:00 +01:00
James Gillham
0ad994dca2 Refactor all the danger ore maps 2020-09-02 12:26:19 +01:00
TWLTriston
fc3b921daf * Fix to allow thermal water extractors (thermal-extractor) to be placed;
* Fix to logistics-0 reference
* Fix to use correct banned_entities.lua file
2020-08-31 13:50:47 +01:00
TWLTriston
5641e99c26 Changing default logistics researched 2020-08-31 13:50:47 +01:00
TWLTriston
c8cb5ba0e5 Tweaks to fluid % and fixing an undefined seed variable 2020-08-31 13:50:47 +01:00
TWLTriston
49b5058d13 Tweak to the purity settings and increased biter rocket clear at 10,000 rockets 2020-08-31 13:50:47 +01:00
TWLTriston
cfb553cca5 Building a bobs+angels version on top of the bobs. Abstracted the ratios build out and increased the rockets to be 1000 instead of 100. 2020-08-31 13:50:47 +01:00
grilledham
c0cc36ccd6 render pollution needed for chunks to unlock 2020-08-31 13:50:47 +01:00
grilledham
4bd615c7b7 updates 2020-08-31 13:50:47 +01:00
grilledham
df7d1a2d98 biter attacks on rocket launch 2020-08-31 13:50:47 +01:00
TWLTriston
8ae7eb6045 Partial commit for adding biter attacks. 2020-08-31 13:49:53 +01:00
grilledham
009bd913eb updated ore ratios 2020-08-31 13:49:53 +01:00
grilledham
e794e85340 reduce starting size to 80 2020-08-31 13:49:53 +01:00
grilledham
598888a3ee use weighted segments 2020-08-31 13:49:53 +01:00
grilledham
ae31250f24 added segment_weighted_pattern builder 2020-08-31 13:49:52 +01:00
TWLTriston
4b75706c10 Moved cobalt and gems to be random ore placements 2020-08-31 13:47:55 +01:00
grilledham
db413097cd updates 2020-08-31 13:47:55 +01:00
grilledham
23bac83a85 mixed_ores config 2020-08-31 13:47:55 +01:00
grilledham
c98be136df updated scenario info + upped pollution thresholds 2020-08-31 13:47:54 +01:00
grilledham
70810d930d banned_entites 2020-08-31 13:47:54 +01:00
plague006
d5ccc003a0 Add table require 2020-08-31 13:47:54 +01:00
grilledham
0f10a2071b fixed missing comma error 2020-08-31 13:47:54 +01:00
grilledham
3c6bd28498 added thorium to the no map gen ores 2020-08-31 13:47:54 +01:00
grilledham
a73d9cd88d danger bob ores 2020-08-31 13:47:54 +01:00
BSM
b3a438b06e
Update venice.lua
Removed trailing whitespaces (inside description strings, so picky the luacheck).
2020-08-27 20:56:16 +02:00
BSM
40f6cea071
Update venice.lua
Added map descriptions and disabled landfill to prevent cheating
2020-08-25 05:11:49 +02:00
zahir
05cea798f3 spidertron bot spawn 2020-08-17 21:34:24 -04:00
BlueRock (on discord)
e2384ba331
undo un-intentional indent 2020-08-09 22:12:38 -04:00
BlueRock (on discord)
2aa7b712ac
Revert change to diggy-clear-void command
Originally proposed change to allow for a numerical surface_index to work with the diggy-clear-void debugging command.   But found that command works as is by using the text 'redmew' as the surface index.   Discarded proposed change and documented example use in comments to help clarify how to use.
2020-08-09 21:15:46 -04:00
BlueRock (on discord)
e2b6f6096d
Update hail_hydra.lua
Fixes an infrequent bug in hail_hydra that has existed a long time.    Currently Factorio does not allow enemy entitities of type 'turret' to target entities of type 'car' (includes cars and tanks).  Doing so logs an error.  If this changes in the future then the condition cause.type ~= "car" below can be removed.
2020-08-09 20:58:59 -04:00
BlueRock (on discord)
86002b4e70
Remove test code 2020-08-07 21:23:30 -04:00
Bluerock
2f2533db40 Merge remote-tracking branch 'upstream/develop' into develop 2020-08-07 21:05:18 -04:00
Bluerock
08197bccd2 first commit 2020-08-07 20:29:56 -04:00
Bluerock
0afdbcb472 Various Diggy enhancements and updates 2020-08-07 20:24:07 -04:00
plague006
c552294021 Resolve remaining linting warnings/errors 2020-07-31 12:03:34 -04:00
plague006
3c04544694 Minor linting fixes 2020-07-31 11:07:09 -04:00
grilledham
4d8aee20c5
Merge pull request #1070 from grilledham/crashsite_do_bot_spawn_bug
fix do_bot_spawn when event.cause is nil
2020-07-21 19:50:46 +01:00
James Gillham
0cb6780922 fix do_bot_spawn when event.cause is nil 2020-07-20 20:26:15 +01:00
Claude
42bdf2be6d
update link 2020-07-18 12:57:57 +03:00
Claude
96aea0b76f
Update link 2020-07-18 12:24:41 +03:00
BlueRock (on discord)
dbdd241c86
Recommended Diggy bot mining update for Factorio .18.27 (#1064)
* Recommended Diggy bot mining update for Factorio .18.27

* Resolve conflicts in this PR with diggy_hole.lua in PR 1061

* Include recent updates made to diggy_hole.lua in PR 1061

* Mining delay and particle tweaks
2020-06-04 16:39:38 +02:00
BlueRock (on discord)
3e08ea6b6c
Diggy updates for Factorio .18.27 (#1061)
* Diggy updates for Factorio .18.27

* Updated with Soggs suggestions and tested again.  Thanks Soggs.

* improved on_entity_died event handling

* Changes to on_entity_died event handling based on feedback

* Ensure loot is also suppressed for rocks that die by being damaged

* Remove unused local variable from simple_room_generator.lua

* Fix exploding reactor generating stone drops and freezing game.  Using entity.destroy() again where it is better suited and for performance.

* Minor cleanup

* Readability

* Additional readibility

* Minor indentation cleanup
2020-06-04 16:34:30 +02:00
James Gillham
707e457a33 Remove evolution_scale_formula.
0.18.28 doesn't allow functions in global so we are removing teh evolution_scale_formula function from being stored in global.
2020-05-30 16:16:07 +01:00
James Gillham
b2cd925d3a Update gui styles for 0.18.27 2020-05-26 17:35:14 +01:00
theorangeangle
f474b562af
Merge pull request #991 from SimonFlapse/concrete_jungle
Concrete Jungle - the map is complete, only remaining things to do are are 
- migrate description to wiki
- add cutscene 
- bring into regular map rotation (this is an interesting map that we should run more often)
2020-05-10 16:23:52 -05:00
theorangeangle
90dae3ded6 add map preview 2020-05-10 16:22:59 -05:00
theorangeangle
191667aec6
Merge pull request #979 from Jayefuu/patch-9
Changes to Maltease Crossings as per #906 - Map might need some balance changes but in terms of "does it work as intended" the answer is yes
2020-05-10 16:11:35 -05:00
Zahir Khan
645eb375a9
Minor fix
event parameter added to do_spawn_entity
2020-04-28 23:06:41 -04:00
grilledham
7c70d36b41
Merge pull request #1049 from Zahir-Khan/In_progress
Artillery kills cause bots to spawn and shoot across the map.
2020-04-28 08:27:28 +01:00
grilledham
de0ba2fa6c
Merge pull request #1047 from Ogg-Technologies/develop
Added maze_with_rooms map
2020-04-27 19:09:00 +01:00
Jayefuu
9b27034345
Update dino_island.lua 2020-04-26 16:22:50 +01:00
Zahir Khan
e7d5044b59
different spawn rate for arty vs arty 2020-04-25 19:46:04 -04:00
Zahir Khan
8238351252
Artillery will cause bots to spawn 2020-04-25 18:17:12 -04:00
Oskar
f963e50910 Fixed reloading 2020-04-19 19:53:58 +02:00
Oskar
1c82183ab5 Added ores at dead ends 2020-04-19 16:59:53 +02:00
Oskar
2566d7fca0 Small refactoring
Added missing local to functions

Moved requires to the top

Removed unused Event require

Renamed remove_dead_ends functions
2020-04-19 11:47:55 +02:00
Oskar
960971d6cb Added maze_with_rooms map
Added a new map which makes everything void except a random maze
Randomly sized rooms are placed around the maze
2020-04-18 20:26:51 +02:00
theorangeangle
fcb14d33fb
Merge pull request #1045 from Refactorio/theorangeangle-patch-2
other things todo:
-basic cutscene
-less biters (add preset?)
2020-04-18 12:56:56 -05:00
grilledham
c0406c5acb
Merge pull request #985 from Zahir-Khan/In_progress
Feature - Combat bots spawn when player kills a turret.
2020-04-18 17:46:18 +01:00
Zahir Khan
f900cb8d39
small balance change 2020-04-18 01:38:31 -04:00
James Gillham
578f3465e4 refactor on_entity_died event 2020-04-16 12:40:43 +01:00
grilledham
7f8efca5a5 Fix restart state not reset when fails to start sceanrio.
When a scenario fails to start the restarting state was not reset, which prevented another restart from being started. We now clear the restarting flag.
2020-04-15 23:03:51 +01:00
Zahir Khan
ede8802e92
Modifiers for Combat bots 2020-04-06 18:15:01 -04:00
Zahir Khan
530ab4f307
Update entity_died_events.lua
Factorio devs fixed the bug.
2020-04-06 16:30:47 -04:00
theorangeangle
e4478f6735
Map description for danger ores
other things todo:
-basic cutscene
-less biters (add preset?)
2020-03-31 00:59:45 -05:00
theorangeangle
dc67a9518b
Update grid_bot_islands.lua
remove the standard market to prevent two markets from spawning at map load
2020-03-30 17:22:19 -05:00
theorangeangle
092f30cded
Merge Space Race into Code Base :D
Space Race is still very much a [WIP] and should be treated as such. Many features need to be added, but it is being merged in its current state to allow for easier internal integration. The map is in a playable state, and includes a configuration file. 

A list of future ideas and features to implement can be found at #996 and it should be notes that this is still a "high priority" project.
2020-03-01 23:34:23 -06:00
grilledham
d45009d1aa
Merge pull request #1038 from BlueRock2/Diggy_oil_spacing
Diggy - Prevent oil from spawning too close to other oil patches
2020-02-19 22:54:49 +00:00
grilledham
8b3a0bbfd6
Merge pull request #1033 from BlueRock2/BlueRock_branch2
Diggy patch for ore showing up on top of water
2020-02-19 22:54:28 +00:00
Simon
d4cab5ef9f
Removed trailing whitespace (Travis CI) 2020-02-18 22:53:59 +01:00
BlueRock (on discord)
b89ba937fe
Update scattered_resources.lua 2020-02-18 16:23:21 -05:00
BlueRock (on discord)
1896b282f4
Updated with Simon's suggestions. 2020-02-18 15:41:54 -05:00
BlueRock (on discord)
24c20bdf17
Update scattered_resources.lua
Updated to use count_entities_filtered with limit instead of find_entities_filtered
2020-02-16 16:54:39 -05:00
Bluerock
54fa0be54b Prevent oil from spawning too close to other oil patches. 2020-02-16 12:27:57 -05:00
grilledham
84ccb2a0be
Merge pull request #1032 from BlueRock2/develop
Diggy-map patch
2020-02-15 16:21:40 +00:00
BlueRock (on discord)
0abf22ad91
Update hail_hydra.lua
Merging this hail hydra particle fix (PR 1035) with PR 1032 (diggy patch for 0.18) since all of the updates are related to the particle changes in Factorio 0.18
2020-02-14 13:48:48 -05:00
grilledham
8ef36c6099 crashsite world map 2020-02-08 13:47:51 +00:00
Bluerock
ca8b0b09c2 Patch for ore spawning on top of water inadvertently introduced in PR #983 to resolve issue #552. 2020-02-06 06:21:22 -05:00
BlueRock (on discord)
aef0788f89
Merge pull request #3 from Claude477/patch-6
update3
2020-02-04 18:48:34 -05:00
Claude
dd801ec7c9
update3
update3
2020-02-05 01:39:56 +02:00
Claude
10820832c8
update2
update2
2020-02-05 01:37:21 +02:00
theorangeangle
2b8a2440ae
Merge pull request #1009 from Claude477/patch-5
Create square_sprial_old
2019-12-31 04:33:57 -06:00
grilledham
be2cc08f31
Merge pull request #1011 from Tarsassum/reversion
new file:   map_gen/maps/terra.lua
2019-12-09 20:21:31 +00:00
Zahir Khan
f4739e9edd
Update scenario.lua 2019-12-07 19:55:30 -05:00
Zahir
dfad5aa8e7 added mapgen to cutscene 2019-12-07 19:47:59 -05:00
theorangeangle
8be717d4bc
Merge pull request #1006 from Zahir-Khan/crashsite-cutscene
Crashsite cutscene
2019-12-04 21:51:31 -06:00
Zahir Khan
734693a19f
Update cutscene.lua 2019-12-04 16:48:26 -05:00
Zahir Khan
6a43accf85
Update cutscene.lua 2019-12-04 16:07:51 -05:00
theorangeangle
17c433a4bb
Merge pull request #1014 from Zahir-Khan/turkey
Turkey.lua Improvements
2019-12-04 14:29:56 -06:00
Zahir Khan
db66b17314
Update cutscene.lua 2019-12-03 21:38:51 -05:00
Zahir Khan
b0354cdb39
Update cutscene.lua 2019-12-03 21:01:01 -05:00
Zahir Khan
e17c3d28f7 Prevent character collision 2019-12-03 20:47:30 -05:00
Zahir Khan
9ea33b6303 one skip btn press needed
Added supporting changes to cutscene_controller.lua
2019-12-03 20:47:30 -05:00
grilledham
a98aea7b49 missing entity + desync fixes 2019-12-03 20:47:30 -05:00
Zahir Khan
4244afd8c5 Condensed code 2019-12-03 20:47:30 -05:00
Zahir Khan
3afde6617b Added player valid check 2019-12-03 20:47:29 -05:00
Zahir Khan
99a7657681 Timing tweaks for the new strings. 2019-12-03 20:47:29 -05:00
Zahir Khan
46ccb4c277 Added cutscene init 2019-12-03 20:47:29 -05:00
Zahir Khan
5f456347b2 Update cutscene.lua
minor addition
2019-12-03 20:47:29 -05:00
Zahir Khan
8a0873f68f Update scenario.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
20bc8cb5cb Update cutscene.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
f1e8911968 Create cutscene.lua 2019-12-03 20:47:29 -05:00
Zahir Khan
d66b62c19a Added cutscene outpost 2019-12-03 20:47:29 -05:00
theorangeangle
c1359be75c
Merge pull request #988 from SimonFlapse/diggy_cutscene
[Diggy] Cutscene Fixes
2019-12-03 13:20:30 -06:00
Zahir Khan
09922c0f54
Update turkey.lua 2019-11-29 09:20:42 -05:00