Merge pull request #2536 from hawkthorne/master

Bugfix 1.0.4
hawkthorne · Nov 3, 2015 · 01e35e5 · 01e35e5
2 parents 12ae861 + 18453d9
commit 01e35e5
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 65 deletions.
diff --git a/Makefile b/Makefile
@@ -62,7 +62,7 @@ CI_TARGET=test validate maps productionize binaries
 ifeq ($(TRAVIS), true)
 ifeq ($(TRAVIS_PULL_REQUEST), false)
 ifeq ($(TRAVIS_BRANCH), release)
-CI_TARGET=clean test validate maps productionize upload social
+CI_TARGET=clean test validate maps productionize social
 endif
 endif
 endif

diff --git a/src/maps/gazette-office.tmx b/src/maps/gazette-office.tmx
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" width="36" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="36" height="14" tilewidth="24" tileheight="24" nextobjectid="27">
  <properties>
   <property name="blue" value="128"/>
   <property name="green" value="115"/>
   <property name="jumping" value="false"/>
   <property name="red" value="102"/>
   <property name="soundtrack" value="mash-theme"/>
  </properties>
- <tileset firstgid="1" name="gazette-office" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="gazette-office" tilewidth="24" tileheight="24" tilecount="121">
   <image source="../images/tilesets/gazette-office.png" width="264" height="264"/>
  </tileset>
  <layer name="Tile Layer 1" width="36" height="14">
@@ -25,119 +25,119 @@
    eJxjYBgFwwHIEKmOnQZm4gJaDAwNWlCaQqPAgJFMfa5A+42AtCkQg2hjEvSC1JsAcRDUHDKdAAbcUNoK6gYTiJsOGKHZhwxMkNiuUL40kruwgVgi3OIMxGJIfEcgdoJiRyz+xBZmVkSowWIvhtkg4AfEekAsCeX7ALEvgo1VDzUA0N4GbG7iA2JLWlmKBwD93+CHxT2SWNQOFKCXW/KR6HwcagZTuAxGAADWcBJw
   </data>
  </layer>
- <objectgroup name="floorspace" width="36" height="14">
-  <object x="250" y="209" width="12" height="6">
+ <objectgroup name="floorspace">
+  <object id="1" x="250" y="209" width="12" height="6">
    <properties>
     <property name="height" value="17"/>
    </properties>
   </object>
-  <object x="362" y="198">
+  <object id="2" x="362" y="198">
    <properties>
     <property name="height" value="25"/>
    </properties>
    <polygon points="0,0 25,25 54,25 26,0"/>
   </object>
-  <object x="266" y="198">
+  <object id="3" x="266" y="198">
    <properties>
     <property name="height" value="25"/>
    </properties>
    <polygon points="0,0 25,25 54,25 26,0"/>
   </object>
-  <object x="393" y="222">
+  <object id="4" x="393" y="222">
    <properties>
     <property name="height" value="15"/>
    </properties>
    <polygon points="0,0 11,0 16,5 5,5"/>
   </object>
-  <object x="753" y="270">
+  <object id="5" x="753" y="270">
    <properties>
     <property name="height" value="15"/>
    </properties>
    <polygon points="0,0 11,0 16,5 5,5"/>
   </object>
-  <object x="722" y="246">
+  <object id="6" x="722" y="246">
    <properties>
     <property name="height" value="25"/>
    </properties>
    <polygon points="0,0 25,25 54,25 26,0"/>
   </object>
-  <object x="533" y="282" width="12" height="6">
+  <object id="7" x="533" y="282" width="12" height="6">
    <properties>
     <property name="height" value="17"/>
    </properties>
   </object>
-  <object x="509" y="258" width="12" height="6">
+  <object id="8" x="509" y="258" width="12" height="6">
    <properties>
     <property name="height" value="17"/>
    </properties>
   </object>
-  <object name="primary" x="0" y="312">
-   <properties>
-    <property name="primary" value="true"/>
-   </properties>
-   <polygon points="0,0 120,-120 744,-120 864,0"/>
-  </object>
-  <object x="556" y="273">
+  <object id="10" x="556" y="273">
    <properties>
     <property name="height" value="19"/>
    </properties>
    <polygon points="2,1 16,15 74,15 59,1"/>
   </object>
-  <object x="435" y="273">
+  <object id="11" x="435" y="273">
    <properties>
     <property name="height" value="19"/>
    </properties>
    <polygon points="2,1 16,15 74,15 59,1"/>
   </object>
-  <object x="251" y="192" width="2" height="6">
+  <object id="12" x="251" y="192" width="2" height="6">
    <properties>
     <property name="height" value="62"/>
    </properties>
   </object>
-  <object x="492" y="192" width="48" height="6">
+  <object id="13" x="492" y="192" width="48" height="6">
    <properties>
     <property name="height" value="24"/>
    </properties>
   </object>
-  <object x="587" y="192" width="2" height="6">
+  <object id="14" x="587" y="191" width="2" height="6">
    <properties>
     <property name="height" value="62"/>
    </properties>
   </object>
-  <object x="714" y="192" width="12" height="6">
+  <object id="15" x="714" y="192" width="12" height="6">
    <properties>
     <property name="height" value="24"/>
    </properties>
   </object>
+  <object id="9" name="primary" x="0" y="312">
+   <properties>
+    <property name="primary" value="true"/>
+   </properties>
+   <polygon points="0,0 120,-120 744,-120 864,0"/>
+  </object>
  </objectgroup>
- <objectgroup name="nodes" width="36" height="14">
-  <object type="info" x="149" y="113" width="86" height="73">
+ <objectgroup name="nodes">
+  <object id="16" type="info" x="149" y="113" width="86" height="73">
    <properties>
     <property name="info" value="Story assignments: Toni Braxton-gate, best pizza and underage drinking."/>
    </properties>
   </object>
-  <object name="main" type="door" x="80" y="188" width="16" height="50">
+  <object id="17" name="main" type="door" x="80" y="188" width="16" height="50">
    <properties>
     <property name="button" value="LEFT"/>
     <property name="level" value="greendale-exterior"/>
     <property name="to" value="admin3"/>
    </properties>
   </object>
-  <object name="gazette2" type="door" x="648" y="144" width="24" height="50">
+  <object id="18" name="gazette2" type="door" x="648" y="144" width="24" height="50">
    <properties>
     <property name="level" value="gazette-office-2"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="sprite" x="245" y="191" width="24" height="24">
+  <object id="19" type="sprite" x="245" y="191" width="24" height="24">
    <properties>
     <property name="depth" value="5"/>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/greendale/gazettestool.png"/>
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="264" y="168" width="58" height="55">
+  <object id="20" type="sprite" x="264" y="168" width="58" height="55">
    <properties>
     <property name="depth" value="24"/>
     <property name="direction" value="right"/>
@@ -146,7 +146,7 @@
     <property name="width" value="58"/>
    </properties>
   </object>
-  <object type="sprite" x="360" y="168" width="58" height="55">
+  <object id="21" type="sprite" x="360" y="168" width="58" height="55">
    <properties>
     <property name="depth" value="25"/>
     <property name="direction" value="right"/>
@@ -155,7 +155,7 @@
     <property name="width" value="58"/>
    </properties>
   </object>
-  <object type="sprite" x="720" y="216" width="58" height="55">
+  <object id="22" type="sprite" x="720" y="216" width="58" height="55">
    <properties>
     <property name="depth" value="25"/>
     <property name="direction" value="right"/>
@@ -164,23 +164,23 @@
     <property name="width" value="58"/>
    </properties>
   </object>
-  <object type="sprite" x="504" y="240" width="24" height="24">
+  <object id="23" type="sprite" x="504" y="240" width="24" height="24">
    <properties>
     <property name="depth" value="5"/>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/greendale/gazettestool.png"/>
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="528" y="264" width="24" height="24">
+  <object id="24" type="sprite" x="528" y="264" width="24" height="24">
    <properties>
     <property name="depth" value="5"/>
     <property name="height" value="24"/>
     <property name="sheet" value="images/sprites/greendale/gazettestool.png"/>
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="sprite" x="552" y="240" width="96" height="48">
+  <object id="25" type="sprite" x="552" y="240" width="96" height="48">
    <properties>
     <property name="depth" value="14"/>
     <property name="direction" value="right"/>
@@ -189,7 +189,7 @@
     <property name="width" value="96"/>
    </properties>
   </object>
-  <object type="sprite" x="432" y="240" width="96" height="48">
+  <object id="26" type="sprite" x="432" y="240" width="96" height="48">
    <properties>
     <property name="depth" value="14"/>
     <property name="direction" value="right"/>
@@ -199,4 +199,5 @@
    </properties>
   </object>
  </objectgroup>
+ <objectgroup name="Object Layer 3"/>
 </map>
diff --git a/src/nodes/door.lua b/src/nodes/door.lua
@@ -76,7 +76,7 @@ function Door.new(node, collider, level)
     door.obstruct = node.properties.obstruct or false
     door.show_sfx = node.properties.show_sfx or 'reveal'
     --used if the closed door should obstruct the player's movement
-    if door.obstruct then
+    if door.obstruct and not door.open then
       -- used for collision detection
       door.bb = collider:addRectangle(node.x-5, node.y, node.width+10, node.height)
       door.bb.node = door

diff --git a/src/nodes/enemies/benzalkBoss.lua b/src/nodes/enemies/benzalkBoss.lua
@@ -76,7 +76,7 @@ return {
 
   enter = function( enemy )
     if enemy.db:get("bosstriggers.benzalk", false) then
-      enemy:die()
+      enemy:die(true)
     end
     enemy.direction = 'left'
     enemy.state = 'default'
@@ -327,4 +327,5 @@ return {
       end
     end
   end
-}
+}
+
diff --git a/src/nodes/enemies/qfo.lua b/src/nodes/enemies/qfo.lua
@@ -251,7 +251,7 @@ return {
 
     local direction = player.position.x > enemy.position.x + 40 and -1 or 1
     local offset = math.random(0,200)
-    if enemy.hp < enemy.props.hp then
+    if enemy.hp < enemy.props.hp and Player.quest ~= 'Aliens! - Destroy the QFO!' then
       enemy.hp = enemy.hp + 1
     end
 

diff --git a/src/npcs/blacksmith_wife.lua b/src/npcs/blacksmith_wife.lua
@@ -84,10 +84,10 @@ return {
   talk_responses = {
 
     ["Anything happening here?"]={
-      "I've been trying to convince my husband to build us a new home.  I keep telling him it's a terrible idea to have his workshop inside a wooden house!",
+      "I've been trying to convince my husband to build us a new home. I keep telling him it's a terrible idea to have his workshop inside a wooden house!",
     },
     ["Any useful info for me?"]={
-      "My husband is the best blacksmith around.  He can help you stock up on supplies before venturing into the woods.",
+      "My husband is the best blacksmith around. He can help you stock up on supplies before venturing into the woods.",
     },
   },
 

diff --git a/src/npcs/hilda.lua b/src/npcs/hilda.lua
@@ -220,7 +220,7 @@ return {
       npc.walking = false
       npc.stare = false
       if affection < 1000 and player.married == false then
-        Dialog.new("I cannot marry someone whom I do not truly love and trust.  My current affection for you is " .. affection .. ".", function()
+        Dialog.new("I cannot marry someone whom I do not truly love and trust. My current affection for you is " .. affection .. ".", function()
           npc.walking = true
           npc.menu:close(player)
         end)
@@ -232,7 +232,7 @@ return {
           npc.menu:close(player)
         end)
       elseif player.married == 'hilda' then
-        Dialog.new("I live in the village.  I love {{orange}}" .. player.character.name .. "{{white}}." , function()
+        Dialog.new("I live in the village. I love {{orange}}" .. player.character.name .. "{{white}}." , function()
           npc.walking = true
           Dialog.currentDialog = nil
           npc.menu:close(player)
@@ -263,7 +263,7 @@ return {
     },
     ['throne of hawkthorne']={
       "The throne is in {{grey}}Castle Hawkthorne{{white}}, {{red_dark}}north{{white}} of here.",
-    "You unlock the castle with the {{peach}}white crystal{{white}} of discipline, which you must free from the {{purple}}black caverns{{white}}.",
+      "You unlock the castle with the {{peach}}white crystal{{white}} of discipline, which you must free from the {{purple}}black caverns{{white}}.",
     },
     ['frog extinction']={
       "You know what? My prank is going to cause a sea of laughter,",
@@ -413,7 +413,7 @@ return {
     },
     ['raccoon clothes']={
       "A raccoon once bit my sister.",
-      "No realli! She was carving her initials on the raccoon...",
+      "No really! She was carving her initials on the raccoon...",
       "with the sharpened end of an intergalactic toothbrush.",
       "Go watch Monty Python if you think realli is wrong.",
     },
@@ -444,7 +444,7 @@ return {
     ['time bombs']={
       "We have three realistic alternatives",
       "#1, Sit here and get blown up,",
-      "#2. Stand here and get blown up,",
+      "#2, Stand here and get blown up,",
       "#3, Jump up and down, shout at me for not being able to think of anything, then get blown up.",
     },
     ['rock punch']={
@@ -743,7 +743,7 @@ return {
         end)
       elseif player.married and not player.married == 'hilda' then
         sound.playSfx( "dbl_beep" )
-        Dialog.new("How dare you!  You're already married!", function()
+        Dialog.new("How dare you! You're already married!", function()
           npc.walking = true
           Dialog.currentDialog = nil
           npc.menu:close(player)

diff --git a/src/npcs/jerry.lua b/src/npcs/jerry.lua
@@ -6,7 +6,7 @@ local quests = require 'npcs/quests/frankiequest'
 return {
   width = 32,
   height = 48,
-  greeting = 'Hey-oh!  I am the janitor around {{olive}}Greendale{{white}}, you can call me {{red_light}}Jerry{{white}}.',
+  greeting = 'Hey-oh! I am the janitor around {{olive}}Greendale{{white}}, you can call me {{red_light}}Jerry{{white}}.',
   animations = {
     default = {
       'loop',{'1,1','11,1'},.5,

diff --git a/src/npcs/laserlotus1.lua b/src/npcs/laserlotus1.lua
@@ -28,7 +28,7 @@ return {
   },
   talk_responses = {
     ["inventory"]={
-      "These are my wares.  Every laser lotus above level five must carry a licensed sacred Buddha incense holder!",
+      "These are my wares. Every laser lotus above level five must carry a licensed sacred Buddha incense holder!",
       "Press {{yellow}}".. string.upper(controls:getKey('INTERACT')) .."{{white}} to view item information.",
     },
     ["Who are you?"]={
@@ -50,4 +50,4 @@ return {
     local screenshot = love.graphics.newImage( love.graphics.newScreenshot() )
     Gamestate.stack("shopping", player, screenshot, "laserlotus")
   end,
-}
+}
diff --git a/src/npcs/profholly.lua b/src/npcs/profholly.lua
@@ -3,7 +3,7 @@
 return {
   width = 32,
   height = 48,   
-  greeting = 'Hello, my precious blueberry!  You can call me {{red_light}}Professor Holly{{white}}.', 
+  greeting = 'Hello, my precious blueberry! You can call me {{red_light}}Professor Holly{{white}}.', 
   animations = {
     default = {
       'loop',{'1,1','11,1'},.5,
@@ -32,7 +32,7 @@ return {
   talk_responses = {
     ["Hello, professor."]={
       "Hello, my precious blueberry!",
-    "I hope you've been having a fantastic adventure.",
+      "I hope you've been having a fantastic adventure.",
     },
     ["A long lonely tiiiiime"]={
       "(Professor Holly grinds his teeth.)",
@@ -51,4 +51,4 @@ return {
       "(Professor Holly's right eye twitches slightly.)",
     },
   },
-}
+}
diff --git a/src/npcs/quests/hildaquest.lua b/src/npcs/quests/hildaquest.lua
@@ -14,7 +14,7 @@ local quests = {
       },
     successPrompt = "Do you want to collect flowers for {{red_light}}Hilda{{white}}?",
     completeQuestFail = "Have you found any flowers? Try looking beyond the town.",
-    completeQuestSucceed = "My goodness, these flowers are beautiful!  Thank you so very much!",
+    completeQuestSucceed = "My goodness, these flowers are beautiful! Thank you so very much!",
     reward = {affection = 300},
   },
 }