github link, less error prone

soster · Mar 25, 2018 · bd8a437 · bd8a437
1 parent 67d9f56
commit bd8a437
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/app/index.html b/app/index.html
@@ -17,17 +17,13 @@
   <!--[if IE]>
       <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
     <![endif]-->
-
+    
   <div class="container advntx">
     <div class="header">
-      <ul class="nav nav-pills float-right">
-        <li>
-          <a class="nav-link" href="https://thoster.net/" target="_blank">thoster.net</a>
-        </li>
-      </ul>
+      <div class="float-right d-none d-lg-block"><a href="https://github.com/soster/adventex"><img src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub"></a></div>
       <h3 class="text-muted">adventex</h3>
     </div>
-    <div class="row">
+    <div class="row clearfix">
       <div class="col-md-9 wrapper">
         <p id="terminal">
         </p>
@@ -82,7 +78,7 @@ <h3>Inventory</h3>
           </div>
           <div class="btn-gropu" role="group">
             <p>
-                <button type="button" class="btn btn-secondary btn-sm" id="btn_save_file">Download savegame</button>
+                <button type="button" class="btn btn-secondary btn-sm" id="btn_save_file">Download savegame</button>&nbsp;
                 <span class="btn btn-secondary btn-sm">
                     <input type="file" id="selectFiles" value="Import" />
                 </span>&nbsp;
@@ -95,12 +91,13 @@ <h3>Inventory</h3>
     <div class="footer smalltext alert-warning">
       <div class="row">
         <div class="col-md-6">
-          <p>2017 Stefan Ostermann</p>
+          <p>2018 <a href="https://osteronline.de/" target="_blank" alt="Stefan Ostermann">Stefan Ostermann</a></p>
+          <p><a href="https://thoster.net/" target="_blank">thoster.net</a></p>
         </div>
         <div class="col-md-6">
           <div>
             <span aria-hidden="true"></span>
-            </button>Frameworks:
+            Frameworks:
             <a href="http://terminal.jcubic.pl/" target="_blank">JQuery Terminal</a>&nbsp;
             <a href="https://getbootstrap.com/" target="_blank">Bootstrap</div>
         </div>

diff --git a/app/scripts/eventhandler.js b/app/scripts/eventhandler.js
@@ -2,7 +2,8 @@
 
 import {
   checkSynonyms,
-  setStateOfObject
+  setStateOfObject,
+  listFormattedObjects
 } from 'app/scripts/helper.js'
 
 import InventoryHandler from 'app/scripts/inventoryhandler.js';
@@ -271,6 +272,8 @@ export default class EventHandler {
 
 
   executeEvent(event, echo) {
+    var location = this.state.locations[this.state.location];
+    var objects_message_before = listFormattedObjects(location.objects, this.state.objects, this.inventoryHandler);
 
     for (var property in event) {
       if (event.hasOwnProperty(property)) {
@@ -295,6 +298,11 @@ export default class EventHandler {
       return this.executeEvent(nevent, echo);
     }
 
+    var objects_message = listFormattedObjects(location.objects, this.state.objects, this.inventoryHandler);
+    if (objects_message !== objects_message_before && objects_message.length > 0) {
+      echo(advntx.messages.info_you_see+'\n'+ objects_message);
+    }
+
     if (!isEmpty(event.action_continue) && event.action_continue) {
       return true;
     }

diff --git a/app/scripts/helper.js b/app/scripts/helper.js
@@ -33,12 +33,12 @@ export function getProperty(objects, property, id) {
   var obj = objects[id];
   var state = constants.NONE;
 
-  if (obj.state !== undefined) {
+  if (obj !== undefined && obj.state !== undefined) {
     state = obj.state;
   }
 
   // name can not be overriden by state.
-  if (property !== 'name' && obj.states !== undefined && obj.states[state] !== undefined) {
+  if (property !== 'name' && obj !== undefined && obj.states !== undefined && obj.states[state] !== undefined) {
     var retVal = obj.states[state][property];
     if (retVal !== undefined) {
       return retVal;
@@ -202,6 +202,11 @@ export function getObjectNameArray(objects) {
 
 export function getFromStateOrObject(objectId, property, objects) {
   var object = objects[objectId];
+
+  if (object === undefined) {
+    return '';
+  }
+
   var state = object.state;
   var effect;
   if (!isEmpty(state) && state != constants.NONE && object.states[state] != undefined) {