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

769 Commits

Author SHA1 Message Date
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
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
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
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
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
Soggs
ef52016d25 Minor fixes to comply with automated testing. 2019-10-13 18:11:06 +02:00
Soggs
706e7bac11 Added Snakey Swamp map script.
Creates a ribbon works with a snakey path surrounded by water at the top and bottom.
2019-10-13 15:52:03 +02:00
SimonFlapse
edc727da05 Changed cliff generation to allow map_gen cliffs 2019-10-13 13:55:18 +02:00
SimonFlapse
68744bc91a Disabled default cliff generation 2019-10-12 23:37:29 +02:00
SimonFlapse
1b317d2941 Fixed missing locals 2019-10-12 23:24:36 +02:00
SimonFlapse
ae3fc079a5 CLIFFS! 2019-10-12 23:23:54 +02:00
SimonFlapse
a128e0d234 Added player count to waiting gui 2019-10-12 16:57:31 +02:00
SimonFlapse
8a304ccb69 Fixed introduced bugs from last commit 2019-10-12 14:09:24 +02:00
SimonFlapse
6eb6574cc4 Refactoring + Changes from #996 2019-10-12 13:29:11 +02:00
SimonFlapse
ac7d60643b More tweaking 2019-10-11 21:07:16 +02:00
SimonFlapse
839019514b Result from first alpha run 2019-10-11 20:24:28 +02:00
SimonFlapse
51dfa636fc Merge remote-tracking branch 'upstream/develop' into space_race 2019-10-11 10:17:19 +02:00
Simon
ca29a047de
[Snake] Added on_snake_player_died event (#995)
* Added on_snake_player_died event and a snake_demo map

* Added score to the event

* Fixed entities being destructible

Changed comment

* Fixed cases where controller type wasn't god

* Changed players controller to spectator when their snake dies

* Changed start_game call away from remote.call

* Needed new call to show the snake button

* Changed start_game to use Snake.control

* removed snake event from demo map

* Update map_gen/maps/snake_demo.lua
2019-10-11 00:28:40 +02:00
SimonFlapse
5122634a3a Bunch of simple map descriptions 2019-10-10 11:29:28 +02:00
SimonFlapse
96eb160534 Added warning in default.lua to help guide newcomers 2019-10-10 11:10:30 +02:00
SimonFlapse
5975942db8 (Hoping to fix the removed cutscene changes)
Revert "Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene""

This reverts commit 0f87f7040a.
2019-10-10 11:01:16 +02:00
SimonFlapse
16810d4a67 Fixed pollution and updated map_settings reference 2019-10-10 10:40:32 +02:00
SimonFlapse
4d33c46b76 Merge remote-tracking branch 'upstream/develop' into mapmodify-3 2019-10-10 10:25:16 +02:00
SimonFlapse
99fe5a8d88 Restricted landfill to 'water' (connected_dots) 2019-10-10 10:24:41 +02:00
SimonFlapse
f5b40ddd07 Market items now working 2019-10-09 21:36:11 +02:00
SimonFlapse
d6842d8e4a Fixed random desync (Static oil placement) 2019-10-09 13:25:43 +02:00
SimonFlapse
f0e147f39e Added markets and more 2019-10-09 02:02:48 +02:00
SimonFlapse
301c57a536 Changed rail_grid_restrictions to use Token 2019-10-08 10:51:07 +02:00
SimonFlapse
1ecf72a86a Merge remote-tracking branch 'upstream/develop' into concrete_jungle 2019-10-08 10:48:30 +02:00
SimonFlapse
5182e21607 Initial commit of Space Race
Playable version 0.1
2019-10-07 22:44:17 +02:00
SimonFlapse
a9836b31f2 Moved containers to tier 1, new logic to prevent chest spilling
Regulars and above ignored by the anti grief
2019-10-06 22:59:09 +02:00
Jayefuu
f905cbf4d9
Update map_gen/maps/grid_islands_rotated.lua
Co-Authored-By: Simon <44922798+SimonFlapse@users.noreply.github.com>
2019-10-06 17:24:36 +01:00
SimonFlapse
199c824ad7 Refactoring + Locales + Welcome message fix 2019-10-06 14:53:51 +02:00
SimonFlapse
f94fdcd660 Added info popup 2019-10-06 01:43:27 +02:00
SimonFlapse
5145b2ac26 Re-disable tile blueprints 2019-10-06 01:27:07 +02:00
SimonFlapse
1f34779c8e Fixed inventory entities losing items
Starting area enclosed by a circle with 4 bridges

Removed refined-hazard-concrete from market

Added 3x3 hazard-concrete to spawn for assembling machine mk2 to start producing concrete
2019-10-06 01:20:01 +02:00
SimonFlapse
428e298ae9 Added more info 2019-10-05 19:43:45 +02:00
SimonFlapse
d7a08fbdae Forgot a game.print 2019-10-05 19:39:26 +02:00
SimonFlapse
9608836a77 Fixed tile blueprinting 2019-10-05 19:36:49 +02:00
SimonFlapse
79aef55281 Preventing downgrading tiles 2019-10-05 19:14:27 +02:00
SimonFlapse
ffe6f0d965 Fixed hazard left and right names 2019-10-05 18:42:50 +02:00
SimonFlapse
a087fb84b4 fixed stack valid for read 2019-10-05 18:35:57 +02:00
SimonFlapse
dad86aeff2 Fixed ground stealing/cheating 2019-10-05 18:28:06 +02:00
SimonFlapse
a324bcd167 Tweaking game play 2019-10-05 17:14:01 +02:00
SimonFlapse
47bd5e4971 Minor improvements 2019-10-05 17:02:00 +02:00
SimonFlapse
712d6bd006 Fixed upvalues 2019-10-05 17:00:36 +02:00
grilledham
c6fd8ec4ea
Merge pull request #980 from Jayefuu/branch
Added rail_grid map preset and preview
2019-10-05 11:45:11 +01:00
SimonFlapse
9b6a9784ba Refactoring 2019-10-05 11:09:32 +02:00
SimonFlapse
5d7a319267 added map info 2019-10-05 02:37:35 +02:00
SimonFlapse
af07e81014 added messages 2019-10-05 02:14:57 +02:00
SimonFlapse
2437a886f9 Added more tiered entities 2019-10-05 01:37:33 +02:00
SimonFlapse
059e8cd274 Created concrete jungle map
Suggested by Sangria Louie (https://discordapp.com/channels/432567222481846283/432570869039104012/629791144846426122)

Initial edition

Starting area with a radius of 50 made with stone-path

Most entities can only be placed on top of stone-path or better.

Entities can be split up into three tiers making the "heaviest" entities banned from any tile except refined-concrete

Needs more tiered entities
2019-10-05 01:01:39 +02:00
SimonFlapse
b7511e1dc1 Reduced landfill pricing based upon feedback 2019-10-04 21:16:08 +02:00
Simon
3997f6ffb3
Toxic Jungle Danger Ores Fixes (#986)
* Fixed danger ores and removed flamethrower ammo recipe

* disabled draw_resource_selection

Disabled map_gen ore, oil and cliffs.

Added map info
2019-10-04 21:01:11 +02:00
SimonFlapse
fa4442d644 "Fixed" LuaPlayer being invalid messages 2019-10-04 20:59:32 +02:00
grilledham
661cd205a4 fixed comment 2019-09-28 14:33:27 +01:00
grilledham
ea7c027495 travis linting 2019-09-28 14:31:19 +01:00
grilledham
781cd11178 refactor rail_grid 2019-09-28 14:23:57 +01:00
curiosity
03dba62d30 Refactoring 2019-09-15 12:00:23 +03:00
curiosity
9dd4f8a3bb Refactoring 2019-09-15 11:47:18 +03:00
curiosity
f3ebccce0b Fix stress corruption caused by water #552 2019-09-14 19:40:43 +03:00
Jayefuu
6d9791beb4 Updated map descriptions and landfill tech from maps named in issue #906 2019-09-11 20:57:39 +01:00
grilledham
e96cbfa680 Added Builders.change_map_gen_tiles(shape, new_tile_map). 2019-09-11 20:51:04 +01:00
Jayefuu
1ad53c842d Added rail_grid lua and png files. Suitable for vanilla but also used on modded. 2019-09-11 19:31:38 +01:00
Jayefuu
e8083dcfe2 Added map preview 2019-09-09 23:29:34 +01:00
Jayefuu
8ddb0c4f8e
Updated maltease_crossings as per #906
Updated as per comments by @theorangeangle in #906 :
https://github.com/Refactorio/RedMew/issues/906#issuecomment-525123084

- Updated map description, name etc.
- Removed remove_tree function broken by Redmew surface
- Added automatic disabling of landfill on game init. Previously used a manual command.
- Moved spawn so market didn't appear on coal patch.
- Added map preview to data folder

Sorry for the several commits. I'll get smartgit set up again soon.
2019-09-09 22:55:01 +01:00
grilledham
def7d53da2 fix require for Popup.player 2019-09-08 13:18:50 +01:00
theorangeangle
0f87f7040a Revert "Merge pull request #947 from SimonFlapse/diggy_cutscene"
This reverts commit fc1d1af9d8, reversing
changes made to 7d56edd582.
2019-09-01 22:01:32 -05:00
theorangeangle
b7be1388cd Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
2019-09-01 20:23:37 -05:00
grilledham
16a0f3cb09 reduce number of trees correctly 2019-09-01 20:23:35 -05:00
grilledham
48a4cd6d93 less trees 2019-09-01 20:23:33 -05:00
grilledham
60cc102c7a 0.17.60 oil changes 2019-09-01 20:23:30 -05:00
grilledham
0bf02b92fd desert preset 2019-09-01 20:23:28 -05:00
grilledham
fc7ed1e735 refactor to allow multiple crashsite presets 2019-09-01 20:23:27 -05:00
grilledham
cf835fcf32 spawn market to neutral force 2019-09-01 20:23:25 -05:00
grilledham
b9354c614d reverted small oil refinery changes 2019-09-01 20:23:23 -05:00
grilledham
eac5daa56f increased advanced circuit output 2019-09-01 20:23:22 -05:00
grilledham
20e836c47e outpost balance 2019-09-01 20:23:21 -05:00
theorangeangle
c2b454a775 Merge pull request #953 from theorangeangle/mapmodify-3
Mapmodify 3
2019-09-01 20:23:20 -05:00
theorangeangle
fc1d1af9d8
Merge pull request #947 from SimonFlapse/diggy_cutscene
Cutscene Controller
2019-08-31 20:52:28 -05:00
theorangeangle
616541bee9 fixed whitespace and added map preview for "loading screen" 2019-08-28 22:13:54 -05:00
theorangeangle
c5d09f50fa fixed broken image sprite and replaced with a parity 2019-08-28 21:40:27 -05:00
grilledham
3e28c29a70 reduce number of trees correctly 2019-08-03 14:26:34 +01:00
grilledham
afa2019faa less trees 2019-08-03 12:16:19 +01:00
grilledham
0eb844b17f 0.17.60 oil changes 2019-07-30 17:30:47 +01:00
grilledham
54ff569235 desert preset 2019-07-28 11:44:21 +01:00
grilledham
119ce340bb refactor to allow multiple crashsite presets 2019-07-28 11:44:13 +01:00
grilledham
3941937400 spawn market to neutral force 2019-07-27 12:00:18 +01:00
grilledham
bac91762a3 reverted small oil refinery changes 2019-07-25 16:21:56 +01:00
grilledham
5b6b46047e increased advanced circuit output 2019-07-25 16:21:26 +01:00
grilledham
c7c6120f55 outpost balance 2019-07-21 18:37:03 +01:00
theorangeangle
5607e7a50b
Merge pull request #953 from theorangeangle/mapmodify-3
Mapmodify 3
2019-07-17 04:38:50 -04:00
SimonFlapse
b431628b86 Removed game.print statements 2019-07-07 20:54:37 +02:00
SimonFlapse
d07ea062fe Merge remote-tracking branch 'origin/diggy_cutscene' into diggy_cutscene 2019-06-22 16:53:26 +02:00
SimonFlapse
40131895f0 Added ability to fit to edges based on the top left corner 2019-06-22 16:53:18 +02:00
Simon
890cdf12e7
Merge branch 'develop' into diggy_cutscene 2019-06-22 15:11:56 +02:00
grilledham
4bd81a89e0 set chest to be on player force 2019-06-22 09:45:09 +01:00
grilledham
869371cb2a added burner inserter to spawn 2019-06-22 09:41:45 +01:00
grilledham
2ba2086618 respawn power poles 2019-06-21 21:29:35 +01:00
theorangeangle
c7f57d257e fixed the shit i broke in the last commit, hopefully 2019-06-20 22:49:09 -05:00
theorangeangle
571b06eadb Revert "renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror."
This reverts commit b8d994a7f6.
2019-06-20 22:43:12 -05:00
theorangeangle
c2cbcc4a0b added map info and disabled landfill on DNA; added map preview and info for double beach 2019-06-20 22:35:51 -05:00
grilledham
fa2a62337a highlight top buttons 2019-06-20 12:39:18 +01:00
theorangeangle
a93ec511b9 added map descriptions for diagonal ribbon, bacon islands, and antfarm; fixed stone and coal generation in ribbon 2019-06-19 21:20:43 -05:00
theorangeangle
4481e86940
Merge pull request #915 from RCTheBlueWolf/develop
set day/night to bright and added preview image for the beach map.
2019-06-19 20:31:51 -05:00
theorangeangle
53281692dc renamed crosses3 to x-cross 2019-06-19 20:23:24 -05:00
theorangeangle
7451e2ae8c removed the crosses default map. 2019-06-19 20:20:34 -05:00
theorangeangle
b8d994a7f6 renamed "factorio_logo2" to "factory_squared"; removed "factorio_logo" and its preview image; fixed info and disabled market module for christmas tree of terror. 2019-06-18 17:28:31 -05:00
SimonFlapse
f811da5b30 Fixed inverted height and width
Polygons are not being placed correctly
2019-06-14 23:19:21 +02:00
SimonFlapse
71044d6ade Refactoring + Rendering module from grilledham 2019-06-14 19:24:11 +02:00
theorangeangle
0e67d6ca99
Update beach.lua 2019-06-10 14:37:13 -05:00
SimonFlapse
7d32760bc2 Diggy cutscene tweaks 2019-06-10 19:29:14 +02:00
SimonFlapse
36f51bc2e5 Fixed rendering background
Minor tweaks to cutscene in diggy
2019-06-10 19:10:02 +02:00
SimonFlapse
6978cc0330 Fixed replay not working in MP 2019-06-10 16:32:13 +02:00
SimonFlapse
860ead05c0 Added localisation, Debug.Print and Cleanup
Also changed some parameters to the draw_text with background so that 'g' and similar letters are not outside the background
2019-06-10 15:15:14 +02:00
SimonFlapse
202e4c37b5 Fixed background parameters
Also added a new waypoint to Diggy with floating text
2019-06-10 01:04:14 +02:00
SimonFlapse
85fc38fd3a Minor changes to player_create
Allowing cutscenes to run before welcoming players via info gui and console messages.

Also includes a search limit for walls and rock to prevent the cutscene from running too far away from {0, 0}
2019-06-09 23:59:16 +02:00
SimonFlapse
f04b13f63a Added parameter passthrough to rendering module 2019-06-09 13:31:44 +02:00
SimonFlapse
de77c9601a Fixed players loosing control 2019-06-09 12:26:51 +02:00
SimonFlapse
3ca8e3f127 Cutscene Controller
Implemented for Diggy
2019-06-09 00:55:25 +02:00
Lynn
99890acdc2
Merge pull request #935 from linaori/cleanup-player-stats
Cleanup player stats
2019-06-02 17:16:55 +02:00
Lynn
f73e017e88 Optimize some reach distances 2019-06-01 17:11:17 +02:00
Lynn
cff6fe8db9 Added more controls to refine evolution config 2019-06-01 16:29:55 +02:00
Lynn
8a84ef7504 Cleanup of player stats functions 2019-05-31 23:18:19 +02:00
Lynn
e72fc1c4a2
Merge pull request #932 from linaori/fix/on_player_built_tile
Ensure the new tile is set, not the item
2019-05-31 22:53:37 +02:00
Lynn
8d8ce28228 Diggy integration with new ScoreTracker 2019-05-30 22:47:19 +02:00
grilledham
fe8e3dffe8 Builder decoratives + 1000x map tweaks (#931)
* added support for decoratives

* use decratives for 1000x map

* Tweaked decoratives and disabled draw_resource_selection

* renamed variable to avoid shadowing
2019-05-30 14:06:52 +02:00
Lynn
da1a59a64d Ensure the new tile is set, not the item 2019-05-30 13:37:24 +02:00
Lynn
8f7695fefd Some diggy tweaks based on feedback
- Added an initial mining speed bonus
 - Added an option to toggle landfill research
 - Slightly increased oil spawn rates
2019-05-30 12:36:15 +02:00
Simon
f24b9aa51f
Crowdin sync 2019-05-29 (#928)
* Crowdin sync 2019-05-29

* fix cs technology tag

* Fixed rich text, new crowdin sync

Crowdin sync at 20:15 UTC 2019-05-29

* First diggy localisedStrings

* Added missing localisedString

* Updated readme + CI fix
2019-05-29 23:13:28 +02:00
theorangeangle
9d3f806d46 reverted market removal 2019-05-28 13:52:13 -05:00
theorangeangle
fcd0163b12 scenario info, map images for christmas tree of terror and 1000x
re-enabled market on 1000x
2019-05-28 13:14:14 -05:00
theorangeangle
1831a381bc added documentation for borg planet; map info and description for broken web. 2019-05-27 22:22:24 -05:00
theorangeangle
ee63ff067e removed V1 of borg planet and renamed V2 to reflect its deprecated state. 2019-05-27 15:18:01 -05:00
theorangeangle
ef5e615c68 removed RS require 2019-05-27 11:31:17 -05:00
theorangeangle
e5e0377d3d added description and RS for crosses3 map.
tested in SP, everything loads as intended.
2019-05-27 00:09:37 -05:00
theorangeangle
15735f0b07 removed diagonal lattice and added descriptions, map preview for contra spiral 2019-05-26 23:47:31 -05:00
Lynn
28f79a9166 Added tooltips for most menu items 2019-05-26 13:21:40 +02:00
Connor Fricker
073dbaf9ce commented out problem code, will have to work on it some other time 2019-05-22 19:16:21 +08:00
Connor Fricker
b67c28fa11 set day/night to bright 2019-05-22 15:28:30 +08:00
grilledham
6ad2be252c Fix RS requires 2019-05-20 14:54:44 +01:00
theorangeangle
f50ef8b9eb sitting here wondering, how do i combine commits? 2019-05-20 06:43:46 -05:00
theorangeangle
2ef2743d16 fixed incorrect MGSP issue
and linting stuff (thanks grilled)
2019-05-20 06:41:30 -05:00
theorangeangle
3651eb1097 added map description info 2019-05-20 00:14:14 -05:00
theorangeangle
bf2382fb4d added map description info 2019-05-20 00:12:50 -05:00
theorangeangle
2688ca9899 foundation for map. current features:
-vanilla terrain
-car body enabled

still need enabling:
-tiny ores
2019-05-20 00:01:44 -05:00
grilledham
2228be6917 get_player_by_index -> game.get_player 2019-05-17 15:57:01 +01:00
grilledham
a0e178fc75 removed unsed Game variable 2019-05-16 12:11:01 +01:00
grilledham
880c0366d1 Game.get_player_by_index -> game.get_player 2019-05-16 11:10:56 +01:00
Simon
14165acdb2
Fixed rich text for old player -> Character (#909) 2019-05-12 23:55:06 +02:00
grilledham
edbcb7f79a
Merge pull request #899 from TWLTriston/map_terraforming_danger_ores_april2019
Map terraforming danger ores april2019
2019-05-11 19:59:51 +01:00
grilledham
21243c5eac prevent landfill + random seed for ores 2019-05-07 19:53:24 +01:00
grilledham
18a333650d better fix for ores 2019-05-07 19:48:36 +01:00
grilledham
d6401e3cbd fixed ore spawn 2019-05-07 19:39:55 +01:00
Simon
5a45ff1729
Quadrants balance update (#863)
* Fix for hydra worms destroying base

Also include a force disable of research for all quadrants to prevent a save mitigation bug from a factorio version to another.

* Fixed wrong worm tier

* Mapgen settings and market locale

Added mapgen settings based on feedback

Added [retailer] market_name to use in rendering the market name over the market. Key has been added in en, de and da with translations.

Indentation fix

* Fixed floating 'a'

* Fixed global variable

* Updated item to chest

Made it more clear what happens when you cross the border in a train

Also added a GPS coordinate for the spawned chest

* Bug fixes for chests spawn

* Gave buttons uid_name()

* Removed debug statements

* Fixed Item to chest

People think the previous behavior was a glitch so I've changed it to align with their expectations.

Also increased evolution factor from pollution a bit

* fixed game.player

* Added crafting_queue_size check

* Updated enemy settings

* Merged map_settings and mapgen_settings, added wall

* Merged map_settings and mapgen_settings

* Added three toggles to settings, disabled item to chest when traveling in trains

* Game.get_player_by_index converted to game.get_player

* Added charting and removed unused variable 'Game'

* Fixed for 0.17.35
https://forums.factorio.com/70188

* Fix for 0.17.35

* Added comments to force new CI build

* fixed missing player_inventory -> character_inventory
2019-05-03 00:40:45 +02:00
grilledham
7516c2f8bc inventory.player -> inventory.character 2019-05-02 17:46:28 +01:00
SimonFlapse
56b6dfbd01 More player -> character 2019-05-02 17:02:53 +02:00
SimonFlapse
69bdd747fb Fixed technology and inventory rename
Also fixed player -> character in types
2019-05-02 16:53:12 +02:00
TWLTriston
464b25b1b9 Changed win conditions to be globals for desync prevention and correction to the wrong variable being called as a win condition for disabling biters.
TravisCI fix on varible name reuse (entity)
2019-04-25 06:21:03 -04:00
grilledham
26ea48de48 fixed desync issue with random quadrants 2019-04-25 10:38:17 +01:00
grilledham
bdb524c6db formatting 2019-04-25 10:37:49 +01:00
TWLTriston
03de8ca472 Added win condition for evolution increases and finally biter wipes from the map. 2019-04-24 22:21:06 -04:00
TWLTriston
5d06eba612 Randomized ore quadrant starting position, moved to single table for easier cross-reference 2019-04-24 18:48:52 -04:00
TWLTriston
b6d453dbb3 Converted tile references to be abstracted to the quadrant instead of ore specific 2019-04-24 17:11:20 -04:00
TWLTriston
9c4c2dce93 Converting to named ratios, reduced stone ratio by 1/2 in all quads. 2019-04-24 17:00:34 -04:00
TWLTriston
c4b6ea0bf0 Converting tile names to tables instead of string concatenation. 2019-04-24 16:45:27 -04:00
Simon
201fc80e55
[Diggy] Updated experience gui (#840)
* Updated experience gui

* Fixed XP from rocket launches

* Added more rich-text

* Updated experience gui

* Fixed XP from rocket launches

* Added more rich-text

* Added more rich_text

* Added new hail_hydra and weapon_balance

* Spitter spawn behemoth worms

* Fixed linting

* Reverted spawn chance back to 0.05

* Fixed Diggy _CHEAT

Now overrides config.lua cheats when debug is not true
2019-04-22 20:21:04 +02:00
grilledham
186e5eedd4 disabled biter attacks module for crashsite 2019-04-21 11:38:27 +01: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
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
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
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
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
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
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 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
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
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
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
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
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
Matthew
e508c9133c
Merge pull request #743 from plague006/create_market_on_launch
Create market on launch
2019-02-16 17:01:51 -05:00
plague006
d8fea761f8 Add missing layer of table 2019-02-16 14:03:58 -05:00
plague006
a9e4e23024 Balance changes for variable tech costs 2019-02-16 13:58:27 -05:00
plague006
63ccee13c1 Update doc for tetris 2019-02-16 12:49:26 -05:00
plague006
72f68b95a0 Add maps that don't want automatic markets 2019-02-16 00:00:50 -05:00
plague006
39ad01b3fb Fix doc for redmew_surface use 2019-02-16 00:00:24 -05:00
plague006
35af187e63 Autoformat 2019-02-16 00:00:24 -05:00
Matthew Heguy
e4abc69bf2 Merge for rebase 2019-02-16 00:00:18 -05:00
Matthew
d48946f357
Merge pull request #713 from plague006/rank_system
Overhaul rank system, command, donator, add probation rank
2019-02-14 11:43:04 -05:00
Lynn
7dfd6e92c9
Merge pull request #752 from plague006/digits
Change digit to string to prevent error (and desyncs)
2019-02-13 18:25:26 +01:00
Lynn
dd93821f51
Update map_gen/maps/diggy/feature/experience.lua
Co-Authored-By: plague006 <plague006@users.noreply.github.com>
2019-02-13 12:18:40 -05:00
Jayefuu
737dc98a6a
Removed default ability to use landfill.
Landfill removes challenge of making train paths through ore circles. Used to be disabled by command after map creation but is important enough feature of map that it should be set on init.
2019-02-13 08:23:49 +00:00
SimonFlapse
937cdb5ec5 Switching teams added 2019-02-13 08:48:15 +01:00
Matthew Heguy
17cc882b04 Change digits to strings to prevent future errors 2019-02-13 01:10:26 -05:00
Matthew Heguy
cbe82d4edb Change digit to string to prevent error 2019-02-13 00:18:17 -05:00
plague006
a5fd1bce2e Fix outpost_builder, fix redmew_qol.
Add functions to donator and rank system to get full player tables.
2019-02-12 20:22:13 -05:00
Matthew Heguy
28daf88f21 Overhaul rank system, command, donator, add probation rank 2019-02-12 20:22:12 -05:00
Matthew Heguy
ba9409f363 Fix config location 2019-02-12 16:47:09 -05:00