Skip to content

Commit 713f1d3

Browse files
committed
beter?
1 parent 4c05586 commit 713f1d3

3 files changed

Lines changed: 52 additions & 20 deletions

File tree

.DS_Store

0 Bytes
Binary file not shown.

main.py

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -864,38 +864,70 @@ def reset():
864864
enemyhealthsmoothper = 1.0
865865
while running:
866866
click_damage = Decimal(click_value)*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate)
867-
def checkenemyded():
867+
def checkenemyded(clickorwait):
868868
global enemy_hp, enemy_max_hp, score, monsterskilled
869-
while Decimal(enemy_hp) <= 0:
870-
monsterskilled += Decimal(1)
871-
score += Decimal(random.uniform(.5, 1.5))*Decimal(enemy_max_hp)
872-
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
873-
enemy_hp += Decimal(enemy_max_hp)
874-
punch_sound_death.play()
875-
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / (Decimal(1.1**100)) >= Decimal(enemy_max_hp):
876-
monsterskilled += Decimal(500)
877-
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
869+
if clickorwait == "click":
870+
while Decimal(enemy_hp) <= 0:
871+
monsterskilled += Decimal(1)
872+
score += Decimal(random.uniform(.5, 1.5))*Decimal(enemy_max_hp)
878873
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
879874
enemy_hp += Decimal(enemy_max_hp)
880875
punch_sound_death.play()
881-
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / (Decimal(1.1**1000)) >= Decimal(enemy_max_hp):
882-
monsterskilled += Decimal(5000)
876+
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / (Decimal(1.1**100)) >= Decimal(enemy_max_hp):
877+
monsterskilled += Decimal(500)
883878
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
884879
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
885880
enemy_hp += Decimal(enemy_max_hp)
886881
punch_sound_death.play()
887-
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / Decimal.__pow__(Decimal(1.1),Decimal(10000)) >= Decimal(enemy_max_hp):
888-
monsterskilled += Decimal(50000)
882+
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / (Decimal(1.1**1000)) >= Decimal(enemy_max_hp):
883+
monsterskilled += Decimal(5000)
889884
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
890-
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(monsterskilled) // Decimal(5)))
885+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
891886
enemy_hp += Decimal(enemy_max_hp)
892887
punch_sound_death.play()
893-
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / Decimal.__pow__(Decimal(1.1),Decimal(100000)) >= Decimal(enemy_max_hp):
894-
monsterskilled += Decimal(500000)
895-
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled-1) // Decimal(5)))
888+
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / Decimal.__pow__(Decimal(1.1),Decimal(10000)) >= Decimal(enemy_max_hp):
889+
monsterskilled += Decimal(50000)
890+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
896891
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(monsterskilled) // Decimal(5)))
897892
enemy_hp += Decimal(enemy_max_hp)
898893
punch_sound_death.play()
894+
while Decimal((Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)) / Decimal.__pow__(Decimal(1.1),Decimal(100000)) >= Decimal(enemy_max_hp):
895+
monsterskilled += Decimal(500000)
896+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled-1) // Decimal(5)))
897+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(monsterskilled) // Decimal(5)))
898+
enemy_hp += Decimal(enemy_max_hp)
899+
punch_sound_death.play()
900+
if clickorwait == "wait":
901+
while Decimal(enemy_hp) <= 0:
902+
monsterskilled += Decimal(1)
903+
score += Decimal(random.uniform(.5, 1.5))*Decimal(enemy_max_hp)
904+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
905+
enemy_hp += Decimal(enemy_max_hp)
906+
punch_sound_death.play()
907+
while Decimal(auto_click_value) * Decimal(auto_click_rate) * Decimal(delta_time) * Decimal(gemboost) / (Decimal(1.1**100)) >= Decimal(enemy_max_hp):
908+
monsterskilled += Decimal(500)
909+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
910+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
911+
enemy_hp += Decimal(enemy_max_hp)
912+
punch_sound_death.play()
913+
while Decimal(auto_click_value) * Decimal(auto_click_rate) * Decimal(delta_time) * Decimal(gemboost) / (Decimal(1.1**1000)) >= Decimal(enemy_max_hp):
914+
monsterskilled += Decimal(5000)
915+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
916+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled) // Decimal(5))))
917+
enemy_hp += Decimal(enemy_max_hp)
918+
punch_sound_death.play()
919+
while Decimal(auto_click_value) * Decimal(auto_click_rate) * Decimal(delta_time) * Decimal(gemboost) / Decimal.__pow__(Decimal(1.1),Decimal(10000)) >= Decimal(enemy_max_hp):
920+
monsterskilled += Decimal(50000)
921+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal(Decimal(1.1)**Decimal(Decimal(monsterskilled-1) // Decimal(5)))
922+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(monsterskilled) // Decimal(5)))
923+
enemy_hp += Decimal(enemy_max_hp)
924+
punch_sound_death.play()
925+
while Decimal(auto_click_value) * Decimal(auto_click_rate) * Decimal(delta_time) * Decimal(gemboost) / Decimal.__pow__(Decimal(1.1),Decimal(100000)) >= Decimal(enemy_max_hp):
926+
monsterskilled += Decimal(500000)
927+
score += Decimal(random.uniform(.5, 1.5))*Decimal(10) * Decimal.__pow__(Decimal(1.1),Decimal(Decimal(monsterskilled-1) // Decimal(5)))
928+
enemy_max_hp = Decimal(10) * Decimal(Decimal.__pow__(Decimal(1.1),Decimal(monsterskilled) // Decimal(5)))
929+
enemy_hp += Decimal(enemy_max_hp)
930+
punch_sound_death.play()
899931
speedmusic = constrain(speedmusic + (1-speedmusic)/(0.75/delta_time), 1, 3)
900932
rl.set_music_pitch(music1, speedmusic)
901933
rl.set_music_pitch(music2, speedmusic)
@@ -1022,7 +1054,7 @@ def checkenemyded():
10221054
speedmusic += 0.025/(speedmusic**5)
10231055
elif BuyThing[2]["value"] == "Fight":
10241056
enemy_hp -= (Decimal(click_value)*Decimal(random.uniform(0.95, 1.05))*Decimal(click_value_multi) + Decimal(cps_to_cpc)*Decimal(auto_click_value)*Decimal(auto_click_rate))*Decimal(gemboost)
1025-
checkenemyded()
1057+
checkenemyded("click")
10261058
soundipunch = random.randint(1,4)
10271059
if soundipunch == 1:
10281060
punch_sound1.play()
@@ -1443,7 +1475,7 @@ def distance_to(ax, ay, bx, by):
14431475
musicplays2 = -1
14441476
musicplays = 0
14451477
musicplays += delta_time*musicplays2*speedmusic
1446-
checkenemyded()
1478+
checkenemyded("wait")
14471479
rl.unload_music_stream(music1)
14481480
rl.unload_music_stream(music2)
14491481
rl.close_audio_device()

save/SaveData.pickle

7 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)