Skip to content

Commit cbb5d91

Browse files
gsmjgsmj
authored
Merge pull request #9 from pysamp/v1.2.0
1.2.0 release
2 parents d8117a7 + 76ad4db commit cbb5d91

File tree

9 files changed

+347
-246
lines changed

9 files changed

+347
-246
lines changed

‎pystreamer/__init__.py

Lines changed: 279 additions & 185 deletions
Large diffs are not rendered by default.

‎pystreamer/dynamicactor.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
get_player_target_dynamic_actor,
1818
get_player_camera_target_dyn_actor,
1919
)
20-
from typing import Tuple
20+
from typing import Optional
2121
from .types import StreamerTypes
2222

2323

@@ -89,10 +89,10 @@ def create_ex(
8989
invulnerable: bool = True,
9090
health: float = 100.0,
9191
stream_distance: float = StreamerTypes.ACTOR_SD,
92-
worlds: list[int] = [-1],
93-
interiors: list[int] = [-1],
94-
players: list[int] = [-1],
95-
areas: list[int] = [-1],
92+
worlds: Optional[list[int]] = None,
93+
interiors: Optional[list[int]] = None,
94+
players: Optional[list[int]] = None,
95+
areas: Optional[list[int]] = None,
9696
priority: int = 0,
9797
) -> "DynamicActor":
9898
return cls(
@@ -166,8 +166,8 @@ def set_facing_angle(self, angle: float):
166166
self._rotation = angle
167167
return set_dynamic_actor_facing_angle(self.id, angle)
168168

169-
def get_position(self) -> Tuple[float, float, float]:
170-
return self._x, self._y, self._z
169+
def get_position(self) -> tuple[float, float, float]:
170+
return (self._x, self._y, self._z, )
171171

172172
def set_position(self, x: float, y: float, z: float):
173173
self._x = x

‎pystreamer/dynamiccp.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
get_player_visible_dynamic_cp,
1111
)
1212
from .types import StreamerTypes
13+
from typing import Optional
1314

1415

1516
class DynamicCheckpoint:
@@ -53,10 +54,10 @@ def create_ex(
5354
z: float,
5455
size: float,
5556
stream_distance: float = StreamerTypes.CP_SD,
56-
worlds: list[int] = [-1],
57-
interiors: list[int] = [-1],
58-
players: list[int] = [-1],
59-
areas: list[int] = [-1],
57+
worlds: Optional[list[int]] = None,
58+
interiors: Optional[list[int]] = None,
59+
players: Optional[list[int]] = None,
60+
areas: Optional[list[int]] = None,
6061
priority: int = 0,
6162
) -> "DynamicCheckpoint":
6263
return cls(

‎pystreamer/dynamicmapicon.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
is_valid_dynamic_map_icon,
66
)
77
from .types import StreamerTypes
8+
from typing import Optional
89

910

1011
class DynamicMapIcon:
@@ -54,10 +55,10 @@ def create_ex(
5455
color: int,
5556
style: int = 0,
5657
stream_distance: float = StreamerTypes.MAP_ICON_SD,
57-
worlds: list[int] = [-1],
58-
interiors: list[int] = [-1],
59-
players: list[int] = [-1],
60-
areas: list[int] = [-1],
58+
worlds: Optional[list[int]] = None,
59+
interiors: Optional[list[int]] = None,
60+
players: Optional[list[int]] = None,
61+
areas: Optional[list[int]] = None,
6162
priority: int = 0,
6263
) -> "DynamicMapIcon":
6364
return cls(

‎pystreamer/dynamicobject.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
remove_dynamic_object_material_text,
2424
set_dynamic_object_material_text,
2525
)
26-
from typing import Tuple
26+
from typing import Optional
2727
from .types import StreamerTypes
2828

2929

@@ -111,10 +111,10 @@ def create_ex(
111111
rotation_z: float,
112112
stream_distance: float = StreamerTypes.OBJECT_SD,
113113
draw_distance: float = StreamerTypes.OBJECT_DD,
114-
worlds: list[int] = [-1],
115-
interiors: list[int] = [-1],
116-
players: list[int] = [-1],
117-
areas: list[int] = [-1],
114+
worlds: Optional[list[int]] = None,
115+
interiors: Optional[list[int]] = None,
116+
players: Optional[list[int]] = None,
117+
areas: Optional[list[int]] = None,
118118
priority: int = 0,
119119
) -> "DynamicObject":
120120
return cls(
@@ -155,8 +155,8 @@ def set_position(self, x: float, y: float, z: float):
155155
self._z = z
156156
return set_dynamic_object_pos(self.id, x, y, z)
157157

158-
def get_position(self) -> Tuple[float, float, float]:
159-
return self._x, self._y, self._z
158+
def get_position(self) -> tuple[float, float, float]:
159+
return (self._x, self._y, self._z, )
160160

161161
def set_rotation(
162162
self, rotation_x: float, rotation_y: float, rotation_z: float
@@ -168,8 +168,8 @@ def set_rotation(
168168
self.id, rotation_x, rotation_y, rotation_z
169169
)
170170

171-
def get_rotation(self) -> Tuple[float, float, float]:
172-
return self._rotation_x, self._rotation_y, self._rotation_z
171+
def get_rotation(self) -> tuple[float, float, float]:
172+
return (self._rotation_x, self._rotation_y, self._rotation_z, )
173173

174174
def get_no_camera_col(self):
175175
return get_dynamic_object_no_camera_col(self.id)
@@ -292,8 +292,8 @@ def set_material(
292292
material_color,
293293
)
294294

295-
def get_material(self) -> Tuple[int, int]:
296-
return self._model_id, self._material_color
295+
def get_material(self) -> tuple[int, int]:
296+
return (self._model_id, self._material_color, )
297297

298298
def is_material_text_used(self, material_index: int):
299299
return is_dynamic_object_material_text_used(self.id, material_index)
@@ -326,7 +326,7 @@ def set_material_text(
326326
text_alignment,
327327
)
328328

329-
def get_material_text(self) -> Tuple[int, int, int, int, int, int, int]:
329+
def get_material_text(self) -> tuple[int, int, int, int, int, int, int]:
330330
return (
331331
self._material_size,
332332
self._material_color,

‎pystreamer/dynamicpickup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
is_valid_dynamic_pickup,
77
)
88
from .types import StreamerTypes
9+
from typing import Optional
910

1011

1112
class DynamicPickup:
@@ -52,10 +53,10 @@ def create_ex(
5253
y: float,
5354
z: float,
5455
stream_distance: float = StreamerTypes.PICKUP_SD,
55-
worlds: list[int] = [-1],
56-
interiors: list[int] = [-1],
57-
players: list[int] = [-1],
58-
areas: list[int] = [-1],
56+
worlds: Optional[list[int]] = None,
57+
interiors: Optional[list[int]] = None,
58+
players: Optional[list[int]] = None,
59+
areas: Optional[list[int]] = None,
5960
priority: int = 0,
6061
) -> "DynamicPickup":
6162
return cls(

‎pystreamer/dynamicracecp.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
get_player_visible_dynamic_race_cp,
1111
)
1212
from .types import StreamerTypes
13+
from typing import Optional
1314

1415

1516
class DynamicRaceCheckpoint:
@@ -65,10 +66,10 @@ def create_ex(
6566
next_z: float,
6667
size: float,
6768
stream_distance: float = StreamerTypes.RACE_CP_SD,
68-
worlds: list[int] = [-1],
69-
interiors: list[int] = [-1],
70-
players: list[int] = [-1],
71-
areas: list[int] = [-1],
69+
worlds: Optional[list[int]] = None,
70+
interiors: Optional[list[int]] = None,
71+
players: Optional[list[int]] = None,
72+
areas: Optional[list[int]] = None,
7273
priority: int = 0,
7374
) -> "DynamicRaceCheckpoint":
7475
return cls(
@@ -100,7 +101,7 @@ def toggle_player(self, player: "Player", toggle: bool):
100101
return toggle_player_dynamic_race_cp(player.id, self.id, toggle)
101102

102103
def toggle_player_all(
103-
self, player: "Player", toggle: bool, exceptions: list[int] = [-1]
104+
self, player: "Player", toggle: bool, exceptions: Optional[list[int]] = None
104105
):
105106
return toggle_player_all_dynamic_race_cps(
106107
player.id,

‎pystreamer/dynamictextlabel.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
)
99
from samp import INVALID_PLAYER_ID, INVALID_VEHICLE_ID # type: ignore
1010
from .types import StreamerTypes
11+
from typing import Optional
1112

1213
class DynamicTextLabel:
1314
def __init__(self, id) -> None:
@@ -65,10 +66,10 @@ def create_ex(
6566
attached_vehicle: int = INVALID_VEHICLE_ID,
6667
testlos: bool = False,
6768
stream_distance: float = StreamerTypes.TEXT_LABEL_SD,
68-
worlds: list[int] = [-1],
69-
interiors: list[int] = [-1],
70-
players: list[int] = [-1],
71-
areas: list[int] = [-1],
69+
worlds: Optional[list[int]] = None,
70+
interiors: Optional[list[int]] = None,
71+
players: Optional[list[int]] = None,
72+
areas: Optional[list[int]] = None,
7273
priority: int = 0,
7374
) -> "DynamicTextLabel":
7475
return cls(

‎pystreamer/dynamiczone.py

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
)
4242
from samp import INVALID_PLAYER_ID # type: ignore
4343
from .types import StreamerTypes
44+
from typing import Optional
45+
4446

4547
class DynamicZone:
4648
def __init__(self, id: int) -> None:
@@ -69,9 +71,9 @@ def create_circle_ex(
6971
x: float,
7072
y: float,
7173
size: float,
72-
worlds: list[int] = [-1],
73-
interiors: list[int] = [-1],
74-
players: list[int] = [-1],
74+
worlds: Optional[list[int]] = None,
75+
interiors: Optional[list[int]] = None,
76+
players: Optional[list[int]] = None,
7577
priority: int = 0,
7678
) -> "DynamicZone":
7779
return cls(
@@ -121,9 +123,9 @@ def create_cylinder_ex(
121123
min_z: float,
122124
max_z: float,
123125
size: float,
124-
worlds: list[int] = [-1],
125-
interiors: list[int] = [-1],
126-
players: list[int] = [-1],
126+
worlds: Optional[list[int]] = None,
127+
interiors: Optional[list[int]] = None,
128+
players: Optional[list[int]] = None,
127129
priority: int = 0,
128130
) -> "DynamicZone":
129131
return cls(
@@ -165,9 +167,9 @@ def create_sphere_ex(
165167
y: float,
166168
z: float,
167169
size: float,
168-
worlds: list[int] = [-1],
169-
interiors: list[int] = [-1],
170-
players: list[int] = [-1],
170+
worlds: Optional[list[int]] = None,
171+
interiors: Optional[list[int]] = None,
172+
players: Optional[list[int]] = None,
171173
priority: int = 0,
172174
) -> "DynamicZone":
173175
return cls(
@@ -215,9 +217,9 @@ def create_rectangle_ex(
215217
min_y: float,
216218
max_x: float,
217219
max_y: float,
218-
worlds: list[int] = [-1],
219-
interiors: list[int] = [-1],
220-
players: list[int] = [-1],
220+
worlds: Optional[list[int]] = None,
221+
interiors: Optional[list[int]] = None,
222+
players: Optional[list[int]] = None,
221223
priority: int = 0,
222224
) -> "DynamicZone":
223225
return cls(
@@ -271,9 +273,9 @@ def create_cuboid_ex(
271273
max_x: float,
272274
max_y: float,
273275
max_z: float,
274-
worlds: list[int] = [-1],
275-
interiors: list[int] = [-1],
276-
players: list[int] = [-1],
276+
worlds: Optional[list[int]] = None,
277+
interiors: Optional[list[int]] = None,
278+
players: Optional[list[int]] = None,
277279
priority: int = 0,
278280
) -> "DynamicZone":
279281
return cls(
@@ -329,9 +331,9 @@ def create_cube_ex(
329331
max_x: float,
330332
max_y: float,
331333
max_z: float,
332-
worlds: list[int] = [-1],
333-
interiors: list[int] = [-1],
334-
players: list[int] = [-1],
334+
worlds: Optional[list[int]] = None,
335+
interiors: Optional[list[int]] = None,
336+
players: Optional[list[int]] = None,
335337
priority: int = 0,
336338
) -> "DynamicZone":
337339
return cls(
@@ -378,9 +380,9 @@ def create_polygon_ex(
378380
points: list[float],
379381
min_z: float = -2139095040.0,
380382
max_z: float = 2139095040.0,
381-
worlds: list[int] = [-1],
382-
interiors: list[int] = [-1],
383-
players: list[int] = [-1],
383+
worlds: Optional[list[int]] = None,
384+
interiors: Optional[list[int]] = None,
385+
players: Optional[list[int]] = None,
384386
priority: int = 0,
385387
) -> "DynamicZone":
386388
return cls(

0 commit comments

Comments
 (0)