Skip to content

Syntax, logic and var fixes #2

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
Werwolf-12 merged 1 commit into from
Nov 23, 2025
Merged

Syntax, logic and var fixes #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
89 changes: 41 additions & 48 deletions scripts/scr_ork_fleet_functions/scr_ork_fleet_functions.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,37 +168,30 @@ function merge_ork_fleets(){
}
}

function init_ork_waagh(override=false) {
var waaagh = irandom(300);
var waaagh_1 = irandom(3);
var _ork_stars = scr_get_stars(false, [eFACTION.Ork]);
var _ork_stars_count = array_length(_ork_stars);
//
if ((_ork_stars_count > 45) && (waaagh_1 == 3 || overide ) && obj_controller.known[eFACTION.Ork]==0)
{
scr_popup("WAAAAGH!","The greenskins have gone unchallenged for far too long. A towering Warboss has rallied the ork hordes and halted their infighting. Now unified, the greenskins pose a dire threat to the entire sector!","waaagh","");
scr_event_log("red","Ork WAAAAGH! begins");
obj_controller.known[eFACTION.Ork]=0.5;
}
else if ((_ork_stars_count = 5) && (waaagh_1 == 3 || overide) && obj_controller.known[eFACTION.Ork]==0)
{
scr_popup("WAAAAGH!","The orks are nearly defeated, but in a final desperate push, a new Warboss has mustered a fresh WAAAGH! and begun reclaiming their lost worlds.","waaagh","");
scr_event_log("red","Ork WAAAAGH! begins.");
obj_controller.known[eFACTION.Ork]=0.5;
}
else if ((_ork_stars_count >= 5 && _ork_stars_count <= 45) && (waaagh==33 || overide) && obj_controller.known[eFACTION.Ork]==0)
{
function init_ork_waagh(override = false) {
var waaagh = irandom(300);
var waaagh_1 = irandom(3);
var _ork_stars = scr_get_stars(false, [eFACTION.Ork]);
var _ork_stars_count = array_length(_ork_stars);

if ((_ork_stars_count > 45) && (waaagh_1 == 3 || override ) && obj_controller.known[eFACTION.Ork] == 0) {
scr_popup("WAAAAGH!", "The greenskins have gone unchallenged for far too long. A towering Warboss has rallied the ork hordes and halted their infighting. Now unified, the greenskins pose a dire threat to the entire sector!", "waaagh", "");
scr_event_log("red", "Ork WAAAAGH! begins");
obj_controller.known[eFACTION.Ork] = 0.5;
} else if ((_ork_stars_count > 0 && _ork_stars_count <= 5) && (waaagh_1 == 3 || override) && obj_controller.known[eFACTION.Ork] == 0) {
scr_popup("WAAAAGH!", "The orks are nearly defeated, but in a final desperate push, a new Warboss has mustered a fresh WAAAGH! and begun reclaiming their lost worlds.", "waaagh", "");
scr_event_log("red", "Ork WAAAAGH! begins.");
obj_controller.known[eFACTION.Ork] = 0.5;
} else if ((_ork_stars_count >= 5 && _ork_stars_count <= 45) && (waaagh == 33 || override) && obj_controller.known[eFACTION.Ork] == 0) {
scr_popup("WAAAAGH!", "The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!", "waaagh", "");
scr_event_log("red", "Ork WAAAAGH! begins.");
obj_controller.known[eFACTION.Ork] = 0.5;
} else {
//if no waaagh is triggered
return;
}

scr_popup("WAAAAGH!","The greenskins have swelled in activity, their numbers increasing seemingly without relent. A massive Warboss has risen to take control, leading most of the sector's Orks on a massive WAAAGH!","waaagh","");
scr_event_log("red","Ork WAAAAGH! begins.");
obj_controller.known[eFACTION.Ork]=0.5;
}
else
{
//if no waaagh is triggered
return;
}
var ork_waagh_activity = [];
var ork_waagh_activity = [];
var _any_ork_star = [];
for (var p=0;p<array_length(_ork_stars);p++){
with(_ork_stars[p]){
Expand Down Expand Up @@ -228,28 +221,28 @@ var ork_waagh_activity = [];
_waaagh_star_found = true;
}

if (_waaagh_star_found){
var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]);

var _boss = _pdata.add_feature(P_features.OrkWarboss);
if (overide){
_boss.player_hidden = false;
scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name);
}
if (_waaagh_star_found){
var _pdata = new PlanetData(_waaagh_star[1], _waaagh_star[0]);

if (_pdata.planet_forces[eFACTION.Ork] < 4) {
_pdata.add_forces(eFACTION.Ork, 2);
}
} else {
out_of_system_warboss(true);
var _boss = _pdata.add_feature(P_features.OrkWarboss);
if (override) {
_boss.player_hidden = false;
scr_event_log("red", $"boss on {_pdata.name()}", _pdata.system.name);
}

if (_pdata.planet_forces[eFACTION.Ork] < 4) {
_pdata.add_forces(eFACTION.Ork, 2);
}
if (_waaagh_star_found){
scr_popup("WAAAAGH!","My lord, our Auspex scans indicate that the Ork Warboss is currently within the "+string(_pdata.system.name)+" system.We must strike swiftly before he relocates. ","waaagh","");
scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name);
}

} else {
out_of_system_warboss(true);
}

if (_waaagh_star_found) {
scr_popup("WAAAAGH!","My lord, our Auspex scans indicate that the Ork Warboss is currently within the "+string(_pdata.system.name)+" system.We must strike swiftly before he relocates. ","waaagh","");
scr_event_log("red",$"boss on {_pdata.name()}", _pdata.system.name);
}
}


function out_of_system_warboss(overide = false){

Expand Down