small airlock + bug fixes

packages/junon-common/protocol/enum.proto

@@ -266,6 +266,7 @@ enum BuildingType {
   MiasmaGate = 272;
   CabbageSeed = 273;
   Cabbage = 274;
+  SmallAirlock = 275;
 }
 
 enum TerrainType {

packages/junon-io/client/src/entities/buildings/index.js

@@ -32,6 +32,7 @@ Buildings.Production.AmmoPrinter = require("./ammo_printer")
 Buildings.Structures.SpikeTrap = require("./spike_trap")
 Buildings.Structures.WebTrap = require("./web_trap")
 Buildings.Structures.ManualAirlock = require("./manual_airlock")
+Buildings.Structures.SmallAirlock = require("./small_airlock")
 Buildings.Structures.Airlock = require("./airlock")
 Buildings.Structures.SealedDoor = require("./sealed_door")
 Buildings.Structures.Fence = require("./fence")

packages/junon-io/client/src/entities/buildings/lamp.js

@@ -226,6 +226,10 @@ class Lamp extends BaseBuilding {
     }
   }
 
+  getDefaultSpriteColor() {
+    return ClientHelper.hexToInt(this.getLightColor())
+  }
+
   getType() {
     return Protocol.definition().BuildingType.Lamp
   }

packages/junon-io/client/src/entities/buildings/small_airlock.js

@@ -0,0 +1,47 @@
+const Airlock = require("./airlock")
+const Constants = require("./../../../../common/constants.json")
+const Protocol = require("./../../../../common/util/protocol")
+
+class SmallAirlock extends Airlock {
+
+  getConstantsTable() {
+    return "Buildings.SmallAirlock"
+  }
+
+  open() {
+    this.tween = super.getOpenTween(Constants.tileSize * 1.5)
+    this.tween.start()
+  }
+
+  getType() {
+    return Protocol.definition().BuildingType.SmallAirlock
+  }
+
+  getBuildingSprite() {
+    let sprite = new PIXI.Container()
+
+    let texture = PIXI.utils.TextureCache["small_airlock_upper.png"]
+    this.upperDoorSprite = new PIXI.Sprite(texture)
+    this.upperDoorSprite.anchor.set(0.5)
+    this.upperDoorSprite.name = "UpperDoor"
+
+    texture = PIXI.utils.TextureCache["small_airlock_lower.png"]
+    this.lowerDoorSprite = new PIXI.Sprite(texture)
+    this.lowerDoorSprite.anchor.set(0.5)
+    this.lowerDoorSprite.name = "LowerDoor"
+
+    sprite.addChild(this.lowerDoorSprite)
+    sprite.addChild(this.upperDoorSprite)
+
+    return sprite
+  }
+
+  getSpritePath() {
+    return "small_airlock.png"
+  }
+
+
+
+}
+
+module.exports = SmallAirlock

packages/junon-io/client/src/entities/buildings/suit_station.js

@@ -12,6 +12,8 @@ class SuitStation extends BaseBuilding {
   onContentChanged() {
     const armorType = this.content
 
+    // just remove armor when content change
+    if (this.armor) this.armor.remove()
     if (armorType) {
       let suitType = armorType.split(":")[0]
       let color = armorType.split(":")[1]
@@ -22,9 +24,6 @@ class SuitStation extends BaseBuilding {
       }
 
       this.armor = Equipments.forType(suitType).build(this.game, data)
-    } else if (this.armor) {
-      // no more armor in storage, remove it
-      this.armor.remove()
     }
   }
 

packages/junon-io/client/src/entities/effects/invisible.js

@@ -16,11 +16,12 @@ class Invisible extends BaseEffect {
     let opacity = { opacity: 1 }
     let targetOpacity = 0
     if (this.affectedEntity.isPlayer() &&
-        this.affectedEntity.isMe()) {
+      (this.affectedEntity.isMe && this.affectedEntity.isMe())) {
       targetOpacity = 0.2
     }
 
-    if(this.affectedEntity.sector.settings.isFovMode && !this.affectedEntity.isMe()) {
+    if(this.affectedEntity.sector.settings.isFovMode &&
+      (this.affectedEntity.isMe && !this.affectedEntity.isMe())) {
       return new TWEEN.Tween(opacity)
       .to({ opacity: targetOpacity }, 0)
       .onUpdate(() => {

packages/junon-io/client/src/entities/game.js

@@ -1412,7 +1412,7 @@ class Game {
     // PIXI.settings.SCALE_MODE = PIXI.SCALE_MODES.NEAREST
 
 
-    let tempAssets = ['displacement_map.png', 'squid_lord_heart.png', 'squid_staff.png', 'fries.png', 'energy_drink.png', 'alien_juice.png', 'rocket_launcher.png', 'scar_17_by_px.png', 'bowl_by_px.png', 'potato_soup_by_px.png', 'miso_soup_by_px.png', 'slime_broth_by_px.png', 'bomber_turret_by_px.png', 'firebat.png', 'plasma_blade.png', 'raven.png', 'starberries.png', 'car.png', 'bricks_texture.png', 'checker_texture.png', 'noise_texture.png', 'x_texture.png', 'xchecker_texture.png', 'nihonshu.png', 'pumpkin.png', 'pumpkin_plant.png', 'pumpkin_seed.png', 'rice.png', 'rice_plant.png', 'rice_seed.png', 'fish.png', 'nigiri.png', 'katana_reskin.png', 'pumpkin_pie.png', 'imperial_special_forces_armor.png', 'deconstructor.png', 'blue_laser.png', 'keypad_door.png', 'keypad_door_lower.png', 'keypad_door_upper.png', 'unbreakable_wall.png', 'sapper.png', 'sapper_corpse.png', 'dynamite.png', 'miasma_gate.png', "solid_texture2.png", "simplex_texture.png", "cabbage_seed.png", "cabbage_plant.png", "cabbage.png", "3dwall-0.png", "3dwall-1.png", "3dwall-2.png", "3dwall-3.png", "3dwall-4.png", "3dwall-5.png", "3dwall-6.png", "3dwall-7.png", "3dwall-8.png", "3dwall-9.png", "3dwall-10.png", "3dwall-11.png", "3dwall-12.png", "3dwall-13.png"]
+    let tempAssets = ['displacement_map.png', 'squid_lord_heart.png', 'squid_staff.png', 'fries.png', 'energy_drink.png', 'alien_juice.png', 'rocket_launcher.png', 'scar_17_by_px.png', 'bowl_by_px.png', 'potato_soup_by_px.png', 'miso_soup_by_px.png', 'slime_broth_by_px.png', 'bomber_turret_by_px.png', 'firebat.png', 'plasma_blade.png', 'raven.png', 'starberries.png', 'car.png', 'bricks_texture.png', 'checker_texture.png', 'noise_texture.png', 'x_texture.png', 'xchecker_texture.png', 'nihonshu.png', 'pumpkin.png', 'pumpkin_plant.png', 'pumpkin_seed.png', 'rice.png', 'rice_plant.png', 'rice_seed.png', 'fish.png', 'nigiri.png', 'katana_reskin.png', 'pumpkin_pie.png', 'imperial_special_forces_armor.png', 'deconstructor.png', 'blue_laser.png', 'keypad_door.png', 'keypad_door_lower.png', 'keypad_door_upper.png', 'unbreakable_wall.png', 'sapper.png', 'sapper_corpse.png', 'dynamite.png', 'miasma_gate.png', "solid_texture2.png", "simplex_texture.png", "cabbage_seed.png", "cabbage_plant.png", "cabbage.png", "3dwall-0.png", "3dwall-1.png", "3dwall-2.png", "3dwall-3.png", "3dwall-4.png", "3dwall-5.png", "3dwall-6.png", "3dwall-7.png", "3dwall-8.png", "3dwall-9.png", "3dwall-10.png", "3dwall-11.png", "3dwall-12.png", "3dwall-13.png", "small_airlock_upper.png","small_airlock_lower.png","small_airlock.png"]
     tempAssets.forEach((asset) => {
       PIXI.Texture.addToCache(PIXI.Texture.fromImage('/assets/images/' + asset), asset)
     })

packages/junon-io/client/src/entities/player.js

@@ -1117,6 +1117,7 @@ class Player extends BaseEntity {
     this.registerToChunk()
 
     this.repositionOnUnitMap()
+    this.redrawVisionLightSprite()
 
     if (this.isMe()) {
       if (this.sector.isFovMode()) {
@@ -1125,7 +1126,6 @@ class Player extends BaseEntity {
       }
 
       this.highlightNearbyEntities()
-      this.redrawVisionLightSprite()
       this.updateSelectedEntity()
 
       if (options.isGridPositionChanged) {
@@ -1415,6 +1415,11 @@ class Player extends BaseEntity {
       this.usernameText.remove()
     }
 
+    if (this.visionLightSprite){
+      this.visionLightSprite.destroy()
+      this.visionLightCanvas.remove()
+    }
+
     this.getContainer().unregisterEntity("players", this)
 
     if (this.chunk) {

packages/junon-io/client/src/menus/entity_menu.js

@@ -400,6 +400,7 @@ class EntityMenu extends BaseMenu {
     }
 
     this.el.querySelector(".entity_action").innerHTML = "" // reset
+    this.el.querySelector('.entity_color').innerText = ""
 
 
     if (this.game.shouldShowDebugDetails()) {
@@ -425,7 +426,8 @@ class EntityMenu extends BaseMenu {
       const isFloorOrWall = entity.hasCategory && (entity.hasCategory('platform') || entity.hasCategory('wall') || entity.hasCategory('custom_colors'))
 
       if (isFloorOrWall && entity.data && entity.data.colorIndex > 37) {
-        this.el.querySelector('.entity_color').innerText = ClientHelper.toHex(entity.data.colorIndex - 38)
+        this.el.querySelector(".debug_container").style.display = 'block'
+        this.el.querySelector('.entity_color').innerText = "color: " + ClientHelper.toHex(entity.data.colorIndex - 38)
       }
     }
 

packages/junon-io/client/src/menus/map_menu.js

@@ -57,6 +57,7 @@ class MapMenu extends BaseMenu {
   reinit() {
     // the grid size is 200x200. map is 600px by 600px wide
     let sectorColCount = this.game.sector.getColCount()
+    this.alerts = {}
 
     this.zoomMultiplier = Math.floor(this.mapSize / sectorColCount)
   }
@@ -450,4 +451,4 @@ class MapMenu extends BaseMenu {
 
 
 
-module.exports = MapMenu 
+module.exports = MapMenu 

packages/junon-io/common/constants.json

@@ -2786,6 +2786,7 @@
     "Gelatin": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "cost": {
         "gold": 15
       },
@@ -2874,6 +2875,7 @@
     "HotDog": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "sprite": {
         "position": {
           "x": 60,
@@ -2896,6 +2898,7 @@
     "Bread": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "isIngredient": true,
       "sprite": {
         "position": {
@@ -2919,6 +2922,7 @@
     "VeganPizza": {
       "width": 40,
       "height": 40,
+      "isCooked": true,
       "sprite": {
         "position": {
           "x": 95,
@@ -2941,6 +2945,7 @@
     "SlimyMeatPizza": {
       "width": 40,
       "height": 40,
+      "isCooked": true,
       "cost": {
         "gold": 500
       },
@@ -2963,6 +2968,7 @@
     "LectersDinner": {
       "width": 40,
       "height": 40,
+      "isCooked": true,
       "cost": {
         "gold": 300
       },
@@ -3088,6 +3094,7 @@
     "Fries": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "cost": {
         "gold": 100
       },
@@ -3111,6 +3118,7 @@
     "Steak": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "cost": {
         "gold": 200
       },
@@ -3153,6 +3161,7 @@
     "PotatoSoup": {
       "width": 32,
       "height": 32,
+      "isCooked": true,
       "cost": {
         "gold": 200
       },
@@ -3173,6 +3182,7 @@
     "SlimeBroth": {
       "width": 32,
       "height": 32,
+      "isCooked": true,
       "cost": {
         "gold": 200
       },
@@ -3192,6 +3202,7 @@
     "MisoSoup": {
       "width": 32,
       "height": 32,
+      "isCooked": true,
       "cost": {
         "gold": 200
       },
@@ -3211,6 +3222,7 @@
     "Omelette": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "cost": {
         "gold": 200
       },
@@ -3233,6 +3245,7 @@
     "Nigiri": {
       "width": 24,
       "height": 24,
+      "isCooked": true,
       "cost": {
         "gold": 400
       },
@@ -3257,6 +3270,7 @@
     "PumpkinPie": {
       "width": 32,
       "height": 32,
+      "isCooked": true,
       "cost": {
         "gold": 250
       },
@@ -6090,19 +6104,33 @@
       "description": "Airtight door. No power required to operate"
     },
     "SmallAirlock": {
-      "width": 64,
+      "width": 32,
       "height": 32,
+      "isInteractable": true,
+      "showInteractTooltip": true,
+      "isUpgradable": true,
+      "isAirtight": true,
+      "categories": {"door":true,"melee_resistant":true},
+      "minimapColor": "#3bceaa",
+      "requirements": {
+        "IronBar": 5
+      },
       "cost": {
         "gold": 50
       },
+      "sprite":{
+        "width": 32,
+        "height": 32
+      },
       "stats": {
         "health": 100,
         "count": 125
       },
       "upgrade": {
-        "health": "+25",
-        "count": "+25"
-      }
+        "health": "+15",
+        "count": "+15"
+      },
+      "description":"A smaller airtight door."
     },
     "ResearchTable": {
       "width": 32,

packages/junon-io/common/interfaces/taintable.js

@@ -247,9 +247,10 @@ Taintable.prototype = {
 
   removeEffect(effectName) {
     if (!this.effects) return
+    this.setEffectLevel(effectName, 0)
 
-    delete this.effects[effectName]
-    this.onEffectRemoved(effectName)
+    // delete this.effects[effectName]
+    // this.onEffectRemoved(effectName)
   },
 
   removeAllEffects() {
@@ -278,4 +279,3 @@ Taintable.prototype = {
 }
 
 module.exports = Taintable
-

packages/junon-io/server/commands/fill.js

@@ -9,7 +9,7 @@ class Fill extends BaseCommand {
   getUsage() {
     return [
       "/fill [start_row] [start_col] [end_row] [end_col] [terrain_type] [color]",
-      // "/fill building [start_row] [start_col] [end_row] [end_col] [1x1 building] [color]"
+      "/fill building [start_row] [start_col] [end_row] [end_col] [1x1 building] [color]"
     ]
   }
 
@@ -19,7 +19,7 @@ class Fill extends BaseCommand {
 
   perform(player, args) {
 
-    if(false) {
+    if(args[0] == 'building') {
       let startRow = parseInt(args[1])
       let startCol = parseInt(args[2])
       let endRow   = parseInt(args[3])

packages/junon-io/server/commands/interact.js

@@ -72,7 +72,7 @@ class Interact extends BaseCommand {
           }
         }
 
-        if (entity.hasCategory("door")) {
+        if (entity.hasCategory("door") || entity.hasCategory("lamp")) {
           if (operation === "open") {
             entity.open()
           } else if (operation === "close") {