Merge pull request #46 from Stephenson-Software/rocks

Rocks

Author: dmccoystephenson

src/config.py

@@ -16,7 +16,7 @@ def __init__(self):
         self.ticksPerSecond = 30
         self.tickSpeed = 1/self.ticksPerSecond
         self.limitTickSpeed = True
-        self.gridSize = random.randrange(16, 19)
+        self.gridSize = 16
         self.playerMovementEnergyCost = 0.2
         self.playerInteractionEnergyCost= 0.05
         self.worldBorder = 16

src/map.py

@@ -2,6 +2,7 @@
 import random
 from apple import Apple
 from graphik import Graphik
+from rock import Rock
 from wood import Wood
 from entity import Entity
 from grass import Grass
@@ -41,6 +42,9 @@ def generateNewRoom(self, x, y):
 
         # generate grass
         self.spawnGrass(newRoom)
+        
+        # generate rocks
+        self.spawnRocks(newRoom)
 
         # generate food
         maxTrees = ceil(self.gridSize/2)
@@ -54,6 +58,11 @@ def spawnGrass(self, room: Room):
         for location in room.getGrid().getLocations():
             if random.randrange(1, 101) > 5: # 95% chance
                 room.addEntityToLocation(Grass(), location)
+    
+    def spawnRocks(self, room: Room):
+        for location in room.getGrid().getLocations():
+            if random.randrange(1, 101) == 1: # 1% chance
+                room.addEntityToLocation(Rock(), location)
 
     def spawnTree(self, room: Room):
         wood = Wood()

src/rock.py

@@ -0,0 +1,13 @@
+import random
+from entity import Entity
+
+
+# @author Daniel McCoy Stephenson
+# @since August 18th, 2022
+class Rock(Entity):
+    def __init__(self):
+        Entity.__init__(self, "Rock")
+        self.color = (random.randrange(100, 110), random.randrange(100, 110), random.randrange(100, 110))
+    
+    def getColor(self):
+        return self.color

src/wood.py

@@ -1,3 +1,4 @@
+import random
 from entity import Entity
 
 
@@ -6,7 +7,7 @@
 class Wood(Entity):
     def __init__(self):
         Entity.__init__(self, "Wood")
-        self.color = (139, 69, 19)
+        self.color = (random.randrange(135, 145), random.randrange(65, 75), random.randrange(15, 25))
 
     def getColor(self):
         return self.color

src/worldScreen.py

@@ -9,6 +9,7 @@
 from graphik import Graphik
 from grass import Grass
 from grid import Grid
+from rock import Rock
 from selectedItemPreview import SelectedItemPreview
 from leaves import Leaves
 from location import Location
@@ -136,8 +137,7 @@ def movePlayer(self, direction: int):
             self.changeRooms()
             return
 
-        if self.map.locationContainsEntity(newLocation, Wood):
-            # apple trees are solid
+        if self.locationContainsSolidEntity(newLocation):
             return
 
         if self.player.getEnergy() < self.player.getMaxEnergy() * 0.95:
@@ -162,7 +162,7 @@ def movePlayer(self, direction: int):
         self.player.setTickLastMoved(self.tick)
 
     def canBePickedUp(self, entity):
-        itemTypes = [Wood, Leaves, Grass, Apple]
+        itemTypes = [Wood, Leaves, Grass, Apple, Rock]
         for itemType in itemTypes:
             if isinstance(entity, itemType):
                 return True
@@ -203,6 +203,9 @@ def getLocationInFrontOfPlayer(self):
         playerLocation = self.getLocationOfPlayer()
         return self.getLocationDirection(direction, self.currentRoom.grid, playerLocation)
 
+    def locationContainsSolidEntity(self, location):
+        return self.map.locationContainsEntity(location, Wood) or self.map.locationContainsEntity(location, Rock)
+    
     def executePlaceAction(self):
         if len(self.player.getInventory().getContents()) == 0:
             self.status.set("no items", self.tick)
@@ -215,8 +218,8 @@ def executePlaceAction(self):
         if targetLocation == -2:
             self.status.set("can't place while moving", self.tick)
             return
-        if self.map.locationContainsEntity(targetLocation, Wood):
-            self.status.set("blocked by wood", self.tick)
+        if self.locationContainsSolidEntity(targetLocation):
+            self.status.set("location blocked", self.tick)
             return
 
         toPlace = self.player.getInventory().getContents().pop()