From 8d1f2df95b4f883d5068f63fae0b444f7bb20915 Mon Sep 17 00:00:00 2001 From: Henry Post Date: Tue, 23 Apr 2024 11:44:16 -0500 Subject: [PATCH] improve name --- lithicrivers/game.py | 10 +++++----- lithicrivers/test/testRender.py | 8 ++++---- lithicrivers/test/testSerialize.py | 2 +- lithicrivers/test/testWorldgen.py | 2 +- lithicrivers/ui.py | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lithicrivers/game.py b/lithicrivers/game.py index 3432c5e..228645c 100644 --- a/lithicrivers/game.py +++ b/lithicrivers/game.py @@ -151,7 +151,7 @@ def summary(self) -> str: for k, v in self.count_items().items(): s += '{}={}, '.format(k, v) - return s[0:len(s) - 2] # wow you lazy bastard, you cant even fucking format a string???? AAFSDFASDFADFAFSD + return s[0:len(s) - 2] class Player(Entity, SpriteRenderable): @@ -217,7 +217,7 @@ def generate_tile(choices: List[Tile] = None, weights: List[int] = None, current if choices is None: choices = [Tiles.Tree(), Tiles.Dirt(), - Tiles.DaFuq()] + Tiles.OreCluster()] if weights is None: weights = [5, 100, 1] @@ -232,7 +232,7 @@ def generate_tile(choices: List[Tile] = None, weights: List[int] = None, current # we are underground return weighted_choice( [1, 0.2, 0.05], - [Tiles.Bedrock(), Tiles.Dirt(), Tiles.DaFuq()] + [Tiles.Bedrock(), Tiles.Dirt(), Tiles.OreCluster()] ) return weighted_choice(weights, choices) @@ -263,8 +263,8 @@ def Tree(): drops={1.00: Items.Stick()}) @staticmethod - def DaFuq(): - return Tile("Dafuq is this?", drops={ + def OreCluster(): + return Tile("A cluster of ores", drops={ 0.9: Items.Gold_Nugget(), 0.1: Items.Diamond() }) diff --git a/lithicrivers/test/testRender.py b/lithicrivers/test/testRender.py index 23f5fde..1c5788d 100644 --- a/lithicrivers/test/testRender.py +++ b/lithicrivers/test/testRender.py @@ -21,9 +21,9 @@ def testgenerate_sprite_repeat(self): def testSimpleRender(self): - self.assertEqual(Tiles.DaFuq().render_sprite(), "?") - self.assertEqual(Tiles.DaFuq().render_sprite(1), "?") - self.assertEqual(Tiles.DaFuq().render_sprite(2), "??\n??") + self.assertEqual(Tiles.OreCluster().render_sprite(), "?") + self.assertEqual(Tiles.OreCluster().render_sprite(1), "?") + self.assertEqual(Tiles.OreCluster().render_sprite(2), "??\n??") def testSortaSimpleRender(self): @@ -71,7 +71,7 @@ def testRenderGame(self): someGame = Game() someGame.world = WorldData(tile_data={ '0,0,0': Tiles.Dirt(), - '1,0,0': Tiles.DaFuq(), + '1,0,0': Tiles.OreCluster(), '0,1,0': Tiles.Dirt(), '1,1,0': Tiles.Dirt() }) diff --git a/lithicrivers/test/testSerialize.py b/lithicrivers/test/testSerialize.py index 3beaf81..b319989 100644 --- a/lithicrivers/test/testSerialize.py +++ b/lithicrivers/test/testSerialize.py @@ -21,7 +21,7 @@ def tearDown(self) -> None: def testSimpleSer(self): for i in range(-5, 5): somePos = VectorN(i, i, i) - someTile = weighted_choice([1, 1, 1], [Tiles.Tree(), Tiles.DaFuq(), Tiles.Bedrock()]) + someTile = weighted_choice([1, 1, 1], [Tiles.Tree(), Tiles.OreCluster(), Tiles.Bedrock()]) someTile.description = "Wow serialize test!!" wd = World.gen_random_world_data(radius=VectorN(5, 5, 5)) diff --git a/lithicrivers/test/testWorldgen.py b/lithicrivers/test/testWorldgen.py index f2067ec..486157a 100644 --- a/lithicrivers/test/testWorldgen.py +++ b/lithicrivers/test/testWorldgen.py @@ -20,7 +20,7 @@ def testworldGenConsistent(self): self.assertEqual(worldData.get_tile(VectorN(0, 0, 1)), Tiles.Cloud()) self.assertIn( worldData.get_tile(VectorN(0, 0, -1)), - [Tiles.Bedrock(), Tiles.Dirt(), Tiles.DaFuq()] + [Tiles.Bedrock(), Tiles.Dirt(), Tiles.OreCluster()] ) def testWorldGenRandomSpread(self): diff --git a/lithicrivers/ui.py b/lithicrivers/ui.py index 757c90e..d206b6f 100644 --- a/lithicrivers/ui.py +++ b/lithicrivers/ui.py @@ -334,7 +334,7 @@ def handle_mining(event: KeyboardEvent, game: Game, root_page: RootPage): elif tile_under == Tiles.Tree(): root_page.labelMessage.text = 'Yell at me to let you mine trees. I\'m lazy.' return # can't mine dirt - elif tile_under == Tiles.DaFuq(): + elif tile_under == Tiles.OreCluster(): game.player.inventory.add_item(tile_under.calc_drop()) game.set_tile_at_player_feet(Tiles.Dirt())