Skip to content

Commit 36d4e15

Browse files
committed
Update for NMS version 147408
1 parent 97edbee commit 36d4e15

File tree

9 files changed

+484
-81
lines changed

9 files changed

+484
-81
lines changed

.github/scripts/version_check.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

.github/workflows/pipeline.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,11 @@ jobs:
5757
- uses: actions/checkout@v4
5858
with:
5959
fetch-depth: 0
60-
- name: Check whether to release on pypi.org
61-
run: |
62-
./.github/scripts/version_check.sh
63-
- name: Check whether to release on test.pypi.org
64-
run: |
65-
export PYPI_INDEX=test.pypi.org
66-
./.github/scripts/version_check.sh
60+
- name: Check whether to release on pypi or test.pypi
61+
id: version-check
62+
uses: MathieuMoalic/action-python-package-new-version@v2.0.1
63+
with:
64+
indexes: pypi.org test.pypi.org
6765
- name: Globalise determined version
6866
id: set_version
6967
run: echo "package_version=${{ env.PACKAGE_VERSION }}" >> "$GITHUB_OUTPUT"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To run NMS.py, enter the following command into a terminal:
2323
pymhf run nmspy
2424
```
2525

26-
This will display some config options to complete. The only option to consider is the location of the mods folder. It is recommended that you create a new folder inside the normal MODS folder which can dontain all the python scripts you want to be run.
26+
This will display some config options to complete. The only option to consider is the location of the mods folder. It is recommended that you create a new folder inside the normal MODS folder which can contain all the python scripts you want to be run.
2727

2828
If NMS.py starts up successfully you should see two extra windows; an auto-created GUI from pyMHF, and a terminal window which will show the logs for pyMHF.
2929

nmspy/data/basic_types.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,9 @@ def __len__(self) -> float:
154154
return (self.x**2 + self.y**2 + self.z**2) ** (0.5)
155155

156156

157+
cTkVector3 = Vector3f
158+
159+
157160
class Vector4f(ctypes.Structure):
158161
x: float
159162
y: float
@@ -228,6 +231,7 @@ class Colour(ctypes.Structure):
228231

229232

230233
class TkID(ctypes.Structure):
234+
""" TkID<128> -> TkID[0x10], TkID<256> -> TkID[0x20] """
231235
_align_ = 0x10 # One day this will work...
232236
_size: int # This should only ever be 0x10 or 0x20...
233237
value: bytes

nmspy/data/enums.py

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3171,3 +3171,81 @@ class GcBiomeType(IntEnum):
31713171
Waterworld = 0xE
31723172
GasGiant = 0xF
31733173
All = 0x10
3174+
3175+
3176+
class GcCreatureTypes(IntEnum):
3177+
None_ = 0x0
3178+
Bird = auto()
3179+
FlyingLizard = auto()
3180+
FlyingSnake = auto()
3181+
Butterfly = auto()
3182+
FlyingBeetle = auto()
3183+
Beetle = auto()
3184+
Fish = auto()
3185+
Shark = auto()
3186+
Crab = auto()
3187+
Snake = auto()
3188+
Dino = auto()
3189+
Antelope = auto()
3190+
Rodent = auto()
3191+
Cat = auto()
3192+
Fiend = auto()
3193+
BugQueen = auto()
3194+
BugFiend = auto()
3195+
Drone = auto()
3196+
Quad = auto()
3197+
SpiderQuad = auto()
3198+
SpiderQuadMini = auto()
3199+
Walker = auto()
3200+
Predator = auto()
3201+
PlayerPredator = auto()
3202+
Prey = auto()
3203+
Passive = auto()
3204+
FishPredator = auto()
3205+
FishPrey = auto()
3206+
FiendFishSmall = auto()
3207+
FiendFishBig = auto()
3208+
Jellyfish = auto()
3209+
LandJellyfish = auto()
3210+
RockCreature = auto()
3211+
MiniFiend = auto()
3212+
Floater = auto()
3213+
Scuttler = auto()
3214+
Slug = auto()
3215+
MiniDrone = auto()
3216+
MiniRobo = auto()
3217+
SpaceFloater = auto()
3218+
JellyBoss = auto()
3219+
JellyBossBrood = auto()
3220+
LandSquid = auto()
3221+
Weird = auto()
3222+
SeaSnake = auto()
3223+
SandWorm = auto()
3224+
ProtoRoller = auto()
3225+
ProtoFlyer = auto()
3226+
ProtoDigger = auto()
3227+
Plough = auto()
3228+
Digger = auto()
3229+
Drill = auto()
3230+
Brainless = auto()
3231+
Pet = auto()
3232+
3233+
3234+
class GcRarity(IntEnum):
3235+
Common = 0x0
3236+
Uncommon = 0x1
3237+
Rare = 0x2
3238+
3239+
3240+
class GcCreatureActiveTime(IntEnum):
3241+
OnlyDay = 0x0
3242+
MostlyDay = 0x1
3243+
AnyTime = 0x2
3244+
MostlyNight = 0x3
3245+
OnlyNight = 0x4
3246+
3247+
3248+
class GcCreatureHemiSphere(IntEnum):
3249+
Any = 0x0
3250+
Northern = 0x1
3251+
Southern = 0x2

nmspy/data/exported_types.py

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ class cGcScanEventData(Structure):
2929
pass
3030

3131

32-
@partial_struct
33-
class GcSolarSystemData(Structure):
34-
PlanetOrbits: Annotated[list[int], Field(ctypes.c_int32 * 8, 0x21D0)]
35-
36-
3732
@partial_struct
3833
class cGcInteractionComponentData(Structure):
3934
mInteractionType: Annotated[c_enum32[enums.GcInteractionType], 0x31C]
@@ -45,3 +40,24 @@ class cGcPlanetGenerationInputData(Structure):
4540
RareSubstance: Annotated[basic.cTkFixedString[0x10], 0x10]
4641
Seed: Annotated[basic.GcSeed, 0x20]
4742
Biome: Annotated[c_enum32[enums.GcBiomeType], 0x30]
43+
44+
45+
@partial_struct
46+
class cGcPlanetData(Structure):
47+
Name: Annotated[basic.cTkFixedString[0x80], 0x3956]
48+
49+
50+
class cGcCreatureRoleData(Structure):
51+
pass
52+
53+
54+
class cGcCreatureSpawnData(Structure):
55+
pass
56+
57+
58+
class cGcGalaxyVoxelAttributesData(Structure):
59+
pass
60+
61+
62+
class cGcGalaxyStarAttributesData(Structure):
63+
pass

0 commit comments

Comments
 (0)