Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
4a378b8
feat(pokes): Gitignored zed
lxgr-linux Sep 16, 2025
f85b9dd
#new pokete Pacino
Pacino125 Oct 3, 2023
d7bbbce
asd
arthias386 Sep 27, 2022
b6f967d
Update poketes.py
radkyz Sep 27, 2022
b35e72c
feat(pokes): linting
lxgr-linux Sep 16, 2025
abaf042
Entered some map data in the creation of the map Watermill.
lxgr-linux Sep 16, 2025
1cdd29f
More data for map_data.py regarding pathways, meadows, and fences in …
amber-codex May 4, 2025
8b8defe
More map data for Watermill. Doors have entered implementation phase
amber-codex May 4, 2025
0013c80
second attempt at adding doors to the map
amber-codex May 4, 2025
b381e47
fixed expression error at end of map_data
amber-codex May 4, 2025
b51fe65
Map data for watermill including more water, sand, and meadow texture…
amber-codex May 6, 2025
f1d7995
shifted sand texture to encompass most of the small lake. More homes …
amber-codex May 6, 2025
2b4655b
added door to enter Agrawos to the left
amber-codex May 6, 2025
0b855e2
added a school another meadow a poke center and some more pathways
amber-codex May 6, 2025
362d395
More map data for Watermill
amber-codex May 6, 2025
c79262d
added an npc for the pokete center in Watermill
amber-codex May 6, 2025
aac0e88
missed a semicolon on a dict object
amber-codex May 6, 2025
c45fb6c
Add playmap_57
craigb20 May 6, 2025
9da4e08
Add playmap_57 to mapstations.py
craigb20 May 6, 2025
987ba9f
Created and implemented design to playmap_57
craigb20 May 6, 2025
304910c
Add playmap_57 to mapstations.py
craigb20 May 6, 2025
e2838ca
added bracket to get balls back in playmap 39
amber-codex May 7, 2025
8bf30d8
removed bracket at end
amber-codex May 7, 2025
868bc48
added balls to playmap 53
amber-codex May 7, 2025
e87a05e
added balls to playmap 56
amber-codex May 7, 2025
829de91
fixed extra to extra actions in a few playmaps in maps.py
amber-codex May 7, 2025
6fafafc
fixed map dictionary in playmap 52 to connect to playmap 39
amber-codex May 7, 2025
149d59f
moved door over 1 space
amber-codex May 7, 2025
c780349
forgot to fix a door
amber-codex May 7, 2025
b65eb55
fixed doors in playmap39
amber-codex May 7, 2025
962d664
moved trees down
amber-codex May 7, 2025
d7965cb
moved trees down again
amber-codex May 7, 2025
010f2d0
fixed variable name
amber-codex May 7, 2025
e593ddd
removed top border trees
amber-codex May 7, 2025
6502789
moved meadow down 1
amber-codex May 7, 2025
85c2839
expanded map
amber-codex May 7, 2025
7f4d633
added map 55 and 56 to mapstations in 52
amber-codex May 7, 2025
327e1fe
Updated playmap_57
craigb20 May 7, 2025
e97dcc6
Move playmap_57 earlier in the game for demo purpose
craigb20 May 7, 2025
635aef6
Fixed issue with map sizes and objects
Mila-7553 May 7, 2025
e613774
Changed coordinates on the first playmap back for demo
craigb20 May 7, 2025
cb5c8db
feat(pokes): linting fixes
lxgr-linux Sep 16, 2025
e13a85c
feat(pokes): fixed poketes validity
lxgr-linux Sep 16, 2025
c0facce
feat(pokes): fixed validation
lxgr-linux Sep 16, 2025
638ea09
feat(pokes): Added misc obs
lxgr-linux Sep 17, 2025
bdf90fd
Moved stuff
lxgr-linux Oct 9, 2025
91950e5
Merge branch 'master' of github.com:lxgr-linux/pokete into new_pokes
lxgr-linux Nov 20, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/pokete/classes/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from .asset_service.service import asset_service
from .classes import PlayMap
from .doors import Door, DoorToCenter, DoorToShop
from .landscape import Meadow, Poketeball, Sand, Water
from .landscape import Meadow, Misc, Poketeball, Sand, Water
from .map_additions.center import CenterMap, ShopMap
from .npcs import NPC, Trainer
from .poke import Poke
Expand Down Expand Up @@ -109,6 +109,7 @@ def gen_single_map_obs(_map: PlayMap, single_map: Obmap, used_npcs: list[str]):
"sand": Sand,
"meadow": Meadow,
"water": Water,
"misc": Misc,
}[single_soft_ob.cls if single_soft_ob.cls is not None else "meadow"]
__parse_obj(
_map,
Expand Down
9 changes: 9 additions & 0 deletions src/pokete/classes/landscape.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ class Sand(Meadow):
esccode = Color.yellow


class Misc(se.Text):
def __init__(self, string, _):
super().__init__(
string,
ignore=" ",
state="float",
)


class Poketeball(se.Object, MapInteract):
"""Poketeball that can be picked up on the map
ARGS:
Expand Down
26 changes: 20 additions & 6 deletions src/pokete/data/attacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,20 @@
"is_generic": False,
"ap": 20,
},
"poison_wrap": {
"name": "Poison Wrap",
"factor": 1.5,
"action": None,
"world_action": "",
"move": ["attack", "downgrade"],
"miss_chance": 0.2,
"min_lvl": 20,
"desc": "Grapple an enemy into venomous bear hug",
"types": ["poison"],
"effect": "poison",
"is_generic": False,
"ap": 30,
},
# stone attacks
"pepple_fire": {
"name": "Pebble Fire",
Expand All @@ -170,7 +184,7 @@
"types": ["stone"],
"effect": None,
"is_generic": True,
"ap": 5,
"ap": 10,
},
"sand_throw": {
"name": "Sand Throw",
Expand All @@ -184,7 +198,7 @@
"types": ["stone"],
"effect": None,
"is_generic": False,
"ap": 5,
"ap": 10,
},
"politure": {
"name": "Polish",
Expand Down Expand Up @@ -240,7 +254,7 @@
"types": ["stone"],
"effect": None,
"is_generic": True,
"ap": 5,
"ap": 10,
},
"dia_stab": {
"name": "Dia Stab",
Expand Down Expand Up @@ -424,7 +438,7 @@
"types": ["fire"],
"effect": "burning",
"is_generic": True,
"ap": 10,
"ap": 20,
},
"fire_ball": {
"name": "Fire Ball",
Expand All @@ -438,7 +452,7 @@
"types": ["fire"],
"effect": None,
"is_generic": True,
"ap": 10,
"ap": 15,
},
# flying attacks
"flying": {
Expand Down Expand Up @@ -949,7 +963,7 @@
"types": ["ice"],
"effect": None,
"is_generic": True,
"ap": 10,
"ap": 20,
},
"spikes": {
"name": "Spikes",
Expand Down
Loading