Skip to content

Commit 687ea81

Browse files
rainlizardrainlizard
committed
Slabset - go to any SlabID
1 parent 0581f28 commit 687ea81

File tree

6 files changed

+121
-31
lines changed

6 files changed

+121
-31
lines changed

‎Autoload/Slabset.gd

+17-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var numberOfThings = 0
66

77
# dat[slabID][variation][subtile]
88
var dat = []
9+
var blank_dat_entry = []
910
var CODETIME_START
1011

1112
enum dir {
@@ -21,6 +22,8 @@ enum dir {
2122
center = 27
2223
}
2324

25+
26+
2427
func load_slabset():
2528
var oGame = Nodelist.list["oGame"]
2629

@@ -46,8 +49,22 @@ func load_slabset():
4649
for subtile in 9:
4750
dat[slabID][variation][subtile] = 0
4851

52+
blank_dat_entry = []
53+
blank_dat_entry.resize(28)
54+
for variation in 28:
55+
blank_dat_entry[variation] = []
56+
blank_dat_entry[variation].resize(9)
57+
for subtile in 9:
58+
blank_dat_entry[variation][subtile] = 0
59+
4960
print('Created Slabset : '+str(OS.get_ticks_msec()-CODETIME_START)+'ms')
5061

62+
func fetch_slab(slabID, variation, subtile):
63+
if dat.size() > slabID:
64+
return dat[slabID][variation][subtile]
65+
else:
66+
return blank_dat_entry[variation][subtile]
67+
5168

5269
func create_cfg_slabset(filePath): #"res://slabset.cfg"
5370
var oMessage = Nodelist.list["oMessage"]
@@ -115,7 +132,6 @@ func create_cfg_slabset(filePath): #"res://slabset.cfg"
115132
else:
116133
oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.")
117134

118-
119135
func get_dir_text(variationNumber):
120136
match variationNumber:
121137
00: return 'S'

‎Scenes/Main.tscn

+45-24
Original file line numberDiff line numberDiff line change
@@ -5403,136 +5403,147 @@ margin_bottom = 342.0
54035403
size_flags_horizontal = 3
54045404
columns = 2
54055405

5406-
[node name="Label9" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
5407-
margin_top = 5.0
5406+
[node name="ObjAddButton" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54085407
margin_right = 113.0
5409-
margin_bottom = 26.0
5410-
text = "Object index"
5408+
margin_bottom = 27.0
5409+
size_flags_horizontal = 3
5410+
text = "Add"
54115411

5412-
[node name="SpinBoxPropertiesValue9" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5412+
[node name="ObjDeleteButton" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54135413
margin_left = 117.0
54145414
margin_right = 191.0
5415-
margin_bottom = 31.0
5416-
size_flags_horizontal = 10
5415+
margin_bottom = 27.0
5416+
size_flags_horizontal = 3
5417+
text = "Delete"
54175418

5418-
[node name="Button" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
5419-
margin_top = 35.0
5419+
[node name="Label9" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
5420+
margin_top = 36.0
54205421
margin_right = 113.0
5421-
margin_bottom = 62.0
5422-
size_flags_horizontal = 3
5423-
text = "Add"
5422+
margin_bottom = 57.0
5423+
text = "Object index"
54245424

5425-
[node name="Button2" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
5425+
[node name="ObjObjectIndexSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54265426
margin_left = 117.0
5427-
margin_top = 35.0
5427+
margin_top = 31.0
54285428
margin_right = 191.0
54295429
margin_bottom = 62.0
5430-
size_flags_horizontal = 3
5431-
text = "Delete"
5430+
size_flags_horizontal = 10
5431+
max_value = 1e+06
54325432

54335433
[node name="Label6" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54345434
margin_top = 71.0
54355435
margin_right = 113.0
54365436
margin_bottom = 92.0
54375437
text = "ThingType"
54385438

5439-
[node name="SpinBoxPropertiesValue6" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5439+
[node name="ObjThingTypeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54405440
margin_left = 117.0
54415441
margin_top = 66.0
54425442
margin_right = 191.0
54435443
margin_bottom = 97.0
54445444
size_flags_horizontal = 10
5445+
max_value = 1e+06
54455446

54465447
[node name="Label7" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54475448
margin_top = 106.0
54485449
margin_right = 113.0
54495450
margin_bottom = 127.0
54505451
text = "Subtype"
54515452

5452-
[node name="SpinBoxPropertiesValue8" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5453+
[node name="ObjSubtypeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54535454
margin_left = 117.0
54545455
margin_top = 101.0
54555456
margin_right = 191.0
54565457
margin_bottom = 132.0
54575458
size_flags_horizontal = 10
5459+
max_value = 1e+06
54585460

54595461
[node name="Label" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54605462
margin_top = 141.0
54615463
margin_right = 113.0
54625464
margin_bottom = 162.0
54635465
text = "IsLight"
54645466

5465-
[node name="SpinBoxPropertiesValue" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5467+
[node name="ObjIsLightSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54665468
margin_left = 117.0
54675469
margin_top = 136.0
54685470
margin_right = 191.0
54695471
margin_bottom = 167.0
54705472
size_flags_horizontal = 10
5473+
max_value = 1.0
54715474

54725475
[node name="Label8" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54735476
margin_top = 176.0
54745477
margin_right = 113.0
54755478
margin_bottom = 197.0
54765479
text = "EffectRange"
54775480

5478-
[node name="SpinBoxPropertiesValue7" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5481+
[node name="ObjEffectRangeSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54795482
margin_left = 117.0
54805483
margin_top = 171.0
54815484
margin_right = 191.0
54825485
margin_bottom = 202.0
54835486
size_flags_horizontal = 10
5487+
max_value = 1e+06
54845488

54855489
[node name="Label2" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54865490
margin_top = 211.0
54875491
margin_right = 113.0
54885492
margin_bottom = 232.0
54895493
text = "Subtile"
54905494

5491-
[node name="SpinBoxPropertiesValue2" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5495+
[node name="ObjSubtileSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
54925496
margin_left = 117.0
54935497
margin_top = 206.0
54945498
margin_right = 191.0
54955499
margin_bottom = 237.0
54965500
size_flags_horizontal = 10
5501+
max_value = 8.0
54975502

54985503
[node name="Label3" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
54995504
margin_top = 246.0
55005505
margin_right = 113.0
55015506
margin_bottom = 267.0
55025507
text = "RelativeX"
55035508

5504-
[node name="SpinBoxPropertiesValue3" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5509+
[node name="ObjRelativeXSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
55055510
margin_left = 117.0
55065511
margin_top = 241.0
55075512
margin_right = 191.0
55085513
margin_bottom = 272.0
55095514
size_flags_horizontal = 10
5515+
min_value = -255.0
5516+
step = 0.01
55105517

55115518
[node name="Label4" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
55125519
margin_top = 281.0
55135520
margin_right = 113.0
55145521
margin_bottom = 302.0
55155522
text = "RelativeY"
55165523

5517-
[node name="SpinBoxPropertiesValue4" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5524+
[node name="ObjRelativeYSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
55185525
margin_left = 117.0
55195526
margin_top = 276.0
55205527
margin_right = 191.0
55215528
margin_bottom = 307.0
55225529
size_flags_horizontal = 10
5530+
min_value = -255.0
5531+
step = 0.01
55235532

55245533
[node name="Label5" type="Label" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer"]
55255534
margin_top = 316.0
55265535
margin_right = 113.0
55275536
margin_bottom = 337.0
55285537
text = "RelativeZ"
55295538

5530-
[node name="SpinBoxPropertiesValue5" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
5539+
[node name="ObjRelativeZSpinBox" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer" instance=ExtResource( 152 )]
55315540
margin_left = 117.0
55325541
margin_top = 311.0
55335542
margin_right = 191.0
55345543
margin_bottom = 342.0
55355544
size_flags_horizontal = 10
5545+
min_value = -255.0
5546+
step = 0.01
55365547

55375548
[node name="SlabsetCopyValues" type="Button" parent="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer"]
55385549
visible = false
@@ -6731,6 +6742,16 @@ script = SubResource( 20 )
67316742
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/SlabsetIDSpinBox" to="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/DkSlabsetVoxelView" method="_on_SlabsetIDSpinBox_value_changed"]
67326743
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/VariationNumberSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_VariationNumberSpinBox_value_changed"]
67336744
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer2/VBoxContainer/GridContainer/VariationNumberSpinBox" to="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/DkSlabsetVoxelView" method="_on_VariationNumberSpinBox_value_changed"]
6745+
[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjAddButton" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjAddButton_pressed"]
6746+
[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjDeleteButton" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjDeleteButton_pressed"]
6747+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjThingTypeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjThingTypeSpinBox_value_changed"]
6748+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjSubtypeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjSubtypeSpinBox_value_changed"]
6749+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjIsLightSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjIsLightSpinBox_value_changed"]
6750+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjEffectRangeSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjEffectRangeSpinBox_value_changed"]
6751+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjSubtileSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjSubtileSpinBox_value_changed"]
6752+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeXSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeXSpinBox_value_changed"]
6753+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeYSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeYSpinBox_value_changed"]
6754+
[connection signal="value_changed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/PanelContainer3/ScrollContainer/VBoxContainer/GridContainer/ObjRelativeZSpinBox" to="Ui/UiSystem/SlabsetWindow" method="_on_ObjRelativeZSpinBox_value_changed"]
67346755
[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ScrollContainer/VBoxContainer/SlabsetCopyValues" to="Ui/UiSystem/SlabsetWindow" method="_on_SlabsetCopyValues_pressed"]
67356756
[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ExportSlabsDat" to="Ui/UiSystem/SlabsetWindow" method="_on_ExportSlabsDat_pressed"]
67366757
[connection signal="pressed" from="Ui/UiSystem/SlabsetWindow/SlabsetTabs/TabSlabset/VBoxContainer/ExportSlabsCfg" to="Ui/UiSystem/SlabsetWindow" method="_on_ExportSlabsCfg_pressed"]

‎Scenes/PickSlabWindow.gd

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ func add_slabs():
9191
match slabID:
9292
Slabs.PORTAL:
9393
for i in 9:
94-
columnArray[i] = Slabset.dat[slabID][8][i]
94+
columnArray[i] = Slabset.fetch_slab(slabID, 8, i)
9595
Slabs.WALL_AUTOMATIC:
9696
for i in 9:
97-
columnArray[i] = Slabset.dat[Slabs.WALL_WITH_BANNER][slabVariation][i]
97+
columnArray[i] = Slabset.fetch_slab(Slabs.WALL_WITH_BANNER, slabVariation, i)
9898
_:
9999
if slabID < 1000:
100100
for i in 9:
101-
columnArray[i] = Slabset.dat[slabID][slabVariation][i] # !!!!!!!!!!!!!
101+
columnArray[i] = Slabset.fetch_slab(slabID, slabVariation, i)
102102
else:
103103
# Custom slab
104104
pass

‎Scenes/SlabPlacement.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ func dkdat_position_to_column_data(asset3x3group):
755755
var index = asset3x3group[subtile] / 9
756756
var variation = index % 28
757757
var slabID = index / 28
758-
var dkClmIndex = Slabset.dat[slabID][variation][subtile]
758+
var dkClmIndex = Slabset.fetch_slab(slabID, variation, subtile)
759759

760760
# Get the cube data from oDkClm
761761
slabCubes.append(Columnset.cubes[dkClmIndex])

‎Scenes/SlabsetWindow.gd

+54-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ onready var oPickSlabWindow = Nodelist.list["oPickSlabWindow"]
1818
onready var oTabCustomSlabs = Nodelist.list["oTabCustomSlabs"]
1919
onready var oExportSlabsetClmDialog = Nodelist.list["oExportSlabsetClmDialog"]
2020

21+
onready var oObjObjectIndexSpinBox = Nodelist.list["oObjObjectIndexSpinBox"]
22+
onready var oObjAddButton = Nodelist.list["oObjAddButton"]
23+
onready var oObjDeleteButton = Nodelist.list["oObjDeleteButton"]
24+
onready var oObjThingTypeSpinBox = Nodelist.list["oObjThingTypeSpinBox"]
25+
onready var oObjSubtypeSpinBox = Nodelist.list["oObjSubtypeSpinBox"]
26+
onready var oObjIsLightSpinBox = Nodelist.list["oObjIsLightSpinBox"]
27+
onready var oObjEffectRangeSpinBox = Nodelist.list["oObjEffectRangeSpinBox"]
28+
onready var oObjSubtileSpinBox = Nodelist.list["oObjSubtileSpinBox"]
29+
onready var oObjRelativeXSpinBox = Nodelist.list["oObjRelativeXSpinBox"]
30+
onready var oObjRelativeYSpinBox = Nodelist.list["oObjRelativeYSpinBox"]
31+
onready var oObjRelativeZSpinBox = Nodelist.list["oObjRelativeZSpinBox"]
32+
33+
2134
var scnColumnSetter = preload('res://Scenes/ColumnSetter.tscn')
2235

2336
# Declare member variables here. Examples:
@@ -149,7 +162,7 @@ func update_columns_ui():
149162
for subtile in columnSettersArray.size():
150163
var spinbox = columnSettersArray[subtile].get_node("CustomSpinBox")
151164
spinbox.disconnect("value_changed",self,"_on_Slabset3x3ColumnSpinBox_value_changed")
152-
var clmIndex = Slabset.dat[slabID][variation][subtile]
165+
var clmIndex = Slabset.fetch_slab(slabID, variation, subtile)
153166
spinbox.value = clmIndex
154167
spinbox.connect("value_changed",self,"_on_Slabset3x3ColumnSpinBox_value_changed")
155168

@@ -262,3 +275,43 @@ func _on_ExportSlabsetClmDialog_file_selected(filePath):
262275
oMessage.quick("Saved: " + filePath)
263276
else:
264277
oMessage.big("Error", "Couldn't save file, maybe try saving to another directory.")
278+
279+
280+
func _on_ObjAddButton_pressed():
281+
pass # Replace with function body.
282+
283+
284+
func _on_ObjDeleteButton_pressed():
285+
pass # Replace with function body.
286+
287+
288+
func _on_ObjThingTypeSpinBox_value_changed(value):
289+
pass # Replace with function body.
290+
291+
292+
func _on_ObjSubtypeSpinBox_value_changed(value):
293+
pass # Replace with function body.
294+
295+
296+
func _on_ObjIsLightSpinBox_value_changed(value):
297+
pass # Replace with function body.
298+
299+
300+
func _on_ObjEffectRangeSpinBox_value_changed(value):
301+
pass # Replace with function body.
302+
303+
304+
func _on_ObjSubtileSpinBox_value_changed(value):
305+
pass # Replace with function body.
306+
307+
308+
func _on_ObjRelativeXSpinBox_value_changed(value):
309+
pass # Replace with function body.
310+
311+
312+
func _on_ObjRelativeYSpinBox_value_changed(value):
313+
pass # Replace with function body.
314+
315+
316+
func _on_ObjRelativeZSpinBox_value_changed(value):
317+
pass # Replace with function body.

‎Scenes/VoxelViewer.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func do_all():
141141
var x = (variation*3) + xSubtile + separation
142142
var z = (variation*3) + ySubtile + separation
143143

144-
var clmIndex = Slabset.dat[slabID][variation][subtile]
144+
var clmIndex = Slabset.fetch_slab(slabID, variation, subtile)
145145

146146
oVoxelGen.column_gen(genArray, x-1.5, z-1.5, clmIndex, surrClmIndex, true, Columnset)
147147

0 commit comments

Comments
 (0)