Skip to content

Commit de5f2a1

Browse files
WuBoytHWuBoytH
authored
Merge branch 'dev' into dev
2 parents 6e2e471 + f8453ef commit de5f2a1

File tree

354 files changed

+12594
-8152
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

354 files changed

+12594
-8152
lines changed

‎.github/workflows/publish_lvd_beta.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: publish_lvd_beta.yml
2+
3+
on:
4+
workflow_run:
5+
workflows: [make beta]
6+
types:
7+
- completed
8+
9+
jobs:
10+
# bump the version and build the changelog
11+
12+
############## handle the creasion of the full package installation ##############
13+
lvd_publish:
14+
runs-on: windows-latest
15+
steps:
16+
- name: checkout version
17+
uses: actions/checkout@v2
18+
19+
- id: romfs_zip
20+
uses: robinraju/release-downloader@v1.8
21+
with:
22+
repository: "HDR-Development/romfs-release"
23+
latest: true
24+
zipBall: true
25+
26+
- id: yamlvd_exe
27+
uses: robinraju/release-downloader@v1.8
28+
with:
29+
repository: "ultimate-research/lvd-rs"
30+
tag: v0.3.0
31+
fileName: "yamlvd.exe"
32+
33+
- name: lvd_to_yml
34+
run: |
35+
7z x romfs.zip
36+
mkdir yml
37+
python3 scripts/lvd-to-yml.py .\yamlvd.exe .\ultimate\mods\hdr-stages\stage\ .\
38+
39+
- name: view_results
40+
run: |
41+
ls -R
42+
43+
- name: Push lvd file to Suddy's HDRStageTools
44+
run: |
45+
git config --global user.email "suddy121800@hotmail.com"
46+
git config --global user.name "SuddyN"
47+
git clone -b gh-pages https://.:${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}@github.com/SuddyN/HDRStageTools HDRStageTools
48+
copy lvd.zip HDRStageTools/lvd/hdr-beta/lvd.zip
49+
cd HDRStageTools
50+
git add .
51+
git diff-index --quiet HEAD || git commit -m "Automatic publish from HDR-Development/HewDraw-Remix"
52+
git push origin gh-pages

‎.github/workflows/publish_lvd_nightly.yml

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: publish_lvd_nightly.yml
2+
3+
on:
4+
workflow_run:
5+
workflows: [build_nightly]
6+
types:
7+
- completed
8+
9+
jobs:
10+
# bump the version and build the changelog
11+
12+
############## handle the creasion of the full package installation ##############
13+
lvd_publish:
14+
runs-on: windows-latest
15+
steps:
16+
- name: checkout version
17+
uses: actions/checkout@v2
18+
19+
- id: romfs_zip
20+
uses: robinraju/release-downloader@v1.8
21+
with:
22+
repository: "HDR-Development/romfs-release"
23+
latest: true
24+
zipBall: true
25+
26+
- id: yamlvd_exe
27+
uses: robinraju/release-downloader@v1.8
28+
with:
29+
repository: "ultimate-research/lvd-rs"
30+
tag: v0.3.0
31+
fileName: "yamlvd.exe"
32+
33+
- name: lvd_to_yml
34+
run: |
35+
7z x romfs.zip
36+
mkdir yml
37+
python3 scripts/lvd-to-yml.py .\yamlvd.exe .\ultimate\mods\hdr-stages\stage\ .\
38+
39+
- name: view_results
40+
run: |
41+
ls -R
42+
43+
- name: Push lvd file to Suddy's HDRStageTools
44+
run: |
45+
git config --global user.email "suddy121800@hotmail.com"
46+
git config --global user.name "SuddyN"
47+
git clone -b gh-pages https://.:${{ secrets.API_TOKEN_GITHUB_HDRSTAGETOOL }}@github.com/SuddyN/HDRStageTools HDRStageTools
48+
copy lvd.zip HDRStageTools/lvd/hdr-nightly/lvd.zip
49+
cd HDRStageTools
50+
git add .
51+
git diff-index --quiet HEAD || git commit -m "Automatic publish from HDR-Development/HewDraw-Remix"
52+
git push origin gh-pages

‎dynamic/src/consts.rs

+70-41
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,8 @@ pub mod vars {
178178

179179
pub const IS_ATTACK_CANCEL: i32 = 0x0063;
180180

181+
pub const DISABLE_CSTICK_BUFFER_ROLL_OOS: i32 = 0x0064;
182+
181183
// ints
182184

183185
pub const LAST_ATTACK_RECEIVER_ENTRY_ID: i32 = 0x0000;
@@ -209,6 +211,8 @@ pub mod vars {
209211
pub const LEFT_STICK_FLICK_X: i32 = 0x000F;
210212
pub const LEFT_STICK_FLICK_Y: i32 = 0x0010;
211213

214+
pub const LEDGE_ID: i32 = 0x0011;
215+
212216
// floats
213217

214218
pub const LAST_ATTACK_DAMAGE_DEALT: i32 = 0x0000;
@@ -223,10 +227,10 @@ pub mod vars {
223227
pub const CURRENT_MOMENTUM_SPECIALS: i32 = 0x0007;
224228
pub const DOUBLE_JUMP_TIMER: i32 = 0x0008; // Only used by Lucas, and it's commented out, goes unused.
225229
pub const ROLL_SPEED: i32 = 0x0009;
226-
pub const LEDGE_POS: i32 = 0x000A;
227-
pub const LEDGE_POS_X: i32 = 0x000A;
228-
pub const LEDGE_POS_Y: i32 = 0x000B;
229-
pub const LEDGE_POS_Z: i32 = 0x000C;
230+
// pub const LEDGE_POS: i32 = 0x000A;
231+
// pub const LEDGE_POS_X: i32 = 0x000A;
232+
// pub const LEDGE_POS_Y: i32 = 0x000B;
233+
// pub const LEDGE_POS_Z: i32 = 0x000C;
230234
pub const GET_DIST_TO_FLOOR: i32 = 0x000D;
231235
pub const ECB_BOTTOM_Y_OFFSET: i32 = 0x000E;
232236
pub const CURR_DASH_SPEED: i32 = 0x000F;
@@ -300,14 +304,11 @@ pub mod vars {
300304

301305
// ints
302306
pub const NUM_RECOVERY_RESOURCE_USED: i32 = 0x0100;
303-
pub const NUM_CANCEL_THIS_AIRTIME: i32 = 0x0101;
307+
pub const FAIR_STATE: i32 = 0x0101;
304308
}
305309
pub mod status {
306-
// flags
307-
pub const IS_ACTIVATE: i32 = 0x1100;
308-
pub const DIRECT_HIT: i32 = 0x1101;
309310
// floats
310-
pub const ABK_ANGLE: i32 = 0x1102;
311+
pub const ABK_ANGLE: i32 = 0x1100;
311312
}
312313
}
313314

@@ -411,6 +412,7 @@ pub mod vars {
411412
pub mod diddy {
412413
pub mod instance {
413414
pub const DISABLE_SPECIAL_S: i32 = 0x0100;
415+
pub const NO_CAP: i32 = 0x0101;
414416
}
415417
pub mod status {
416418
// ints
@@ -518,6 +520,13 @@ pub mod vars {
518520
}
519521
}
520522

523+
pub mod edge {
524+
pub mod instance {
525+
// flags
526+
pub const SPECIAL_HI_BLADE_DASH_NO_HITBOX: i32 = 0x1000;
527+
}
528+
}
529+
521530
pub mod eflame {
522531
pub mod instance {
523532
// flags
@@ -627,6 +636,13 @@ pub mod vars {
627636
}
628637
}
629638

639+
pub mod jack {
640+
pub mod instance {
641+
// flags
642+
pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
643+
}
644+
}
645+
630646
pub mod kamui {
631647
pub mod status {
632648
// floats
@@ -649,7 +665,8 @@ pub mod vars {
649665
pub mod status {
650666
// copy ability
651667
// flags
652-
pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
668+
pub use super::super::mario::status::FIREBRAND;
669+
pub use super::super::luigi::status::THUNDERHAND;
653670
pub use super::super::mariod::status::CHILL_PILL;
654671
pub const MINING_TIMER: i32 = 0x11F4;
655672
}
@@ -675,6 +692,8 @@ pub mod vars {
675692
pub mod instance {
676693
// flags
677694
pub const DISABLE_SPECIAL_S: i32 = 0x0100;
695+
pub const DISABLE_MECHAKOOPA: i32 = 0x0101;
696+
pub const MECHAKOOPA_IS_COOLDOWN: i32 = 0x0102;
678697
}
679698
}
680699

@@ -725,6 +744,7 @@ pub mod vars {
725744
pub const SPECIAL_HI_ATTACK_IS_LEAVE_WALL: i32 = 0x1101;
726745
pub const SPECIAL_HI_ATTACK_IS_FLIPPED_MOMENTUM_AFTER_WALLTOUCH: i32 = 0x1102;
727746
pub const SPECIAL_HI_ATTACK_IS_SET_WALL_LEAVE_MOMENTUM: i32 = 0x1103;
747+
pub const THUNDER_LOOSE: i32 = 0x1104;
728748

729749
// float
730750
/// Holds the initial y velocity you have during up b to compare once you've touched a wall to reflect your speed the other direction if it changes
@@ -741,7 +761,10 @@ pub mod vars {
741761

742762
pub mod lucina {
743763
pub mod instance {
744-
//int
764+
// flag
765+
pub const EQUIP_MASK: i32 = 0x0100;
766+
767+
// int
745768
/// This int stores damage received from an attack during quick riposte
746769
pub const CURRENT_DAMAGE: i32 = 0x0100;
747770
}
@@ -776,19 +799,16 @@ pub mod vars {
776799
}
777800
pub mod status {
778801
// flag
779-
pub use super::super::mario::status::IS_SPECIAL_N_DOUBLE_FIREBALL;
780-
pub use super::super::mario::status::IS_SPECIAL_N_FIREBRAND;
802+
pub const THUNDERHAND: i32 = 0x1100;
781803
}
782804
}
783805

784806
pub mod mario {
785807
pub mod instance {
786808
// flags
787809
pub const NOKNOK_SHELL: i32 = 0x0100;
788-
pub const CAN_INPUT_SPECIAL_N_DOUBLE_FIREBALL: i32 = 0x0101;
789-
pub const SPECIAL_N_DOUBLE_FIREBALL_NOTIFY_FLAG: i32 = 0x0102;
790-
pub const DISABLE_DSPECIAL_STALL: i32 = 0x0103;
791-
pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0104;
810+
pub const DISABLE_DSPECIAL_STALL: i32 = 0x0101;
811+
pub const SPECIAL_S_DISABLE_STALL: i32 = 0x0102;
792812
}
793813

794814
pub mod status {
@@ -797,8 +817,7 @@ pub mod vars {
797817
pub const AERIAL_COMMAND_RISING: i32 = 0x1101;
798818
pub const AERIAL_COMMAND_RISEN: i32 = 0x1102;
799819

800-
pub const IS_SPECIAL_N_FIREBRAND: i32 = 0x1100;
801-
pub const IS_SPECIAL_N_DOUBLE_FIREBALL: i32 = 0x1101;
820+
pub const FIREBRAND: i32 = 0x1100;
802821
}
803822
}
804823

@@ -998,8 +1017,12 @@ pub mod vars {
9981017

9991018
pub mod sonic {
10001019
pub mod instance {
1020+
// flags
10011021
pub const USED_AIR_ACTION: i32 = 0x0100;
10021022
pub const UP_SPECIAL_FREEFALL: i32 = 0x0101;
1023+
1024+
// ints
1025+
pub const SPECIAL_N_POSE: i32 = 0x0100;
10031026
}
10041027
pub mod status {
10051028
// flags
@@ -1099,6 +1122,9 @@ pub mod vars {
10991122
// flags
11001123
pub const AIRTIME_BAIR: i32 = 0x0100;
11011124
pub const AIRTIME_SIDEB: i32 = 0x0101;
1125+
pub const IS_INIT_METER: i32 = 0x0102;
1126+
pub const GROUNDED_UPB: i32 = 0x0103;
1127+
pub const UPB_CANCEL: i32 = 0x0104;
11021128
// ints
11031129
pub const PASSIVE_FUEL_INDICATOR_EFFECT_HANDLE: i32 = 0x0100;
11041130
pub const PREV_FUEL_THRESHOLD: i32 = 0x0101;
@@ -1207,23 +1233,30 @@ pub mod vars {
12071233
}
12081234

12091235
pub mod littlemac {
1210-
pub mod status {
1236+
pub mod instance {
12111237
// flags
12121238
pub const IS_DREAMLAND_EXPRESS: i32 = 0x0100;
12131239
pub const IS_LATE_DLE_INPUT: i32 = 0x0101;
12141240

1241+
// floats
1242+
pub const CURRENT_DAMAGE: i32 = 0x0100;
1243+
}
1244+
pub mod status {
1245+
// flags
1246+
pub const LIMIT_METER_GAIN: i32 = 0x102;
1247+
12151248
// ints
1216-
pub const SPECIAL_N_CANCEL_TYPE: i32 = 0x1100;
1249+
pub const SPECIAL_LW_CANCEL_TYPE: i32 = 0x1100;
12171250
}
12181251

1219-
pub const SPECIAL_N_CANCEL_TYPE_NONE: i32 = 0x0;
1220-
pub const SPECIAL_N_CANCEL_TYPE_GROUND_JUMP: i32 = 0x1;
1221-
pub const SPECIAL_N_CANCEL_TYPE_JUMP_AERIAL: i32 = 0x2;
1222-
pub const SPECIAL_N_CANCEL_TYPE_GUARD: i32 = 0x3;
1223-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE: i32 = 0x4;
1224-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_AIR: i32 = 0x5;
1225-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_F: i32 = 0x6;
1226-
pub const SPECIAL_N_CANCEL_TYPE_ESCAPE_B: i32 = 0x7;
1252+
pub const SPECIAL_LW_CANCEL_TYPE_NONE: i32 = 0x0;
1253+
pub const SPECIAL_LW_CANCEL_TYPE_GROUND_JUMP: i32 = 0x1;
1254+
pub const SPECIAL_LW_CANCEL_TYPE_JUMP_AERIAL: i32 = 0x2;
1255+
pub const SPECIAL_LW_CANCEL_TYPE_GUARD: i32 = 0x3;
1256+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE: i32 = 0x4;
1257+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_AIR: i32 = 0x5;
1258+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_F: i32 = 0x6;
1259+
pub const SPECIAL_LW_CANCEL_TYPE_ESCAPE_B: i32 = 0x7;
12271260
}
12281261

12291262
pub mod pichu {
@@ -1318,10 +1351,10 @@ pub mod vars {
13181351
pub const STANCE_REVERSE: i32 = 0x0103;
13191352

13201353
// floats
1321-
pub const PTOOIE_SCALE: i32 = 0x0100;
1354+
pub const PTOOIE_SCALE: i32 = 0x01BF;
13221355

13231356
// ints
1324-
pub const CURRENT_STANCE: i32 = 0x0100; // 0 = Normal, 1 = Putrid, 2 = Prickly
1357+
pub const CURRENT_STANCE: i32 = 0x01BE; // 0 = Normal, 1 = Putrid, 2 = Prickly
13251358
pub const STANCE_STATUS: i32 = 0x0101;
13261359
}
13271360
pub mod status {
@@ -1395,14 +1428,6 @@ pub mod vars {
13951428
pub const RING_SECOND_COLOR: i32 = 0x108;
13961429
}
13971430
}
1398-
1399-
pub mod jack {
1400-
pub mod instance {
1401-
// flags
1402-
pub const GROUNDED_DOYLE_DASH: i32 = 0x0100;
1403-
}
1404-
}
1405-
14061431
}
14071432

14081433
pub mod statuses {
@@ -1436,8 +1461,8 @@ pub mod statuses {
14361461
}
14371462

14381463
pub mod littlemac {
1439-
pub const SPECIAL_N_CANCEL: i32 = 1;
1440-
pub const SPECIAL_N_CANCEL_JUMP: i32 = 2;
1464+
pub const SPECIAL_LW_CANCEL: i32 = 1;
1465+
pub const SPECIAL_LW_CANCEL_JUMP: i32 = 2;
14411466
}
14421467

14431468
pub mod wolf {
@@ -1466,4 +1491,8 @@ pub mod statuses {
14661491
pub const SPECIAL_N_O: i32 = 4;
14671492
pub const SPECIAL_N_G: i32 = 5;
14681493
}
1494+
1495+
pub mod bayonetta {
1496+
pub const SPECIAL_S_KICK: i32 = 0;
1497+
}
14691498
}

0 commit comments

Comments
 (0)