Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
update pony list to 2.8.0, bug fix, added party keys
Browse files Browse the repository at this point in the history
  • Loading branch information
Arzaroth Lekva committed Apr 18, 2016
1 parent bbbe49b commit 2452f26
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CelestiaSunrise.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
-h, --help Show this help and exit.
Notes:
- This tool might have compatibility issues with recent versions of save files. It was tested with save files generated from the 2.5.x version of the game.
- This tool might have compatibility issues with recent versions of save files. It was tested with save files generated from the 2.8.x version of the game.
- The code of this tool is currently open source. If you experiment issues, feel free to report or improve it.
Author:
Expand Down
8 changes: 4 additions & 4 deletions CelestiaSunrise.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ a = Analysis(['CelestiaSunrise.py'],
excludes=None,
cipher=block_cipher)

for d in a.datas:
if 'pyconfig' in d[0]:
a.datas.remove(d)
break
# for d in a.datas:
# if 'pyconfig' in d[0]:
# a.datas.remove(d)
# break

pyz = PYZ(a.pure,
cipher=block_cipher)
Expand Down
8 changes: 5 additions & 3 deletions celestia/gui/poniesframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

@six.add_metaclass(TkVarDescriptorOwner)
class PonyFrame(ttk.Frame, object):
level = TkVarDescriptor(tk.IntVar)
level = TkVarDescriptor(tk.DoubleVar)
level_up = TkVarDescriptor(tk.BooleanVar)
next_game = TkVarDescriptor(tk.StringVar)
reset_next_game = TkVarDescriptor(tk.BooleanVar)
Expand All @@ -48,7 +48,7 @@ def __init__(self, parent,
self.level = level
self._level_frame = ttk.Frame(self.parent)
self._level_label = ttk.Label(self._level_frame,
text=self.level)
text=int(self.level))
self._level_scale = ttk.Scale(self._level_frame,
from_=0, to=5,
orient=HORIZONTAL,
Expand All @@ -61,6 +61,7 @@ def __init__(self, parent,
self.next_game = next_game
self._option_next = ttk.OptionMenu(self.parent,
PonyFrame.next_game.raw_klass(self),
self.next_game,
Pony.GameTypes.rmap[Pony.GameTypes.Ball],
Pony.GameTypes.rmap[Pony.GameTypes.Apple],
Pony.GameTypes.rmap[Pony.GameTypes.Book])
Expand All @@ -78,9 +79,10 @@ def __init__(self, parent,
self._reset_checkbox.grid(row=offset, column=4, **options)

def _level_change(self, *args):
self.level = int(self.level)
self._shards.configure(state=(DISABLED if self.level == 5 else NORMAL))
self.level_up = self.level_up and self.level != 5
self._level_label.config(text=self.level)
self._level_label.config(text=int(self.level))


class EveryponyFrame(PonyFrame):
Expand Down
3 changes: 3 additions & 0 deletions celestia/utility/ponies.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
('Pony_Half_Baked_Apple', 'Half Baked Apple'),
('Pony_Hayseed_Turnip_Truck', 'Hayseed Turnip Truck'),
('Pony_Hoity_Toity', 'Hoity Toity'),
('Pony_Horticultural_Pegasus', 'Horticultural Pegasus'),
('Pony_Jeff_Letrotski', 'Jeff Letrotski'),
('Pony_Jet_Set', 'Jet Set'),
('Pony_Jigging_Clownspony', 'Jigging Clownspony'),
Expand Down Expand Up @@ -163,6 +164,7 @@
('Pony_Princess_Celestia', 'Princess Celestia'),
('Pony_Princess_Luna', 'Princess Luna'),
('Pony_Professor', 'Bill Neigh (Professor)'),
('Pony_Public_Works_Pony', 'Public Works Pony'),
('Pony_Purple_Wave', 'Purple Wave'),
('Pony_Quake', 'Quake'),
('Pony_Rainbow_Dash', 'Rainbow Dash'),
Expand All @@ -189,6 +191,7 @@
('Pony_Snails', 'Snails'),
('Pony_Snips', 'Snips'),
('Pony_Soarin', 'Soarin'),
('Pony_Spike', 'Spike'),
('Pony_Spitfire', 'Spitfire'),
('Pony_Sprinkle_Stripe', 'Sprinkle Stripe'),
('Pony_Starlight_Glimmer', 'Starlight Glimmer'),
Expand Down
5 changes: 5 additions & 0 deletions celestia/xml/xmlhandler.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@ def _get_currencies(self):
boutique['Ribbon'] = Currency('@PopCurrency5', 'Ribbon', popcurrency, 999)
except:
pass
try:
# Party Update (2.8)
main['Party Keys'] = Currency('@SpecialCurrency', 'Party Keys', playerdata)
except:
pass
return res

def _get_player_infos(self):
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import os
from setuptools import setup, find_packages

VERSION = ("v1", "4", "0")
VERSION = ("v1", "5", "0")

if __name__ == '__main__':
setup(
Expand Down

0 comments on commit 2452f26

Please sign in to comment.