From f338e67759fffe7cb77b2e4fac4bff4c4d02237a Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:07:27 +0800 Subject: [PATCH 01/12] Create savedata.pk --- savedata.pk | 1 + 1 file changed, 1 insertion(+) create mode 100644 savedata.pk diff --git a/savedata.pk b/savedata.pk new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/savedata.pk @@ -0,0 +1 @@ + From 7b445aae2b71399abffd43df31ed2bccb0bbc712 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:09:12 +0800 Subject: [PATCH 02/12] Update python-run.yml --- .github/workflows/python-run.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/python-run.yml b/.github/workflows/python-run.yml index ae33ec0..aec8eaa 100644 --- a/.github/workflows/python-run.yml +++ b/.github/workflows/python-run.yml @@ -16,6 +16,9 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install Dependecacies + run: + pip install colorama - name: Set up Python 3.10 uses: actions/setup-python@v3 with: From 3f1e66674a78fa1cdbdead1925c0077c8e9c8922 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:12:25 +0800 Subject: [PATCH 03/12] Update python-run.yml --- .github/workflows/python-run.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-run.yml b/.github/workflows/python-run.yml index aec8eaa..8149a7b 100644 --- a/.github/workflows/python-run.yml +++ b/.github/workflows/python-run.yml @@ -18,11 +18,11 @@ jobs: - uses: actions/checkout@v4 - name: Install Dependecacies run: - pip install colorama + pip3 install colorama - name: Set up Python 3.10 uses: actions/setup-python@v3 with: python-version: "3.10" - name: Run Python 3.10 run: - python main.py + python3 main.py From f86eb0d13744fa9549a1dd067e68aa1c3e939c9e Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:18:38 +0800 Subject: [PATCH 04/12] Update main.py --- main.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.py b/main.py index 6929462..0e19a3b 100644 --- a/main.py +++ b/main.py @@ -1,3 +1,6 @@ +from os import system as sys +sys("pip3 install colorama") + from base import * from colorama import Fore, Style as fore, style testing = Disk("Pikachu") From ec8c64f9081da1c8e34bb3764b11c07912a99b4d Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:19:57 +0800 Subject: [PATCH 05/12] Update main.py --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 0e19a3b..5f7f7cf 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,7 @@ sys("pip3 install colorama") from base import * -from colorama import Fore, Style as fore, style +from colorama import Fore as fore testing = Disk("Pikachu") print(testing.name) From 5075805f588b0c7e61a62c570330539bf4372667 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:22:40 +0800 Subject: [PATCH 06/12] Update base.py --- base.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/base.py b/base.py index e8ff7cd..378be3f 100644 --- a/base.py +++ b/base.py @@ -3,7 +3,7 @@ import typeChart class Disk: - def __init__(self, name, type, number, bst, move, star, energy, special, mega, z, fuse): + def __init__(self, name, type, number, bst, move, star, energy , special = None, mega = None, z = None, fuse = None): self.name = name self.type = ["Normal","Fighting","Flying","Poison","Ground","Rock","Bug","Ghost","Steel","Fire","Water","Grass","Electric","Psychic","Ice","Dragon","Dark","Fairy"].index(type) self.number = number @@ -14,7 +14,10 @@ def __init__(self, name, type, number, bst, move, star, energy, special, mega, z self.special = special self.mega = mega self.level = self.energy/30 # hidden - self.z = ["Breakneck Blitz","All-Out Pummeling","Supersonic Skystrike","Acid Downpour","Tectonic Rage","Continental Crush","Savage Spin-Out","Never-Ending Nightmare","Corkscrew Crash","Inferno Overdrive","Hydro Vortex","Bloom Doom","Gigavolt Havoc","Shattered Psyche","Subzero Slammer","Devastating Drake","Black Hole Eclipse","Twinkle Tackle","Catastropika","Sinister Arrow Raid","Malicious Moonsault","Oceanic Operetta","Guardian of Alola","Soul-Stealing 7-Star Strike","Stoked Sparksurfer","Pulverizing Pancake","Extreme Evoboost","Genesis Supernova","10,000,000 Volt Thunderbolt","Light That Burns the Sky","Searing Sunraze Smash","Menacing Moonraze Maelstrom","Let's Snuggle Forever","Splintered Stormshards","Clangorous Soulblaze"].index(z) + if z != None: + self.z = ["Breakneck Blitz","All-Out Pummeling","Supersonic Skystrike","Acid Downpour","Tectonic Rage","Continental Crush","Savage Spin-Out","Never-Ending Nightmare","Corkscrew Crash","Inferno Overdrive","Hydro Vortex","Bloom Doom","Gigavolt Havoc","Shattered Psyche","Subzero Slammer","Devastating Drake","Black Hole Eclipse","Twinkle Tackle","Catastropika","Sinister Arrow Raid","Malicious Moonsault","Oceanic Operetta","Guardian of Alola","Soul-Stealing 7-Star Strike","Stoked Sparksurfer","Pulverizing Pancake","Extreme Evoboost","Genesis Supernova","10,000,000 Volt Thunderbolt","Light That Burns the Sky","Searing Sunraze Smash","Menacing Moonraze Maelstrom","Let's Snuggle Forever","Splintered Stormshards","Clangorous Soulblaze"].index(z) + else: + self.z = None self.fuse = fuse # list del name, type, number, bst, move, star, energy, special, mega, z, fuse def Attack(self, enemy,selfch = [1,1,1,1,1],enemych = [1,1,1,1,1]): # Stat changes: [Attack, Defense, Sp. Atk, Sp. Def, Spe, Crit] From 970a2c58fa8ec38305057f916a0001ded5c3aacf Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:25:49 +0800 Subject: [PATCH 07/12] Update main.py --- main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/main.py b/main.py index 5f7f7cf..5b67bcb 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,9 @@ from base import * from colorama import Fore as fore -testing = Disk("Pikachu") +testing = Disk("Pikachu","Electric",25,[35,55,40,50,50,90],["Thunderbolt","Electric",90,"S"],2,1500) +testing2 = Disk("Charmander","Fire",25,[35,55,40,50,50,90],["Flamethrower","Fire",90,"S"],2,1500) print(testing.name) print("Hello World") +print(testing.Attack(testing2)) From 5e58722409d51179526c4d1d370da95e60a0cb53 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:28:11 +0800 Subject: [PATCH 08/12] Fix indexerrror --- base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base.py b/base.py index 378be3f..a15ca1f 100644 --- a/base.py +++ b/base.py @@ -20,7 +20,7 @@ def __init__(self, name, type, number, bst, move, star, energy , special = None, self.z = None self.fuse = fuse # list del name, type, number, bst, move, star, energy, special, mega, z, fuse - def Attack(self, enemy,selfch = [1,1,1,1,1],enemych = [1,1,1,1,1]): # Stat changes: [Attack, Defense, Sp. Atk, Sp. Def, Spe, Crit] + def Attack(self, enemy,selfch = [1,1,1,1,1,1],enemych = [1,1,1,1,1,1]): # Stat changes: [Attack, Defense, Sp. Atk, Sp. Def, Spe, Crit] if self.move[3] == "P": getbst = [1,2] elif self.move[3] == "S": From 6d837fcdff1dc5233faf8ff93480ed7d3d93e02f Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:31:37 +0800 Subject: [PATCH 09/12] Update typeChart.py --- typeChart.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/typeChart.py b/typeChart.py index 281bd59..9af9305 100644 --- a/typeChart.py +++ b/typeChart.py @@ -1,3 +1,12 @@ -def match(): +class Type(): + def __init__(self, weak, resist, immune): + self.weak = weak + self.resist = resist + self.immune = immune + del weak, resist, immune + +# create class types later + +def match(type1,type2): # dummy return 1 From a7ca906ac48e8942c55d3fa369a2b323f608c778 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:33:08 +0800 Subject: [PATCH 10/12] Create src-test.yml --- .github/workflows/src-test.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/src-test.yml diff --git a/.github/workflows/src-test.yml b/.github/workflows/src-test.yml new file mode 100644 index 0000000..c5210fb --- /dev/null +++ b/.github/workflows/src-test.yml @@ -0,0 +1,28 @@ +name: Python Host + +on: + push: + branches: [ "src" ] + pull_request: + branches: [ "src" ] + +permissions: + contents: read + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Install Dependecacies + run: + pip3 install colorama + - name: Set up Python 3.10 + uses: actions/setup-python@v3 + with: + python-version: "3.10" + - name: Run Python 3.10 + run: + python3 main.py From e0e4eb3635043dee4dc079de7d6669c91d1ac508 Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:39:26 +0800 Subject: [PATCH 11/12] Update base.py --- base.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/base.py b/base.py index a15ca1f..b4ceaa2 100644 --- a/base.py +++ b/base.py @@ -1,5 +1,5 @@ -from random import choice, randint -# from math import round, floor +from random import choice, randint, uniform +from math import round import typeChart class Disk: @@ -47,11 +47,11 @@ def Attack(self, enemy,selfch = [1,1,1,1,1,1],enemych = [1,1,1,1,1,1]): # Stat c attack = (((self.bst[getbst[0]]*2+31+252/4)*self.level)/100+5)*selfchnew defense = (((enemy.bst[getbst[1]]*2+31+252/4)*enemy.level)/100+5)*enemychnew powerBonus = choice([10,10,10,20,20,20,20,30,30,30,50]) - damage = (((2*self.level)/250)*attack/defense*(self.move[2]+powerBonus)+2)*multi + damage = round((((2*self.level)/250)*attack/defense*(self.move[2]+powerBonus)+2)*multi*uniform(0.8, 1)) else: attack = (((self.bst[getbst[0]]*2+31+252/4)*self.level)/100+5)*selfch[0] defense = (((enemy.bst[getbst[1]]*2+31+252/4)*enemy.level)/100+5)*enemych[1] powerBonus = choice([10,10,10,20,20,20,20,30,30,30,50]) - damage = (((2*self.level)/250)*attack/defense*(self.move[2]+powerBonus)+2)*multi + damage = round((((2*self.level)/250)*attack/defense*(self.move[2]+powerBonus)+2)*multi*uniform(0.8, 1)) return damage # work in progres From 10593524a549961af2ebe3ed4d98358802ea874e Mon Sep 17 00:00:00 2001 From: Not Sus Impostor <111621644+a-sussy-impostor@users.noreply.github.com> Date: Fri, 3 May 2024 21:41:16 +0800 Subject: [PATCH 12/12] Update base.py --- base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/base.py b/base.py index b4ceaa2..211b021 100644 --- a/base.py +++ b/base.py @@ -1,5 +1,4 @@ from random import choice, randint, uniform -from math import round import typeChart class Disk: