Skip to content

Commit 968cc1e

Browse files
committed
Improve vmethod field handling
1 parent 18333ed commit 968cc1e

26 files changed

+988
-349
lines changed

dist/library/structures/df.advmode.lua

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,8 @@ function _adventurest_assume_identity_unk_2:erase(index) end
23702370
---@field _type identity.text_info_elementst
23712371
local text_info_elementst
23722372

2373-
function text_info_elementst:getString() end
2373+
---@param val string
2374+
function text_info_elementst:getString(val) end
23742375

23752376
---@return number
23762377
function text_info_elementst:getLong() end
@@ -2409,13 +2410,17 @@ function df.text_info_element_stringst:new() end
24092410
---@field _type identity.adventure_optionst
24102411
local adventure_optionst
24112412

2412-
function adventure_optionst:getDescription() end
2413+
---@param anon_0 string
2414+
function adventure_optionst:getDescription(anon_0) end
24132415

24142416
---@return df.item
24152417
function adventure_optionst:getIngestedItem() end
24162418

2419+
---@param anon_0 number
2420+
---@param anon_1 boolean
2421+
---@param anon_2 boolean
24172422
---@return df.item
2418-
function adventure_optionst:performAction() end
2423+
function adventure_optionst:performAction(anon_0, anon_1, anon_2) end
24192424

24202425
---@return number
24212426
function adventure_optionst:getPlayerPosX() end
@@ -2755,7 +2760,8 @@ function df.adventure_movement_item_interact_pushst:new() end
27552760
---@field _type identity.adventure_item_interact_choicest
27562761
local adventure_item_interact_choicest
27572762

2758-
function adventure_item_interact_choicest:getDescription() end
2763+
---@param anon_0 string
2764+
function adventure_item_interact_choicest:getDescription(anon_0) end
27592765

27602766
function adventure_item_interact_choicest:performAction() end
27612767

dist/library/structures/df.art.lua

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,40 @@ df.art_image_element_type = {}
2626
---@field count number
2727
local art_image_element
2828

29-
function art_image_element:write_file() end
29+
---@param file df.file_compressorst
30+
function art_image_element:write_file(file) end
3031

31-
function art_image_element:read_file() end
32+
---@param file df.file_compressorst
33+
---@param loadversion df.save_version
34+
function art_image_element:read_file(file, loadversion) end
3235

3336
---@return df.art_image_element_type
3437
function art_image_element:getType() end
3538

36-
function art_image_element:setID() end
39+
---@param ID number
40+
function art_image_element:setID(ID) end
3741

3842
---@return df.art_image_element
3943
function art_image_element:clone() end
4044

41-
function art_image_element:getSymbol() end
45+
---@param sym number
46+
---@param anon_0 number
47+
function art_image_element:getSymbol(sym, anon_0) end
4248

43-
function art_image_element:getName1() end
49+
---@param name string
50+
---@param useThe boolean
51+
---@param useName boolean
52+
function art_image_element:getName1(name, useThe, useName) end
4453

45-
function art_image_element:getName2() end
54+
---@param name string
55+
---@param anon_0 boolean
56+
function art_image_element:getName2(name, anon_0) end
4657

4758
function art_image_element:markDiscovered() end
4859

49-
function art_image_element:getColorAndShape() end
60+
---@param colors DFPointer<integer>
61+
---@param shapes DFPointer<integer>
62+
function art_image_element:getColorAndShape(colors, shapes) end
5063

5164

5265
---@class identity.art_image_element: DFCompoundType
@@ -135,17 +148,23 @@ df.art_image_property_type = {}
135148
---@field flags _art_image_property_flags
136149
local art_image_property
137150

138-
function art_image_property:write_file() end
151+
---@param file df.file_compressorst
152+
function art_image_property:write_file(file) end
139153

140-
function art_image_property:read_file() end
154+
---@param file df.file_compressorst
155+
---@param loadversion df.save_version
156+
function art_image_property:read_file(file, loadversion) end
141157

142158
---@return df.art_image_property_type
143159
function art_image_property:getType() end
144160

145161
---@return df.art_image_element
146162
function art_image_property:clone() end
147163

148-
function art_image_property:getName() end
164+
---@param anon_0 string
165+
---@param anon_1 df.art_image
166+
---@param useName boolean
167+
function art_image_property:getName(anon_0, anon_1, useName) end
149168

150169

151170
---@class identity.art_image_property: DFCompoundType

dist/library/structures/df.building-raws.lua

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
---@field build_stages number
2727
local building_def
2828

29-
function building_def:parseRaws() end
29+
---@param anon_0 DFPointer<integer>
30+
---@param anon_1 DFPointer<integer>
31+
---@param anon_2 DFPointer<integer>
32+
---@param anon_3 DFPointer<integer>
33+
function building_def:parseRaws(anon_0, anon_1, anon_2, anon_3) end
3034

3135
function building_def:categorize() end
3236

dist/library/structures/df.buildings.lua

Lines changed: 75 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,11 @@ local building
423423
---@return number
424424
function building:getCustomType() end
425425

426-
function building:setCustomType() end
426+
---@param type number
427+
function building:setCustomType(type) end
427428

428-
function building:countHospitalSupplies() end
429+
---@param supplies df.hospital_supplies
430+
function building:countHospitalSupplies(supplies) end
429431

430432
---@return df.stockpile_links
431433
function building:getStockpileLinks() end
@@ -438,11 +440,18 @@ function building:canLinkToStockpile() end
438440
---@return df.building_users
439441
function building:getUsers() end
440442

441-
function building:moveBuilding() end
443+
---@param delta_x number
444+
---@param delta_y number
445+
---@param delta_z number
446+
function building:moveBuilding(delta_x, delta_y, delta_z) end
442447

443-
function building:initOccupancy() end
448+
---@param abs_x number
449+
---@param abs_y number
450+
function building:initOccupancy(abs_x, abs_y) end
444451

445-
function building:setFillTimer() end
452+
---@param anon_0 df.job_type
453+
---@param anon_1 number
454+
function building:setFillTimer(anon_0, anon_1) end
446455

447456
---@return boolean
448457
function building:isOnFire() end
@@ -468,7 +477,10 @@ function building:updateTemperature() end
468477

469478
function building:updateItems() end
470479

471-
function building:updateTempFromTile() end
480+
---@param temp integer
481+
---@param anon_0 boolean
482+
---@param anon_1 boolean
483+
function building:updateTempFromTile(temp, anon_0, anon_1) end
472484

473485
---@return boolean
474486
function building:isNormalFurniture() end
@@ -482,18 +494,21 @@ function building:getWorkshopProfile() end
482494
---@return df.machine_info
483495
function building:getMachineInfo() end
484496

485-
function building:getPowerInfo() end
497+
---@param power_info df.power_info
498+
function building:getPowerInfo(power_info) end
486499

500+
---@param anon_0 df.machine_tile_set
487501
---@return boolean
488-
function building:canConnectToMachine() end
502+
function building:canConnectToMachine(anon_0) end
489503

490504
---@return df.building_type
491505
function building:getType() end
492506

493507
---@return number
494508
function building:getSubtype() end
495509

496-
function building:setSubtype() end
510+
---@param subtype number
511+
function building:setSubtype(subtype) end
497512

498513
---@return boolean
499514
function building:isActual() end
@@ -506,9 +521,11 @@ function building:updateAction() end
506521
---@return boolean
507522
function building:isStatueOrRestraint() end
508523

509-
function building:setMaterialAmount() end
524+
---@param anon_0 number
525+
function building:setMaterialAmount(anon_0) end
510526

511-
function building:setBuildStage() end
527+
---@param stage number
528+
function building:setBuildStage(stage) end
512529

513530
---@return number
514531
function building:getBuildStage() end
@@ -528,10 +545,13 @@ function building:isActual2() end
528545
---@return boolean
529546
function building:isExtentShaped() end
530547

531-
function building:updateOccupancy() end
548+
---@param abs_x number
549+
---@param abs_y number
550+
function building:updateOccupancy(abs_x, abs_y) end
532551

552+
---@param anon_0 df.unit
533553
---@return number
534-
function building:getPersonalValue() end
554+
function building:getPersonalValue(anon_0) end
535555

536556
---@return boolean
537557
function building:canBeRoom() end
@@ -541,16 +561,22 @@ function building:getConstructionValue() end
541561

542562
function building:queueDestroy() end
543563

564+
---@param rel_x number
565+
---@param rel_y number
544566
---@return boolean
545-
function building:isImpassableTile() end
567+
function building:isImpassableTile(rel_x, rel_y) end
546568

569+
---@param subtract_pending_jobs boolean
547570
---@return number
548-
function building:getFreeCapacity() end
571+
function building:getFreeCapacity(subtract_pending_jobs) end
549572

573+
---@param anon_0 df.item
574+
---@param subtract_pending_jobs boolean
550575
---@return boolean
551-
function building:canStoreItem() end
576+
function building:canStoreItem(anon_0, subtract_pending_jobs) end
552577

553-
function building:getName() end
578+
---@param name string
579+
function building:getName(name) end
554580

555581
function building:getNameColor() end
556582

@@ -562,8 +588,9 @@ function building:getClutterLevel() end
562588
---@return boolean
563589
function building:needsDesign() end
564590

591+
---@param anon_0 df.job_type
565592
---@return boolean
566-
function building:canUseForMood() end
593+
function building:canUseForMood(anon_0) end
567594

568595
---@return boolean
569596
function building:canBeRoomSubset() end
@@ -583,35 +610,46 @@ function building:isAssigned() end
583610
---@return boolean
584611
function building:isJusticeRestraint() end
585612

586-
function building:detachRestrainedUnit() end
613+
---@param anon_0 df.unit
614+
function building:detachRestrainedUnit(anon_0) end
587615

588-
function building:write_file() end
616+
---@param file df.file_compressorst
617+
function building:write_file(file) end
589618

590-
function building:read_file() end
619+
---@param file df.file_compressorst
620+
---@param loadversion df.save_version
621+
function building:read_file(file, loadversion) end
591622

592623
---@return boolean
593624
function building:isImpassableAtCreation() end
594625

595-
function building:categorize() end
626+
---@param in_play boolean
627+
function building:categorize(in_play) end
596628

597629
function building:uncategorize() end
598630

599631
---@return number
600632
function building:getBaseValue() end
601633

602-
function building:setTriggerState() end
634+
---@param new_state number
635+
function building:setTriggerState(new_state) end
603636

604637
---@return boolean
605638
function building:needsMagma() end
606639

607-
function building:removeUses() end
640+
---@param noscatter boolean
641+
---@param lost boolean
642+
function building:removeUses(noscatter, lost) end
608643

609-
function building:deconstructItems() end
644+
---@param noscatter boolean
645+
---@param lost boolean
646+
function building:deconstructItems(noscatter, lost) end
610647

611648
function building:cleanupMap() end
612649

650+
---@param fire_type number
613651
---@return boolean
614-
function building:isFireSafe() end
652+
function building:isFireSafe(fire_type) end
615653

616654
function building:fillSidebarMenu() end
617655

@@ -624,20 +662,27 @@ function building:isHidden() end
624662
---@return boolean
625663
function building:isVisibleInUI() end
626664

665+
---@param viewport df.map_viewport
627666
---@return boolean
628-
function building:isVisibleInViewport() end
667+
function building:isVisibleInViewport(viewport) end
629668

630-
function building:getDrawExtents() end
669+
---@param buffer df.building_drawbuffer
670+
function building:getDrawExtents(buffer) end
631671

632-
function building:drawBuilding() end
672+
---@param curtick integer
673+
---@param buffer df.building_drawbuffer
674+
---@param z_offset number
675+
function building:drawBuilding(curtick, buffer, z_offset) end
633676

634677
---@return number
635678
function building:getSpecificSquad() end
636679

637680
---@return number
638681
function building:getSpecificPosition() end
639682

640-
function building:setSpecificSquadPos() end
683+
---@param anon_0 number
684+
---@param anon_1 number
685+
function building:setSpecificSquadPos(anon_0, anon_1) end
641686

642687
function building:clearSpecificSquad() end
643688

0 commit comments

Comments
 (0)