mirrors/ProgressQuest-cli
1
0
Fork 0
mirror of https://github.com/rr-/pq-cli.git synced 2026-09-29 06:44:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

misc: reformat numbers

Browse Source
This commit is contained in:
rr-
2018-11-08 10:07:51 +01:00
parent c7c5abf7c8
commit b00cf34e8f
2 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pqcli/mechanic.py
+28 -32
View File
@@ -427,28 +427,28 @@ class Simulation:
def tick(self, elapsed: float = 100.0) -> None: def tick(self, elapsed: float = 100.0) -> None:
if self.player.task is None: if self.player.task is None:
self.player.set_task(RegularTask("Loading", 2_000)) self.player.set_task(RegularTask("Loading", 2000))
self.player.queue += [ self.player.queue += [
RegularTask( RegularTask(
"Experiencing an enigmatic and foreboding night vision", "Experiencing an enigmatic and foreboding night vision",
10_000, 10000,
), ),
RegularTask( RegularTask(
"Much is revealed about that wise old bastard " "Much is revealed about that wise old bastard "
"you'd underestimated", "you'd underestimated",
6_000, 6000,
), ),
RegularTask( RegularTask(
"A shocking series of events leaves you " "A shocking series of events leaves you "
"alone and bewildered, but resolute", "alone and bewildered, but resolute",
6_000, 6000,
), ),
RegularTask( RegularTask(
"Drawing upon an unrealized reserve of determination, " "Drawing upon an unrealized reserve of determination, "
"you set out on a long and dangerous journey", "you set out on a long and dangerous journey",
4_000, 4000,
), ),
PlotTask(f"Loading {act_name(1)}", 2_000), PlotTask(f"Loading {act_name(1)}", 2000),
] ]
self.player.quest_book.plot_bar.reset(28) self.player.quest_book.plot_bar.reset(28)
return return
@@ -528,7 +528,7 @@ class Simulation:
self.player.set_task( self.player.set_task(
SellTask( SellTask(
"Selling " + indefinite(item.name, item.quantity), "Selling " + indefinite(item.name, item.quantity),
1_000, 1000,
) )
) )
break break
@@ -541,21 +541,19 @@ class Simulation:
self.player.set_task(self.player.queue.pop(0)) self.player.set_task(self.player.queue.pop(0))
elif self.player.inventory.encum_bar.done: elif self.player.inventory.encum_bar.done:
self.player.set_task( self.player.set_task(
HeadingToMarketTask( HeadingToMarketTask("Heading to market to sell loot", 4000)
"Heading to market to sell loot", 4_000
)
) )
elif not isinstance(old, (KillTask, HeadingToKillingFieldsTask)): elif not isinstance(old, (KillTask, HeadingToKillingFieldsTask)):
if self.player.inventory.gold > self.player.equip_price(): if self.player.inventory.gold > self.player.equip_price():
self.player.set_task( self.player.set_task(
BuyTask( BuyTask(
"Negotiating purchase of better equipment", 5_000 "Negotiating purchase of better equipment", 5000
) )
) )
else: else:
self.player.set_task( self.player.set_task(
HeadingToKillingFieldsTask( HeadingToKillingFieldsTask(
"Heading to the killing fields", 4_000 "Heading to the killing fields", 4000
) )
) )
else: else:
@@ -625,19 +623,19 @@ class Simulation:
RegularTask( RegularTask(
"Exhausted, you arrive at a friendly oasis " "Exhausted, you arrive at a friendly oasis "
"in a hostile land", "in a hostile land",
1_000, 1000,
) )
) )
enqueue( enqueue(
RegularTask("You greet old friends and meet new allies", 2_000) RegularTask("You greet old friends and meet new allies", 2000)
) )
enqueue( enqueue(
RegularTask( RegularTask(
"You are privy to a council of powerful do-gooders", 2_000 "You are privy to a council of powerful do-gooders", 2000
) )
) )
enqueue( enqueue(
RegularTask("There is much to be done. You are chosen!", 1_000) RegularTask("There is much to be done. You are chosen!", 1000)
) )
elif choice == 1: elif choice == 1:
@@ -645,7 +643,7 @@ class Simulation:
RegularTask( RegularTask(
"Your quarry is in sight, " "Your quarry is in sight, "
"but a mighty enemy bars your path!", "but a mighty enemy bars your path!",
1_000, 1000,
) )
) )
@@ -653,7 +651,7 @@ class Simulation:
enqueue( enqueue(
RegularTask( RegularTask(
f"A desperate struggle commences with {nemesis}", 4_000 f"A desperate struggle commences with {nemesis}", 4000
) )
) )
@@ -665,20 +663,20 @@ class Simulation:
if s % 3 == 0: if s % 3 == 0:
enqueue( enqueue(
RegularTask( RegularTask(
f"Locked in grim combat with {nemesis}", 2_000 f"Locked in grim combat with {nemesis}", 2000
) )
) )
elif s % 3 == 1: elif s % 3 == 1:
enqueue( enqueue(
RegularTask( RegularTask(
f"{nemesis} seems to have the upper hand", 2_000 f"{nemesis} seems to have the upper hand", 2000
) )
) )
elif s % 3 == 2: elif s % 3 == 2:
enqueue( enqueue(
RegularTask( RegularTask(
f"You seem to gain the advantage over {nemesis}", f"You seem to gain the advantage over {nemesis}",
2_000, 2000,
) )
) )
else: else:
@@ -688,12 +686,12 @@ class Simulation:
RegularTask( RegularTask(
f"Victory! {nemesis} is slain! " f"Victory! {nemesis} is slain! "
"Exhausted, you lose conciousness", "Exhausted, you lose conciousness",
3_000, 3000,
) )
) )
enqueue( enqueue(
RegularTask( RegularTask(
"You awake in a friendly place, but the road awaits", 2_000 "You awake in a friendly place, but the road awaits", 2000
) )
) )
@@ -703,37 +701,35 @@ class Simulation:
RegularTask( RegularTask(
"Oh sweet relief! " "Oh sweet relief! "
f"You've reached the protection of the good {nemesis}", f"You've reached the protection of the good {nemesis}",
2_000, 2000,
) )
) )
enqueue( enqueue(
RegularTask( RegularTask(
"There is rejoicing, " "There is rejoicing, "
f"and an unnerving encouter with {nemesis} in private", f"and an unnerving encouter with {nemesis} in private",
3_000, 3000,
) )
) )
enqueue( enqueue(
RegularTask( RegularTask(
f"You forget your {boring_item()} and go back to get it", f"You forget your {boring_item()} and go back to get it",
2_000, 2000,
) )
) )
enqueue( enqueue(
RegularTask( RegularTask(
"What's this!? You overhear something shocking!", 2_000 "What's this!? You overhear something shocking!", 2000
) )
) )
enqueue( enqueue(
RegularTask( RegularTask(f"Could {nemesis} be a dirty double-dealer?", 2000)
f"Could {nemesis} be a dirty double-dealer?", 2_000
)
) )
enqueue( enqueue(
RegularTask( RegularTask(
"Who can possibly be trusted with this news!? ... " "Who can possibly be trusted with this news!? ... "
"Oh yes, of course", "Oh yes, of course",
3_000, 3000,
) )
) )
@@ -742,7 +738,7 @@ class Simulation:
enqueue( enqueue(
PlotTask( PlotTask(
f"Loading {act_name(self.player.quest_book.act + 1)}", 1_000 f"Loading {act_name(self.player.quest_book.act + 1)}", 1000
) )
) )
pqcli/sim.py
+2 -2
View File
@@ -24,9 +24,9 @@ logging.basicConfig(
# make things predictable # make things predictable
SEED_A = 1664525 SEED_A = 1_664_525
SEED_B = 2141 SEED_B = 2141
SEED_C = 1013904223 SEED_C = 1_013_904_223
def custom_random(num: int) -> int: def custom_random(num: int) -> int: