Skip to content

Commit

Permalink
set overworld sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
DragoniteSpam committed Nov 30, 2019
1 parent 9bb900f commit 8110ca6
Showing 9 changed files with 64 additions and 13 deletions.
9 changes: 9 additions & 0 deletions DDDEditor2.yyp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions scripts/batch_tile_raw/batch_tile_raw.gml
Original file line number Diff line number Diff line change
@@ -11,15 +11,15 @@
// this is much like batch_tile, except it bypasses the part where it actually needs an EntityTile,
// and also writes the data straight into a regular buffer instead of a vertex buffer

var buffer = argument0;
var wire = argument1;
var xx = argument2 * TILE_WIDTH;
var yy = argument3 * TILE_HEIGHT;
var zz = argument4 * TILE_DEPTH;
var tile_x = argument5;
var tile_y = argument6;
var color = argument7;
var alpha = argument8;
var buffer = argument[0];
var wire = argument[1];
var xx = argument[2] * TILE_WIDTH;
var yy = argument[3] * TILE_HEIGHT;
var zz = argument[4] * TILE_DEPTH;
var tile_x = argument[5];
var tile_y = argument[6];
var color = argument[7];
var alpha = argument[8];
var TEXEL = 1 / TEXTURE_SIZE;

var nx = 0;
7 changes: 6 additions & 1 deletion scripts/sa_process_selection/sa_process_selection.gml
Original file line number Diff line number Diff line change
@@ -52,10 +52,13 @@ if (ds_list_size(list) == 0) {
Stuff.map.ui.element_entity_pawn_direction.interactive = false;
Stuff.map.ui.element_entity_pawn_animating.value = false;
Stuff.map.ui.element_entity_pawn_animating.interactive = false;
Stuff.map.ui.element_entity_pawn_sprite.interactive = false;
ui_list_deselect(Stuff.map.ui.element_entity_pawn_sprite);
} else if (ds_list_size(list) == 1) {
safa_on_select(list[| 0]);
} else {
// populate the UI elements with a nice ¯\_(ツ)_/¯
// if multiple eligible entities are selected, populate the UI
// elements with a nice ¯\_(ツ)_/¯
ui_input_set_value(Stuff.map.ui.element_entity_name, "");
Stuff.map.ui.element_entity_solid.value = 2;
Stuff.map.ui.element_entity_static.value = 2;
@@ -132,10 +135,12 @@ if (ds_list_size(list) == 0) {
Stuff.map.ui.element_entity_pawn_frame.value = "0";
Stuff.map.ui.element_entity_pawn_direction.value = 0;
Stuff.map.ui.element_entity_pawn_animating.value = 2;
ui_list_deselect(Stuff.map.ui.element_entity_pawn_sprite);

Stuff.map.ui.element_entity_pawn_frame.interactive = true;
Stuff.map.ui.element_entity_pawn_direction.interactive = true;
Stuff.map.ui.element_entity_pawn_animating.interactive = true;
Stuff.map.ui.element_entity_pawn_sprite.interactive = true;
break;
case EntityEffect:
break;
11 changes: 10 additions & 1 deletion scripts/safc_on_pawn/safc_on_pawn.gml
Original file line number Diff line number Diff line change
@@ -10,6 +10,15 @@ ui_input_set_value(Stuff.map.ui.element_entity_pawn_frame, string(floor(pawn.fra
Stuff.map.ui.element_entity_pawn_direction.value = pawn.map_direction;
Stuff.map.ui.element_entity_pawn_animating.value = pawn.is_animating;

ui_list_deselect(Stuff.map.ui.element_entity_pawn_sprite);
for (var i = 0; i < ds_list_size(Stuff.all_graphic_overworlds); i++) {
if (Stuff.all_graphic_overworlds[| i].GUID == pawn.overworld_sprite) {
ui_list_select(Stuff.map.ui.element_entity_pawn_sprite, i, true);
break;
}
}

Stuff.map.ui.element_entity_pawn_frame.interactive = true;
Stuff.map.ui.element_entity_pawn_direction.interactive = true;
Stuff.map.ui.element_entity_pawn_animating.interactive = true;
Stuff.map.ui.element_entity_pawn_animating.interactive = true;
Stuff.map.ui.element_entity_pawn_sprite.interactive = true;
3 changes: 2 additions & 1 deletion scripts/serialize_save_data/serialize_save_data.gml
Original file line number Diff line number Diff line change
@@ -95,8 +95,9 @@ if (!ds_map_empty(global.error_map)) {
}
var dialog = dialog_create_notice(noone, "Some warnings were generated when saving your data file:\n\n" + err_str, "Warning!", undefined, undefined, 560);
dialog.el_text.x = 32;
dialog.el_text.x = 64;
dialog.el_text.y = 64;
dialog.el_text.alignment = fa_left;
dialog.el_text.valignment = fa_top;
ds_list_destroy(error_list);
}

5 changes: 5 additions & 0 deletions scripts/ui_init_main/ui_init_main.gml
Original file line number Diff line number Diff line change
@@ -603,6 +603,11 @@ with (instance_create_depth(0, 0, 0, UIMain)) {

yy = yy + element_entity_pawn_animating.height + spacing;

element_entity_pawn_sprite = create_list(legal_x + spacing, yy, "Overworld Sprite", "<no overworlds>", col_width, element_height, 12, uivc_entity_pawn_set_sprite, false, t_p_pawn, Stuff.all_graphic_overworlds);
element_entity_pawn_sprite.entries_are = ListEntries.INSTANCES;
ds_list_add(t_p_pawn.contents, element_entity_pawn_sprite);

yy = yy + ui_get_list_height(element_entity_pawn_sprite) + spacing;
#endregion

#region tab: tiles
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/// @param UIList

var list_element = argument0;

// this assumes that every selected entity is already an instance of Pawn
var list = Stuff.map.selected_entities;
var selection = ui_list_selection(list_element);

if (selection + 1) {
for (var i = 0; i < ds_list_size(list); i++) {
list[| i].overworld_sprite = Stuff.all_graphic_overworlds[| selection].GUID;
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion views/660cfa5d-62a5-42b7-9924-7fe0b2ba592f.yy

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8110ca6

Please sign in to comment.