Skip to content

Commit 7596348

Browse files
committed
Even more bindings and enums
1 parent 160ed1d commit 7596348

File tree

2 files changed

+35
-15
lines changed

2 files changed

+35
-15
lines changed

bindings/2.2074/GeometryDash.bro

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3453,7 +3453,7 @@ class CurrencyRewardLayer : cocos2d::CCLayer {
34533453
// virtual ~CurrencyRewardLayer();
34543454
// CurrencyRewardLayer();
34553455

3456-
static CurrencyRewardLayer* create(int orbs, int stars, int moons, int diamonds, CurrencySpriteType demonKey, int keyCount, CurrencySpriteType shardType, int shardsCount, cocos2d::CCPoint position, CurrencyRewardType, float, float time) = win 0x9f500, imac 0x78ff00, m1 0x6a36f8, ios 0x31e9b4;
3456+
static CurrencyRewardLayer* create(int orbs, int stars, int moons, int diamonds, CurrencySpriteType demonKey, int keyCount, CurrencySpriteType shardType, int shardsCount, cocos2d::CCPoint position, CurrencyRewardType rewardType, float, float time) = win 0x9f500, imac 0x78ff00, m1 0x6a36f8, ios 0x31e9b4;
34573457

34583458
virtual void update(float) = win 0xa2230, imac 0x792fd0, m1 0x6a64a8, ios 0x3212a4;
34593459

@@ -3500,7 +3500,7 @@ class CurrencyRewardLayer : cocos2d::CCLayer {
35003500
this->pulseSprite(m_starsSprite);
35013501
m_starsLabel->setString(cocos2d::CCString::createWithFormat("%i", count)->getCString());
35023502
}
3503-
bool init(int, int, int, int, CurrencySpriteType, int, CurrencySpriteType, int, cocos2d::CCPoint, CurrencyRewardType, float, float) = win 0x9f750, imac 0x78ffe0, m1 0x6a3800, ios 0x31eabc;
3503+
bool init(int orbs, int stars, int moons, int diamonds, CurrencySpriteType demonKey, int keyCount, CurrencySpriteType shardType, int shardsCount, cocos2d::CCPoint position, CurrencyRewardType rewardType, float, float time) = win 0x9f750, imac 0x78ffe0, m1 0x6a3800, ios 0x31eabc;
35043504
void pulseSprite(cocos2d::CCSprite*) = win 0xa2c00, imac 0x793fa0, m1 0x6a72f8;
35053505

35063506
CurrencyRewardDelegate* m_delegate;
@@ -3526,7 +3526,7 @@ class CurrencyRewardLayer : cocos2d::CCLayer {
35263526
int m_keys;
35273527
int m_shards;
35283528
float m_elapsed;
3529-
int m_unknown;
3529+
float m_unknown;
35303530
float m_time;
35313531
cocos2d::CCPoint m_orbsPosition;
35323532
cocos2d::CCPoint m_starsPosition;
@@ -8287,7 +8287,9 @@ class GameStatsManager : cocos2d::CCNode {
82878287
return cocos2d::CCString::createWithFormat("star_%i",levelID)->getCString();
82888288
}
82898289
int getStat(char const*) = ios 0x32bf54, win 0x1d21e0, imac 0x66610, m1 0x5aca0;
8290-
TodoReturn getStatFromKey(StatKey);
8290+
int getStatFromKey(StatKey key) = win inline {
8291+
return this->getStat(GameToolbox::intToString((int)key).c_str());
8292+
}
82918293
TodoReturn getStoreItem(int, int);
82928294
TodoReturn getStoreItem(int);
82938295
int getTotalCollectedCurrency() = ios 0x3349f0, win 0x1e08b0, imac 0x743f0, m1 0x67fc4;
@@ -12440,7 +12442,7 @@ class GJSmartTemplate : cocos2d::CCObject {
1244012442
GJSmartPrefab* getPrefab(gd::string, bool, bool) = win 0x2ab4e0;
1244112443
cocos2d::CCArray* getPrefabs(gd::string);
1244212444
GJSmartPrefab* getPrefabWithID(gd::string, int) = win 0x2abdd0;
12443-
GJSmartPrefab* getRandomPrefab(gd::string);
12445+
GJSmartPrefab* getRandomPrefab(gd::string) = win 0x2ab370;
1244412446
static gd::string getSimplifiedKey(gd::string) = win 0x2a9a10;
1244512447
static SmartBlockType getSimplifiedType(SmartBlockType, bool&);
1244612448
void getTemplateState(gd::vector<SmartPrefabResult>&) = win 0x2ad890;
@@ -21410,7 +21412,7 @@ class SFXSearchResult : MusicSearchResult {
2141021412
}
2141121413
int getSelectedPage(int, int) = win 0x332580;
2141221414
bool init(int folderID) = win inline, imac 0x582990, m1 0x4d5004 {
21413-
if (!MusicSearchResult::init((GJSongType)-1)) return false;
21415+
if (!MusicSearchResult::init(GJSongType::Music)) return false;
2141421416
m_folderID = folderID;
2141521417
m_audioType = 1;
2141621418
return true;
@@ -22945,8 +22947,8 @@ class TableView : CCScrollLayerExt, CCScrollLayerExtDelegate {
2294522947
m_array2->retain();
2294622948
m_cellArray = cocos2d::CCArray::create();
2294722949
m_cellArray->retain();
22948-
m_array3 = cocos2d::CCArray::create();
22949-
m_array3->retain();
22950+
m_indexPathArray = cocos2d::CCArray::create();
22951+
m_indexPathArray->retain();
2295022952
m_touchLastY = 0.f;
2295122953
m_cancellingTouches = false;
2295222954
m_idk2 = false;
@@ -23003,7 +23005,7 @@ class TableView : CCScrollLayerExt, CCScrollLayerExtDelegate {
2300323005
bool m_touchMoved;
2300423006
cocos2d::CCArray* m_cellArray;
2300523007
cocos2d::CCArray* m_array2;
23006-
cocos2d::CCArray* m_array3;
23008+
cocos2d::CCArray* m_indexPathArray;
2300723009
TableViewDelegate* m_tableDelegate;
2300823010
TableViewDataSource* m_dataSource;
2300923011
TableViewCellDelegate* m_cellDelegate;
@@ -23163,7 +23165,7 @@ class TextArea : cocos2d::CCSprite {
2316323165
}
2316423166
}
2316523167
void fadeIn(float, bool) = m1 0x2a47e4;
23166-
void fadeInCharacters(float, float, bool, TextFadeInStyle) = m1 0x2a4db0;
23168+
float fadeInCharacters(float, float, bool, TextFadeInStyle) = win 0x77890, m1 0x2a4db0;
2316723169
void fadeOut(float) = m1 0x2a49b4;
2316823170
void fadeOutAndRemove() = imac 0x30ddf0, m1 0x2a4944;
2316923171
void finishFade() = win 0x775a0, imac 0x30ddc0, m1 0x2a4920;

bindings/include/Geode/Enums.hpp

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ enum class GJSongError {
226226
DownloadSFXFailed = 2
227227
};
228228
enum class GJSongType {
229-
Music = 0,
229+
Music = -1,
230230
NCS = 1,
231231
};
232232
enum class LikeItemType {
@@ -463,7 +463,18 @@ enum class LevelLeaderboardMode {
463463
Time = 0,
464464
Points = 1
465465
};
466-
enum class StatKey {};
466+
enum class StatKey {
467+
FirePath = 30,
468+
IcePath = 31,
469+
PoisonPath = 32,
470+
ShadowPath = 33,
471+
LavaPath = 34,
472+
EarthPath = 35,
473+
BloodPath = 36,
474+
MetalPath = 37,
475+
LightPath = 38,
476+
SoulPath = 39
477+
};
467478
enum class TextStyleType {
468479
Colored = 1,
469480
Instant = 2,
@@ -560,7 +571,11 @@ enum class gjParticleValue {
560571
FrictionR = 0x47,
561572
PlusMinus26 = 0x48
562573
};
563-
enum class ColorSelectType {};
574+
enum class ColorSelectType {
575+
Pulse = 0,
576+
Color = 1,
577+
Filter = 2
578+
};
564579
enum class AudioGuidelinesType {
565580
GuidelineCreator = 0,
566581
BPMFinder = 1
@@ -950,7 +965,7 @@ enum class DialogAnimationType {
950965
FromLeft = 2,
951966
FromRight = 3,
952967
FromTop = 4,
953-
// a 5th type is defined which acts exactly the same as FromTop
968+
FromTop2 = 5
954969
};
955970

956971
// Geode Addition
@@ -1000,7 +1015,10 @@ enum class ShipStreak {
10001015
ShipFire6 = 6,
10011016
};
10021017

1003-
enum class TextFadeInStyle {};
1018+
enum class TextFadeInStyle {
1019+
Fade = 0,
1020+
Scale = 1
1021+
};
10041022

10051023
// Geode Addition
10061024
enum class GameOptionsSetting {

0 commit comments

Comments
 (0)