diff --git a/Visual Novel/GuiManager/Core/Colors.int b/Visual Novel/GuiManager/Core/Colors.lua similarity index 100% rename from Visual Novel/GuiManager/Core/Colors.int rename to Visual Novel/GuiManager/Core/Colors.lua diff --git a/Visual Novel/GuiManager/Core/EventDefinitions.int b/Visual Novel/GuiManager/Core/EventDefinitions.lua similarity index 100% rename from Visual Novel/GuiManager/Core/EventDefinitions.int rename to Visual Novel/GuiManager/Core/EventDefinitions.lua diff --git a/Visual Novel/GuiManager/Core/_GetAllChildren.int b/Visual Novel/GuiManager/Core/_GetAllChildren.lua similarity index 100% rename from Visual Novel/GuiManager/Core/_GetAllChildren.int rename to Visual Novel/GuiManager/Core/_GetAllChildren.lua diff --git a/Visual Novel/GuiManager/Core/_GetAllChildren2.int b/Visual Novel/GuiManager/Core/_GetAllChildren2.lua similarity index 100% rename from Visual Novel/GuiManager/Core/_GetAllChildren2.int rename to Visual Novel/GuiManager/Core/_GetAllChildren2.lua diff --git a/Visual Novel/GuiManager/Core/canPress.int b/Visual Novel/GuiManager/Core/canPress.lua similarity index 95% rename from Visual Novel/GuiManager/Core/canPress.int rename to Visual Novel/GuiManager/Core/canPress.lua index 0e33f11..ae69c2e 100644 --- a/Visual Novel/GuiManager/Core/canPress.int +++ b/Visual Novel/GuiManager/Core/canPress.lua @@ -59,7 +59,7 @@ end function gui:canPress() local ref = self if self.ClipReference then ref = self.ClipReference end - if self.Visible==true and self:parentVisible() and not(self:isBeingCovering()) then + if self.Active and self.Visible==true and self:parentVisible() and not(self:isBeingCovering()) then local x,y = love.mouse.getX(),love.mouse.getY() if (x > ref.x and x < ref.x+ref.width and y > ref.y and y < ref.y+ref.height) and (x > self.x and x < self.x+self.width and y > self.y and y < self.y+self.height and self:Clickable() and (self:eventable() or self:touchable())) then return true diff --git a/Visual Novel/GuiManager/Core/fromString.int b/Visual Novel/GuiManager/Core/fromString.lua similarity index 100% rename from Visual Novel/GuiManager/Core/fromString.int rename to Visual Novel/GuiManager/Core/fromString.lua diff --git a/Visual Novel/GuiManager/Core/full.int b/Visual Novel/GuiManager/Core/full.lua similarity index 100% rename from Visual Novel/GuiManager/Core/full.int rename to Visual Novel/GuiManager/Core/full.lua diff --git a/Visual Novel/GuiManager/Core/newBase.int b/Visual Novel/GuiManager/Core/newBase.lua similarity index 100% rename from Visual Novel/GuiManager/Core/newBase.int rename to Visual Novel/GuiManager/Core/newBase.lua diff --git a/Visual Novel/GuiManager/Core/patches.int b/Visual Novel/GuiManager/Core/patches.lua similarity index 100% rename from Visual Novel/GuiManager/Core/patches.int rename to Visual Novel/GuiManager/Core/patches.lua diff --git a/Visual Novel/GuiManager/Core/toString.int b/Visual Novel/GuiManager/Core/toString.lua similarity index 100% rename from Visual Novel/GuiManager/Core/toString.int rename to Visual Novel/GuiManager/Core/toString.lua diff --git a/Visual Novel/GuiManager/Core/touchManager.int b/Visual Novel/GuiManager/Core/touchManager.lua similarity index 100% rename from Visual Novel/GuiManager/Core/touchManager.int rename to Visual Novel/GuiManager/Core/touchManager.lua diff --git a/Visual Novel/GuiManager/Drawing/AddDrawRuleB.int b/Visual Novel/GuiManager/Drawing/AddDrawRuleB.lua similarity index 100% rename from Visual Novel/GuiManager/Drawing/AddDrawRuleB.int rename to Visual Novel/GuiManager/Drawing/AddDrawRuleB.lua diff --git a/Visual Novel/GuiManager/Drawing/AddDrawRuleE.int b/Visual Novel/GuiManager/Drawing/AddDrawRuleE.lua similarity index 100% rename from Visual Novel/GuiManager/Drawing/AddDrawRuleE.int rename to Visual Novel/GuiManager/Drawing/AddDrawRuleE.lua diff --git a/Visual Novel/GuiManager/Drawing/canvas.int b/Visual Novel/GuiManager/Drawing/canvas.lua similarity index 100% rename from Visual Novel/GuiManager/Drawing/canvas.int rename to Visual Novel/GuiManager/Drawing/canvas.lua diff --git a/Visual Novel/GuiManager/Drawing/draw.int b/Visual Novel/GuiManager/Drawing/draw.lua similarity index 100% rename from Visual Novel/GuiManager/Drawing/draw.int rename to Visual Novel/GuiManager/Drawing/draw.lua diff --git a/Visual Novel/GuiManager/Drawing/drawC.int b/Visual Novel/GuiManager/Drawing/drawC.lua similarity index 100% rename from Visual Novel/GuiManager/Drawing/drawC.int rename to Visual Novel/GuiManager/Drawing/drawC.lua diff --git a/Visual Novel/GuiManager/Drawing/drawR.int b/Visual Novel/GuiManager/Drawing/drawR.lua similarity index 75% rename from Visual Novel/GuiManager/Drawing/drawR.int rename to Visual Novel/GuiManager/Drawing/drawR.lua index 05a96f0..fbda362 100644 --- a/Visual Novel/GuiManager/Drawing/drawR.int +++ b/Visual Novel/GuiManager/Drawing/drawR.lua @@ -54,14 +54,22 @@ function gui:drawR() love.graphics.rectangle("line", self.x-(b/2), self.y-(b/2), self.width+b, self.height+b,(self.rx or 1)*self.DPI,(self.ry or 1)*self.DPI,(self.segments or 1)*self.DPI) end if string.find(self.Type, "Text") then - if self.text~=nil and self.TextFormat ~= "center" then - love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) - love.graphics.setFont(self.Font) - love.graphics.printf(self.text, self.x, self.y, self.width, self.TextFormat,self.TextRotaion) - elseif self.text~=nil and self.TextFormat == "center" then + if self.text~=nil and self.TextFormat == "center" then love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) love.graphics.setFont(self.Font) love.graphics.printf(self.text, self.x+(self.width-self.Font:getWidth(self.text))/2, self.y+(self.height-self.Font:getHeight())/2, self.width, "left",self.TextRotaion) + elseif self.text~=nil and self.TextFormat == "middleleft" then + love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) + love.graphics.setFont(self.Font) + love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y+(self.height-self.Font:getHeight())/2, self.width, "left",self.TextRotaion) + elseif self.text~=nil and self.TextFormat == "middleright" then + love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) + love.graphics.setFont(self.Font) + love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y+(self.height-self.Font:getHeight())/2, self.width, "right",self.TextRotaion) + else + love.graphics.setColor(self.TextColor[1],self.TextColor[2],self.TextColor[3],self.TextVisibility) + love.graphics.setFont(self.Font) + love.graphics.printf(self.text, self.x + (self.XTween or 0), self.y, self.width, self.TextFormat,self.TextRotaion) end end if self.DrawRulesE then diff --git a/Visual Novel/GuiManager/Frame/newDropFrame.int b/Visual Novel/GuiManager/Frame/newDropFrame.lua similarity index 100% rename from Visual Novel/GuiManager/Frame/newDropFrame.int rename to Visual Novel/GuiManager/Frame/newDropFrame.lua diff --git a/Visual Novel/GuiManager/Frame/newFrame.int b/Visual Novel/GuiManager/Frame/newFrame.lua similarity index 100% rename from Visual Novel/GuiManager/Frame/newFrame.int rename to Visual Novel/GuiManager/Frame/newFrame.lua diff --git a/Visual Novel/GuiManager/Frame/newFullFrame.int b/Visual Novel/GuiManager/Frame/newFullFrame.lua similarity index 100% rename from Visual Novel/GuiManager/Frame/newFullFrame.int rename to Visual Novel/GuiManager/Frame/newFullFrame.lua diff --git a/Visual Novel/GuiManager/Frame/newTabFrame.int b/Visual Novel/GuiManager/Frame/newTabFrame.lua similarity index 100% rename from Visual Novel/GuiManager/Frame/newTabFrame.int rename to Visual Novel/GuiManager/Frame/newTabFrame.lua diff --git a/Visual Novel/GuiManager/Frame/newratioFrame.int b/Visual Novel/GuiManager/Frame/newratioFrame.lua similarity index 100% rename from Visual Novel/GuiManager/Frame/newratioFrame.int rename to Visual Novel/GuiManager/Frame/newratioFrame.lua diff --git a/Visual Novel/GuiManager/Image-Animation/SetImage.int b/Visual Novel/GuiManager/Image-Animation/SetImage.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/SetImage.int rename to Visual Novel/GuiManager/Image-Animation/SetImage.lua diff --git a/Visual Novel/GuiManager/Image-Animation/SetThreadedImage.int b/Visual Novel/GuiManager/Image-Animation/SetThreadedImage.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/SetThreadedImage.int rename to Visual Novel/GuiManager/Image-Animation/SetThreadedImage.lua diff --git a/Visual Novel/GuiManager/Image-Animation/imageThreadHandler.int b/Visual Novel/GuiManager/Image-Animation/imageThreadHandler.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/imageThreadHandler.int rename to Visual Novel/GuiManager/Image-Animation/imageThreadHandler.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newAnim.int b/Visual Novel/GuiManager/Image-Animation/newAnim.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newAnim.int rename to Visual Novel/GuiManager/Image-Animation/newAnim.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newAnimFromData.int b/Visual Novel/GuiManager/Image-Animation/newAnimFromData.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newAnimFromData.int rename to Visual Novel/GuiManager/Image-Animation/newAnimFromData.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newAnimFromTiles.int b/Visual Novel/GuiManager/Image-Animation/newAnimFromTiles.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newAnimFromTiles.int rename to Visual Novel/GuiManager/Image-Animation/newAnimFromTiles.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newFullImageLabel.int b/Visual Novel/GuiManager/Image-Animation/newFullImageLabel.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newFullImageLabel.int rename to Visual Novel/GuiManager/Image-Animation/newFullImageLabel.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newImageButton.int b/Visual Novel/GuiManager/Image-Animation/newImageButton.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newImageButton.int rename to Visual Novel/GuiManager/Image-Animation/newImageButton.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newImageLabel.int b/Visual Novel/GuiManager/Image-Animation/newImageLabel.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newImageLabel.int rename to Visual Novel/GuiManager/Image-Animation/newImageLabel.lua diff --git a/Visual Novel/GuiManager/Image-Animation/newVideo.int b/Visual Novel/GuiManager/Image-Animation/newVideo.lua similarity index 100% rename from Visual Novel/GuiManager/Image-Animation/newVideo.int rename to Visual Novel/GuiManager/Image-Animation/newVideo.lua diff --git a/Visual Novel/GuiManager/Item/newDragItem.int b/Visual Novel/GuiManager/Item/newDragItem.lua similarity index 100% rename from Visual Novel/GuiManager/Item/newDragItem.int rename to Visual Novel/GuiManager/Item/newDragItem.lua diff --git a/Visual Novel/GuiManager/Item/newItem.int b/Visual Novel/GuiManager/Item/newItem.lua similarity index 100% rename from Visual Novel/GuiManager/Item/newItem.int rename to Visual Novel/GuiManager/Item/newItem.lua diff --git a/Visual Novel/GuiManager/Misc/AdvTextBox.int b/Visual Novel/GuiManager/Misc/AdvTextBox.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/AdvTextBox.int rename to Visual Novel/GuiManager/Misc/AdvTextBox.lua diff --git a/Visual Novel/GuiManager/Misc/ApplyGradient.int b/Visual Novel/GuiManager/Misc/ApplyGradient.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/ApplyGradient.int rename to Visual Novel/GuiManager/Misc/ApplyGradient.lua diff --git a/Visual Novel/GuiManager/Misc/BottomStack.int b/Visual Novel/GuiManager/Misc/BottomStack.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/BottomStack.int rename to Visual Novel/GuiManager/Misc/BottomStack.lua diff --git a/Visual Novel/GuiManager/Misc/ClipDescendants.int b/Visual Novel/GuiManager/Misc/ClipDescendants.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/ClipDescendants.int rename to Visual Novel/GuiManager/Misc/ClipDescendants.lua diff --git a/Visual Novel/GuiManager/Misc/Destroy.int b/Visual Novel/GuiManager/Misc/Destroy.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/Destroy.int rename to Visual Novel/GuiManager/Misc/Destroy.lua diff --git a/Visual Novel/GuiManager/Misc/GetAllChildren.int b/Visual Novel/GuiManager/Misc/GetAllChildren.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/GetAllChildren.int rename to Visual Novel/GuiManager/Misc/GetAllChildren.lua diff --git a/Visual Novel/GuiManager/Misc/GetChild.int b/Visual Novel/GuiManager/Misc/GetChild.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/GetChild.int rename to Visual Novel/GuiManager/Misc/GetChild.lua diff --git a/Visual Novel/GuiManager/Misc/InGrid.int b/Visual Novel/GuiManager/Misc/InGrid.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/InGrid.int rename to Visual Novel/GuiManager/Misc/InGrid.lua diff --git a/Visual Novel/GuiManager/Misc/InGridX.int b/Visual Novel/GuiManager/Misc/InGridX.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/InGridX.int rename to Visual Novel/GuiManager/Misc/InGridX.lua diff --git a/Visual Novel/GuiManager/Misc/InGridY.int b/Visual Novel/GuiManager/Misc/InGridY.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/InGridY.int rename to Visual Novel/GuiManager/Misc/InGridY.lua diff --git a/Visual Novel/GuiManager/Misc/IsHovering.int b/Visual Novel/GuiManager/Misc/IsHovering.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/IsHovering.int rename to Visual Novel/GuiManager/Misc/IsHovering.lua diff --git a/Visual Novel/GuiManager/Misc/Move.int b/Visual Novel/GuiManager/Misc/Move.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/Move.int rename to Visual Novel/GuiManager/Misc/Move.lua diff --git a/Visual Novel/GuiManager/Misc/SetDualDim.int b/Visual Novel/GuiManager/Misc/SetDualDim.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SetDualDim.int rename to Visual Novel/GuiManager/Misc/SetDualDim.lua diff --git a/Visual Novel/GuiManager/Misc/SetHand.int b/Visual Novel/GuiManager/Misc/SetHand.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SetHand.int rename to Visual Novel/GuiManager/Misc/SetHand.lua diff --git a/Visual Novel/GuiManager/Misc/SetHover.int b/Visual Novel/GuiManager/Misc/SetHover.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SetHover.int rename to Visual Novel/GuiManager/Misc/SetHover.lua diff --git a/Visual Novel/GuiManager/Misc/SetName.int b/Visual Novel/GuiManager/Misc/SetName.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SetName.int rename to Visual Novel/GuiManager/Misc/SetName.lua diff --git a/Visual Novel/GuiManager/Misc/SquareX.int b/Visual Novel/GuiManager/Misc/SquareX.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SquareX.int rename to Visual Novel/GuiManager/Misc/SquareX.lua diff --git a/Visual Novel/GuiManager/Misc/SquareY.int b/Visual Novel/GuiManager/Misc/SquareY.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/SquareY.int rename to Visual Novel/GuiManager/Misc/SquareY.lua diff --git a/Visual Novel/GuiManager/Misc/TopStack.int b/Visual Novel/GuiManager/Misc/TopStack.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/TopStack.int rename to Visual Novel/GuiManager/Misc/TopStack.lua diff --git a/Visual Novel/GuiManager/Misc/UpdateImage.int b/Visual Novel/GuiManager/Misc/UpdateImage.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/UpdateImage.int rename to Visual Novel/GuiManager/Misc/UpdateImage.lua diff --git a/Visual Novel/GuiManager/Misc/Utils.int b/Visual Novel/GuiManager/Misc/Utils.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/Utils.int rename to Visual Novel/GuiManager/Misc/Utils.lua diff --git a/Visual Novel/GuiManager/Misc/addDominance.int b/Visual Novel/GuiManager/Misc/addDominance.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/addDominance.int rename to Visual Novel/GuiManager/Misc/addDominance.lua diff --git a/Visual Novel/GuiManager/Misc/alphanumsort.int b/Visual Novel/GuiManager/Misc/alphanumsort.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/alphanumsort.int rename to Visual Novel/GuiManager/Misc/alphanumsort.lua diff --git a/Visual Novel/GuiManager/Misc/anchorRight.int b/Visual Novel/GuiManager/Misc/anchorRight.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/anchorRight.int rename to Visual Novel/GuiManager/Misc/anchorRight.lua diff --git a/Visual Novel/GuiManager/Misc/center.int b/Visual Novel/GuiManager/Misc/center.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/center.int rename to Visual Novel/GuiManager/Misc/center.lua diff --git a/Visual Novel/GuiManager/Misc/centerX.int b/Visual Novel/GuiManager/Misc/centerX.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/centerX.int rename to Visual Novel/GuiManager/Misc/centerX.lua diff --git a/Visual Novel/GuiManager/Misc/centerY.int b/Visual Novel/GuiManager/Misc/centerY.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/centerY.int rename to Visual Novel/GuiManager/Misc/centerY.lua diff --git a/Visual Novel/GuiManager/Misc/disrespectHierarchy.int b/Visual Novel/GuiManager/Misc/disrespectHierarchy.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/disrespectHierarchy.int rename to Visual Novel/GuiManager/Misc/disrespectHierarchy.lua diff --git a/Visual Novel/GuiManager/Misc/getChildren.int b/Visual Novel/GuiManager/Misc/getChildren.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getChildren.int rename to Visual Novel/GuiManager/Misc/getChildren.lua diff --git a/Visual Novel/GuiManager/Misc/getColor.int b/Visual Novel/GuiManager/Misc/getColor.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getColor.int rename to Visual Novel/GuiManager/Misc/getColor.lua diff --git a/Visual Novel/GuiManager/Misc/getFullSize.int b/Visual Novel/GuiManager/Misc/getFullSize.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getFullSize.int rename to Visual Novel/GuiManager/Misc/getFullSize.lua diff --git a/Visual Novel/GuiManager/Misc/getHighest.int b/Visual Novel/GuiManager/Misc/getHighest.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getHighest.int rename to Visual Novel/GuiManager/Misc/getHighest.lua diff --git a/Visual Novel/GuiManager/Misc/getLowest.int b/Visual Novel/GuiManager/Misc/getLowest.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getLowest.int rename to Visual Novel/GuiManager/Misc/getLowest.lua diff --git a/Visual Novel/GuiManager/Misc/getTile.int b/Visual Novel/GuiManager/Misc/getTile.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/getTile.int rename to Visual Novel/GuiManager/Misc/getTile.lua diff --git a/Visual Novel/GuiManager/Misc/isDescendant.int b/Visual Novel/GuiManager/Misc/isDescendant.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/isDescendant.int rename to Visual Novel/GuiManager/Misc/isDescendant.lua diff --git a/Visual Novel/GuiManager/Misc/isHighest.int b/Visual Novel/GuiManager/Misc/isHighest.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/isHighest.int rename to Visual Novel/GuiManager/Misc/isHighest.lua diff --git a/Visual Novel/GuiManager/Misc/isLowest.int b/Visual Novel/GuiManager/Misc/isLowest.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/isLowest.int rename to Visual Novel/GuiManager/Misc/isLowest.lua diff --git a/Visual Novel/GuiManager/Misc/massMutate.int b/Visual Novel/GuiManager/Misc/massMutate.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/massMutate.int rename to Visual Novel/GuiManager/Misc/massMutate.lua diff --git a/Visual Novel/GuiManager/Misc/newCheckBox.int b/Visual Novel/GuiManager/Misc/newCheckBox.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newCheckBox.int rename to Visual Novel/GuiManager/Misc/newCheckBox.lua diff --git a/Visual Novel/GuiManager/Misc/newMessageBox.int b/Visual Novel/GuiManager/Misc/newMessageBox.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newMessageBox.int rename to Visual Novel/GuiManager/Misc/newMessageBox.lua diff --git a/Visual Novel/GuiManager/Misc/newPart.int b/Visual Novel/GuiManager/Misc/newPart.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newPart.int rename to Visual Novel/GuiManager/Misc/newPart.lua diff --git a/Visual Novel/GuiManager/Misc/newProgressBar.int b/Visual Novel/GuiManager/Misc/newProgressBar.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newProgressBar.int rename to Visual Novel/GuiManager/Misc/newProgressBar.lua diff --git a/Visual Novel/GuiManager/Misc/newScrollBar.int b/Visual Novel/GuiManager/Misc/newScrollBar.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newScrollBar.int rename to Visual Novel/GuiManager/Misc/newScrollBar.lua diff --git a/Visual Novel/GuiManager/Misc/newScrollMenu.int b/Visual Novel/GuiManager/Misc/newScrollMenu.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/newScrollMenu.int rename to Visual Novel/GuiManager/Misc/newScrollMenu.lua diff --git a/Visual Novel/GuiManager/Misc/preloadImages.int b/Visual Novel/GuiManager/Misc/preloadImages.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/preloadImages.int rename to Visual Novel/GuiManager/Misc/preloadImages.lua diff --git a/Visual Novel/GuiManager/Misc/removeAllChildren.int b/Visual Novel/GuiManager/Misc/removeAllChildren.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/removeAllChildren.int rename to Visual Novel/GuiManager/Misc/removeAllChildren.lua diff --git a/Visual Novel/GuiManager/Misc/removeDominance.int b/Visual Novel/GuiManager/Misc/removeDominance.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/removeDominance.int rename to Visual Novel/GuiManager/Misc/removeDominance.lua diff --git a/Visual Novel/GuiManager/Misc/respectHierarchy.int b/Visual Novel/GuiManager/Misc/respectHierarchy.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/respectHierarchy.int rename to Visual Novel/GuiManager/Misc/respectHierarchy.lua diff --git a/Visual Novel/GuiManager/Misc/round.int b/Visual Novel/GuiManager/Misc/round.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/round.int rename to Visual Novel/GuiManager/Misc/round.lua diff --git a/Visual Novel/GuiManager/Misc/setBG.int b/Visual Novel/GuiManager/Misc/setBG.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/setBG.int rename to Visual Novel/GuiManager/Misc/setBG.lua diff --git a/Visual Novel/GuiManager/Misc/setColor.int b/Visual Novel/GuiManager/Misc/setColor.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/setColor.int rename to Visual Novel/GuiManager/Misc/setColor.lua diff --git a/Visual Novel/GuiManager/Misc/setMouseXY.int b/Visual Novel/GuiManager/Misc/setMouseXY.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/setMouseXY.int rename to Visual Novel/GuiManager/Misc/setMouseXY.lua diff --git a/Visual Novel/GuiManager/Misc/setParent.int b/Visual Novel/GuiManager/Misc/setParent.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/setParent.int rename to Visual Novel/GuiManager/Misc/setParent.lua diff --git a/Visual Novel/GuiManager/Misc/setVisibility.int b/Visual Novel/GuiManager/Misc/setVisibility.lua similarity index 100% rename from Visual Novel/GuiManager/Misc/setVisibility.int rename to Visual Novel/GuiManager/Misc/setVisibility.lua diff --git a/Visual Novel/GuiManager/Text/fitFont.int b/Visual Novel/GuiManager/Text/fitFont.lua similarity index 100% rename from Visual Novel/GuiManager/Text/fitFont.int rename to Visual Novel/GuiManager/Text/fitFont.lua diff --git a/Visual Novel/GuiManager/Text/newTextBase.int b/Visual Novel/GuiManager/Text/newTextBase.lua similarity index 100% rename from Visual Novel/GuiManager/Text/newTextBase.int rename to Visual Novel/GuiManager/Text/newTextBase.lua diff --git a/Visual Novel/GuiManager/Text/newTextBox.int b/Visual Novel/GuiManager/Text/newTextBox.lua similarity index 100% rename from Visual Novel/GuiManager/Text/newTextBox.int rename to Visual Novel/GuiManager/Text/newTextBox.lua diff --git a/Visual Novel/GuiManager/Text/newTextButton.int b/Visual Novel/GuiManager/Text/newTextButton.lua similarity index 100% rename from Visual Novel/GuiManager/Text/newTextButton.int rename to Visual Novel/GuiManager/Text/newTextButton.lua diff --git a/Visual Novel/GuiManager/Text/newTextLabel.int b/Visual Novel/GuiManager/Text/newTextLabel.lua similarity index 100% rename from Visual Novel/GuiManager/Text/newTextLabel.int rename to Visual Novel/GuiManager/Text/newTextLabel.lua diff --git a/Visual Novel/GuiManager/Text/setDefualtFont.int b/Visual Novel/GuiManager/Text/setDefualtFont.lua similarity index 100% rename from Visual Novel/GuiManager/Text/setDefualtFont.int rename to Visual Novel/GuiManager/Text/setDefualtFont.lua diff --git a/Visual Novel/GuiManager/Text/setNewFont.int b/Visual Novel/GuiManager/Text/setNewFont.lua similarity index 100% rename from Visual Novel/GuiManager/Text/setNewFont.int rename to Visual Novel/GuiManager/Text/setNewFont.lua diff --git a/Visual Novel/GuiManager/Text/setgetText.int b/Visual Novel/GuiManager/Text/setgetText.lua similarity index 100% rename from Visual Novel/GuiManager/Text/setgetText.int rename to Visual Novel/GuiManager/Text/setgetText.lua diff --git a/Visual Novel/GuiManager/Text/widthToTextSize.int b/Visual Novel/GuiManager/Text/widthToTextSize.lua similarity index 100% rename from Visual Novel/GuiManager/Text/widthToTextSize.int rename to Visual Novel/GuiManager/Text/widthToTextSize.lua diff --git a/Visual Novel/GuiManager/init.lua b/Visual Novel/GuiManager/init.lua index a1d65f0..e275c66 100644 --- a/Visual Novel/GuiManager/init.lua +++ b/Visual Novel/GuiManager/init.lua @@ -32,7 +32,7 @@ _GuiPro.rotate=0 _defaultfont = love.graphics.setNewFont(12) setmetatable(_GuiPro, gui) function gui:LoadInterface(file) - local add=".int" + local add=".lua" if string.find(file,".",1,true) then add="" end if love.filesystem.getInfo(file..add) then a,b=pcall(love.filesystem.load(file..add)) @@ -49,7 +49,7 @@ end function gui.LoadAll(dir) files=love.filesystem.getDirectoryItems(dir) for i=1,#files do - if string.sub(files[i],-4)==".int" then + if string.sub(files[i],-4)==".lua" then gui:LoadInterface(dir.."/"..files[i]) end end diff --git a/Visual Novel/VNCore.lua b/Visual Novel/VNCore.lua deleted file mode 100644 index 6e039be..0000000 --- a/Visual Novel/VNCore.lua +++ /dev/null @@ -1,66 +0,0 @@ -return { - init = function(frame, parseManager, multi) - frame.Visibility = 0 - local workspace = frame:newImageLabel(nil,"Workspace", 0,0,0,0,0,0,1,1) - workspace.Color = Color.Green - local HUD = frame:newFullFrame("HUD") - local go = false - HUD.Visibility = 0 - local handle = parseManager:load("init.dms") - handle:define{ - sleep = thread.sleep - } - local chat = HUD:newTextLabel("","",0,0,0,0,.5/40,31/40,39/40,1/5) - local name = chat:newTextLabel("Name","Name",0,0,80,0,0,-1.165/5,0,1/5) - name.Visible = false - name:fitFont() - name:widthToTextSize() - name:setRoundness(6,6,180) - local disp = chat:newTextLabel("","",15/2,15/2,-15,-15,0,0,1,1) - disp.TextFormat = "left" - disp.Font = name.Font - disp.Visibility = 0 - disp.BorderSize = 0 - chat:setRoundness(15,15,180) - workspace:OnReleased(function(b,self) - if b == "l" then - go = true - else - HUD.Visible = not HUD.Visible - end - end) - parseManager.print("\n"..handle:dump()) - handle.__TEXT = function(text) -- change the default text stuff - local pan = false - local n,txt = text:match("([%w ]+):(.+)") - if n then - text = txt - name.text = n - name:widthToTextSize() - name.Visible = true - end - multi:newThread("UpdateText",function() - disp.text = "" - for i in text:gmatch(".") do - disp.text = disp.text .. i - thread.sleep(.05) - if go then disp.text = text go = false pan = true break end - end - pan = true - go = false - end) - thread.hold(function() - return pan - end) - pan = false - end - multi:newThread("Runner",function() - local active = true - while true do - thread.skip() - active = handle:think() - end - end) - return frame - end -} \ No newline at end of file diff --git a/Visual Novel/VNCore/debug.lua b/Visual Novel/VNCore/debug.lua new file mode 100644 index 0000000..9ce6688 --- /dev/null +++ b/Visual Novel/VNCore/debug.lua @@ -0,0 +1,60 @@ +local vncore = require("VNCore") +local multi = require("multi") +if not vncore.loaded then + error("The vncore module needs to be loaded and initiated before it can be used!") +end +local debug = {} +local taskmanagerDetails = {} +local debugF = gui:newFrame("DebugFrame",0,0,0,0,0,0,1,1) +debugF.Visibility = 0--.5 +debugF.Color = Color.Black +vncore.getWorkspace().Active = false +vncore.getWorkspace().Visibility = 1 +-- debugF.Visible = false +local taskmanager = debugF:newFrame("TaskManager",0,0,400,500,0,0) +taskmanager.scroll = taskmanager:newFrame("ScrollBar",-20,30,20,-60,1,0,0,1) +taskmanager.header = taskmanager:newTextLabel(" Task Manager","Task Manager",1,1,-2,29,0,0,1) +taskmanager.header.X = taskmanager.header:newTextButton("X","X",-25,5,20,20,1) +taskmanager.header.X.Color = Color.Red +taskmanager.header.X:setRoundness(4,4,60) +taskmanager.details = taskmanager:newTextLabel(" Details","",1,-31,-2,30,0,1,1) +taskmanager.header:AddDrawRuleE(function(self) + love.graphics.line(self.x, self.y+self.height, self.x+self.width, self.y+self.height) +end) +taskmanager.details:AddDrawRuleE(function(self) + love.graphics.line(self.x, self.y+1, self.x+self.width, self.y+1) +end) +--taskmanager.frame = taskmanager:new +taskmanager:setRoundness(8,8,180) +gui.massMutate({ + TextFormat = "middleleft", + BorderSize = 0, + [[setRoundness(8,8,180)]], +},taskmanager.header,taskmanager.details) +taskmanager:centerX() +taskmanager:centerY() +function debug:show(frame) + vncore.getWorkspace().Active = false -- Prevents click events from functioning + if not frame then + -- Show the console + elseif frame == "tasks" then + -- Show the task manager + end +end +function debug:hide(frame) + vncore.getWorkspace().Active = true -- Reinstates the click events on the workspace + if not frame then + -- Hide everything + end +end +multi:newThread("DebugHandler",function() + while true do + thread.hold(function() + return debugF.Visible -- If the debug frame is not in view dont bother process any debug info + end) + thread.sleep(.1) + taskmanagerDetails = multi:getTasksDetails("t") + debugF:TopStack() + end +end) +return debug \ No newline at end of file diff --git a/Visual Novel/VNCore/init.lua b/Visual Novel/VNCore/init.lua new file mode 100644 index 0000000..fe087c8 --- /dev/null +++ b/Visual Novel/VNCore/init.lua @@ -0,0 +1,79 @@ +local vncore = {} +vncore.loaded = false +local HUD,workspace,disp,chat,name,disp,handle +function vncore.getHUD() + return HUD +end +function vncore.getWorkspace() + return workspace +end +function vncore.getStateMachine() + return handle +end +-- We need to manage the disp, chat and name loval varaibles +function vncore.init(frame, parseManager, multi) + if vncore.loaded then return vncore.__Frame end + vncore.__Frame = frame + frame.Visibility = 0 + workspace = frame:newImageLabel(nil,"Workspace", 0,0,0,0,0,0,1,1) + workspace.Color = Color.Green + HUD = frame:newFullFrame("HUD") + local go = false + HUD.Visibility = 0 + handle = parseManager:load("init.dms") + handle:define{ + sleep = thread.sleep + } + chat = HUD:newTextLabel("","",0,0,0,0,.5/40,31/40,39/40,1/5) + name = chat:newTextLabel("Name","Name",0,0,80,0,0,-1.165/5,0,1/5) + name.Visible = false + name:fitFont() + name:widthToTextSize() + name:setRoundness(6,6,180) + disp = chat:newTextLabel("","",15/2,15/2,-15,-15,0,0,1,1) + disp.TextFormat = "left" + disp.Font = name.Font + disp.Visibility = 0 + disp.BorderSize = 0 + chat:setRoundness(15,15,180) + workspace:OnReleased(function(b,self) + if b == "l" then + go = true + else + HUD.Visible = not HUD.Visible + end + end) + parseManager.print("\n"..handle:dump()) + handle.__TEXT = function(text) -- change the default text stuff + local n,txt = text:match("([%w ]+):(.+)") + if disp.text == "" then + go = true + end + thread.hold(function() + return go + end) + if n then + text = txt + name.text = n + name:widthToTextSize() + name.Visible = true + end + go = false + disp.text = "" + for i in text:gmatch(".") do + disp.text = disp.text .. i + thread.sleep(.1) + if go then disp.text = text go = false break end + end + end + multi:newThread("Runner",function() + local active = true + while true do + thread.skip() + active = handle:think() + end + end) + vncore.loaded = true + return vncore +end +return vncore \ No newline at end of file diff --git a/Visual Novel/main.lua b/Visual Novel/main.lua index 8687872..dc1b7ed 100644 --- a/Visual Novel/main.lua +++ b/Visual Novel/main.lua @@ -4,10 +4,11 @@ local bin = require("bin") GLOBAL,sThread = require("multi.integration.loveManager").init() require("GuiManager") require("parseManager") +VNCore = require("VNCore").init(gui:newFullFrame("Main"), parseManager, multi) +debug = require("VNCore.debug") function love.update() multi:uManager() end multi.OnError(function(...) print(...) end) -VNCore = require("VNCore").init(gui:newFullFrame("Main"), parseManager, multi)