mirror of
https://github.com/ArchipelagoMW/Archipelago.git
synced 2026-03-21 23:23:24 -07:00
* APQuest * Add confetti cannon * ID change on enemy drop * nevermind * Write the apworld * Actually implement hard mode * split everything into multiple files * Push out webworld into a file * Comment * Enemy health graphics * more ruff rules * graphics :) * heal player when receiving health upgrade * the dumbest client of all time * Fix typo * You can kinda play it now! Now we just need to render the game... :))) * fix kvui imports again * It's playable. Kind of * oops * Sounds and stuff * exceptions for audio * player sprite stuff * Not attack without sword * Make sure it plays correctly * Collect behavior * ruff * don't need to clear checked_locations, but do need to still clear finished_game * Connect calls disconnect, so this is not necessary * more seemless reconnection * Ok now I think it's correct * Bgm * Bgm * minor adjustment * More refactoring of graphics and sound * add graphics * Item column * Fix enemies not regaining their health * oops * oops * oops * 6 health final boss on hard mode * boss_6.png * Display APQuest items correctly * auto switch tabs * some mypy stuff * Intro song * Confetti Cannon * a bit more confetti work * launcher component * Graphics change * graphics and cleanup * fix apworld * comment out horse and cat for now * add docs * copypasta * ruff made my comment look unhinged * Move that comment * Fix typing and don't import kvui in nogui * lmao that already exists I don't need to do it myself * Must've just copied this from somewhere * order change * Add unit tests * Notes about the client * oops * another intro song case * Write WebWorld and setup guides * Yes description provided * thing * how to play * Music and Volume * Add cat and horse player sprites * updates * Add hammer and breakable wall * TODO * replace wav with ogg * Codeowners and readme * finish unit tests * lint * Todid * Update worlds/apquest/client/ap_quest_client.py Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> * Update worlds/apquest/client/custom_views.py Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> * Filler pattern * __future__ annotations * twebhost * Allow wasd and arrow keys * correct wording * oops * just say the website * append instead of += * qwint is onto my favoritism * kitty alias * Add a comment about preplaced items for assertAccessDependency * Use classvar_matrix instead of MultiworldTestBase * actually remove multiworld stuff from those tests * missed one more * Refactor a bit more * Fix getting of the user path * Actually explain components * Meh * Be a bit clearer about what's what * oops * More comments in the regions.py file * Nevermind * clarify regions further * I use too many brackets * Ok I'm done fr * simplify wording * missing . * Add precollected example * add note about precollected advancements * missing s * APQuest sound rework * Volume slider * I forgot I made this * a * fix volume of jingles * Add math trap to game (only works in play_in_console mode so far) * Math trap in apworld and client side * Fix background during math trap * fix leading 0 * Sound and further ui improvements for Math Trap * fix music bug * rename apquest subfolder to game * Move comment to where it belongs * Clear up language around components (hopefully) * Clear up what CommonClient is * Reword some more * Mention Archipelago (the program) explicitly * Update worlds/apquest/docs/en_APQuest.md Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * Explain a bit more why you would use classvar matrix * reword the assert raises stuff * the volume slider thing is no longer true * german game page * Be more clear about why we're overriding Item and Location * default item classification * logically considered -> relevant to logic () * Update worlds/apquest/items.py Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * a word on the ambiguity of the word 'filler' * more rewording * amount -> number * stress the necessity of appending to the multiworld itempool * Update worlds/apquest/locations.py Co-authored-by: Ixrec <ericrhitchcock@gmail.com> * get_location_names_with_ids * slight rewording of the new helper method * add some words about creating known location+item pairs * Add some more words to worlds/apqeust/options.py * more words in options.py * 120 chars (thanks Ixrec >:((( LOL) * Less confusing wording about rules, hopefully? * victory -> completion * remove the immediate creation of the hammer rule on the option region entrance * access rule performance * Make all imports module-level in world.py * formatting * get rid of noqa RUF012 (and also disable the rule in my local ruff.toml * move comment for docstring closer to docstring in another place * advancement???? * Missing function type annotations * pass mypy again (I don't love this one but all the alternatives are equally bad) * subclass instead of override * I forgor to remove these * Get rid of classvar_matrix and instead talk about some other stuff * protect people a bit from the assertAccessDependency nonsense * reword a bit more * word * More accessdependency text * More accessdependency text * More accessdependency text * More accessdependency text * oops * this is supposed to be absolute * Add some links to docs * that's called game now * Add an archipelago.json and explain what it means * new line who dis * reorganize a bit * ignore instead of skip * Update archipelago.json * She new on my line till I * Update archipelago.json * add controls tab * new ruff rule? idk * WHOOPS * Pack graphics into fewer files * annoying ruff format thing * Cleanup + mypy * relative import * Update worlds/apquest/client/custom_views.py Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com> * Update generate_math_problem.py * Update worlds/apquest/game/player.py Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com> --------- Co-authored-by: Duck <31627079+duckboycool@users.noreply.github.com> Co-authored-by: Ixrec <ericrhitchcock@gmail.com> Co-authored-by: Fabian Dill <Berserker66@users.noreply.github.com>
64 lines
1.8 KiB
Python
64 lines
1.8 KiB
Python
import random
|
|
from collections.abc import Callable
|
|
from enum import Enum
|
|
from operator import add, mul, sub, truediv
|
|
from typing import NamedTuple
|
|
|
|
_random = random.Random()
|
|
|
|
class NumberChoiceConstraints(NamedTuple):
|
|
num_1_min: int
|
|
num_1_max: int
|
|
num_2_min: int
|
|
num_2_max: int
|
|
commutative: bool
|
|
operator: Callable[[int, int], int | float]
|
|
|
|
|
|
class MathProblemType(Enum):
|
|
PLUS = 1
|
|
MINUS = 2
|
|
TIMES = 3
|
|
DIVIDE = 4
|
|
|
|
|
|
MATH_PROBLEM_CONSTRAINTS = {
|
|
MathProblemType.PLUS: NumberChoiceConstraints(1, 99, 1, 99, True, add),
|
|
MathProblemType.MINUS: NumberChoiceConstraints(2, 99, 1, 99, False, sub),
|
|
MathProblemType.TIMES: NumberChoiceConstraints(2, 10, 2, 50, True, mul),
|
|
MathProblemType.DIVIDE: NumberChoiceConstraints(4, 99, 2, 50, False, truediv),
|
|
}
|
|
|
|
|
|
class MathProblem(NamedTuple):
|
|
problem_type: MathProblemType
|
|
num_1: int
|
|
num_2: int
|
|
result: int
|
|
|
|
|
|
def generate_math_problem(random_object: random.Random = _random) -> MathProblem:
|
|
problem_type: MathProblemType = random_object.choice(list(MathProblemType))
|
|
number_choice_constraints = MATH_PROBLEM_CONSTRAINTS[problem_type]
|
|
|
|
for _ in range(10000):
|
|
num_1 = random.randint(number_choice_constraints.num_1_min, number_choice_constraints.num_1_max)
|
|
num_2 = random.randint(number_choice_constraints.num_2_min, number_choice_constraints.num_2_max)
|
|
|
|
result = number_choice_constraints.operator(num_1, num_2)
|
|
|
|
result_int = int(result)
|
|
if not result_int == result:
|
|
continue
|
|
|
|
if result_int < 2 or result_int > 99:
|
|
continue
|
|
|
|
if number_choice_constraints.commutative:
|
|
if random.randint(0, 1):
|
|
num_1, num_2 = num_2, num_1
|
|
|
|
return MathProblem(problem_type, num_1, num_2, result_int)
|
|
|
|
return MathProblem(MathProblemType.PLUS, 1, 1, 2)
|