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

1476 Commits

Author SHA1 Message Date
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
Zahir Khan
7682f1967e
Use of on_nth_tick 2019-11-29 08:53:32 -05:00
Zahir Khan
d0f2fc5748
Update turkey.lua 2019-11-28 13:37:27 -05:00
theorangeangle
0e52cb3519
Merge pull request #1012 from Zahir-Khan/turkey
Added random messages to print every 10 minutes to the turkey map 
just in time!
2019-11-27 23:59:07 -06:00
theorangeangle
2225f5363f added vauge documentation that will come back to haunt me later
local time 11:49 pm and travis better approve this by midnight!
2019-11-27 23:49:24 -06:00
theorangeangle
9e72495790 after playing whack a mole for 20 mins i think it's working now. local time 11:43pm 2019-11-27 23:43:45 -06:00
theorangeangle
bd8e289e58 i wanted to add the turkey ores from the 2018 map onto the 2019 terrain but can't clear out all the errors. going to have inebriate myself and see if that makes things better or worse. -11:10pm local 2019-11-27 23:10:50 -06:00
Zahir Khan
9a6e978a27
Update turkey.lua 2019-11-27 21:01:49 -05:00
Zahir Khan
837eedcc2c
Update turkey.lua 2019-11-27 20:39:26 -05:00
Zahir Khan
97be613e3d
Added random turkey message every 10min 2019-11-27 20:26:37 -05:00
theorangeangle
b0dd0b072c
Merge pull request #981 from Jayefuu/map_description_fixes
Updated map descriptions and landfill tech from maps named in issue #906
2019-11-27 11:29:04 -06:00
Tarsassum
f662f12b79 Removed unnecessary comments and replaced useful comments on top of the lines. 2019-11-26 03:26:48 +01:00
Tarsassum
5461b3147f new file: map_gen/maps/terra.lua 2019-11-25 04:17:14 +01:00
theorangeangle
99ae9c0cf4 added map preview 2019-11-24 19:48:17 -06:00
Claude
0a1636161c
wrong folder 2019-11-24 20:23:37 +02:00
Claude
b6d53d2db6
Update 2019-11-24 20:22:59 +02:00
Claude
7ee39fc280
Create square_spiral_old 2019-11-24 20:13:12 +02:00
Claude
546694a8b2
update suare_spiral_old
Meybe this fix it
2019-11-24 19:49:00 +02:00
theorangeangle
6347833eaf removed unnecessary commenting 2019-11-16 12:37:50 -06:00
theorangeangle
4e7b3f8e21 reduced movement for players during combat 2019-11-16 12:27:19 -06:00
Claude
aca98f7098
Update creation_of_adam2.lua
This fix "map_gen.ores" path to "map_gen.entities"
2019-11-15 23:06:46 +02:00
Claude
8d0766cecc
Update vanilla.lua
This fix path for tiny_ores.lua start vanilla.lua
2019-11-12 18:48:37 +02:00
SimonFlapse
738e105766 v0.4.6 dark nights and market + coin fixes 2019-11-03 17:38:23 +01:00
SimonFlapse
69d3fd64d1 Minor changes to fix join team bug 2019-11-03 15:14:21 +01:00
grilledham
71356cc504
Merge pull request #1003 from grilledham/crashsite/biters_to_worms
Crashsite: Change biters to spawn worms on death
2019-11-01 20:35:02 +00:00
grilledham
a7ec8e9856 Change biters to spawn worms on death 2019-11-01 16:04:43 +00:00
SimonFlapse
0d3c93bad0 Minor fixes involving the gui and market 2019-10-27 19:40:27 +01:00
SimonFlapse
337eabc08a Bug fixes and team balancing changes 2019-10-27 14:46:57 +01:00
SimonFlapse
f4710e824a Changing seed 2019-10-27 12:36:05 +01:00
SimonFlapse
63d2b85407 New ore shapes 2019-10-27 12:21:08 +01:00
SimonFlapse
a9be1b46fa Minor fixes 2019-10-27 00:51:29 +02:00
SimonFlapse
bedcb2e1a9 v0.4 king of the hill 2019-10-27 00:45:28 +02:00
SimonFlapse
09d4d76359 Added custom mirrored ore generation + Refactoring 2019-10-26 22:09:32 +02:00
SimonFlapse
52f0fe2e5c Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-26 16:26:19 +02:00
SimonFlapse
350ab55fcc Changes from second playthrough 2019-10-21 17:20:28 +02:00
Soggs
b44ca8621b Changes to Snakier_Swamp as proposed by grilledham. 2019-10-21 12:34:01 +02:00
Soggs
f1bfc70d43 Deleted Builders.remove_decoratives() from Builders.lua as it was a inferior duplicate of the newly added Builders.remove_map_gen_decoratives().
Swapped Snakey_Swamp and Snakier_Swamp to use Builders.remove_map_gen_decoratives() instead of Builders.remove_decoratives().
2019-10-21 12:21:54 +02:00
Soggs
f3ffc28512 Merge remote-tracking branch 'upstream/develop' into snakey_swamp 2019-10-21 12:15:26 +02:00
Simon
9a2e5e554f
Hilbert Water Trap + Fixes for Hilbert Sand Trap (#998)
* Initial commit of hilbert water trap

* Refactoring in features/market.lua

* Fixed ribbon for both Hilberts

* Added remove decoratives function to the builder

* Refactoring the new builder functions

* Simplifying create_standard_market

* remove_map_gen_decoratives_by_filter renamed

* Fixed documentation links having _edit in them

* Formating documents
2019-10-20 16:23:34 +02:00
Simon
5b290676d4
Update map_gen/maps/space_race/cliff_generator.lua
Co-Authored-By: grilledham <jrdgillham@gmail.com>
2019-10-20 14:41:01 +02:00
Simon
0a8dc3012e
Update map_gen/shared/generate.lua
Co-Authored-By: grilledham <jrdgillham@gmail.com>
2019-10-20 14:40:22 +02:00
Soggs
78dbd16b30 Added Builders.remove_decoratives(shape) to builders.lua
Builders.remove_decoratives(shape) removes any decoratives in the given shape.
Update the map scripts, snakey_swamp and snakier_swamp to use this to remove decoratives from the dividers.
2019-10-20 05:24:35 +02:00
Soggs
d360169ab7 Merge remote-tracking branch 'upstream/develop' into snakey_swamp 2019-10-20 05:16:18 +02:00
SimonFlapse
f85c434077 Fixed whitespace 2019-10-19 00:03:07 +02:00
SimonFlapse
d812c71fe5 Merge remote-tracking branch 'upstream/develop' into diggy_cutscene 2019-10-18 23:41:21 +02:00
Simon
b6bcc70194
Merge branch 'develop' into patch-9 2019-10-17 23:54:40 +02:00
Simon
03f461da36
Merge branch 'develop' into map_description_fixes 2019-10-17 23:53:19 +02:00
Simon
fce544c2d1
Merge branch 'develop' into mapmodify-3 2019-10-17 20:27:42 +02:00
SimonFlapse
2a83ea5ad1 Fixed saved prices being synced between forces 2019-10-14 23:11:04 +02:00
SimonFlapse
5143a12d15 Fixed unlocking disabled research and the random research unlock 2019-10-14 22:54:15 +02:00
SimonFlapse
f0fe5ed20a Added "random" research unlocks in the market 2019-10-14 22:29:30 +02:00
grilledham
0f88751faf fix crashsite no wall bug 2019-10-14 19:04:46 +01:00
SimonFlapse
21bb182644 Removed sand-1 beach 2019-10-14 17:25:13 +02:00
SimonFlapse
01fb65f323 Moved entity creation to a new function 2019-10-14 17:21:36 +02:00
SimonFlapse
09a565c115 Nice beach transition 2019-10-14 17:18:06 +02:00
SimonFlapse
f131b4d483 Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-14 15:43:52 +02:00
Soggs
d3e82fb1fa Purging the evil trailing whitespaces. 2019-10-14 13:10:57 +02:00
Soggs
dd544919c8 Snakier_Swamp Initial Commit
Adds another ribbon style map similar to Snakey Swamp with even windier paths.
2019-10-14 13:03:22 +02:00
SimonFlapse
4e4945f159 Changes to starting resources 2019-10-14 09:59:18 +02:00
SimonFlapse
31e534c502 Merge remote-tracking branch 'upstream/develop' into snakey_swamp 2019-10-14 09:45:10 +02:00
Simon
bf8cd265d2
[Builder] Simple entity removal (#994)
* Simple entity removal in Builders

Performance could be improved

* Removed rocks parameter
The increased radius caused simple-entity to work

* Added another way to remove units that should be more efficient

* Changed find_entities to use area instead of radius

* removed remove_units function

* changed function name from names to name

* added table.shallow_copy

* reworked 'remove_*' builders

* used remove_* builders for existing maps

* update .luacheckrc

* Added links to documentation for each public function

* Added links for new functions
2019-10-14 00:09:47 +02:00