Skip to content

Commit

Permalink
added sunny beach
Browse files Browse the repository at this point in the history
  • Loading branch information
@lxgr-linux
lxgr-linux committed Mar 6, 2022
1 parent 1f46492 commit 8deb057
Show file tree
Hide file tree
Showing 6 changed files with 251 additions and 0 deletions.
61 changes: 61 additions & 0 deletions pokete.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ class Water(Meadow):
esccode = Color.blue


class Sand(Meadow):
"""Same as Meadow, but for Sand"""
esccode = Color.yellow


class Poketeball(se.Object):
"""Poketeball that can be picked up on the map
ARGS:
Expand Down Expand Up @@ -1079,6 +1084,11 @@ def playmap_7():
else:
obj.rechar(" ")

@staticmethod
def playmap_40():
"""Water animation"""
ExtraActions.water(ob_maps["playmap_40"].lake_1.obs)


# main functions
################
Expand Down Expand Up @@ -1619,6 +1629,57 @@ def map_additions():
_map.dor.add(_map, 13, 7)
_map.shopdor.add(_map, 30, 7)

# playmap_40
_map = ob_maps["playmap_40"]
_map.lake_1 = Water("""~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~
~~~~~~~~~~ ~~
~~~""", _map.w_poke_args)
_map.sand_1 = Sand(""" ............
....................
.......................
...................
..............
...""", _map.poke_args)
_map.sand_2 = Sand(""" .....
..............
.....................
..........................
.............................
...........................
......................
.................
..........
...""", _map.poke_args)
_map.sand_3 = Sand(""" ............
..................
.....................
..................
................
.......""", _map.poke_args)
_map.sand_4 = Sand(""" .........
..............
................
...............
.............
.......""", _map.poke_args)
# adding
_map.lake_1.add(_map, 0, 0)
_map.sand_1.add(_map, 10, 15)
_map.sand_2.add(_map, 86, 12)
_map.sand_3.add(_map, 39, 19)
_map.sand_4.add(_map, 115, 20)


# Actual code execution
#######################
Expand Down
96 changes: 96 additions & 0 deletions pokete_data/map_data.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2321,6 +2321,26 @@
"y": 6,
"args": {"map": "playmap_29", "x": 11, "y": 7}
},
"dor_playmap_40_1": {
"x": 95,
"y": 0,
"args": {"map": "playmap_40", "x": 69, "y": 28}
},
"dor_playmap_40_2": {
"x": 96,
"y": 0,
"args": {"map": "playmap_40", "x": 70, "y": 28}
},
"dor_playmap_40_3": {
"x": 97,
"y": 0,
"args": {"map": "playmap_40", "x": 71, "y": 28}
},
"dor_playmap_40_4": {
"x": 98,
"y": 0,
"args": {"map": "playmap_40", "x": 72, "y": 28}
},
},
"balls": {
"ball_1": {
Expand Down Expand Up @@ -3464,6 +3484,82 @@
"balls": {
},
},
"playmap_40": {
"hard_obs": {
"trees": {
"x": 0,
"y": 0,
"txt": """
())
()()
())( (((
(()) ()()
())) (())
())( ()()
())() (()()
(()()))))(()))(()(((()(())(()))())))())((()))(()()())((()))(())((() # # ())()()(()))(()()())()())((()()()))(()))()))()(())))((()))()))(()
(())((())()()()(((())((())(()()(())((()()()())((()))(()()()))((()())# #(()))(()()()()))(((()))((()))(((())))(((())(()()))((((())))((()))("""
}
},
"soft_obs": {
},
"dors": {
"dor_playmap_21_1": {
"x": 69,
"y": 29,
"args": {"map": "playmap_21", "x": 95, "y": 1}
},
"dor_playmap_21_2": {
"x": 70,
"y": 29,
"args": {"map": "playmap_21", "x": 96, "y": 1}
},
"dor_playmap_21_3": {
"x": 71,
"y": 29,
"args": {"map": "playmap_21", "x": 97, "y": 1}
},
"dor_playmap_21_4": {
"x": 72,
"y": 29,
"args": {"map": "playmap_21", "x": 98, "y": 1}
},
},
"balls": {
"ball_1": {
"x": 5,
"y": 27,
},
"ball_2": {
"x": 89,
"y": 18,
},
"ball_3": {
"x": 139,
"y": 22,
},
}
},
}

if __name__ == "__main__":
Expand Down
17 changes: 17 additions & 0 deletions pokete_data/maps.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,23 @@
"poke_args": None,
"weather": None
},
"playmap_40": {
"height": 30,
"width": 140,
"extra_actions": "playmap_40",
"pretty_name": "Sunny Beach",
"poke_args": {
"pokes": ["crabbat", "würgos"],
"minlvl": 1400,
"maxlvl": 1700
},
"w_poke_args": {
"pokes": ["karpi", "blub", "clampi"],
"minlvl": 1400,
"maxlvl": 1700
},
"weather": "sunny"
},
}


Expand Down
60 changes: 60 additions & 0 deletions pokete_data/npcs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,66 @@
"x": 74,
"y": 15
},
"beach_girl": {
"texts": [],
"fn": "chat",
"chat": {
"q": [" < Hey there", " < What are you doing here at the beach?"],
"a": {
"Just chilling": {
"q": [" < Nice", " < This beach is the most beautiful in the region!", " < Isn't the weather great today?"],
"a": {}
},
"Searching for Poketes": {
"q": [" < Oh cool, your a Pokete trainer!", " < Did already find some?"],
"a": {
"Yes": {
"q": [" < Cool!", " < Have you already caught a Crabbat?"],
"a": {
"Yes": {
"q": [" < That's pretty cool!", "But have you also met a Saugh?"],
"a": {
"Yes": {
"q": [" < Those a fucking beasts!"],
"a": {}
},
"Hell, what are those?": {
"q": [" < Their the dark firy souls of those who got burned to death by the hot sun!"],
"a": {}
}
}
},
"Yes, of course" : {
"q": [" < You're a good trainer, huh?", " < I wan't to see you fight a Rustcean", " < They're very tough!"],
"a": {}
},
"No": {
"q": [" < That's too bad", " < But they're very tought!"],
"a": {}
}
}
},
"No": {
"q": [" < That's too bad", " < You can find some in the sand fields"],
"a": {
"Thank's a lot": {
"q": [" < No problem!"],
"a": {}
},
"Are you a trainer your self?": {
"q": [" < No, but the guy overthere"],
"a": {}
}
}
}
}
}
}
},
"map": "playmap_40",
"x": 107,
"y": 25
},
}

if __name__ == "__main__":
Expand Down
8 changes: 8 additions & 0 deletions pokete_data/trainers.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,14 @@
[" < NOOOOOO; WHYYY ARE YOU BETTER ??!!!1!!!111"], 69, 61)
},
],
"playmap_40": [{
"poke": ("rustacean", 1800),
"args": ("Gustav the angler", "He",
[" < My Pokete will blow you away!"],
[" < You're a fucking loooser!"],
[" < Cool, huh?"], 58, 12)
},
]
}

if __name__ == "__main__":
Expand Down
9 changes: 9 additions & 0 deletions pokete_data/weather.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,14 @@
"undead": 1.5,
"normal": 0.75,
}
},
"sunny": {
"info": "It's a hot sunny day!",
"effected": {
"fire": 1.5,
"water": 0.75,
"ice": 0.5,
"plant": 0.75,
}
}
}

0 comments on commit 8deb057

Please sign in to comment.