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

842 Commits

Author SHA1 Message Date
Matthew
17c54eb136
Merge pull request #579 from iltar/retailer-in-crash-site
Uses the retailer in crash site for markets
2018-12-30 17:21:46 -05:00
Matthew
77846c1d66
Merge pull request #604 from plague006/use_color_presets
Change custom colors to presets
2018-12-30 17:20:15 -05:00
Lynn
97e757dca5
Re-added refined-hazard-concrete to the support entities 2018-12-29 22:03:44 +01:00
plague006
494648f35c Change custom colors to presets 2018-12-29 12:39:20 -05:00
Lynn
377ad8a25a
Merge pull request #603 from iltar/disabled-market-items
Ability to disable market items without removal
2018-12-29 14:07:38 +01:00
Matthew
486effcab7 Remove spaces in extant names and modify name function to remove spaces to prevent future mistakes (#581)
* Remove spaces in extant names and modify name function to remove spaces to prevent future mistakes

* Remove regulars hack and map_layout entry
2018-12-29 02:20:23 +01:00
Matthew
1b20b72d9e Update to Info's new function (#580) 2018-12-29 02:20:09 +01:00
Lynn
14e814d47f Ability to disable market items without removal 2018-12-28 21:31:08 +01:00
Lynn
2661b92b5b Re-added the blueprint helper for diggy (#602)
* Re-added the blueprint helper for diggy

* Balance shop items
2018-12-28 17:20:16 +01:00
BlueRock2
f4c9051603
Further balance tendrils_impure.lua ore ratios
This update is to better match overall map ore ratios in tendrils_impure.lua to ore consumption ratios on previous Diggy games.   Fragmented tendril ratios target anticipated early game needs, while the larger tendrils help balance out expected mid/late game ratios.   Toatal map ore average ratios for this commit are iron/copper/coal/stone equal to approx 1/0.8/0.4/0.25
2018-12-25 21:37:10 -05:00
BlueRock2
7438071700
Late game ore balancing for tendrils_impure.lua
Lowered impurity amounts in iron and copper veins as there was little or no need to seek out stone or coal veins later in the game.   Purity went from about 82% to 86%.   Standardized ore weights for each cluster to add up to 1000 so that percentage of each ore = weight / 10.   Coal and stone veins effectively the same since players can tap them or not.   Kept ore percentages scattered fragments the same since the stone and coal in them is useful early game, but doesn't affect late game much since the scattered fragments are low yield overall.
2018-12-23 13:37:25 -05:00
Lynn
7ec2380989 Retailer can generate a unique identifier 2018-12-23 13:33:54 +01:00
Lynn
511fe1a1f7 Uses the retailer in crash site for markets 2018-12-22 17:30:25 +01:00
Lynn
5cdb67979a Added some features to the market GUI (#564)
* Added some features to the market GUI

* Grouped inputs differently

* Use referenced table instead of copy
2018-12-22 00:39:18 +01:00
Matthew
bcf0c3e85d Fix issues with silly names (#559)
* Fix new LuaPlayer created on join.

* Change set_map_extra_info to add_map_extra_info

* Make silly_player and regulars compatible
2018-12-22 00:38:47 +01:00
Matthew
43aed22459 correct a typo, re-scope a couple vars, remove unused require (#570) 2018-12-22 00:38:11 +01:00
Lynn
1b29ead2e2 Track diggy XP loss (#569) 2018-12-22 00:37:44 +01:00
Matthew Heguy
38bc895796 Fix source of desync 2018-12-19 17:05:44 -05:00
Matthew Heguy
ca0ad6f431 Fix case where get_player_by_index was being sent nil 2018-12-19 17:03:41 -05:00
Matthew
00cf6eb40c
Merge pull request #553 from grilledham/top_buttons_visibility
allow player to toggle top buttons visibility
2018-12-17 10:55:33 -05:00
Lynn
f6f47b7776 Diggy fixes from last run (#554)
* Fixed wrong diggy default setting

* Fixes for Diggy

* Small balance changes
2018-12-17 13:08:58 +01:00
grilledham
f45d6d5111 allow player to toggle top buttons visibility 2018-12-16 01:28:00 +00:00
Matthew
238f6b9d7b Rename task and queue (#535)
* Rename task and queue to q

* Threading to schedule

* processing_queue to q
2018-12-15 21:28:27 +01:00
Matthew Heguy
bd04ea7fc1 Minor formatting 2018-12-15 15:26:34 -05:00
Jayefuu
9ebb826152
Merge branch 'develop' into maps/christmas_tree_of_death 2018-12-14 17:32:46 +00:00
Jayefuu
0cc268bcb5 Added christmas_tree_of_terror.lua and supporting files 2018-12-14 17:29:37 +00:00
Lynn
2776b67b54 Balanced chest raffle to be more rewarding 2018-12-13 21:42:15 +01:00
Lynn
221cf9c67d Diggy fixes, performance improvements and balance tweaks 2018-12-13 21:14:27 +01:00
grilledham
9e3f4bd7dd fixed triangle of death loot balance 2018-12-12 22:11:52 +00:00
grilledham
e8275890b6 fixed triangle_of_death 2018-12-12 22:01:59 +00:00
Lynn
239f4c021a
Re-added missing iron/gears in starting_items 2018-12-11 09:13:27 +01:00
Lynn
6549ad7c12 Autoloot coins in diggy that are dropped 2018-12-10 22:09:21 +01:00
Lynn
a29d66f47f Removed unused locals 2018-12-10 21:34:51 +01:00
Lynn
bff12f1fdb Removed duplicate config 2018-12-10 21:22:25 +01:00
Lynn
2a8a047c64 Fixed coin mining and behavior in Diggy 2018-12-10 21:18:22 +01:00
Lynn
8f2b92f56f
Merge pull request #520 from iltar/diggy-fixes
Diggy - Fixed some bugs and tweaked some balance
2018-12-10 21:17:17 +01:00
Lynn
59c70346a3 Fixed a missing comment 2018-12-10 21:15:32 +01:00
Lynn
06d64a6e7c Diggy - Fixed some bugs and tweaked some balance 2018-12-10 21:15:32 +01:00
Matthew
17f7e9dcfe
Merge pull request #533 from iltar/alien-spawner-using-prototype
Alien spawner using prototype
2018-12-10 15:14:09 -05:00
Matthew
b5de650716
Merge pull request #532 from iltar/hydra-mode-into-redmew
Made hail_hydra available to all redmew scenarios
2018-12-10 15:13:29 -05:00
Matthew
66240a6c8e
Merge pull request #538 from BlueRock2/patch-2
Update tendrils_impure.lua
2018-12-10 14:29:52 -05:00
Lynn
0f2c3655fc Added comments for the different ores 2018-12-10 19:45:30 +01:00
BlueRock2
66866e7574
Update tendrils_impure.lua
Adds a another impurity to coal vein (iron) and another impurity to stone vein (copper).   Coal vein no longer overlaps iron vein.  Iron and Copper veins slightly narrower than before.   Made weights for each cluster add up to 100 so percentage becomes obvious.
2018-12-10 13:44:34 -05:00
Lynn
6b4b8a68f8 Default ore pattern set to tendrils_impure 2018-12-10 19:42:52 +01:00
Lynn
fb9e1dba6e Made hail_hydra available to all redmew scenarios 2018-12-10 19:24:48 +01:00
Lynn
2f98d21006 Some minor fixes for venus 2018-12-09 20:55:39 +01:00
Lynn
2f44ace4dd Minor reference improvement 2018-12-09 19:40:07 +01:00
Lynn
61fbcaa653 Simplified AlienSpawner global storage 2018-12-09 19:18:16 +01:00
Lynn
0fbfe49b2f AlienEvolutionProgress to utils and uses prototype data 2018-12-09 19:18:16 +01:00
Matthew
c3d7876113 Overhauled day_night_cycle, creep_spread, and nightfall. Add Venus map. (#524)
* Added dead trees to starting area

* Add shuffle_table to table utilities

* Refine venus, terraforming, nightfall, day_night_cycle

* Overhaul day_night

* Cleanup from day_night overhaul
2018-12-09 16:50:16 +01:00
Valansch
39085a37c9
Merge pull request #528 from BlueRock2/patch-1
Ore tendril pattern with slight impurities
2018-12-09 13:27:50 +01:00
BlueRock2
a43b0faaf9
Update tendrils_impure.lua
Added in a small amount of scattered ore since it may take players a little time to find each of the four primary ore types.  Slight reduction in copper and iron ore.
2018-12-08 20:11:23 -05:00
Lynn
2b7d0d0890 Removed automatic research unlock from player_create 2018-12-08 22:36:17 +01:00
Lynn
7800fab345 Gave the player_create feature the same as diggy SetupPlayer 2018-12-08 21:52:40 +01:00
BlueRock2
6054885c30
Ore tendril pattern with slight impurities
Instead of the heavily mixed ore pattern used with Diggy in the past, this ore pattern contains ore tendrils that are about 80% pure ore with lower impurities.   Feedback encouraged.
2018-12-08 15:24:20 -05:00
Matthew
0a076b5e1f
Merge pull request #523 from iltar/retailer-with-custom-gui
Added the crash-site GUI features to the retailer
2018-12-08 14:10:08 -05:00
Lynn
6617370fbc Added the crash-site GUI features to the retailer 2018-12-07 22:58:44 +01:00
Matthew
5c1bafe55e
Merge pull request #522 from iltar/command-cleanup
Cleaned up some diggy commands and the left-overs register in _DEBUG
2018-12-07 16:29:12 -05:00
Matthew
779297aece
Merge pull request #521 from plague006/fix/car_body
Fix car body directions
2018-12-07 16:28:11 -05:00
Lynn
f1494e7d6a Cleaned up some diggy commands and the left-overs register in _DEBUG 2018-12-07 21:16:28 +01:00
plague006
adb2eebd1b Fix car bodies 2018-12-07 14:57:42 -05:00
grilledham
d8ad43b171
Merge pull request #514 from Jayefuu/patch-4
Added builders.circular_pattern
2018-12-07 19:32:19 +00:00
Lynn
a17e783daf Fixed invalid cluster ore config (#517) 2018-12-06 12:31:51 +01:00
Matthew
3bff630669 Docs into wiki (#510)
* Docs into wiki

* Redirect readme
2018-12-06 12:27:29 +01:00
Lynn
bbfcdd4629 Added a basic RedMew configuration setup (#502)
* Added a basic RedMew configuration setup
2018-12-06 12:18:52 +01:00
Jayefuu
d8335494f3
Added builders.circular_pattern 2018-12-05 13:50:02 +00:00
Matthew
1329e5199d
Merge pull request #508 from Jayefuu/modified_spiral
Added spiral_crossings map preset.
2018-12-05 03:49:10 -05:00
Matthew Heguy
30aedaebc1 Add on_init 2018-12-05 03:27:32 -05:00
Matthew
f96183e0c4
Merge pull request #498 from iltar/hydra-improvements
Improved Biter aggression and scales a bit higher
2018-12-05 03:05:42 -05:00
Jayefuu
b10f81005c
Update spiral_crossings.lua 2018-12-05 07:58:48 +00:00
Jayefuu
ba3a8431b8
Updated as per stickler's comments. 2018-12-05 07:55:10 +00:00
Jayefuu
3a6a77db1c
Good bot. 2018-12-03 22:25:53 +00:00
Jayefuu
be89404a1e Added spiral_crossings map preset. 2018-12-03 22:22:40 +00:00
Jayefuu
6297d9358e Added 'rotten_apples' map preset and supporting files. (#494)
* Added 'rotten_apples' map preset and supporting files.

* Added comment about market item balance.
2018-12-03 11:21:44 +01:00
Lynn
745c55be7a Removed the old cave_miner 2018-12-01 22:47:39 +01:00
Lynn
3077e1cf59 Fixed wrong position 2018-12-01 21:44:01 +01:00
Lynn
83597c6f5a Improved Biter aggression and scales a bit higher 2018-12-01 21:39:24 +01:00
Lynn
1694c39f5b
Fixed duplicate big rock and missing huge rock 2018-12-01 19:00:42 +01:00
Matthew
aa1cf8ed74
Merge pull request #489 from iltar/added-big-rocks
Added big rocks to the table
2018-12-01 12:46:40 -05:00
Lynn
5b29219f61
Merge pull request #488 from iltar/fix-remaining-require
Fixed a few left-over requires in Experience
2018-12-01 18:02:46 +01:00
Lynn
2a9d89accd Using Template for is_diggy_rock 2018-12-01 17:58:22 +01:00
Matthew
7cbdf6c073
Merge pull request #491 from ShingenPizza/develop
Removed duplicated lines.
2018-11-30 17:26:36 -05:00
Shingen
10fb2995db Removed duplicated lines. 2018-11-30 23:00:50 +01:00
Lynn
84ab83644f Added big rocks to the table 2018-11-30 20:30:50 +01:00
Lynn
a83acc4ea7 Fixed a few left-over requires in Experience 2018-11-30 19:57:31 +01:00
Lynn
9d35776849 Server/Debug/Player only flags and Debug extraction 2018-11-30 18:45:27 +01:00
Lynn
8009df20c7 Fixed a bug related to player index missing 2018-11-29 21:00:51 +01:00
Lynn
59330af344
Merge pull request #481 from SimonFlapse/Balancing
Balancing changes
2018-11-29 20:20:03 +01:00
SimonFlapse
4a0da42991 Balancing changes 2018-11-29 20:16:23 +01:00
Lynn
0fe4f7efa9 Fixed local shadow 2018-11-29 20:03:09 +01:00
Lynn
fefb26c91a Added a crumbling effect from the ceiling when close to collapse 2018-11-29 20:03:08 +01:00
Lynn
a6339e1598 Slightly lowered stone and slightly increased uranium 2018-11-29 19:47:49 +01:00
Lynn
5cc6afe8c4 Lowered uranium density in main vein 2018-11-29 19:27:25 +01:00
Matthew
1afbeae0ca
Merge pull request #464 from plague006/utils
Overhaul utils and add minor functionality
2018-11-28 15:39:51 -05:00
Matthew Heguy
0553c2af7e Catch up on new requires 2018-11-28 07:03:10 -05:00
Matthew
d5907cc2a2
Merge pull request #467 from Refactorio/antigrief_desync_fix
Fixed antigrief desyncs
2018-11-28 06:56:17 -05:00
Matthew Heguy
bdc5d2ae77 Revert change to utils.task refs 2018-11-27 17:08:27 -05:00
Matthew Heguy
c3a2c25f3c Remove task require 2018-11-27 17:08:26 -05:00
Matthew Heguy
3fa0091971 Change existing code to use new utility functions 2018-11-27 17:08:26 -05:00
Matthew Heguy
ae024c4e10 utils->core, list_utils->table, overhaul both and updated extant uses 2018-11-27 17:08:26 -05:00
Matthew Heguy
c7201e119b Rename utils and fix requires 2018-11-27 17:08:26 -05:00
Lynn
ccab45a8a6 Fixed the cause 2018-11-27 21:10:08 +01:00
Lynn
d4e1890445 Slimmed down enemy killed comments 2018-11-27 20:48:05 +01:00
Lynn
67616ad330 Improved scanner performance 2018-11-27 20:32:23 +01:00
Lynn
fa4560fdcb Fixed a bunch of performance issues and bugs 2018-11-27 20:32:23 +01:00
Matthew
06a1a1927a Merge branch 'develop' into chat_triggers 2018-11-27 13:39:05 -05:00
Matthew
b142939c5f Overhaul config and global.scenario usage (#466) 2018-11-27 01:09:52 +01:00
Valansch
305a15581e
Update Antigrief.lua 2018-11-27 00:48:51 +01:00
Lynn
a3ff0edd61 Minor memory allocation fix 2018-11-26 20:31:10 +01:00
Lynn
58be972190 Fixed collapse on biters error 2018-11-26 20:23:53 +01:00
Lynn
ab1dff64f5 Cleanup Experience and MarketExchange to use the Retailer 2018-11-26 18:11:32 +01:00
Matthew
b5477034b7 Move infinite storage (#463) 2018-11-26 13:11:26 +01:00
Matthew
1332ad5a8d Move spawn control (#456) 2018-11-26 13:10:37 +01:00
Valansch
40b45ab860
Fixed antigrief desyncs 2018-11-26 13:06:30 +01:00
Matthew Heguy
de87998299 Break chat_trigger functions apart 2018-11-26 01:52:43 -05:00
SimonFlapse
fadce394c0 Made mining speed scale a bit quicker the first couple of levels 2018-11-25 15:00:23 +01:00
SimonFlapse
16f3241c98 Minor refactor to prevent turrets logic getting stuck 2018-11-25 13:45:14 +01:00
SimonFlapse
b240b278f6 Minor changes based on feedback 2018-11-25 12:53:05 +01:00
SimonFlapse
37c7b29221 Fixed broken turret and error messages in console 2018-11-25 05:14:08 +01:00
SimonFlapse
cae9c68c3e Fixed multiplication instead of addition
Tested rocket launch succesfully
2018-11-25 02:45:21 +01:00
SimonFlapse
7b031a7c9d Tweaking Diggy controls
Fixed rockets not giving experience and converted it to 1% of total experience.

Decreased player died deduct to 0.2%

Increased xp from rocks by 1 every fifth level

Increased xp from bots by about 1 every tenth level.

Increased early science XP reward (doubled for red and green, 50% for black and blue)

Level 100 is not 19,990,000 XP (Down from 30 million)

Starting XP is 400.
2018-11-25 02:27:41 +01:00
SimonFlapse
c78f023b50 Bot mining not giving xp fixed 2018-11-24 18:44:27 +01:00
SimonFlapse
a373cddade Update AlienSpawner.lua 2018-11-24 18:08:18 +01:00
Lynn
dbc862a2a7 Properly pass debug and cheats 2018-11-24 17:55:08 +01:00
Lynn
7e3864ef19 Fixed undeflatable reference 2018-11-24 17:48:30 +01:00
Lynn
4d15ac038c Some small performance fixes and cleanup 2018-11-24 17:31:34 +01:00
SimonFlapse
6ed752e73d Fixed floating text and CI pleasing 2018-11-24 16:35:20 +01:00
SimonFlapse
7febb1162e Turrets give experience 2018-11-24 16:33:26 +01:00
SimonFlapse
b1d182008e Fixed exp scope 2018-11-24 16:08:14 +01:00
SimonFlapse
56a11c4ab7 Bot mining now gives about half experience 2018-11-24 16:05:01 +01:00
Lynn
1d876ed1ff Fixed merge and cleanups 2018-11-24 13:53:06 +01:00
Lynn
83eee2b48a Added bot mining and particles 2018-11-24 13:17:48 +01:00
Simon
22c21011ab Diggy - New leveling system (#402)
* Basic setup for Force Control

* Buffs transitioned to new level system

Implemented level up buffs (Also made a double value avaliable at certain levels)

Added experience for research, rocket launched, mined rocks

Removing experience on player death. 0.5% of total experience

Added total_experience to ForceControl.lua

Refactored util/game.lua

* Transfered market item unlocks

Made Market Items unlock through the force control system.

Removed stone from mined stone

* Initial conversion of market items to coins

* Started biter killing giving XP

* XP for killing enemies. GUI update

* Made ForceControl.remove_experience return the actual removed experience

* Got my head and mind back, also fixed progress bar saying long numbers

* Changed get_market()

* Brand new formula, CI review changes

* Update CHANGELOG.md
2018-11-24 10:45:43 +01:00
Jayefuu
e2ea3a10df Update tetris.lua (#444) 2018-11-24 10:37:08 +01:00
Matthew
55aaf19b48 Add player renaming (#428)
* Add player renaming from auto-generated names

* Give admins IDs on name changes
2018-11-23 18:08:44 +01:00
Matthew
a5d0ff0ae9
Merge pull request #424 from iltar/biter-mining-particles
Added particles when a biter mines a rock upon spawning
2018-11-22 22:53:50 -05:00
Matthew
9a62febdea
Merge pull request #433 from Jayefuu/map/tetris_and_world_thanksgiving
Add Tetris and World Thanksgiving maps
2018-11-22 22:22:03 -05:00
plague006
b85555bc00 Fix other lint warnings 2018-11-22 22:18:38 -05:00
plague006
b6c8f32c14 Merge and move docs 2018-11-22 17:44:27 -05:00
Jayefuu
0920ad70a5 Resolved Plague's comments 2018-11-22 22:11:00 +00:00
Lynn
b3a19a2a7b Added bot mining 2018-11-22 20:43:23 +01:00
Jayefuu
5b727f5b53 Added:
- Tetris map and associated files
- World Thanksgiving map with turkey ore preset
2018-11-22 18:39:46 +00:00
Lynn
38068e15cd Added particles when a biter mines a rock upon spawning 2018-11-21 21:09:46 +01:00
Lynn
a52e9f710c Improved biter spawning algorithm (#408)
* Improved biter spawning algorithm

* HAIL HYDRA, biter hell
2018-11-21 15:26:04 +01:00
Matthew Heguy
e6dda20e41 All tabs to spaces 2018-11-21 08:42:39 -05:00
Matthew
8b74f104fc Formatting (#420) 2018-11-21 14:35:47 +01:00
Matthew
691d47cbd0 Cleanup map_gen/shared (#421)
* Cleanup whitespaces+tabs

* Tabs to spaces
2018-11-21 14:34:19 +01:00
Matthew
c9369c3d14 Features cleanup (#414)
* Fix scoping, var names, unused functions, etc.

* Autoformat
2018-11-20 11:46:19 +01:00
Lynn
bb05785c79 added cause and force to the entity died 2018-11-18 19:21:39 +01:00
Lynn
7b51db1ac0 Prevent rocks from dying and spilling on dmg taken 2018-11-18 19:15:45 +01:00
Valansch
7fa48bc583
Changed all windows style line endings to unix style line endings (#393) 2018-11-18 17:12:00 +01:00
Simon
bdfd122f3c Changed first popup from full inventory to ping (#392) 2018-11-18 17:06:23 +01:00
Lynn
74fa8009fa Mining related improvements (#391)
* Fixed manual mining overflow hints

* Smaller memory footprint for collapse message
2018-11-18 16:48:28 +01:00
Lynn
3ac668c731
Merge pull request #390 from SimonFlapse/Diggy-Market-Text
Changed the level up chat messages for diggy
2018-11-18 16:42:17 +01:00
SimonFlapse
cb0daa31bf Changed Debug to Diggy specific debug.print() 2018-11-18 16:40:37 +01:00
SimonFlapse
e399370292 Less prints at level up 2018-11-18 16:25:56 +01:00
Lynn
988713d258 Fixed room loot spill (close to permanently) (#388) 2018-11-18 16:23:25 +01:00
SimonFlapse
7adcc96de3 Changed the level up chat messages 2018-11-18 15:53:25 +01:00
Lynn
247b1df7f4
Merge pull request #377 from Valansch/dev_diggy_antigrief
fixed report desyncs
2018-11-18 13:22:18 +01:00
Matthew
654216f149 Add day/night cycle options (#360)
* Add day/night cycle options

* txt to markdown and fix formatting errors
2018-11-18 13:00:22 +01:00
Maik Wild
1e5ea9c58f Revert "Removed unused config (#378)"
This reverts commit 230600cf5c.
2018-11-18 12:56:45 +01:00
Valansch
58a74fe13a added Antigrief.lua 2018-11-18 12:56:03 +01:00
Lynn
dd7b546caa
Merge pull request #385 from SimonFlapse/Diggy-Market-Item-Fix
Added iron-axe to market
2018-11-18 11:48:07 +01:00
Rdjrjqouqcu
19e278bba0 Fixes how generating big rocks causes multiple ores to be spawned on the same tile 2018-11-17 22:58:18 -05:00
Lynn
ddbe32bf70
Merge pull request #380 from damium/patch-1
Move level up logic outside of unlock check loop
2018-11-17 20:55:30 +01:00
Lynn
230600cf5c Removed unused config (#378) 2018-11-17 20:48:33 +01:00
damium
af8b2b6bc8
Move level up logic outside of unlock check loop 2018-11-17 11:07:20 -08:00
SimonFlapse
50062fbce8 Added iron-axe 2018-11-17 15:56:52 +01:00
Valansch
4e34d33dcd Merge branch 'develop' of https://github.com/Valansch/RedMew into develop 2018-11-17 15:15:52 +01:00
Valansch
0909cdfff8 merged #319 2018-11-17 15:15:49 +01:00
Valansch
af8c00ea43 converted newlines to unix 2018-11-17 15:07:36 +01:00
Lynn
f249cab9df Updated readme and minor perf fix 2018-11-17 14:52:56 +01:00
Valansch
028095f135 changed autojail #319 2018-11-17 14:47:59 +01:00
SimonFlapse
c9b4e596cc Removed prefix for admin and moderator 2018-11-17 14:22:51 +01:00
Lynn
8ad66f70b3
Merge pull request #369 from SimonFlapse/Diggy-Market-Items
[Diggy] Armor items in market
2018-11-17 13:36:10 +01:00
Simon
47fe6c8dc0
Removed gold fish reminder 2018-11-17 13:36:04 +01:00
Jayefuu
c48f31fbe6 Added grid_islands_rotated.lua to map presets. (#363) 2018-11-17 13:33:23 +01:00
SimonFlapse
7dab50d72a Added more items (NUKE!) and spread it further out
Nuke shouldn't be used, thus the high price. It's almost purely for SP and to give players an achievement feeling at level 100
2018-11-17 13:27:02 +01:00
Rdjrjqouqcu
a2ab7d06fd resolved indentation issues 2018-11-17 07:24:26 -05:00
Rdjrjqouqcu
0e6e879347 changes, courtesy of BlueTemplar 2018-11-17 07:17:49 -05:00
Lynn
b33e75570d Fixed unused requires 2018-11-17 12:35:05 +01:00
Lynn
bd54efd1ac
Merge pull request #341 from Rdjrjqouqcu/dev_diggy_compound_clusters
Created a compound cluster mode for scattered resources.
2018-11-17 12:19:57 +01:00
Rdjrjqouqcu
8084e7b029 Forgot to tweak minimum distance from origin for tendrils so all ores started >30 tiles away from the start 2018-11-17 05:55:35 -05:00
Rdjrjqouqcu
9ac3f0a370 Seperated the configs to be defined in a different file, reducing the length of the main config file 2018-11-16 20:55:42 -05:00
Rdjrjqouqcu
027bbe4498 Updated the configs so you can optionally define a color for the debug print ore location config 2018-11-16 20:37:33 -05:00
SimonFlapse
9967684194 Added multi item prices and new items
Also spread out the item unlock further
2018-11-17 00:33:10 +01:00
Rdjrjqouqcu
8ff0fd64cc updated configs to give approximately the same resource concentrations as the original map. Changed default mode to tendrils only 2018-11-16 17:50:01 -05:00
SimonFlapse
bede8be09a on_nth_tick update for ArtefactHunting GUI 2018-11-16 23:08:31 +01:00
Lynn
bbff4e512b
Merge pull request #367 from SimonFlapse/Diggy-Gui-Fix
Fixed Diggy GUIs and more
2018-11-16 22:52:10 +01:00
Lynn
2613471da1
Merge pull request #366 from iltar/small-fixes
Some small artefact fixes
2018-11-16 22:44:51 +01:00
SimonFlapse
9a64bb3a1b Fixed Diggy GUIs and more 2018-11-16 22:43:41 +01:00
Lynn
52c818f9dd Some small artefact fixes 2018-11-16 22:32:16 +01:00
Lynn
21bd95137d Fixed some typos 2018-11-16 20:20:59 +01:00
der-dave
57955cdd86 fixes 2018-11-16 19:36:29 +01:00
der-dave
3299280c64 Added basic scoretable GUI and moved comma_value to utils 2018-11-16 17:13:45 +01:00
Rdjrjqouqcu
01a80062ea Added tendril generation modes, removed old cluster generation method 2018-11-15 21:01:08 -05:00
Rdjrjqouqcu
2f87fce7bb Merge branch 'develop' into dev_diggy_compound_clusters 2018-11-15 20:10:43 -05:00
Simon
218f50d574 Diggy - Gamebreaking fix (#352)
* Fix for market being stuck at level 3, 11, 13, 16 and 30

* Reverted assignment of current_level to prevent progressbar to bug out
2018-11-16 00:20:21 +01:00
Matthew
263b8fb680 Diagonal_ribbon postmortum (#348) 2018-11-15 21:01:46 +01:00
Valansch
9b102a898d
Merge pull request #328 from Rdjrjqouqcu/dev_diggy_stress_colors
Dev diggy stress colors
2018-11-15 20:02:06 +01:00
Rdjrjqouqcu
57ca881864 allowed color code to work with string values, fixed a small bug with delta_colors parameter 2018-11-15 13:10:41 -05:00
Simon
cd1ce8e221 Redraw stone sent to surface GUI on stone sent (#339)
* Moved GUI to top left and removed focus

* redrawing stone gui on market update
2018-11-15 19:09:05 +01:00
Rdjrjqouqcu
201c5e1f45
Merge branch 'develop' into dev_diggy_compound_clusters 2018-11-15 03:22:24 -05:00
Rdjrjqouqcu
861794b09d modified ScatteredResources to add a compound_cluster mode which allows for different weight and generation settings to apply to different groupings of resources 2018-11-15 02:56:18 -05:00
Rdjrjqouqcu
4c8ed2ea85 Moved changes to a seperate function and converted the method to work generically with different colors 2018-11-14 22:31:44 -05:00
Lynn
ebc5b58320
Merge pull request #318 from SimonFlapse/Stone-Reward-Makeover
Isolated market items and buffs
2018-11-14 18:08:53 +01:00
Lynn
771ef0a79c
Merge pull request #335 from SimonFlapse/Diggy-Luadoc
Added Luadoc for NightTime.lua
2018-11-14 17:00:36 +01:00
SimonFlapse
f450b73204
Update NightTime.lua 2018-11-14 16:56:20 +01:00
Matthew
cf4b8fc73a Maltese crossings fixed (#332) 2018-11-14 16:40:31 +01:00
SimonFlapse
b32afe36c2 Updated LuaDoc 2018-11-14 13:45:36 +01:00
SimonFlapse
47617cc5e9
Merge branch 'develop' into Stone-Reward-Makeover 2018-11-14 13:26:31 +01:00
SimonFlapse
2a80a1ff5a Merge conflict for map_gen.Diggy.Config.lua solved 2018-11-14 13:20:38 +01:00
grilledham
3b9247fc90 more builder functions 2018-11-14 12:16:42 +00:00
SimonFlapse
87b3ac197b Added Luadoc for NightTime.lua
Also added .gitignore for intellij /.idea folder
2018-11-14 13:08:47 +01:00
Lynn
a366d3aaf9
Merge pull request #329 from Rdjrjqouqcu/dev_ore_weights
ore weights instead of chances
2018-11-14 09:56:01 +01:00
SimonFlapse
ac5f003322 Added luadoc for new files 2018-11-14 01:41:39 +01:00
SimonFlapse
f0a1c44d3d Fixed broken level up 2018-11-14 00:23:44 +01:00
grilledham
5a65a7caff maltease_crossing fixes 2018-11-13 22:53:03 +00:00
grilledham
ccb9f040ee Merge branch 'develop' of https://github.com/Jayefuu/RedMew into develop 2018-11-13 22:45:26 +00:00
SimonFlapse
c87511d0c0 Infinite levels, Configuable calculations and fixes
Added true infinite levels and the ability to configure the stone requirements calculation from the config.lua file.

Moved MarketUnlockables out ouf Diggy.feature, but needed to create another file to handle the formating of adding market items. Could maybe revert back to the longer format to remove the need for it. (Only possible now because I removed the stone setting from items and made MarketExhange calculate it everytime.)
2018-11-13 23:33:39 +01:00
Jayefuu
b8faa1bf51
Added maltease_crossings.lua preset. 2018-11-13 21:45:34 +00:00
Rdjrjqouqcu
3d776d3306 de-tab-ified and precalced weight sums 2018-11-13 13:06:13 -05:00
grilledham
01b27d6146 updated Builders.apply_effect 2018-11-13 16:21:08 +00:00
Rdjrjqouqcu
7b94bdeebc small tweak for rare exact cases 2018-11-13 11:15:28 -05:00
Rdjrjqouqcu
6803267b89 changed colors to go from green to red, and turn white on collapse 2018-11-13 11:13:22 -05:00
Rdjrjqouqcu
f210f7a828 converted chances in config to weights 2018-11-13 10:39:41 -05:00
SimonFlapse
e559187d87 Clarifying the assignment of MarketUnlockables 2018-11-12 22:06:48 +01:00
SimonFlapse
da82a748b1 Added the definition of unlockables back into config.lua
Also added a current level tool tip for the "Progress to next level:" label.

Removed some old comments I forgot
2018-11-12 22:02:18 +01:00
Lynn
94a5a7a2d2 Fixed oil spawn 2018-11-12 21:33:22 +01:00
SimonFlapse
ae78bf47cc
Merge branch 'develop' into Stone-Reward-Makeover 2018-11-12 20:50:06 +01:00
SimonFlapse
2a09ff01c8 Clean-up and merged 2018-11-12 20:45:51 +01:00
SimonFlapse
4258568c90
Catching up (#2) (#3)
* Add creep spread mechanic

* Added bot ore islands, use bool flag to turn on.

* Added a noise based chest spawning system for artefacts

* Added coin loot from biters and mining

* Track artefacts launched into space

* Add Creepy map preset

* Update donators.lua

* Add scenario info for crashsite (#291)

* Split colors resources from colors code & catchup on donators (#288)

* Split colors resources from colors code

* Switch back to colors

* Added jail button

Moved parts of the jail command to report.lua

Made jailing possible from a users report.

closes #215

* Added sound for new reports

Admins now get a sound when a new report is created. Useful for admins that doesn't have Factorio as active window.

Currently set the sound_path as utility/tutorial_notice

* Split chat triggers from control

* Move cheat tracking outside of control.lua

* Remove player-specific code

* Split donator/on_join messages out of control

* Move features into features folder

* Indentation fix

I aimed to fix the troublesome indentation.

* Added a single indent

* Make sure biter modifiers are accessible for mods

* Consistency change regarding table access

* Added NightTime.lua

Split the time assignment into a new file NightTime.lua allowing for it to be disabled. (Restore normal day/night cycle)

Also added a popup when a player places a solar panel informing that they are purely cosmetic

Removed the recipe for portable solar panels because they are useless, but the technology is needed.

* Fixed debug print grid value to show non-rounded value

* added support for hidden tiles

* Add newline to eof

* Fixed no newline, indentation and scope of research

* crash_site outposts set hidden tile to 'grass-1'

* Log items spawned by crafting in cheat mode

* Newline to eof

* Put responses into table

* Use trigger as table key

* Change name of lattice to diagonal lattice (#297)

* Add Diagonal Ribbon to map presets (#294)

* Reorganize control (#312)

* Check for config before disabling fish market (#311)

* Force diggy biters to spawn, even if there's no space (#308)

* Fixed some small things from feedback and issues (#313)

* Update fractal_balls.lua

* Add ALo's message and color (#314)

* Add join message for ALo

* Add ALo's color

* Typo in donators.lua

* fixed tile corruption issus closes #310 (#317)

* Update player_list.lua

* Update diagonal_ribbon.lua (#322)

* Regulars: remove duplicates and sort alphabetically (#320)
2018-11-12 20:23:25 +01:00
Matthew
27513ddb62 Update diagonal_ribbon.lua (#322) 2018-11-12 19:25:28 +01:00
Valansch
2cd0b397d5 implemented autojail on too many collapses 2018-11-12 17:59:25 +01:00
SimonFlapse
565c4a4481 Isolated market items and buffs
Needs additional testing

I have changed the GUI, and implemented infinite stone progression. Created levels to mask the stone requirement.

Developed on a older branch!
2018-11-12 17:51:55 +01:00
Valansch
817768e59b
fixed tile corruption issus closes #310 (#317) 2018-11-12 15:03:21 +01:00
grilledham
d2ca20d93c
Merge pull request #278 from Jayefuu/develop
Added bot ore islands, use bool flag to turn on.
2018-11-11 22:29:28 +00:00
grilledham
078f677d51
Update fractal_balls.lua 2018-11-11 22:28:49 +00:00
Lynn
09df8dd723 Fixed some small things from feedback and issues (#313) 2018-11-11 22:36:00 +01:00
Lynn
3f700fc7b9 Force diggy biters to spawn, even if there's no space (#308) 2018-11-11 22:33:22 +01:00
Maik Wild
39125b1f24 merged #261 2018-11-11 22:31:46 +01:00
Matthew
c4eca72471 Check for config before disabling fish market (#311) 2018-11-11 22:02:13 +01:00
Matthew
77eef06f06 Add Diagonal Ribbon to map presets (#294) 2018-11-11 20:54:57 +01:00
Matthew
c67408ea5a Change name of lattice to diagonal lattice (#297) 2018-11-11 20:42:11 +01:00
Valansch
dbe845db79
Merge pull request #299 from plague006/features_split
Move features into features folder
2018-11-11 20:37:16 +01:00
Lynn
0244e63213
Merge pull request #289 from iltar/coin-artefact-system
Added a "comeptitive" system, which lets Diggy "matches" compete
2018-11-11 19:39:07 +01:00
Lynn
53d7a12216
Merge pull request #303 from SimonFlapse/NightTime-and-SolarPanel-Popup
Night time and solar panel popup
2018-11-11 17:00:41 +01:00
grilledham
9be688c92f crash_site outposts set hidden tile to 'grass-1' 2018-11-11 15:36:33 +00:00
SimonFlapse
0137bda0bd Fixed no newline, indentation and scope of research 2018-11-11 16:24:09 +01:00
grilledham
7fa2173e70 added support for hidden tiles 2018-11-11 15:08:35 +00:00