From 2a8ea4ef44c14fc8f761e1527a9710e30a325999 Mon Sep 17 00:00:00 2001 From: Justin <52604018+hiimjustin000@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:17:23 -0400 Subject: [PATCH 1/4] test --- loader/include/Geode/cocos/include/cocos2d.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/loader/include/Geode/cocos/include/cocos2d.h b/loader/include/Geode/cocos/include/cocos2d.h index cbcc600c..f2426f06 100644 --- a/loader/include/Geode/cocos/include/cocos2d.h +++ b/loader/include/Geode/cocos/include/cocos2d.h @@ -325,8 +325,6 @@ THE SOFTWARE. #include "../robtop/scene_nodes/CCSceneTransitionDelegate.h" -#include "../robtop/special_nodes/CCLightning.h" - #include "../robtop/xml/DS_Dictionary.h" #include "../robtop/xml/ObjectDecoder.h" From 0187014d3cd702eaafe4e8c95fbae74752fababd Mon Sep 17 00:00:00 2001 From: Justin <52604018+hiimjustin000@users.noreply.github.com> Date: Sat, 28 Sep 2024 13:57:53 -0400 Subject: [PATCH 2/4] okay what --- loader/include/Geode/cocos/include/cocos2d.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/loader/include/Geode/cocos/include/cocos2d.h b/loader/include/Geode/cocos/include/cocos2d.h index f2426f06..d5cfa134 100644 --- a/loader/include/Geode/cocos/include/cocos2d.h +++ b/loader/include/Geode/cocos/include/cocos2d.h @@ -325,6 +325,12 @@ THE SOFTWARE. #include "../robtop/scene_nodes/CCSceneTransitionDelegate.h" +NS_CC_BEGIN + +class CCLightning; + +NS_CC_END + #include "../robtop/xml/DS_Dictionary.h" #include "../robtop/xml/ObjectDecoder.h" From b8233258da4e9ec0fbd9e2886484ed73516a928d Mon Sep 17 00:00:00 2001 From: Justin <52604018+hiimjustin000@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:25:40 -0400 Subject: [PATCH 3/4] i think i got it --- loader/include/Geode/cocos/include/cocos2d.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/loader/include/Geode/cocos/include/cocos2d.h b/loader/include/Geode/cocos/include/cocos2d.h index d5cfa134..f2426f06 100644 --- a/loader/include/Geode/cocos/include/cocos2d.h +++ b/loader/include/Geode/cocos/include/cocos2d.h @@ -325,12 +325,6 @@ THE SOFTWARE. #include "../robtop/scene_nodes/CCSceneTransitionDelegate.h" -NS_CC_BEGIN - -class CCLightning; - -NS_CC_END - #include "../robtop/xml/DS_Dictionary.h" #include "../robtop/xml/ObjectDecoder.h" From fa3daf602d43121327cc790f50a8c3f1edf16999 Mon Sep 17 00:00:00 2001 From: Justin <52604018+hiimjustin000@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:30:31 -0400 Subject: [PATCH 4/4] WE ARE DELETING IT --- .../cocos/robtop/special_nodes/CCLightning.h | 71 ------------------- 1 file changed, 71 deletions(-) delete mode 100644 loader/include/Geode/cocos/robtop/special_nodes/CCLightning.h diff --git a/loader/include/Geode/cocos/robtop/special_nodes/CCLightning.h b/loader/include/Geode/cocos/robtop/special_nodes/CCLightning.h deleted file mode 100644 index 78e204ad..00000000 --- a/loader/include/Geode/cocos/robtop/special_nodes/CCLightning.h +++ /dev/null @@ -1,71 +0,0 @@ -#ifndef __CCLIGHTNING_H__ -#define __CCLIGHTNING_H__ - -#include "../../include/ccMacros.h" -#include "../../base_nodes/CCNode.h" - -NS_CC_BEGIN - -// @note RobTop Addition -class CCLightning : public CCNode, public CCRGBAProtocol { -public: - CCLightning(); - virtual ~CCLightning(); - GEODE_CUSTOM_CONSTRUCTOR_GD(CCLightning, CCNode); - - static CCLightning* lightningWithStrikePoint(CCPoint strikePoint, CCPoint strikePoint2, float duration); - static CCLightning* lightningWithStrikePoint(CCPoint strikePoint); - - bool initWithStrikePoint(CCPoint strikePoint, CCPoint strikePoint2, float duration); - bool initWithStrikePoint(CCPoint strikePoint); - - void strike(); - void strikeFinished(); - - void strikeRandom(); - void strikeWithSeed(uint64_t seed); - - void draw(); - - // cocos2d::CCRGBAProtocol - bool isOpacityModifyRGB(); - void setOpacityModifyRGB(bool); - unsigned char getOpacity(); - unsigned char getDisplayedOpacity(); - void setOpacity(unsigned char); - void updateDisplayedOpacity(unsigned char); - bool isCascadeColorEnabled(); - void setCascadeOpacityEnabled(bool); - ccColor3B const& getColor(); - ccColor3B const& getDisplayedColor(); - void setColor(ccColor3B const&); - void updateDisplayedColor(ccColor3B const&); - bool isCascadeOpacityEnabled(); - void setCascadeColorEnabled(bool); - -protected: - CCPoint m_strikePoint; - CCPoint m_strikePoint2; - bool m_split; - int m_displacement; - int m_minDisplacement; - uint64_t m_seed; - float m_lineWidth; - bool m_unkBool; - bool m_removeAfterFinished; - float m_duration; - float m_opacityModify; - std::array* m_lightningPoints; - uint32_t m_numPoints; - uint8_t m_displayedOpacity; - uint8_t m_opacity; - ccColor3B m_displayedColor; - ccColor3B m_color; - bool m_cascadeColorEnabled; - bool m_cascadeOpacityEnabled; - bool m_opacityModifyEnabled; -}; - -NS_CC_END - -#endif //__CCLIGHTNING_H__