Skip to content

Commit

Permalink
Slightly random fixes in the hope that v1.0-3 will be the absolutely …
Browse files Browse the repository at this point in the history
…definitely stable not breaky version.
  • Loading branch information
20kdc committed Jan 23, 2018
1 parent ffb462b commit 14fc869
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 8 deletions.
10 changes: 7 additions & 3 deletions src/main/java/r48/io/r2k/obj/lsd/SaveSystem.java
Expand Up @@ -18,9 +18,13 @@ public class SaveSystem extends R2kObject {
public IntegerR2kStruct screen = new IntegerR2kStruct(1);
public IntegerR2kStruct frameCount = new IntegerR2kStruct(0);
public StringR2kStruct systemName = new StringR2kStruct();
// This is different from the documented default - test this out?
// the "messing with YNET" test showed that it's value is actually forced to 1 somehow, hm.
public IntegerR2kStruct systemBoxStretch = new IntegerR2kStruct(0);
// This gets it's default from the database.
public OptionalR2kStruct<IntegerR2kStruct> systemBoxStretch = new OptionalR2kStruct<IntegerR2kStruct>(new ISupplier<IntegerR2kStruct>() {
@Override
public IntegerR2kStruct get() {
return new IntegerR2kStruct(0);
}
});
public IntegerR2kStruct fontId = new IntegerR2kStruct(0);
public ArraySizeR2kInterpretable<BooleanR2kStruct> switchesSize = new ArraySizeR2kInterpretable<BooleanR2kStruct>(true);
public ArrayR2kStruct<BooleanR2kStruct> switches = new ArrayR2kStruct<BooleanR2kStruct>(switchesSize, new ISupplier<BooleanR2kStruct>() {
Expand Down
5 changes: 1 addition & 4 deletions src/main/resources/assets/IRB_TODO.txt
Expand Up @@ -9,11 +9,8 @@ from highest priority to lowest:
+ eventually turn editor into huge gelatinous monstrosity (Working on it)

short-term planning:
+ v1.0-2
+ Figure out RXP's oddities
+ Figure out RXP's oddities(???)

+ ask easyrpg about what is up with SaveSystem system_box_tiling
+ ask easyrpg about pan_state having to be -1 (not 0, -1) to prevent pan weirdness, etcetc
+ send back SavePicture default value fixes, they probably need this (Well, I did mention it, but if anything's happened I don't see it)

- Maybe remove IMI, which I'll rename the WAU.
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/assets/R2K/SchemaLSD.txt
Expand Up @@ -78,7 +78,8 @@ e rpg_savesystem_screen 5 save
@frame_count int
If empty, defaults to game's default System.
@system_name f_save_system_name
@system_box_tiling int_boolean
If not present, defaults to that in Database.
+optP @system_box_tiling int_boolean
@font_id rpg_system_font
@switches subwindow arrayEIdX switch_id 1 0 boolean
@variables subwindow arrayEIdX var_id 1 0 int
Expand Down
Binary file modified src/main/resources/assets/layertab.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 14fc869

Please sign in to comment.