Skip to content

Commit f4b93eb

Browse files
committed
Marking relevant areas
Marked potentially relevant areas for #714 issue solution.
1 parent 84693b6 commit f4b93eb

11 files changed

Lines changed: 14 additions & 14 deletions

File tree

objects/obj_controller/Alarm_8.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ if (obj_controller.faction_gender[10]==1) and (obj_controller.known[eFACTION.Cha
4141

4242
with(obj_star){
4343
if (p_owner[1]==1) or (p_owner[2]==1) or (p_owner[3]==1) or (p_owner[4]==1){
44-
var heh=instance_create(x,y,obj_crusade);
44+
var heh=instance_create(x,y,obj_crusade); // This seems relevant for 714
4545
heh.radius=64;
4646
heh.duration=9999;
4747
heh.show=false;

objects/obj_controller/Mouse_50.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool
277277
}
278278
if (liscensing==2) and (repair_ships==0){
279279
cooldown=8;
280-
var cru=instance_create(mouse_x,mouse_y,obj_crusade);
280+
var cru=instance_create(mouse_x,mouse_y,obj_crusade); // This seems relevant
281281
cru.owner=diplomacy;
282282
cru.placing=true;
283283
diplomacy=0;
@@ -350,7 +350,7 @@ if (menu==20) and (diplomacy>0) or ((diplomacy<-5) and (diplomacy>-6)) and (cool
350350
trade_theirs[1]="Requisition";
351351
trade_theirs[2]="Recruiting Planet";
352352
trade_theirs[3]="License: Repair";
353-
trade_theirs[4]="License: Crusade";
353+
trade_theirs[4]="License: Crusade"; // TODO: Rename here, issue 714
354354
}
355355
// Mechanicus trade goods
356356
if (diplomacy==3){

objects/obj_crusade/Alarm_0.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

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

44
if (duration=0){
55
with(obj_en_ship){

objects/obj_crusade/Alarm_1.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

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

objects/obj_en_fleet/Alarm_1.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if (_is_orbiting) {
3333
_is_orbiting=false;
3434
}
3535
}
36-
if (instance_exists(obj_crusade)){
36+
if (instance_exists(obj_crusade)){ // Issue 714
3737
try{
3838
fleet_respond_crusade();
3939
} catch(_exception) {

scripts/__global_object_depths/__global_object_depths.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function __global_object_depths() {
9191
global.__objectDepths[80] = -21000; // obj_event
9292
global.__objectDepths[81] = -900; // obj_event_log
9393
global.__objectDepths[82] = -1002; // obj_shop
94-
global.__objectDepths[83] = -1; // obj_crusade
94+
global.__objectDepths[83] = -1; // obj_crusade // Might be related to issue 714
9595
global.__objectDepths[84] = 0; // obj_star
9696
global.__objectDepths[85] = -1; // obj_star_event
9797
global.__objectDepths[86] = -999999999; // obj_halp
@@ -181,7 +181,7 @@ function __global_object_depths() {
181181
global.__objectNames[80] = "obj_event";
182182
global.__objectNames[81] = "obj_event_log";
183183
global.__objectNames[82] = "obj_shop";
184-
global.__objectNames[83] = "obj_crusade";
184+
global.__objectNames[83] = "obj_crusade"; // Might be related to issue 714
185185
global.__objectNames[84] = "obj_star";
186186
global.__objectNames[85] = "obj_star_event";
187187
global.__objectNames[86] = "obj_halp";

scripts/scr_controller_helpers/scr_controller_helpers.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ function scr_end_turn() {
537537
if (instance_exists(obj_en_fleet)) {
538538
obj_en_fleet.alarm[1] = 1;
539539
}
540-
if (instance_exists(obj_crusade)) {
540+
if (instance_exists(obj_crusade)) { // Issue 714
541541
obj_crusade.alarm[0] = 2;
542542
}
543543

scripts/scr_enemy_ai_c/scr_enemy_ai_c.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ function scr_enemy_ai_c() {
389389

390390
if (kawaii=1) and (instance_exists(obj_crusade)){// NOPE, stay home and defend
391391
var him,own,dis;
392-
him=instance_nearest(x,y,obj_crusade);
392+
him=instance_nearest(x,y,obj_crusade); // Issue 714
393393
own=him.owner;dis=him.radius;
394394
if (point_distance(x,y,him.x,him.y)<=dis) then kawaii=0;
395395
}

scripts/scr_fleet_functions/scr_fleet_functions.gml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -954,7 +954,7 @@ function merge_fleets(main_fleet, merge_fleet){
954954
instance_destroy(merge_fleet.id);
955955
}
956956

957-
function fleet_respond_crusade(){
957+
function fleet_respond_crusade(){ // Related to issue 714 maybe?
958958
if (owner != eFACTION.Imperium) then exit;
959959
if (!navy) then exit;
960960
if (orbiting.owner > eFACTION.Ecclesiarchy) then exit;

scripts/scr_trade/scr_trade.gml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function scr_trade(argument0) {
4646
if (disposition[2]>=70) then their_worth+=trade_tnum[i]*2000;
4747
}
4848
if (trade_take[i]="License: Repair") then their_worth+=trade_tnum[i]*750;
49-
if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500;
49+
if (trade_take[i]="License: Crusade") then their_worth+=trade_tnum[i]*1500; // Issue 714, rename here
5050

5151
if (trade_take[i]="Terminator Armour") then their_worth+=trade_tnum[i]*400;
5252
if (trade_take[i]="Tartaros") then their_worth+=trade_tnum[i]*900;
@@ -173,7 +173,7 @@ function scr_trade(argument0) {
173173
if (trade_take[3]="Recruiting Planet") then recruiting_worlds_bought+=1;
174174
if (trade_take[4]="Recruiting Planet") then recruiting_worlds_bought+=1;
175175
}
176-
if (trade_take[1]="License: Crusade") or (trade_take[2]="License: Crusade") or (trade_take[3]="License: Crusade") or (trade_take[4]="License: Crusade"){
176+
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
177177
obj_controller.liscensing=2;
178178
}
179179
if (trade_take[1]="Useful Information") or (trade_take[2]="Useful Information") or (trade_take[3]="Useful Information") or (trade_take[4]="Useful Information"){

0 commit comments

Comments
 (0)