3543 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
grilledham	40b2d858aa	Merge pull request #1069 from Claude477/patch-10 ... Update info.lua	2020-07-18 11:01:43 +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
Claude	5dd2156cfa	Update info.lua ... Changed domain name because old giving SSL errors.	2020-07-17 11:39:23 +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
grilledham	c9660efcc9	Merge pull request #1063 from grilledham/fix-remove-evolution_scale_formula ... Remove evolution_scale_formula.	2020-05-30 16:44:52 +01: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
grilledham	b45ecc8cb2	Merge pull request #1062 from grilledham/fix-0.18.28 ... Fix PriorityQueue to no longer store comparator function in global.	2020-05-29 12:24:50 +01:00
James Gillham	7c0867d08b	Fix PriorityQueue to no longer store function in global. ... Changed the PriorityQueue to store the comparator function in a metatable to avoid serializing the comparator function to the global table. This means that the PriorityQueue has to be restored on load. Plus side is we can use comparators that are closures.	2020-05-29 12:20:49 +01:00
grilledham	041c95def5	Merge pull request #1060 from grilledham/0.18.27-fix ... Update gui styles for 0.18.27	2020-05-26 18:14:44 +01:00
James Gillham	b2cd925d3a	Update gui styles for 0.18.27	2020-05-26 17:35:14 +01:00
theorangeangle	8f9092cd64	Merge pull request #1001 from SimonFlapse/auto-server-description ... Server description generator, rich text	2020-05-18 15:04:40 -05:00
theorangeangle	e9e5cf91d3	Revert "added a description for SP use" ... This reverts commit b4a370d660.	2020-05-10 17:16:12 -05:00
theorangeangle	b4a370d660	added a description for SP use	2020-05-10 17:15:09 -05: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
grilledham	6e649ab0e7	Merge pull request #1051 from grilledham/fix/remove-comp-chest-from-cheat-items ... Remove compilatron-chest from cheat items.	2020-04-29 21:51:48 +01:00
James Gillham	c65090321a	Remove compilatron-chest from cheat items. ... Looks like they have been removed from the game so we have to remove them from the cheat items to allow cheat mode to still work.	2020-04-29 21:50:48 +01:00
grilledham	76c88a721e	Merge pull request #1050 from Zahir-Khan/patch-1 ... Minor fix in Crashsite entity_died_events.lua	2020-04-29 21:43:53 +01: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
grilledham	a9e81b135a	Merge pull request #1046 from grilledham/restart-fail-bug ... Fix restart state not reset when fails to start scenario.	2020-04-16 12:50:11 +01: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	f3f26b5c44	Merge pull request #1044 from Refactorio/theorangeangle-patch-1 ... Update grid_bot_islands.lua	2020-03-30 21:32:24 -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
grilledham	287c35452c	Merge pull request #1043 from BlueRock2/poll_fix ... Fix poll	2020-03-24 17:00:54 +00:00
Bluerock	f6b3a83c08	Fix poll	2020-03-24 10:14:46 -04:00
grilledham	f20483540e	Merge pull request #1042 from BlueRock2/fix_tasklist ... Fix redmew shared gui tasklist	2020-03-20 16:47:00 +00:00
Bluerock	79948a0e70	Fix tasklist	2020-03-20 09:30:00 -04: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