Merge pull request #2447 from hawkthorne/master

MajorVersion 1.0.0

scripts/version.py

@@ -24,9 +24,14 @@ def next_minor_version():
     x, y, z = current_version_tuple()
     return "{0}.{1}.0".format(x,int(y)+1) 
 
+def next_major_version():
+    x, y, z = current_version_tuple()
+    return "{0}.0.0".format(x+1)
 
 def next_version():
-    if is_release():
+    if is_major():
+        return next_major_version()
+    elif is_release():
         return next_minor_version()
     else:
         return next_bugfix_version()
@@ -59,6 +64,20 @@ def is_release():
 
     return 'release' in pulls[0].get('title', '').lower()
 
+def is_major():
+    pulls_url = "https://api.github.com/repos/hawkthorne/hawkthorne-journey/pulls"
+    resp = requests.get(pulls_url, params={'state': 'closed', 'base': 'release'})
+
+    if not resp.ok:
+        return False
+
+    pulls = resp.json()
+
+    if len(pulls) == 0:
+        return False
+
+    return 'majorversion' in pulls[0].get('title', '').lower()
+
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument('action', choices=['next', 'current', 'previous'])

src/brewing.lua

@@ -7,35 +7,62 @@ local Item = require 'items/item'
 local camera = require 'camera'
 local Prompt = require 'prompt'
 local HUD = require 'hud'
-local Timer = require 'vendor/timer'
 local potion_recipes = require 'items/potion_recipes'
 --instantiate this gamestate
 local state = Gamestate.new()
 
 local selectionSprite = love.graphics.newImage('images/inventory/selection.png')
 
-local ITEMS_ROW_AMT = 4
+local function nonzeroMod(a,b)
+  local m = a % b
+  if m ~= 0 then
+    return m
+  else
+    return b
+  end
+end
+
 bundle = {}
 
 --called once when the gamestate is initialized
 function state:init()
-  self.background = love.graphics.newImage('images/potions/potion_menu.png')
 end
 
 --called when the player enters this gamestate
 --enter may take additional arguments from previous as necessary
 --@param previous the actual gamestate that the player came from (not just its name)
-function state:enter(previous, player, screenshot, supplierName)
+function state:enter(previous, player, screenshot, cauldronName)
   fonts.set( 'arial' )
   sound.playMusic( "potionlab" )
   self.previous = previous
   self.screenshot = screenshot
+  self.cauldronName = cauldronName
   self.player = player
   self.offset = 0
+
+  self.background = love.graphics.newImage('images/potions/potion_menu.png')
+  self.backgroundPlain = love.graphics.newImage('images/potions/potion_plain.png')
+  self.text = "Recipes can be found throughout the game. It's a good idea to collect them. "..
+              "If you don't follow the recipes, you'll make a Dud Potion, which has unpredictable side effects when consumed."
 
   self.hud = HUD.new(previous)
 
   local playerMaterials = self.player.inventory.pages.materials
+
+  self.playerRecipes = {}
+  local count = 1
+  for _,currentRecipe in pairs(potion_recipes) do
+     if self.player.inventory:hasDetail(currentRecipe.name) then
+       self.playerRecipes[count] = {}
+       self.playerRecipes[count].name = currentRecipe.name
+       self.playerRecipes[count].description = currentRecipe.description
+       self.playerRecipes[count].info = currentRecipe.info
+       count = count + 1
+     end
+  end
+
+  self.total = count - 1
+  self.count = 1
 
   -- This block creates a table of the players inventory with limits on items and also holds how many ingredients are added
   self.values = {}
@@ -100,16 +127,19 @@ function state:keypressed( button )
     sound.playSfx('click')
   elseif button == "JUMP" then
     self:check()
+  elseif button == "INTERACT" then
+    self.count = nonzeroMod(self.count + 1, self.total)
+  elseif button == "ATTACK" then
+    self.count = nonzeroMod(self.count - 1, self.total)
   end
-
   self.ingredients[self.values[self.overall].name] = self.current
 end
 
 function state:brew( potion )
   local SpriteClass = require('nodes/sprite')
   local ItemClass = require('items/item')
 
-  sound.playSfx('potion_brew')
+  sound.playSfx( self.cauldronName == 'cauldron' and 'potion_brew' or self.cauldronName)
 
   for mat,amount in pairs(self.ingredients) do
     self.player.inventory:removeManyItems(amount, {name=mat, type="material"})
@@ -122,7 +152,7 @@ function state:brew( potion )
   self.player.freeze = true
   self.player.invulnerable = true
   self.player.character.state = "acquire"
-  local message = {'You brewed a '..item.description..'!'}
+  local message = 'You made a {{red}}'..item.description..'{{white}}!'
   local callback = function(result)
      self.prompt = nil
      self.player.freeze = false
@@ -153,9 +183,9 @@ function state:check()
   if notBlankBrew then
     local brewed = false
     Gamestate.switch(self.previous)
-    for _,currentRecipe in pairs(potion_recipes) do                             -- The logic behind my checking is to count the amount correct ingredients the player has         
+    for _,currentRecipe in pairs(potion_recipes) do                           -- The logic behind my checking is to count the amount correct ingredients the player has         
       local correctAmount = 0                                                 -- and compare that to the amount of ingredients in the recipe. If they are the same the
-      local recipeLenth = 0                                                   -- player has added in all the correct ingerdients and a potion can be brewed.
+      local recipeLenth = 0                                                   -- player has added in all the correct ingredients and a potion can be brewed.
       local recipe = currentRecipe.recipe
       for mat,amount in pairs(currentRecipe.recipe) do
         recipeLenth = recipeLenth + 1
@@ -227,6 +257,34 @@ function state:draw()
       love.graphics.printf(self.values[i+self.offset].description, firstcell_right + 25, firstcell_top + 3.5 + ((i-1) * 22), width, 'left')
     end
   end
+
+  -- draw introduction to potions & recipes
+  local x1 = menu_right - self.backgroundPlain:getWidth() - 25
+  love.graphics.draw (self.backgroundPlain, x1, menu_top)
+  love.graphics.printf(self.text, x1 + 16, menu_top + 10, 132, "center")
+
+  local x2 = menu_right + self.background:getWidth() + 25
+  love.graphics.draw (self.backgroundPlain, x2, menu_top)
+
+    -- lists recipes players have in their inventory
+  if self.total == 0 then
+    love.graphics.printf("You don't have any recipes yet.", x2 + 16, menu_top + 50, 132, "center")
+  else
+    --love.graphics.print(self.playerRecipes[self.count], x2 + 16, menu_top + 10)
+    --love.graphics.print(self.count, x2 + 16, menu_top + 50)
+    for _,currentRecipe in pairs(potion_recipes) do
+      local recipe = self.playerRecipes[self.count]
+      if currentRecipe.name == recipe.name then
+        tastyDetails = fonts.tasty.new("{{teal}}" .. recipe.description .. "{{white}} \n\n" .. recipe.info, x2 + 16, menu_top + 10, 132, love.graphics.getFont(), fonts.colors)
+        tastyDetails:draw()
+        --instructions to scroll through recipes
+        if self.total > 1 then
+          recipeInstructions = fonts.tasty.new("Press {{red}}" .. self.player.controls:getKey('INTERACT') .. "{{white}} or {{red}}" .. self.player.controls:getKey('ATTACK') .. "{{white}} to view other recipes.", x2 + 16, menu_top + 100, 132, love.graphics.getFont(), fonts.colors)
+          recipeInstructions:draw()
+        end
+      end
+    end
+   end
 end
 
 --called every update cycle

src/character_map.json

@@ -167,6 +167,18 @@
   "shootarrowjump": {
     "left": [ "loop", [ "9-12,11" ], 0.12 ], 
     "right": [ "loop", [ "9-12,12" ], 0.12 ]
+  },  
+  "laserpistol": {
+    "left": [ "loop", [ "9,9" ], 0.12 ], 
+    "right": [ "loop", [ "9,10" ], 0.12 ]
+  },
+  "laserpistolwalk": {
+    "left": [ "loop", [ "10-11,9" ], 0.12 ], 
+    "right": [ "loop", [ "10-11,10" ], 0.12 ]
+  },
+  "laserpistoljump": {
+    "left": [ "loop", [ "12,9" ], 0.12 ], 
+    "right": [ "loop", [ "12,10" ], 0.12 ]
   },
   "slide": {
     "left": [ "once", [ "8,3" ], 1 ], 

src/cheat.lua

@@ -6,6 +6,7 @@ local app = require 'app'
 local Cheat = {}
 
 local cheatList ={}
+local cheatEnabled = true
 
 --if turnOn is true the cheat is enabled
 -- if turnOn is false the cheat is disabled
@@ -24,9 +25,14 @@ local function setCheat(cheatName, turnOn)
       'tacomeat','baggle','brekwich','chickenfinger','deepfrieddud',
       'ironcrepe','keynana','alcohol','watermelon'}},
     give_weapons = {weapons = {
-      'sword','battleaxe','boneclub','switch','longsword',
-      'mace','mallet','crimson_sword','torch','bow','icicle',
+      'sword','battleaxe','boneclub','bow','longsword',
+      'mace','mallet','crimson_sword','torch','laser_pistol','lasercell',
       'throwingaxe','throwingknife','arrow'}},
+    give_armor = {armor = {
+      'ajaxshield', 'berserkerbarbute', 'femininefaulds',
+      'greenguard', 'hagshat', 'ivoryheadpiece', 'lightarmor',
+      'necromancercloak', 'platemail', 'pruneplackart',
+      'spiderburgonet', 'tinytarge', 'windwalkercloak'}},
     give_scrolls = {misc = {'lightning', 'ghost_pepper'}},
     give_materials = {materials = {
       'blade','bone','boulder','crystal','ember','fire',
@@ -39,6 +45,9 @@ local function setCheat(cheatName, turnOn)
       'yellow_potion'}},
     give_fryables = {materials = {
       'bubblgum','carkeys','fries','pancake','toast'}},
+    give_recipes = {details = {
+      'blue_potion','green_potion','orange_potion','pink_potion',
+      'purple_potion','red_potion','white_potion', 'yellow_potion'}},
   }
   local activations = {
     give_money = function() player.money = player.money + 10000 end,
@@ -93,13 +102,25 @@ function Cheat:is(cheatName)
 end
 
 function Cheat:on(cheatName)
-  setCheat(cheatName,true)
+  if cheatEnabled then
+    setCheat(cheatName,true)
+  end
 end
 
 function Cheat:off(cheatName)
   setCheat(cheatName,false)
 end
 
+function Cheat:fairfight()
+  cheatEnabled = false
+  local cheats = false
+  for cheat,_ in pairs(cheatList) do
+    if self:is(cheat) then cheats = true end
+    self:off(cheat)
+  end
+  return cheats
+end
+
 function Cheat:toggle(cheatName)
   setCheat(cheatName,not cheatList[cheatName])
 end

src/cheatscreen.lua

@@ -150,6 +150,7 @@ function cheatscreen:keypressed( button )
         ['i want tbd'] = {'give_scrolls', 'Scrolls granted'},
         ['no no juice'] = {'give_potions', 'Potions granted'},
         ['dan harmon'] = {'give_master_key', 'Key granted'},
+        ['recipes'] = {'give_recipes', 'Recipes granted'},
       }
       if codes.quits[self.cmd.current] then
         cheatscreen:exit()

src/credits.lua

@@ -259,6 +259,7 @@ state.credits = {
   'mminson',
   'mtwstudios',
   'muugin',
+  'muplah',
   'myers78',
   'mystro256',
   'm_a_d',

src/dialog.lua

@@ -8,23 +8,28 @@ Dialog.__index = Dialog
 
 Dialog.currentDialog = nil
 
-function Dialog.new(message, callback, drawable)
-  local d = Dialog.create(message)
+function Dialog.new(message, callback, drawable, size)
+  local d = Dialog.create(message, size)
   d:reposition()
   d:open(callback)
   d.drawable = drawable
   Dialog.currentDialog = d
   return d
 end
 
-function Dialog.create(message)
+function Dialog.create(message, size)
   local say = {}
   setmetatable(say, Dialog)
-  say.board = Board.new(312, 60)
+  if size == 'small' then
+    say.board = Board.new(156, 80)
+  else
+    say.board = Board.new(312, 60)
+  end
   say.line = 1
   say.cursor = 0
   say.y = camera.y + camera:getHeight() - 60
   say.x = camera.x + camera:getWidth() / 2
+
 
   if type(message) == 'string' then
     say.messages = {message}