Skip to content

Commit 8be1943

Browse files
SpookLassSpookLass
committed
Buncha Locale Fixes
1 parent 5d4d13e commit 8be1943

52 files changed

Lines changed: 359 additions & 222 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MOD_DATA/OBJ/CHILD/MON/mur_obj.gml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ object_event_add
4343
ring_rate_var = 12;
4444
water_spd_mult_var = 0.6;
4545
water_spd_mult_deep_var = 0.6;
46+
water_alpha_var = 1;
4647
crateless_spd_mult_var = 1;
4748
zone_var = true;
4849
sink_var = false;
@@ -74,6 +75,7 @@ object_event_add
7475
atk_range_var = global.mon_coll[2];
7576
type_var = 2;
7677
water_spd_mult_var = 1;
78+
water_alpha_var = 0.6;
7779
fog_end_var = 128;
7880
crateless_spd_mult_var = 0.64;
7981
sink_var = true;
@@ -253,6 +255,7 @@ object_event_add
253255
path_start(path_var,0.02*global.delta_time_var,1,true);
254256
spd_mult_var = other.water_spd_mult_var;
255257
spd_mult_deep_var = other.water_spd_mult_deep_var;
258+
image_alpha = other.water_alpha_var;
256259
}
257260
}
258261
// Fog

‎MOD_DATA/OBJ/CHILD/SPAWN/asy_trig_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ object_event_add
1515
object_event_add
1616
(argument0,ev_other,ev_user0,'
1717
fmod_update_take_over_when_lock_scr();
18-
if ds_list_find_index(global.mon_list,ringu_obj) < 0
19-
{ ds_list_add(global.mon_list,ringu_obj); }
18+
if ds_list_find_index(mon_list,ringu_obj) < 0
19+
{ ds_list_add(mon_list,ringu_obj); }
2020
with spawn_door_trig_obj { lock_var = true; }
2121
with instance_create(0,0,bab_obj)
2222
{

‎MOD_DATA/OBJ/CHILD/SPAWN/lab_trig_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ object_event_add
1515
object_event_add
1616
(argument0,ev_other,ev_user0,'
1717
fmod_update_take_over_when_lock_scr();
18-
if ds_list_find_index(global.mon_list,bug_obj) < 0
19-
{ ds_list_add(global.mon_list,bug_obj); }
18+
if ds_list_find_index(mon_list,bug_obj) < 0
19+
{ ds_list_add(mon_list,bug_obj); }
2020
with spawn_door_trig_obj { lock_var = true; }
2121
with instance_create(0,0,bug_obj)
2222
{

‎MOD_DATA/OBJ/CHILD/SPAWN/school_trig_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ object_event_add
1515
object_event_add
1616
(argument0,ev_other,ev_user0,'
1717
fmod_update_take_over_when_lock_scr();
18-
if ds_list_find_index(global.mon_list,ringu_obj) < 0
19-
{ ds_list_add(global.mon_list,ringu_obj); }
18+
if ds_list_find_index(mon_list,ringu_obj) < 0
19+
{ ds_list_add(mon_list,ringu_obj); }
2020
with spawn_door_trig_obj { lock_var = true; }
2121
instance_create(0,0,ringu_obj);
2222
global.last_time_var = current_time;

‎MOD_DATA/OBJ/MAIN/SPAWN/gel_note_obj.gml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,25 @@ object_event_add
3333
event_inherited();
3434
z += 9.5;
3535
');
36+
// Leave without spawning
37+
object_event_add
38+
(argument0,ev_other,ev_room_end,'
39+
event_inherited();
40+
if !spawn_var
41+
{
42+
if ds_list_find_index(mon_list,gel_obj) < 0
43+
{ ds_list_add(mon_list,gel_obj); }
44+
instance_create(0,0,gel_obj);
45+
}
46+
');
3647
// Put down note
3748
object_event_add
3849
(argument0,ev_other,ev_user3,'
3950
event_inherited();
4051
if !spawn_var
4152
{
42-
if ds_list_find_index(global.mon_list,gel_obj) < 0
43-
{ ds_list_add(global.mon_list,gel_obj); }
53+
if ds_list_find_index(mon_list,gel_obj) < 0
54+
{ ds_list_add(mon_list,gel_obj); }
4455
local.note = id;
4556
with instance_create(0,0,gel_obj)
4657
{

‎MOD_DATA/OBJ/MAIN/SPAWN/mad_load_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ object_event_add
250250
with instance_create(0,0,flesh_obj) { dur_var += 1; }
251251
if global.reset_spd_var > 0 && global.game_spd_var > 1
252252
{ global.game_spd_var = 1; fmod_group_set_pitch_scr(0,global.game_spd_var); }
253-
if ds_list_find_index(global.mon_list,flesh_obj) < 0
254-
{ ds_list_add(global.mon_list,flesh_obj); }
253+
if ds_list_find_index(mon_list,flesh_obj) < 0
254+
{ ds_list_add(mon_list,flesh_obj); }
255255
}
256256
');

‎MOD_DATA/OBJ/MAIN/SPAWN/spawn_door_trig_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ object_event_add
1111
(argument0,ev_create,0,'
1212
rm_var = noone;
1313
rm_count_var = 0;
14-
spawn_var = 0;
14+
rm_spawn_var = 0;
1515
event_inherited();
1616
');
1717
// Alarm 0 Event
1818
object_event_add
1919
(argument0,ev_alarm,0,'
20-
global.spawn_var = spawn_var;
20+
global.spawn_var = rm_spawn_var;
2121
event_inherited();
2222
');

‎MOD_DATA/OBJ/MAIN/brain_tank_obj.gml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ object_event_add
115115
{ global.game_spd_var = 1; fmod_group_set_pitch_scr(0,global.game_spd_var); }
116116
if instance_exists(load_par_obj)
117117
{
118-
if ds_list_find_index(global.mon_list,brain_chase_obj) < 0
119-
{ ds_list_add(global.mon_list,brain_chase_obj); }
118+
if ds_list_find_index(mon_list,brain_chase_obj) < 0
119+
{ ds_list_add(mon_list,brain_chase_obj); }
120120
with door_trig_obj { lock_var = !lock_var; }
121121
}
122122
else { with door_trig_obj { save_var = false; event_user(0); }}

‎MOD_DATA/OBJ/MAIN/door_trig_obj.gml‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ object_event_add
4242
interact_target_var = noone;
4343
delay_var = 20;
4444
zone_var = -1;
45+
locale_var = false;
4546
ele_var = false;
4647
if !variable_local_exists("rm_count_var") { rm_count_var = 1; }
4748
if !variable_local_exists("lock_var") { lock_var = false; }
@@ -60,8 +61,16 @@ object_event_add
6061
{
6162
local.set = false;
6263
ele_var = false;
64+
// Locale
65+
if global.rm_count_var+1 == global.locale_rm_var && ds_list_size(locale_list) > 0
66+
{
67+
locale_var = true;
68+
rm_var = ds_list_find_value(locale_list,0);
69+
ds_list_delete(locale_list,0);
70+
local.set = true;
71+
}
6372
// Elevator
64-
if ele_rm_scr(global.rm_count_var+1)
73+
if ele_rm_scr(global.rm_count_var+1) && !local.set
6574
{
6675
rm_var = ele_rm;
6776
ele_var = true;
@@ -80,8 +89,12 @@ object_event_add
8089
else { local.rare = rare_zone_list; }
8190
if local.rare >= 0
8291
{
83-
rm_var = ds_list_find_value(local.rare,irandom(ds_list_size(local.rare)-1));
84-
local.set = true;
92+
if ds_list_size(local.rare) > 0
93+
{
94+
rm_var = ds_list_find_value(local.rare,irandom(ds_list_size(local.rare)-1));
95+
local.set = true;
96+
}
97+
else { show_error("This rare list empty! Im not gonna say it.",false)}
8598
}
8699
}
87100
}
@@ -103,8 +116,13 @@ object_event_add
103116
{
104117
zone_scr(-3,-1,-1,-1,false);
105118
tex_scr(-1);
119+
global.locale_rm_var = locale_rm_scr(global.rm_count_var);
120+
}
121+
if room_exists(rm_var) && rm_var != 0
122+
{
123+
if locale_var { rm_goto_menu_scr(rm_var,2); }
124+
else { rm_goto_scr(rm_var); }
106125
}
107-
if room_exists(rm_var) && rm_var != 0 { rm_goto_scr(rm_var); }
108126
else { show_error("Room "+string(rm_var)+" does not exist!",false); rm_goto_scr(hall_01_rm); }
109127
')
110128
// Step Event

‎MOD_DATA/OBJ/MAIN/menu_obj.gml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,8 +1400,8 @@ object_event_add
14001400
global.mode_var = save_mode_var;
14011401
global.main_type_var = save_type_var;
14021402
global.custom_var = save_custom_var;
1403-
ds_list_clear(global.mon_list);
1404-
1403+
ds_list_clear(mon_list);
1404+
ds_list_clear(locale_list);
14051405
// Difficulty
14061406
if global.main_type_var == 1 || global.main_type_var == 2 { global.diff_var = -1; } // OG and HD
14071407
else if !global.custom_var && diff_arr[save_diff_var,3] { global.diff_var = diff_arr[save_diff_var,4]; }
@@ -1436,14 +1436,19 @@ object_event_add
14361436
if local.custom { local.value = custom_value_arr_var[local.i]; }
14371437
// Get default value from 4D array
14381438
else { local.value = custom_arr_get_scr(local.i,global.diff_var,global.mode_var,global.main_type_var); }
1439-
// Disabled
1439+
// Enabled
14401440
if local.value != -2
14411441
{
14421442
local.monid = custom_arr[local.i,10];
1443-
if object_exists(mon_arr[local.monid,4]) && mon_arr[local.monid,2]
1444-
{ ds_list_add(global.mon_list,mon_arr[local.monid,4]); }
1443+
if mon_arr[local.monid,2]
1444+
{
1445+
// Gotta make sure locale_var loads first, otherwise everything will break
1446+
if global.locale_var && room_exists(mon_arr[local.monid,5]) { ds_list_add(locale_list,mon_arr[local.monid,5])}
1447+
else if object_exists(mon_arr[local.monid,4]) { ds_list_add(mon_list,mon_arr[local.monid,4]); }
1448+
}
1449+
14451450
}
1446-
// Enabled
1451+
// Disabled
14471452
else { local.value = global.main_type_var; }
14481453
execute_string("global."+custom_arr[local.i,0]+"_type_var = "+string(local.value));
14491454
}
@@ -1453,12 +1458,13 @@ object_event_add
14531458
else { execute_string("global."+custom_arr[local.i,0]+"_var = "+string(custom_arr_get_scr(local.i,global.diff_var,global.mode_var,global.main_type_var))); }
14541459
}
14551460
}
1456-
14571461
// Save Info
14581462
global.rm_count_var = 0;
14591463
global.note_var = 0;
14601464
global.mon_fail_var = 0;
14611465
global.count_var = get_count_scr();
1466+
global.locale_rm_var = locale_rm_scr(global.rm_count_var);
1467+
if global.locale_rand_var { ds_list_shuffle(locale_list); }
14621468
// Boot it up!
14631469
for (local.i=0; local.i<global.player_len_var; local.i+=1;)
14641470
{

0 commit comments

Comments
 (0)