Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
b0f4616
dungeon
OH296 Feb 26, 2024
bebfcca
obstacles
OH296 Mar 2, 2024
eeedf94
good ui
OH296 Mar 3, 2024
95d76b2
stuff
OH296 Mar 5, 2024
6ea99de
misc crash
OH296 Mar 8, 2024
8b16e71
start to modernise
OH296 May 24, 2024
9ec9c1e
return dungeon to functionality
OH296 May 25, 2024
a9213ba
merge main
OH296 May 25, 2024
6583ec0
dungeon generative map build
OH296 May 25, 2024
1165477
Merge branch '9.2.0_wip' into dungeon_crawler_mk2
OH296 May 25, 2024
391bf16
Edit some role names
EttyKitty Apr 16, 2024
5adb295
Run scr_initialize_custom through a formatter
EttyKitty Apr 16, 2024
bf6bf54
A local var for roles?
EttyKitty Apr 16, 2024
9b6050b
Ancient as a role and local struct usage in initialization
EttyKitty Apr 17, 2024
7f58bca
Big edit to the starting squads and their equipment
EttyKitty Apr 17, 2024
6cc62a0
Ancient with a power sword and scouts without swords
EttyKitty Apr 17, 2024
568c6ba
More edits to starting equipment
EttyKitty Apr 17, 2024
60f63a0
Change librarian starting storm bolter to bolt pistol
EttyKitty Mar 24, 2024
aac91bb
Jetpack and iron halo for dante
EttyKitty Apr 21, 2024
ec857d2
Minor code edits
EttyKitty Apr 26, 2024
8347678
Devastator loadout tweaks
EttyKitty May 2, 2024
882d688
Terminators with paired lightning claws
EttyKitty May 2, 2024
5d785ca
Put additional chaplains into Reclusium
EttyKitty May 2, 2024
adf762a
Test commit
EttyKitty May 3, 2024
5691133
1st company is now full
EttyKitty May 4, 2024
79f6f11
DA 1st company tweaks
EttyKitty May 4, 2024
f68dd1a
5 man terminator squads and some sgt stuff
EttyKitty May 4, 2024
c16793e
Gauntlets of Ultramar as a separate item?
EttyKitty May 7, 2024
5ff767d
Different weapons to honor guard
EttyKitty May 7, 2024
d75e15a
Command veterans with terminator armor
EttyKitty May 7, 2024
40e33b1
Combat Shield tweaks and a sprite
EttyKitty May 7, 2024
bbec202
Numerous additional loadout tweaks
EttyKitty May 7, 2024
40850fb
Standard bearer typo fix and adjustment
EttyKitty May 8, 2024
16019f9
Techmarines in companies and 16 additional ones
EttyKitty May 9, 2024
e5eef8e
Function description
EttyKitty May 9, 2024
221cf75
Rename functions to be more descriptive and edit backstories rolls
EttyKitty May 11, 2024
c11405f
A lot of changes to starting chapter composition and Iron Hands tweaks
EttyKitty May 11, 2024
fec4604
More edits to loadouts and chapter composition
EttyKitty May 11, 2024
772acf8
More edits for starting marines
EttyKitty May 11, 2024
488db1d
Try out some stuff related to marine generation
EttyKitty May 17, 2024
6cd0b75
Two Boltstorm Gauntlets to replace Gauntlets of Ultramar
EttyKitty May 24, 2024
92f8f75
Draw combat shield placed down around legs and another sprite for it
EttyKitty May 24, 2024
8e479fb
More age and exp related edits
EttyKitty May 27, 2024
72c8c8f
More age/exp edits
EttyKitty May 27, 2024
da91d2d
Now the function is named properly
EttyKitty May 27, 2024
f4211dd
Roll armor and a ton of additional generation changes
EttyKitty May 28, 2024
2fa3be9
Grav Gun, Grav Pistol and Hand Flamer sprites
EttyKitty May 29, 2024
f213d83
Narrow out the use of normal distribution for age randomization
EttyKitty May 29, 2024
59a0c56
Plasma Cannon and Grav Cannon sprites from Chapter Generator
EttyKitty May 29, 2024
37ed64d
final three bugs
OH296 Jun 3, 2024
8134c2d
bonus to mk5 arti armour
OH296 Jun 3, 2024
1c14712
menu soft lock
OH296 Jun 3, 2024
968736d
Fix some wrong hue on the MK7 chest variant
EttyKitty May 24, 2024
956e551
Merge remote-tracking branch 'etty/compile/nelsonh' into final_versio…
OH296 Jun 4, 2024
8f1c3e2
specialist view adjust
OH296 Jun 4, 2024
e0f892c
Give heavy tacticals knifes
EttyKitty Jun 4, 2024
946402f
Give heavy tacticals knifes
EttyKitty Jun 4, 2024
4d13a1c
cluster of bugs
OH296 Jun 4, 2024
0dccf89
scale back some messages andincrease garrison effectiveness
OH296 Jun 4, 2024
43fb884
scout and ship sprites
OH296 Jun 4, 2024
0c14421
Merge remote-tracking branch 'etty/feat/starting-equipment' into star…
OH296 Jun 4, 2024
539aa71
post merge tweaks
OH296 Jun 4, 2024
d505213
some potential solves to distribution
OH296 Jun 4, 2024
7377a01
more tweaks
OH296 Jun 4, 2024
30af4cc
rescource
OH296 Jun 4, 2024
3b68942
tweak exp distribution
OH296 Jun 4, 2024
08f8997
captain predjudice experiment
OH296 Jun 5, 2024
da3a045
Merge branch 'start_gear_merge_branch' into dungeon_crawler_mk2
OH296 Jun 5, 2024
ad509c1
weird bug appeared
OH296 Jun 6, 2024
16a95e3
segregate code and start flavour
OH296 Jun 8, 2024
04575a9
dynamic requirement and mod systme
OH296 Jun 8, 2024
88e61ac
tweaks and compile
OH296 Jun 8, 2024
ba4a16d
restore most operability
OH296 Jun 8, 2024
1b720d6
start to implement map drawing
OH296 Jun 8, 2024
bd32553
special unit test area
OH296 Jun 9, 2024
f5719a8
work on functionality
OH296 Jun 9, 2024
8e08cee
add concept of base difficulty
OH296 Jun 9, 2024
53326d8
success percentages
OH296 Jun 9, 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
6 changes: 6 additions & 0 deletions ChapterMaster.resource_order
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@
{"name":"textures","order":1,"path":"folders/Sprites/textures.yy",},
],
"ResourceOrderSettings": [
{"name":"spr_scout_heads","order":8,"path":"sprites/spr_scout_heads/spr_scout_heads.yy",},
{"name":"spr_generic_sgt_mk4","order":7,"path":"sprites/spr_generic_sgt_mk4/spr_generic_sgt_mk4.yy",},
{"name":"scr_fleet_advisor","order":4,"path":"scripts/scr_fleet_advisor/scr_fleet_advisor.yy",},
{"name":"spr_generic_sgt_mk5","order":3,"path":"sprites/spr_generic_sgt_mk5/spr_generic_sgt_mk5.yy",},
{"name":"spr_generic_sgt_mk7","order":1,"path":"sprites/spr_generic_sgt_mk7/spr_generic_sgt_mk7.yy",},
{"name":"spr_generic_sgt_mk8","order":2,"path":"sprites/spr_generic_sgt_mk8/spr_generic_sgt_mk8.yy",},
{"name":"scr_ground_ai_helpers","order":3,"path":"scripts/scr_ground_ai_helpers/scr_ground_ai_helpers.yy",},
{"name":"scr_player_fleet_functions","order":1,"path":"scripts/scr_player_fleet_functions/scr_player_fleet_functions.yy",},
{"name":"light_dark_shader","order":1,"path":"shaders/light_dark_shader/light_dark_shader.yy",},
{"name":"scr_dungeon_map","order":6,"path":"scripts/scr_dungeon_map/scr_dungeon_map.yy",},
{"name":"scr_ork_fleet_functions","order":2,"path":"scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.yy",},
{"name":"spr_generic_terminator_sgt","order":5,"path":"sprites/spr_generic_terminator_sgt/spr_generic_terminator_sgt.yy",},
{"name":"scr_unit_testing_methods","order":7,"path":"scripts/scr_unit_testing_methods/scr_unit_testing_methods.yy",},
{"name":"scr_dungeon_obstacles","order":5,"path":"scripts/scr_dungeon_obstacles/scr_dungeon_obstacles.yy",},
{"name":"spr_ship_back_black","order":1,"path":"sprites/spr_ship_back_black/spr_ship_back_black.yy",},
{"name":"spr_generic_sgt_mk6","order":4,"path":"sprites/spr_generic_sgt_mk6/spr_generic_sgt_mk6.yy",},
{"name":"spr_generic_sgt_mk3","order":6,"path":"sprites/spr_generic_sgt_mk3/spr_generic_sgt_mk3.yy",},
],
Expand Down
14 changes: 14 additions & 0 deletions ChapterMaster.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions objects/obj_controller/Create_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ current_eventing="";
chaos_rating=0;
chapter_made = 0;
obj_cuicons.alarm[1]=1; // Clean up custom icons
dungeon=false;

diplomacy_pathway = "";
option_selections=[];
Expand Down Expand Up @@ -1746,3 +1747,4 @@ if (vih>=5){
remov=string_length(string(temp[65])+string(temp[66])+string(temp[67])+string(temp[68])+string(temp[69]))+1;

action_set_alarm(2, 0);

Loading