Skip to content

Commit 2d6c348

Browse files
committed
Fix nested function return types
1 parent 580b6c0 commit 2d6c348

14 files changed

+58
-5
lines changed

dist/library/df.advmode.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,9 +1745,11 @@ df.adventure_optionst = {}
17451745

17461746
function df.adventure_optionst:getDescription() end
17471747

1748+
---@return item
17481749
function df.adventure_optionst:getIngestedItem() end
17491750

17501751
---for "pick up vermin": the first argument is set to the vermin index if an item was allocated and this was the last vermin of its type the second argument is set to true if an item was allocated, false otherwise the third argument is set to true if the second argument is false the first and third arguments are not changed in all other cases returns an item_verminst pointer for all other types (as of 0.47.04): does not modify arguments 1 and 2 argument 3 is set to true if a fire was started returns nullptr
1752+
---@return item
17511753
function df.adventure_optionst:performAction() end
17521754

17531755
---@return integer
@@ -1770,15 +1772,19 @@ function df.adventure_optionst:getTargetPosZ() end
17701772

17711773
function df.adventure_optionst:deleteSpatter() end
17721774

1775+
---@return unit
17731776
function df.adventure_optionst:getSuckBloodUnitID() end
17741777

17751778
---@return boolean
17761779
function df.adventure_optionst:isIngestFromContainer() end
17771780

1781+
---@return building
17781782
function df.adventure_optionst:getBuildingContainer() end
17791783

1784+
---@return item
17801785
function df.adventure_optionst:getItemContainer() end
17811786

1787+
---@return unit
17821788
function df.adventure_optionst:getUnitContainer() end
17831789

17841790
---@class adventure_option_eat_unit_contaminantst: adventure_optionst

dist/library/df.art.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ function df.art_image_element:getType() end
4343
---@param ID integer
4444
function df.art_image_element:setID(ID) end
4545

46+
---@return art_image_element
4647
function df.art_image_element:clone() end
4748

4849
---@param sym integer
@@ -117,6 +118,7 @@ function df.art_image_property:read_file(file, loadversion) end
117118
---@return art_image_property_type
118119
function df.art_image_property:getType() end
119120

121+
---@return art_image_element
120122
function df.art_image_property:clone() end
121123

122124
---@param useName boolean

dist/library/df.buildings.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -424,6 +424,7 @@ function df.building:setCustomType(type) end
424424
---@param supplies hospital_supplies
425425
function df.building:countHospitalSupplies(supplies) end
426426

427+
---@return stockpile_links
427428
function df.building:getStockpileLinks() end
428429

429430
---?
@@ -433,6 +434,7 @@ function df.building:detachWorldData() end
433434
---@return boolean
434435
function df.building:canLinkToStockpile() end
435436

437+
---@return building_users
436438
function df.building:getUsers() end
437439

438440
---@param delta_x integer
@@ -480,8 +482,10 @@ function df.building:isNormalFurniture() end
480482
---@return boolean
481483
function df.building:isFarmPlot() end
482484

485+
---@return workshop_profile
483486
function df.building:getWorkshopProfile() end
484487

488+
---@return machine_info
485489
function df.building:getMachineInfo() end
486490

487491
---@param power_info power_info

dist/library/df.history.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2989,7 +2989,7 @@ function df.history_event:getHappinessModifier(entity1, entity2) end
29892989
function df.history_event:madeFirstContact(entity1, entity2, site) end
29902990

29912991
---@param killer historical_figure
2992-
---@return integer
2992+
---@return historical_figure
29932993
function df.history_event:getKilledHistfigID(killer) end
29942994

29952995
---@param victim historical_figure

dist/library/df.itemimprovements.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,14 @@ df.dye_info = {}
8181
---@field unk_1 integer
8282
df.itemimprovement = {}
8383

84+
---@return art_image
8485
function df.itemimprovement:getImage() end
8586

8687
---@param colors integer[]
8788
---@param shapes integer[]
8889
function df.itemimprovement:getColorAndShape(colors, shapes) end
8990

91+
---@return itemimprovement
9092
function df.itemimprovement:clone() end
9193

9294
---@param file file_compressorst

dist/library/df.items.lua

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,7 @@ function df.item:getVehicleID() end
494494
---@return boolean
495495
function df.item:isAmmo() end
496496

497+
---@return item_stockpile_ref
497498
function df.item:getStockpile() end
498499

499500
---@return boolean
@@ -505,6 +506,7 @@ function df.item:isPlaster() end
505506
---@return boolean
506507
function df.item:getColorOverride() end
507508

509+
---@return item_history_info
508510
function df.item:getHistoryInfo() end
509511

510512
---@param use tool_uses
@@ -613,11 +615,14 @@ function df.item:setMaker(unit_id) end
613615
---@param punit unit
614616
function df.item:getCorpseInfo(prace, pcaste, phfig, punit) end
615617

618+
---@return caste_body_info
616619
function df.item:getBodyInfo() end
617620

621+
---@return boolean[]
618622
function df.item:getGloveFlags() end
619623

620624
---a statue/figurine of "string goes here"
625+
---@return string
621626
function df.item:getItemShapeDesc() end
622627

623628
---@return boolean
@@ -669,6 +674,7 @@ function df.item:isBogeymanCorpse() end
669674
---@return boolean
670675
function df.item:testMaterialFlag(mat_flag) end
671676

677+
---@return string
672678
function df.item:getAmmoType() end
673679

674680
---@return boolean
@@ -696,6 +702,7 @@ function df.item:getVolume() end
696702
---@param site world_site
697703
---@param unk integer
698704
---@param unshaped boolean
705+
---@return itemimprovement
699706
function df.item:addImprovementFromJob(imp_type, job, unit, mat_type, mat_index, shape, forced_quality, entity, site, unk, unshaped) end
700707

701708
---@return boolean
@@ -793,6 +800,7 @@ function df.item:needTwoHandedWield() end
793800

794801
---@param stack_size integer
795802
---@param preserve_containment boolean
803+
---@return item
796804
function df.item:splitStack(stack_size, preserve_containment) end
797805

798806
---@return boolean
@@ -869,6 +877,7 @@ function df.item:write_file(file) end
869877
---@param loadversion save_version
870878
function df.item:read_file(file, loadversion) end
871879

880+
---@return integer[]
872881
function df.item:getWeaponAttacks() end
873882

874883
---@return boolean
@@ -1054,6 +1063,7 @@ function df.item:hasImprovements() end
10541063
---@return boolean
10551064
function df.item:isImproved() end
10561065

1066+
---@return item_magicness[]
10571067
function df.item:getMagic() end
10581068

10591069
---@param plurality integer
@@ -1121,6 +1131,7 @@ function df.item:detachStockpileAssignment() end
11211131
---just wipes the fields
11221132
function df.item:removeStockpileAssignment() end
11231133

1134+
---@return item_stockpile_ref
11241135
function df.item:getStockpile2() end
11251136

11261137
---this updates the quality of a thread improvement already added to the item (or adjusts the quality of a thread item) based on the skill of the dyer
@@ -1161,6 +1172,7 @@ function df.item:calcUniformScore(exact_match, best_any, best_melee, best_ranged
11611172
---@return integer
11621173
function df.item:calcBaseUniformScore() end
11631174

1175+
---@return slab_engraving_type
11641176
function df.item:getSlabEngravingType() end
11651177

11661178
---@return integer
@@ -1175,6 +1187,7 @@ function df.item:setGemShape(shape) end
11751187
---@return boolean
11761188
function df.item:hasGemShape() end
11771189

1190+
---@return descriptor_shape
11781191
function df.item:getGemShape() end
11791192

11801193
---@return boolean

dist/library/df.map.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -897,13 +897,16 @@ function df.feature_init:write_file(file, include_feature) end
897897
---@param include_feature boolean
898898
function df.feature_init:read_file(file, loadversion, include_feature) end
899899

900+
---@return feature
900901
function df.feature_init:createFeature() end
901902

902903
---destroyFeature(), then createFeature()
904+
---@return feature
903905
function df.feature_init:recreateFeature() end
904906

905907
function df.feature_init:destroyFeature() end
906908

909+
---@return feature
907910
function df.feature_init:getFeature() end
908911

909912
---@param mat_type integer
@@ -1094,6 +1097,7 @@ df.world_construction = {}
10941097
---@return world_construction_type
10951098
function df.world_construction:getType() end
10961099

1100+
---@return language_name
10971101
function df.world_construction:getName() end
10981102

10991103
---@param file file_compressorst

dist/library/df.meeting.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ df.script_step_eventst = {}
112112
---@field name string
113113
df.script_varst = {}
114114

115+
---@return active_script_varst
115116
function df.script_varst:instantiate() end
116117

117118
---@class script_var_unitst: script_varst
@@ -594,6 +595,7 @@ function df.activity_event:read_file(file, loadversion) end
594595
---@return boolean
595596
function df.activity_event:isEmpty() end
596597

598+
---@return activity_event_participants
597599
function df.activity_event:getParticipantInfo() end
598600

599601
---@param children_too boolean
@@ -618,6 +620,7 @@ function df.activity_event:checkDrillInvalid(unit) end
618620
---@return boolean
619621
function df.activity_event:decUniformLock() end
620622

623+
---@return squad_event_type
621624
function df.activity_event:getSquadEventType() end
622625

623626
---@param skill job_skill
@@ -637,6 +640,7 @@ function df.activity_event:adjustOrganizeCounter(amount) end
637640
function df.activity_event:getOrganizer(hist_figure_id, unit_id) end
638641

639642
---returns pointer to building_id
643+
---@return integer
640644
function df.activity_event:getBuilding() end
641645

642646
---@return boolean

dist/library/df.military.lua

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,7 @@ df.squad_order_cannot_reason = {}
396396
---@field unk_1 integer
397397
df.squad_order = {}
398398

399+
---@return squad_order
399400
function df.squad_order:clone() end
400401

401402
---@param file file_compressorst
@@ -431,6 +432,7 @@ function df.squad_order:decUniformLock(soldier) end
431432
---@return boolean
432433
function df.squad_order:isFulfilled() end
433434

435+
---@return integer[]
434436
function df.squad_order:getTargetUnits() end
435437

436438
---@param soldier unit

dist/library/df.refs.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,20 +299,28 @@ function df.general_ref:read_file(file, loadversion) end
299299
---@return general_ref_type
300300
function df.general_ref:getType() end
301301

302+
---@return item
302303
function df.general_ref:getItem() end
303304

305+
---@return unit
304306
function df.general_ref:getUnit() end
305307

308+
---@return projectile
306309
function df.general_ref:getProjectile() end
307310

311+
---@return building
308312
function df.general_ref:getBuilding() end
309313

314+
---@return historical_entity
310315
function df.general_ref:getEntity() end
311316

317+
---@return artifact_record
312318
function df.general_ref:getArtifact() end
313319

320+
---@return nemesis_record
314321
function df.general_ref:getNemesis() end
315322

323+
---@return activity_event
316324
function df.general_ref:getEvent() end
317325

318326
function df.general_ref:setID() end
@@ -330,6 +338,7 @@ function df.general_ref:setLocation(x, y, z) end
330338
---@param out_z integer
331339
function df.general_ref:getLocation(out_x, out_y, out_z) end
332340

341+
---@return general_ref
333342
function df.general_ref:clone() end
334343

335344
---@param str string

0 commit comments

Comments
 (0)