diff --git a/modern/resources/maki-skin-data.json b/modern/resources/maki-skin-data.json index a53b6a30..9abe0a4f 100644 --- a/modern/resources/maki-skin-data.json +++ b/modern/resources/maki-skin-data.json @@ -1,225 +1,225 @@ { "totalCalls": { - "System.getsonginfotext": 48, - "System.strsearch": 53, - "System.getcontainer": 61, - "Container.getlayout": 56, - "Group.getobject": 83, - "System.getprivateint": 34, - "GuiObject.show": 60, - "GuiObject.hide": 60, - "Button.setactivatednocallback": 4, - "PopupMenu.addcommand": 17, - "PopupMenu.popatmouse": 17, - "System.navigateurl": 60, - "Button.getactivated": 12, - "System.setprivateint": 34, - "System.getparam": 81, - "System.getscriptgroup": 100, - "System.gettoken": 68, - "Map.loadmap": 86, - "System.getvolume": 73, - "GuiObject.onmousemove": 30, - "GuiObject.getleft": 69, - "GuiObject.gettop": 65, - "Map.inregion": 42, - "Map.getvalue": 56, - "System.setvolume": 65, - "Layer.setregionfrommap": 42, - "GuiObject.findobject": 69, - "Slider.getposition": 12, + "System.getsonginfotext": 193, + "System.strsearch": 196, + "System.getcontainer": 241, + "Container.getlayout": 305, + "Group.getobject": 896, + "System.getprivateint": 394, + "GuiObject.show": 691, + "GuiObject.hide": 937, + "Button.setactivatednocallback": 7, + "PopupMenu.addcommand": 362, + "PopupMenu.popatmouse": 48, + "System.navigateurl": 118, + "Button.getactivated": 35, + "System.setprivateint": 474, + "System.getparam": 137, + "System.getscriptgroup": 475, + "System.gettoken": 616, + "Map.loadmap": 190, + "System.getvolume": 152, + "GuiObject.onmousemove": 100, + "GuiObject.getleft": 270, + "GuiObject.gettop": 259, + "Map.inregion": 123, + "Map.getvalue": 170, + "System.setvolume": 167, + "Layer.setregionfrommap": 276, + "GuiObject.findobject": 1850, + "Slider.getposition": 95, "Slider.onsetposition": 3, - "System.integertostring": 82, - "Text.settext": 54, - "Slider.setposition": 13, + "System.integertostring": 587, + "Text.settext": 1402, + "Slider.setposition": 92, "System.geteq": 3, "System.oneqchanged": 2, "System.geteqpreamp": 14, - "System.geteqband": 19, - "AnimatedLayer.getlength": 25, - "AnimatedLayer.gotoframe": 41, - "Object.getid": 10, - "GuiObject.getheight": 20, - "System.seteqpreamp": 5, - "System.stringtointeger": 44, - "System.seteqband": 10, - "GuiObject.setalpha": 37, - "Timer.setdelay": 100, - "Timer.stop": 86, - "System.getplayitemlength": 55, - "Timer.start": 100, - "System.integertotime": 30, - "System.getstatus": 70, - "System.strmid": 16, - "System.strlower": 18, - "GuiObject.setxmlparam": 54, - "System.messagebox": 63, - "System.onsetxuiparam": 13, + "System.geteqband": 91, + "AnimatedLayer.getlength": 54, + "AnimatedLayer.gotoframe": 278, + "Object.getid": 22, + "GuiObject.getheight": 114, + "System.seteqpreamp": 7, + "System.stringtointeger": 501, + "System.seteqband": 531, + "GuiObject.setalpha": 869, + "Timer.setdelay": 471, + "Timer.stop": 620, + "System.getplayitemlength": 234, + "Timer.start": 741, + "System.integertotime": 102, + "System.getstatus": 307, + "System.strmid": 61, + "System.strlower": 52, + "GuiObject.setxmlparam": 1763, + "System.messagebox": 293, + "System.onsetxuiparam": 15, "System.newgroup": 23, "GuiObject.init": 23, "LayoutStatus.callme": 11, - "Container.show": 20, - "System.getposition": 45, - "System.seekto": 29, - "Object.onnotify": 3, - "System.getprivatestring": 10, - "GuiObject.settargeta": 25, - "GuiObject.settargetspeed": 42, - "GuiObject.gototarget": 42, - "System.setprivatestring": 10, - "Config.newitem": 25, - "Config.getitem": 24, - "ConfigItem.newattribute": 25, - "ConfigAttribute.setdata": 24, - "ConfigAttribute.getdata": 25, - "ConfigAttribute.ondatachanged": 11, - "System.strleft": 20, + "Container.show": 23, + "System.getposition": 131, + "System.seekto": 51, + "Object.onnotify": 5, + "System.getprivatestring": 154, + "GuiObject.settargeta": 441, + "GuiObject.settargetspeed": 556, + "GuiObject.gototarget": 575, + "System.setprivatestring": 38, + "Config.newitem": 158, + "Config.getitem": 70, + "ConfigItem.newattribute": 974, + "ConfigAttribute.setdata": 355, + "ConfigAttribute.getdata": 354, + "ConfigAttribute.ondatachanged": 22, + "System.strleft": 87, "System.isvideofullscreen": 12, - "System.isminimized": 15, - "Container.getcurlayout": 6, - "GuiObject.getalpha": 16, - "Layout.istransparencysafe": 7, - "GuiObject.canceltarget": 16, - "System.restoreapplication": 13, - "System.activateapplication": 13, - "Container.close": 9, - "System.newdynamiccontainer": 16, - "System.isdesktopalphaavailable": 6, - "System.getviewportwidth": 17, - "System.getviewportleft": 9, - "System.getviewportheight": 17, - "System.getviewporttop": 9, - "GuiObject.resize": 21, - "GuiObject.settargetx": 36, - "GuiObject.settargety": 30, - "GuiObject.settargetw": 15, - "GuiObject.settargeth": 9, - "System.getplayitemstring": 23, + "System.isminimized": 21, + "Container.getcurlayout": 10, + "GuiObject.getalpha": 43, + "Layout.istransparencysafe": 13, + "GuiObject.canceltarget": 60, + "System.restoreapplication": 30, + "System.activateapplication": 30, + "Container.close": 12, + "System.newdynamiccontainer": 51, + "System.isdesktopalphaavailable": 10, + "System.getviewportwidth": 50, + "System.getviewportleft": 31, + "System.getviewportheight": 32, + "System.getviewporttop": 27, + "GuiObject.resize": 114, + "GuiObject.settargetx": 190, + "GuiObject.settargety": 145, + "GuiObject.settargetw": 62, + "GuiObject.settargeth": 41, + "System.getplayitemstring": 55, "System.debugstring": 4, - "System.getplaylistindex": 14, - "System.getplaylistlength": 14, - "System.isvideo": 11, - "System.getplayitemmetadatastring": 27, - "System.getplayitemdisplaytitle": 8, - "GuiObject.getautowidth": 11, + "System.getplaylistindex": 258, + "System.getplaylistlength": 159, + "System.isvideo": 36, + "System.getplayitemmetadatastring": 212, + "System.getplayitemdisplaytitle": 12, + "GuiObject.getautowidth": 57, "Layout.center": 1, "AnimatedLayer.isplaying": 4, - "AnimatedLayer.setstartframe": 11, - "AnimatedLayer.setendframe": 11, - "AnimatedLayer.play": 15, - "System.onvolumechanged": 8, - "System.onseek": 10, - "Layer.fx_update": 14, - "Layer.fx_setgridsize": 16, - "Layer.fx_setbgfx": 14, - "Layer.fx_setwrap": 14, - "Layer.fx_setbilinear": 16, - "Layer.fx_setrect": 16, - "Layer.fx_setclear": 16, - "Layer.fx_setlocalized": 16, - "Layer.fx_setrealtime": 16, - "Layer.fx_setenabled": 16, - "GuiObject.getxmlparam": 24, - "GuiObject.isgoingtotarget": 13, + "AnimatedLayer.setstartframe": 22, + "AnimatedLayer.setendframe": 22, + "AnimatedLayer.play": 32, + "System.onvolumechanged": 11, + "System.onseek": 21, + "Layer.fx_update": 34, + "Layer.fx_setgridsize": 36, + "Layer.fx_setbgfx": 30, + "Layer.fx_setwrap": 30, + "Layer.fx_setbilinear": 36, + "Layer.fx_setrect": 36, + "Layer.fx_setclear": 36, + "Layer.fx_setlocalized": 36, + "Layer.fx_setrealtime": 36, + "Layer.fx_setenabled": 42, + "GuiObject.getxmlparam": 246, + "GuiObject.isgoingtotarget": 44, "System.oneqpreampchanged": 3, "System.oneqbandchanged": 3, - "AnimatedLayer.getendframe": 4, - "System.getskinname": 14, - "ConfigItem.getattribute": 15, - "AnimatedLayer.setspeed": 7, - "PopupMenu.addseparator": 9, - "System.strlen": 24, - "System.getleftvumeter": 23, - "System.getrightvumeter": 23, - "Button.leftclick": 14, - "PopupMenu.checkcommand": 7, - "Container.switchtolayout": 11, + "AnimatedLayer.getendframe": 5, + "System.getskinname": 66, + "ConfigItem.getattribute": 59, + "AnimatedLayer.setspeed": 18, + "PopupMenu.addseparator": 23, + "System.strlen": 81, + "System.getleftvumeter": 49, + "System.getrightvumeter": 49, + "Button.leftclick": 65, + "PopupMenu.checkcommand": 140, + "Container.switchtolayout": 43, "Button.onleftclick": 2, - "System.gettimeofday": 11, - "System.integertolongtime": 13, - "Text.setalternatetext": 11, - "System.removepath": 9, - "System.strright": 10, - "Map.getwidth": 25, - "Map.getheight": 14, - "GuiObject.getwidth": 20, - "GuiObject.ismouseover": 2, + "System.gettimeofday": 15, + "System.integertolongtime": 17, + "Text.setalternatetext": 36, + "System.removepath": 15, + "System.strright": 24, + "Map.getwidth": 45, + "Map.getheight": 19, + "GuiObject.getwidth": 149, + "GuiObject.ismouseover": 5, "GuiObject.getguiw": 1, - "GuiObject.getguix": 1, - "GuiObject.getguiy": 1, - "GuiObject.getguih": 1, - "Button.setactivated": 19, - "GuiObject.ismouseoverrect": 2, - "GuiObject.isvisible": 17, + "GuiObject.getguix": 4, + "GuiObject.getguiy": 4, + "GuiObject.getguih": 3, + "Button.setactivated": 179, + "GuiObject.ismouseoverrect": 5, + "GuiObject.isvisible": 69, "Container.toggle": 3, - "Container.hide": 6, - "System.switchskin": 23, - "Region.loadfrommap": 4, - "Layer.setregion": 6, - "System.getvisband": 5, + "Container.hide": 7, + "System.switchskin": 46, + "Region.loadfrommap": 6, + "Layer.setregion": 8, + "System.getvisband": 13, "System.random": 2, - "PopupMenu.addsubmenu": 9, - "Timer.isrunning": 7, - "GuiObject.getparentlayout": 17, + "PopupMenu.addsubmenu": 32, + "Timer.isrunning": 75, + "GuiObject.getparentlayout": 54, "GuiObject.clienttoscreenx": 2, "GuiObject.screentoclientx": 2, - "System.getmouseposx": 4, + "System.getmouseposx": 6, "System.getmouseposy": 3, - "ToggleButton.getcurcfgval": 3, - "System.getpath": 5, + "ToggleButton.getcurcfgval": 11, + "System.getpath": 6, "System.urlencode": 4, - "Browser.navigateurl": 6, - "System.getextension": 5, - "CheckBox.setchecked": 6, - "CheckBox.ischecked": 4, - "System.floattostring": 5, - "Text.gettext": 13, - "Text.gettextwidth": 7, - "Timer.getdelay": 10, - "System.integer": 10, - "System.strupper": 6, - "Layout.setscale": 8, + "Browser.navigateurl": 8, + "System.getextension": 12, + "CheckBox.setchecked": 222, + "CheckBox.ischecked": 116, + "System.floattostring": 40, + "Text.gettext": 200, + "Text.gettextwidth": 50, + "Timer.getdelay": 11, + "System.integer": 31, + "System.strupper": 13, + "Layout.setscale": 39, "GuiObject.setfocus": 8, "Region.loadfrombitmap": 2, - "AnimatedLayer.stop": 8, + "AnimatedLayer.stop": 19, "System.getviewportleftfrompoint": 2, "System.getviewporttopfrompoint": 2, "System.getviewportwidthfrompoint": 2, "System.getviewportheightfrompoint": 2, - "Config.getitembyguid": 2, + "Config.getitembyguid": 8, "Text.ontextchanged": 2, "System.getdate": 2, "System.formatdate": 2, - "Vis.setmode": 6, - "System.stringtofloat": 4, + "Vis.setmode": 22, + "System.stringtofloat": 10, "Layer.fx_setalphamode": 2, - "Layer.fx_setspeed": 4, + "Layer.fx_setspeed": 8, "System.onshownotification": 2, - "System.next": 3, - "System.playfile": 2, - "System.seteq": 2, - "Timer.ontimer": 2, - "AnimatedLayer.pause": 2, + "System.next": 13, + "System.playfile": 19, + "System.seteq": 10, + "Timer.ontimer": 4, + "AnimatedLayer.pause": 6, "Edit.settext": 1, "Edit.gettext": 1, "System.minimizeapplication": 1, "AnimatedLayer.isstopped": 2, - "Layout.beforeredock": 1, - "Layout.redock": 1, - "Layout.snapadjust": 4, - "System.iskeydown": 1, + "Layout.beforeredock": 2, + "Layout.redock": 2, + "Layout.snapadjust": 24, + "System.iskeydown": 3, "GuiObject.onresize": 3, "GuiObject.onsetvisible": 2, - "System.play": 3, + "System.play": 5, "System.previous": 1, - "System.pause": 2, + "System.pause": 3, "System.stop": 3, "Layout.getcontainer": 1, - "AnimatedLayer.getcurframe": 1, + "AnimatedLayer.getcurframe": 2, "ConfigAttribute.getattributename": 1, - "Button.rightclick": 1, + "Button.rightclick": 12, "System.pow": 1, - "System.sqrt": 1 + "System.sqrt": 3 }, "foundInSkins": { "System.getsonginfotext": 48, diff --git a/modern/src/maki-interpreter/tools/extract-functions.js b/modern/src/maki-interpreter/tools/extract-functions.js index 8434cdc8..855f78b4 100755 --- a/modern/src/maki-interpreter/tools/extract-functions.js +++ b/modern/src/maki-interpreter/tools/extract-functions.js @@ -21,9 +21,9 @@ function findWals(parentDir) { function sumCountObjects(obj1, obj2) { return Object.keys(obj2).reduce((summaryObj, key) => { if (summaryObj[key] == null) { - summaryObj[key] = 1; + summaryObj[key] = obj2[key]; } else { - summaryObj[key]++; + summaryObj[key] += obj2[key]; } return summaryObj; }, Object.assign({}, obj1));