Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion objects/obj_controller/Alarm_8.gml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if (obj_controller.faction_gender[10]==1) and (obj_controller.known[eFACTION.Cha

with(obj_star){
if (p_owner[1]==1) or (p_owner[2]==1) or (p_owner[3]==1) or (p_owner[4]==1){
var heh=instance_create(x,y,obj_crusade);
var heh=instance_create(x,y,obj_crusade); // This seems relevant for 714
heh.radius=64;
heh.duration=9999;
heh.show=false;
Expand Down
4 changes: 2 additions & 2 deletions objects/obj_controller/Mouse_50.gml
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool
}
if (liscensing==2) and (repair_ships==0){
cooldown=8;
var cru=instance_create(mouse_x,mouse_y,obj_crusade);
var cru=instance_create(mouse_x,mouse_y,obj_crusade); // This seems relevant
cru.owner=diplomacy;
cru.placing=true;
diplomacy=0;
Expand Down Expand Up @@ -350,7 +350,7 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool
trade_theirs[1]="Requisition";
trade_theirs[2]="Recruiting Planet";
trade_theirs[3]="License: Repair";
trade_theirs[4]="License: Crusade";
trade_theirs[4]="License: Crusade"; // TODO: Rename here, issue 714
}
// Mechanicus trade goods
if (diplomacy==3){
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_crusade/Alarm_0.gml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

duration-=1;
duration-=1; // Whole file here seems relevant for 714

if (duration=0){
with(obj_en_ship){
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_crusade/Alarm_1.gml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

obj_controller.combat=owner;
owner+=100;
with(obj_crusade){if (owner=obj_controller.combat) then instance_destroy();}
with(obj_crusade){if (owner=obj_controller.combat) then instance_destroy();} // This one seems relevant for 714
owner-=100;
obj_controller.combat=0;

Expand Down
2 changes: 1 addition & 1 deletion objects/obj_en_fleet/Alarm_1.gml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (_is_orbiting) {
_is_orbiting=false;
}
}
if (instance_exists(obj_crusade)){
if (instance_exists(obj_crusade)){ // Issue 714
try{
fleet_respond_crusade();
} catch(_exception) {
Expand Down
4 changes: 2 additions & 2 deletions scripts/__global_object_depths/__global_object_depths.gml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function __global_object_depths() {
global.__objectDepths[80] = -21000; // obj_event
global.__objectDepths[81] = -900; // obj_event_log
global.__objectDepths[82] = -1002; // obj_shop
global.__objectDepths[83] = -1; // obj_crusade
global.__objectDepths[83] = -1; // obj_crusade // Might be related to issue 714
global.__objectDepths[84] = 0; // obj_star
global.__objectDepths[85] = -1; // obj_star_event
global.__objectDepths[86] = -999999999; // obj_halp
Expand Down Expand Up @@ -181,7 +181,7 @@ function __global_object_depths() {
global.__objectNames[80] = "obj_event";
global.__objectNames[81] = "obj_event_log";
global.__objectNames[82] = "obj_shop";
global.__objectNames[83] = "obj_crusade";
global.__objectNames[83] = "obj_crusade"; // Might be related to issue 714
global.__objectNames[84] = "obj_star";
global.__objectNames[85] = "obj_star_event";
global.__objectNames[86] = "obj_halp";
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_controller_helpers/scr_controller_helpers.gml
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ function scr_end_turn() {
if (instance_exists(obj_en_fleet)) {
obj_en_fleet.alarm[1] = 1;
}
if (instance_exists(obj_crusade)) {
if (instance_exists(obj_crusade)) { // Issue 714
obj_crusade.alarm[0] = 2;
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ function scr_enemy_ai_c() {

if (kawaii=1) and (instance_exists(obj_crusade)){// NOPE, stay home and defend
var him,own,dis;
him=instance_nearest(x,y,obj_crusade);
him=instance_nearest(x,y,obj_crusade); // Issue 714
own=him.owner;dis=him.radius;
if (point_distance(x,y,him.x,him.y)<=dis) then kawaii=0;
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/scr_fleet_functions/scr_fleet_functions.gml
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ function merge_fleets(main_fleet, merge_fleet){
instance_destroy(merge_fleet.id);
}

function fleet_respond_crusade(){
function fleet_respond_crusade(){ // Related to issue 714 maybe?
if (owner != eFACTION.Imperium) then exit;
if (!navy) then exit;
if (orbiting.owner > eFACTION.Ecclesiarchy) then exit;
Expand Down
4 changes: 2 additions & 2 deletions scripts/scr_trade/scr_trade.gml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function scr_trade(argument0) {
if (disposition[2]>=70) then their_worth+=trade_tnum[i]*2000;
}
if (trade_take[i]="License: Repair") then their_worth+=trade_tnum[i]*750;
if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500;
if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500; // Issue 714, rename here

if (trade_take[i]="Terminator Armour") then their_worth+=trade_tnum[i]*400;
if (trade_take[i]="Tartaros") then their_worth+=trade_tnum[i]*900;
Expand Down Expand Up @@ -173,7 +173,7 @@ function scr_trade(argument0) {
if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought+=1;
if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought+=1;
}
if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){
if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){ // Issue 714
obj_controller.liscensing=2;
}
if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function UnitQuickFindPanel() constructor{
_loc_display_string = "Lost";
_zoomable_loc = false;
}
else if (string_count("crusade", cur_fleet.action)){
else if (string_count("crusade", cur_fleet.action)){ // Not sure if related to 714 issue
_loc_display_string = "Crusading";
_zoomable_loc = false;
}
Expand Down