Skip to content

Commit

Permalink
improve name
Browse files Browse the repository at this point in the history
  • Loading branch information
meltingscales committed Apr 23, 2024
1 parent 3c9205b commit 8d1f2df
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions lithicrivers/game.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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]
Expand All @@ -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)
Expand Down Expand Up @@ -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()
})
Expand Down
8 changes: 4 additions & 4 deletions lithicrivers/test/testRender.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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()
})
Expand Down
2 changes: 1 addition & 1 deletion lithicrivers/test/testSerialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion lithicrivers/test/testWorldgen.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion lithicrivers/ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down

0 comments on commit 8d1f2df

Please sign in to comment.