Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better map event distribution #113

Merged
merged 25 commits into from
Sep 9, 2024
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a3bd2db
add probabilities to events
Lann-hyl Jun 15, 2024
d406849
extract event assignment to a different function, assign null room ty…
Lann-hyl Jun 15, 2024
8be3f8a
change probas to int, assign room types based on probabilities
Lann-hyl Jun 15, 2024
7439b35
add temp debug code: print event count in generated map
Lann-hyl Jun 15, 2024
9c9ef09
add fixed event rooms: boss (to be implemented) on last room, heal on…
Lann-hyl Jun 15, 2024
755548b
remove TestMap node from EventMob scene
Lann-hyl Jun 18, 2024
6cf3255
Implement map generation rules, add map null check in _ready function
Lann-hyl Jun 25, 2024
91b14cb
set all constants to false
Lann-hyl Jun 25, 2024
6063de8
Merge branch 'Saplings-Projects:main' into main
Lann-hyl Jun 27, 2024
b1c38d3
move no_consecutive_room_event inside is_room_event_correct function
Lann-hyl Jul 2, 2024
1207a86
add map generation rule tests
Lann-hyl Jul 2, 2024
a0041f9
Change GlobalVar.EVENTS_PROBABILITIES to Dictionary, Reorder GlobalVa…
Lann-hyl Aug 2, 2024
5981b93
optimize code that were pointed out in PR
Lann-hyl Aug 2, 2024
306fcd6
delete event_classification from Global_var, add helper function choo…
Lann-hyl Aug 10, 2024
99e8ce1
remove queue pop in test_rule_3_map_gen
Lann-hyl Aug 10, 2024
faf03b6
rewrite tests that depended on Event_classification, testing GlobalEn…
Lann-hyl Aug 10, 2024
586fd42
Revert "remove queue pop in test_rule_3_map_gen"
Lann-hyl Aug 18, 2024
4a3bcdf
replace the logic of picking events: pick from a list instead of rand…
Lann-hyl Aug 19, 2024
04c6077
remove hardcoding in debug
Lann-hyl Aug 20, 2024
342c322
remove hardcoding from the expected_probabilities dictionary in debug
Lann-hyl Aug 21, 2024
43af824
add map regeneration functionnality
Lann-hyl Sep 5, 2024
0e84da2
Merge branch 'Saplings-Projects:main' into main
Lann-hyl Sep 5, 2024
2dc039b
remove breaks in map regeneration, put a return instead
Lann-hyl Sep 6, 2024
3f289f7
Merge branch 'main' of https://github.com/Lann-hyl/1M_sub
Lann-hyl Sep 6, 2024
ffd8235
move debug print code to a separate function
Lann-hyl Sep 8, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Tests/test_map.gd
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ func test_rule_3_map_gen() -> void:
test_map.rooms[index_height][index_width].room_event.get_event_name(), test_map.rooms[index_height][index_width].room_position])

# Check if the two rightmost rooms of the floor are the same type or not
queue.pop_front()
Turtyo marked this conversation as resolved.
Show resolved Hide resolved
if queue.size() >= 2:
unique = []

Expand Down
Loading