Skip to content

feat: Contemptor dreadnought by werwolf #966

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.

Sign up for GitHub

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

Merged
OH296 merged 18 commits into from
Aug 16, 2025
Merged

feat: Contemptor dreadnought by werwolf #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0eec479
improve sub component system
OH296 Aug 4, 2025
9953907
Merge branch 'main' into culture_tweaks
OH296 Aug 5, 2025
8e66abe
further tweaks
OH296 Aug 6, 2025
34b5cc3
eaa
Werwolf-12 Aug 6, 2025
46b64ed
fix dread finding
OH296 Aug 6, 2025
0250f78
Merge branch 'culture_tweaks' into Contemptor
OH296 Aug 6, 2025
c530986
contemptor weapons fixed
OH296 Aug 7, 2025
e1b15af
Merge branch 'Contemptor'
OH296 Aug 7, 2025
01c15f3
Revert "Merge branch 'Contemptor'"
OH296 Aug 7, 2025
4654b03
Merge branch 'main' into Contemptor
OH296 Aug 7, 2025
feaac39
Reapply "Merge branch 'Contemptor'"
OH296 Aug 7, 2025
8429c50
fix some complex rules
OH296 Aug 7, 2025
9c46066
make a start on angelic theme
OH296 Aug 11, 2025
0616fc0
Update scripts/scr_weapon/scr_weapon.gml
OH296 Aug 13, 2025
5a45f1a
review points
OH296 Aug 16, 2025
24aaf52
Merge remote-tracking branch 'origin/Contemptor' into Contemptor
OH296 Aug 16, 2025
2ec0116
final tweaks
OH296 Aug 16, 2025
8f22349
the actual final tweaks
OH296 Aug 16, 2025
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
11 changes: 11 additions & 0 deletions ChapterMaster.yyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,6 +989,7 @@
{"id":{"name":"mk7_chest_variants","path":"sprites/mk7_chest_variants/mk7_chest_variants.yy",},},
{"id":{"name":"spr_advisors","path":"sprites/spr_advisors/spr_advisors.yy",},},
{"id":{"name":"spr_alpha_backpack","path":"sprites/spr_alpha_backpack/spr_alpha_backpack.yy",},},
{"id":{"name":"spr_angelic_wings","path":"sprites/spr_angelic_wings/spr_angelic_wings.yy",},},
{"id":{"name":"spr_apoth_area_pad","path":"sprites/spr_apoth_area_pad/spr_apoth_area_pad.yy",},},
{"id":{"name":"spr_apothecary_lights","path":"sprites/spr_apothecary_lights/spr_apothecary_lights.yy",},},
{"id":{"name":"spr_aquila_colors","path":"sprites/spr_aquila_colors/spr_aquila_colors.yy",},},
Expand Down Expand Up @@ -1023,6 +1024,8 @@
{"id":{"name":"spr_battle_block","path":"sprites/spr_battle_block/spr_battle_block.yy",},},
{"id":{"name":"spr_battle_block2","path":"sprites/spr_battle_block2/spr_battle_block2.yy",},},
{"id":{"name":"spr_beakie_colors","path":"sprites/spr_beakie_colors/spr_beakie_colors.yy",},},
{"id":{"name":"spr_binders_belt","path":"sprites/spr_binders_belt/spr_binders_belt.yy",},},
{"id":{"name":"spr_binders_robe","path":"sprites/spr_binders_robe/spr_binders_robe.yy",},},
{"id":{"name":"spr_binders_robes","path":"sprites/spr_binders_robes/spr_binders_robes.yy",},},
{"id":{"name":"spr_bio_fighter","path":"sprites/spr_bio_fighter/spr_bio_fighter.yy",},},
{"id":{"name":"spr_bionic_eye_2","path":"sprites/spr_bionic_eye_2/spr_bionic_eye_2.yy",},},
Expand Down Expand Up @@ -1103,8 +1106,12 @@
{"id":{"name":"spr_clothing_colors","path":"sprites/spr_clothing_colors/spr_clothing_colors.yy",},},
{"id":{"name":"spr_cm_specialty","path":"sprites/spr_cm_specialty/spr_cm_specialty.yy",},},
{"id":{"name":"spr_cog_pinion","path":"sprites/spr_cog_pinion/spr_cog_pinion.yy",},},
{"id":{"name":"spr_combat_shield_bottom_part","path":"sprites/spr_combat_shield_bottom_part/spr_combat_shield_bottom_part.yy",},},
{"id":{"name":"spr_company_title","path":"sprites/spr_company_title/spr_company_title.yy",},},
{"id":{"name":"spr_constitution_icon","path":"sprites/spr_constitution_icon/spr_constitution_icon.yy",},},
{"id":{"name":"spr_contemptor_CCW","path":"sprites/spr_contemptor_CCW/spr_contemptor_CCW.yy",},},
{"id":{"name":"spr_contemptor_chasis_colors","path":"sprites/spr_contemptor_chasis_colors/spr_contemptor_chasis_colors.yy",},},
{"id":{"name":"spr_contemptor_head_colors","path":"sprites/spr_contemptor_head_colors/spr_contemptor_head_colors.yy",},},
{"id":{"name":"spr_craftworld","path":"sprites/spr_craftworld/spr_craftworld.yy",},},
{"id":{"name":"spr_creation_arrow","path":"sprites/spr_creation_arrow/spr_creation_arrow.yy",},},
{"id":{"name":"spr_creation_check","path":"sprites/spr_creation_check/spr_creation_check.yy",},},
Expand All @@ -1116,6 +1123,7 @@
{"id":{"name":"spr_creation_slate","path":"sprites/spr_creation_slate/spr_creation_slate.yy",},},
{"id":{"name":"spr_credits_bg","path":"sprites/spr_credits_bg/spr_credits_bg.yy",},},
{"id":{"name":"spr_crusader","path":"sprites/spr_crusader/spr_crusader.yy",},},
{"id":{"name":"spr_crux_belt_fancy","path":"sprites/spr_crux_belt_fancy/spr_crux_belt_fancy.yy",},},
{"id":{"name":"spr_crux_on_chain","path":"sprites/spr_crux_on_chain/spr_crux_on_chain.yy",},},
{"id":{"name":"spr_cthonian_tabbard","path":"sprites/spr_cthonian_tabbard/spr_cthonian_tabbard.yy",},},
{"id":{"name":"spr_cursor","path":"sprites/spr_cursor/spr_cursor.yy",},},
Expand Down Expand Up @@ -1202,6 +1210,7 @@
{"id":{"name":"spr_formation_splash","path":"sprites/spr_formation_splash/spr_formation_splash.yy",},},
{"id":{"name":"spr_fur_tabbard","path":"sprites/spr_fur_tabbard/spr_fur_tabbard.yy",},},
{"id":{"name":"spr_fur_tail_topknot","path":"sprites/spr_fur_tail_topknot/spr_fur_tail_topknot.yy",},},
{"id":{"name":"spr_gear_apoth_eye","path":"sprites/spr_gear_apoth_eye/spr_gear_apoth_eye.yy",},},
{"id":{"name":"spr_gear_apoth","path":"sprites/spr_gear_apoth/spr_gear_apoth.yy",},},
{"id":{"name":"spr_gear_chap","path":"sprites/spr_gear_chap/spr_gear_chap.yy",},},
{"id":{"name":"spr_gear_combat_shield","path":"sprites/spr_gear_combat_shield/spr_gear_combat_shield.yy",},},
Expand Down Expand Up @@ -1534,6 +1543,7 @@
{"id":{"name":"spr_servo_harness","path":"sprites/spr_servo_harness/spr_servo_harness.yy",},},
{"id":{"name":"spr_settings_bg","path":"sprites/spr_settings_bg/spr_settings_bg.yy",},},
{"id":{"name":"spr_settings_button","path":"sprites/spr_settings_button/spr_settings_button.yy",},},
{"id":{"name":"spr_sgt_forehead","path":"sprites/spr_sgt_forehead/spr_sgt_forehead.yy",},},
{"id":{"name":"spr_ship_aconite","path":"sprites/spr_ship_aconite/spr_ship_aconite.yy",},},
{"id":{"name":"spr_ship_ammer","path":"sprites/spr_ship_ammer/spr_ship_ammer.yy",},},
{"id":{"name":"spr_ship_apoc","path":"sprites/spr_ship_apoc/spr_ship_apoc.yy",},},
Expand Down Expand Up @@ -1651,6 +1661,7 @@
{"id":{"name":"spr_tooltip1","path":"sprites/spr_tooltip1/spr_tooltip1.yy",},},
{"id":{"name":"spr_torpedo_board","path":"sprites/spr_torpedo_board/spr_torpedo_board.yy",},},
{"id":{"name":"spr_torpedo","path":"sprites/spr_torpedo/spr_torpedo.yy",},},
{"id":{"name":"spr_twl_Volkite_Culverins","path":"sprites/spr_twl_Volkite_Culverins/spr_twl_Volkite_Culverins.yy",},},
{"id":{"name":"spr_ui_but_1","path":"sprites/spr_ui_but_1/spr_ui_but_1.yy",},},
{"id":{"name":"spr_ui_but_2","path":"sprites/spr_ui_but_2/spr_ui_but_2.yy",},},
{"id":{"name":"spr_ui_but_3","path":"sprites/spr_ui_but_3/spr_ui_but_3.yy",},},
Expand Down
2 changes: 1 addition & 1 deletion fonts/fnt_menu/fnt_menu.yy
View file
Open in desktop

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

24 changes: 20 additions & 4 deletions objects/obj_shop/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,9 +558,8 @@ if (shop = "equipment") {
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
nobuy[i] = 1;

i += 1;
nobuy[i] = 1;
i += 1;
nobuy[i] = 1;
item[i] = "Volkite Charger";
item_stocked[i] = scr_item_count(item[i]);
Expand Down Expand Up @@ -659,7 +658,24 @@ if (shop = "equipment") {
item_cost[i] = 0;
forge_cost[i] = 0;
i += 1;

item[i] = "Contemptor Dreadnought";
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
nobuy[i]=1
i += 1;
nobuy[i]=1;
item[i] = "Twin-linked Volkite Culverins";
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;
i += 1;
nobuy[i]=1;
item[i] = "Contemptor CCW";
item_stocked[i] = scr_item_count(item[i]);
item_cost[i] = 0;
forge_cost[i] = 0;

var mc = 0;
repeat(i) {
mc++;
Expand Down
175 changes: 2 additions & 173 deletions objects/obj_turn_end/Draw_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,180 +15,9 @@ if (show=0) and (obj_controller.zoomed=1) and (current_popup=0) then draw_sprite


if (show>0) and (current_battle<=battles){
var xxx,yyy,i;
xxx=__view_get( e__VW.XView, 0 )+535;
yyy=__view_get( e__VW.YView, 0 )+200;
i=current_battle;

draw_sprite(spr_purge_panel,0,xxx,yyy);
// if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54);
// if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54);
if (battle_world[i]=-50) then scr_image("attacked",1,xxx+12,yyy+54,254,174);
if (battle_world[i]>0) then scr_image("attacked",0,xxx+12,yyy+54,254,174);

draw_set_font(fnt_40k_14);draw_set_halign(fa_left);draw_set_color(c_gray);
draw_text(xxx+8,yyy+13,string_hash_to_newline(string(i)+"/"+string(battles)));

draw_set_halign(fa_center);
draw_set_font(fnt_40k_30b);

if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Forces Attacked! ("+string(battle_location[i])+" "+scr_roman(battle_world[i])+")"),0.7,0.7,0);
if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,string_hash_to_newline("Fleet Attacked! ("+string(battle_location[i])+" System)"),0.7,0.7,0);

scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64);
// draw_sprite(spr_force_icon,1,xxx+378,yyy+86);

draw_set_font(fnt_40k_14);draw_set_halign(fa_left);



if (battle_world[i]<0){
draw_set_font(fnt_40k_14b);
draw_set_halign(fa_left);

draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Fleets:"));
draw_text(xxx+332,yyy+237,string_hash_to_newline("Allied Fleets:"));

if (string(strin[1])="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleship ("+string(strin[4])+"% HP)"));
if (string(strin[2])="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigate ("+string(strin[5])+"% HP)"));
if (string(strin[3])="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escort ("+string(strin[6])+"% HP)"));
if (string(strin[1])!="1") then draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Battleships ("+string(strin[4])+"% HP)"));
if (string(strin[2])!="1") then draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Frigates ("+string(strin[5])+"% HP)"));
if (string(strin[3])!="1") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Escorts ("+string(strin[6])+"% HP)"));


draw_set_halign(fa_center);

if (enemy_fleet[1]!=0){
// draw_sprite(spr_force_icon,enemy_fleet[1],xxx+44,yyy+269);
scr_image("ui/force",enemy_fleet[1],xxx+44-32,yyy+269-32,64,64);
var shw;shw="";
if (ecap[1]=1) then shw+=string(ecap[1])+" Battleship#";
if (ecap[1]!=1) then shw+=string(ecap[1])+" Battleships#";
if (efri[1]=1) then shw+=string(efri[1])+" Frigate#";
if (efri[1]!=1) then shw+=string(efri[1])+" Frigates#";
if (eesc[1]=1) then shw+=string(eesc[1])+" Escort#";
if (eesc[1]!=1) then shw+=string(eesc[1])+" Escorts#";

draw_text_transformed(xxx+44,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);
}
if (enemy_fleet[2]!=0){
// draw_sprite(spr_force_icon,enemy_fleet[2],xxx+154,yyy+269);
scr_image("ui/force",enemy_fleet[2],xxx+154-32,yyy+269-32,64,64);
var shw;shw="";
if (ecap[2]=1) then shw+=string(ecap[2])+" Battleship#";
if (ecap[2]!=1) then shw+=string(ecap[2])+" Battleships#";
if (efri[2]=1) then shw+=string(efri[2])+" Frigate#";
if (efri[2]!=1) then shw+=string(efri[2])+" Frigates#";
if (eesc[2]=1) then shw+=string(eesc[2])+" Escort#";
if (eesc[2]!=1) then shw+=string(eesc[2])+" Escorts#";

draw_text_transformed(xxx+154,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);
}
if (enemy_fleet[3]!=0){
// draw_sprite(spr_force_icon,enemy_fleet[3],xxx+264,yyy+269);
scr_image("ui/force",enemy_fleet[3],xxx+264-32,yyy+269-32,64,64);
var shw;shw="";
if (ecap[3]=1) then shw+=string(ecap[3])+" Battleship#";
if (ecap[3]!=1) then shw+=string(ecap[3])+" Battleships#";
if (efri[3]=1) then shw+=string(efri[3])+" Frigate#";
if (efri[3]!=1) then shw+=string(efri[3])+" Frigates#";
if (eesc[3]=1) then shw+=string(eesc[3])+" Escort#";
if (eesc[3]!=1) then shw+=string(eesc[3])+" Escorts#";

draw_text_transformed(xxx+264,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);
}

if (allied_fleet[1]!=0){
// draw_sprite(spr_force_icon,allied_fleet[1],xxx+374,yyy+269);
scr_image("ui/force",allied_fleet[1],xxx+374-32,yyy+269-32,64,64);
var shw;shw="";
if (acap[1]=1) then shw+=string(acap[1])+" Battleship#";
if (acap[1]!=1) then shw+=string(acap[1])+" Battleships#";
if (afri[1]=1) then shw+=string(afri[1])+" Frigate#";
if (afri[1]!=1) then shw+=string(afri[1])+" Frigates#";
if (aesc[1]=1) then shw+=string(aesc[1])+" Escort#";
if (aesc[1]!=1) then shw+=string(aesc[1])+" Escorts#";

draw_text_transformed(xxx+374,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);
}
if (allied_fleet[2]!=0){
// draw_sprite(spr_force_icon,allied_fleet[1],xxx+484,yyy+269);
scr_image("ui/force",allied_fleet[1],xxx+484-32,yyy+269-32,64,64);
var shw;shw="";
if (acap[2]=1) then shw+=string(acap[2])+" Battleship#";
if (acap[2]!=1) then shw+=string(acap[2])+" Battleships#";
if (afri[2]=1) then shw+=string(afri[2])+" Frigate#";
if (afri[2]!=1) then shw+=string(afri[2])+" Frigates#";
if (aesc[2]=1) then shw+=string(aesc[2])+" Escort#";
if (aesc[2]!=1) then shw+=string(aesc[2])+" Escorts#";

draw_text_transformed(xxx+484,yyy+286,string_hash_to_newline(string(shw)),0.7,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);
}





draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);
draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Retreat"),1.1,1.1,0);
if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){
draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1);
}

draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);
draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Fight"),1.1,1.1,0);
if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){
draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1);
}

}



if (battle_world[i]>=1){
if (battle_opponent[i]<=20){
draw_text(xxx+310,yyy+118,string_hash_to_newline(string(strin[1])+" Marines"));
draw_text(xxx+310,yyy+138,string_hash_to_newline(string(strin[2])+" Vehicles"));
if (strin[3]!="") then draw_text(xxx+310,yyy+158,string_hash_to_newline(string(strin[3])+" Fortified"));// Not / Barely / Lightly / Moderately / Highly / Maximally
}

draw_set_font(fnt_40k_14b);
draw_set_halign(fa_left);

draw_text(xxx+12,yyy+237,string_hash_to_newline("Enemy Factions:"));
draw_text(xxx+332,yyy+237,string_hash_to_newline("Allies:"));



draw_set_halign(fa_center);
// draw_sprite(spr_force_icon,battle_opponent[i],xxx+44,yyy+289);
scr_image("ui/force",battle_opponent[i],xxx+44-32,yyy+289-32,64,64);
draw_text_transformed(xxx+44,yyy+316,string_hash_to_newline(string(strin[4])),0.75,1,0);
draw_set_halign(fa_center);draw_set_font(fnt_40k_14b);


draw_set_color(c_gray);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);
draw_set_color(0);draw_text_transformed(xxx+195,yyy+362,string_hash_to_newline("Offensive"),1.1,1.1,0);
if (scr_hit(xxx+132,yyy+354,xxx+259,yyy+389)=true){
draw_set_alpha(0.2);draw_rectangle(xxx+132,yyy+354,xxx+259,yyy+389,0);draw_set_alpha(1);
}

draw_set_color(c_gray);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);
draw_set_color(0);draw_text_transformed(xxx+335,yyy+362,string_hash_to_newline("Defensive"),1.1,1.1,0);
if (scr_hit(xxx+272,yyy+354,xxx+399,yyy+389)=true){
draw_set_alpha(0.2);draw_rectangle(xxx+272,yyy+354,xxx+399,yyy+389,0);draw_set_alpha(1);
}





}

}


Expand Down
40 changes: 39 additions & 1 deletion objects/obj_turn_end/Draw_64.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,43 @@ if (alerts>0) and (popups_end=1){
}
}

draw_set_alpha(1);
main_slate.inside_method = function(){
if (show>0 && current_battle<=battles && current_battle>-1){
var xxx=main_slate.XX;
var yyy=main_slate.YY;
var i=current_battle;

// if (battle_world[i]=-50) then draw_sprite(spr_attacked,1,xxx+12,yyy+54);
// if (battle_world[i]>0) then draw_sprite(spr_attacked,0,xxx+12,yyy+54);
var _img = battle_world[i]==-50;
scr_image("attacked",_img,xxx+12,yyy+54,254,174);

draw_set_font(fnt_40k_14);
draw_set_halign(fa_left);
draw_set_color(c_gray);
draw_text(xxx+8,yyy+13,$"{i}/{battles}");

draw_set_halign(fa_center);
draw_set_font(fnt_40k_30b);

if (battle_world[i]>0) then draw_text_transformed(xxx+265,yyy+11,$"Forces Attacked! ({battle_location[i]} {scr_roman(battle_world[i])})",0.7,0.7,0);
if (battle_world[i]=-50) then draw_text_transformed(xxx+265,yyy+11,$"Fleet Attacked! ({battle_location[i]} System)",0.7,0.7,0);

scr_image("ui/force",1,xxx+378-32,yyy+86-32,64,64);
// draw_sprite(spr_force_icon,1,xxx+378,yyy+86);

draw_set_font(fnt_40k_14);
draw_set_halign(fa_left);
if (battle_world[current_battle]<0){
draw_player_fleet_combat_options();
} else if (battle_world[i]>=1){
draw_player_ground_combat_options();
}
}
draw_set_alpha(1);
}

if (show>0 && current_battle<=battles && current_battle>-1 ){
main_slate.draw_with_dimensions(535, 200, 530, 400);
}

Loading