Merge branch 'master' into menu

Author: AnReu

Defold/map.tilesource

@@ -7,7 +7,16 @@ collision: ""
 material_tag: "tile"
 collision_groups: "default"
 animations {
-  id: "Coffee_Cup"
+  id: "Cappucchino"
+  start_tile: 8
+  end_tile: 8
+  playback: PLAYBACK_LOOP_FORWARD
+  fps: 1
+  flip_horizontal: 0
+  flip_vertical: 0
+}
+animations {
+  id: "Coffee"
   start_tile: 17
   end_tile: 17
   playback: PLAYBACK_LOOP_FORWARD
@@ -123,15 +132,6 @@ animations {
   flip_horizontal: 0
   flip_vertical: 0
 }
-animations {
-  id: "Milk_Coffee_Cup"
-  start_tile: 8
-  end_tile: 8
-  playback: PLAYBACK_LOOP_FORWARD
-  fps: 1
-  flip_horizontal: 0
-  flip_vertical: 0
-}
 animations {
   id: "Milk_Empty"
   start_tile: 25

Defold/scripts/customer.script.script

@@ -1,34 +1,67 @@
 function init(self)
-	self.item = {}
+	self.items = {}
 	self.item_count = 0
+	
+end
+
+function delete_items(items)
+	if items then
+		for _, id in pairs(items) do
+			go.delete(id)
+		end
+	end
+end
+
+function update_item_positions(items)
+	if items then
+		local position = go.get_position();
+		for pos, id in pairs(items) do
+			msg.post(id, "Game State", {x = position.x, y = position.y - (pos-1) * 20})
+		end
+	end
 end
 
 function on_message(self, message_id, message, sender)
+	if message.sprite_id then
+		sprite.play_flipbook("#sprite",hash("Customer_".. message.sprite_id))
+	end
 	if message.y then
 		local position = go.get_position();
 		position.y = message.y;
 		go.set_position(position);
+		update_item_positions(self.items)
+	end
+	if message.x then
+		local position = go.get_position();
+		position.x = message.x;
+		go.set_position(position);
+		update_item_positions(self.items)
 	end
+	
 	if message.type then	
 		--sprite.play_flipbook("#sprite",hash(message.type))
 	end
 	if message.order and not self.order then
+		--delete_items(self.items)
 			for k, v in pairs(message.order) do
-				if type(k) == "string" and type(v) == "number" then
+				if k ~= '__keys' then
 					local position = go.get_position();
 					created_id = factory.create("#order_factory", vmath.vector3(position.x , position.y- self.item_count * 20,0.1), vmath.quat(),{},1)
 					if created_id then
 						self.order = true
 						msg.post(created_id, "Game State", {item = k, amount = v})
-						self.item = created_id
+						table.insert(self.items, created_id)
 						self.item_count = self.item_count +1
 					end			
-				end
+				
+			end
 		end
 	end
 
 end
 
+
+
 function final(self)
-	go.delete(self.item)
+	delete_items(self.items)
 end

Defold/scripts/game_controller.script

@@ -14,26 +14,49 @@ local spriteCenter = 50;
 local other_players = {}
 local customers = {}
 
-function drawCustomers(change)
-	if table.maxn(room.state.customers) > table.maxn(customers) then
-		created_id = factory.create("default:/customer_factory#factory", vmath.vector3(50,0,0.1), vmath.quat(),{},3.125)
-		customers[table.maxn(customers) +1] = created_id
-	elseif table.maxn(room.state.customers) < table.maxn(customers) then
-		go.delete(customers[table.maxn(customers)])
-		table.remove(customers)
+function setContains(set, key)
+	return set[key] ~= nil
+end
+
+function gamestateHasCustomer(id)
+	for k,v in pairs(room.state.customers) do
+		if v.id == id then
+			return true
+		end
 	end
-	for pos,customer_id in pairs(customers) do
+	return false
+end
+
+function drawCustomers(change)
+	--update and add customers from gamestate
+
+
+	for pos, customer in pairs(room.state.customers) do
+
+		-- called out of order
+		if not setContains(customers, customer.id) then
+			-- create new customer if not yet created
+			created_id = factory.create("default:/customer_factory#factory", vmath.vector3(50,0,0.1), vmath.quat(),{},3.125)
+			customers[customer.id] = created_id
+			customer_go = customers[customer.id]
+			msg.post(customer_go, "Game State", {sprite_id = customer.sprite_id})
+			
+
+		end
+		--update all customer
 		--lua starts indexing at 1 instead of 0 like everything else
 		newy = (pos-1) * scaling + spriteCenter;
-		newtype = nil
-		if room.state.customers[pos].wants["Kolle"] then
-			newtype = "KolleCustomer"
-		elseif room.state.customers[pos].wants["Zotrine"] then
-			newtype = "ZotrineCustomer"
-		elseif room.state.customers[pos].wants["Premium"] then
-			newtype = "PremiumCustomer"
+		customer_go = customers[customer.id]
+		msg.post(customer_go, "Game State", {y = newy, order = customer.wants})
+	end
+
+	-- remove customers not in gamestate
+
+	for customer_id, customer_go in pairs(customers) do
+		if not gamestateHasCustomer(customer_id) then
+			go.delete(customers[customer_id])
+			customers[customer_id] = nil;
 		end
-		msg.post(customer_id, "Game State", {y = newy, type = newtype, order = room.state.customers[pos].wants})
 	end
 end
 
@@ -86,6 +109,11 @@ end
 
 function onStateChange(change)
 	Move(change)
+	for k, v in pairs(change) do
+		if v['field'] == 'customers' then
+			drawCustomers(change)
+		end
+	end
 end
 
 
@@ -142,10 +170,6 @@ function on_message(self, message_id, message, sender)
 		room:send("move",message.dir);
 	elseif (message_id == hash("use")) then
 		room:send("use")
-	elseif (message_id == hash("drop")) then
-		room:send("drop");
-	elseif (message_id == hash("refill")) then
-		room:send("refill",message.item);
 	end
 
 end

Defold/scripts/player.script

@@ -14,6 +14,7 @@ function init(self)                                 -- [1]
 	origRotation = go.get_rotation();
 	self.has_inventory = false
 	self.direction = 'down'
+
 end
 
 function final(self)                                -- [7]
@@ -36,6 +37,7 @@ function on_input(self, action_id, action)
 			msg.post(game_controller, "drop");
 		elseif action_id == hash("use") then
 			msg.post(game_controller, "use");
+			print('use')
 		elseif action_id == hash("refill") then --just for testing
 			msg.post(game_controller, "refill", {item = "all"});
 		end

Server/Ascii.ts

@@ -24,11 +24,17 @@ class Player extends Schema {
 class Customer extends Schema {
 	@type({ map: "number" }) wants = new MapSchema<number>();
 	@type("number") pays : number = 0;
+	@type("boolean") waiting : boolean = true;
+	@type("number") id : number;
+	@type("number") sprite_id : number;
 
-	constructor(wants:MapSchema<number>,){
+	constructor(wants:MapSchema<number>, id:number){
 		super();
 		this.wants = wants;
-	}	
+		this.id = id;
+		this.sprite_id = Math.floor(Math.random() * 1.99) + 1; // numbers between 1 and 2
+
+	}
 }
 
 //state of the game in the current room
@@ -39,11 +45,11 @@ class State extends Schema {
 	//function to create a new player for given id  
 	createPlayer (id: string) { this.players[ id ] = new Player(Object.keys(this.players).length); }
 	@type([Customer]) customers = new ArraySchema<Customer>();
-	createCustomer (wants: MapSchema<number>) { this.customers.push(new Customer(wants)); }
+	createCustomer (wants: MapSchema<number>, id: number) { this.customers.push(new Customer(wants, id)); }
 }
 
 export class Ascii extends Room {
-
+	customerMaxId = 0;
 	//single Tick of the Timer
 	gametick() {
 		this.generateCustomer();
@@ -305,6 +311,8 @@ export class Ascii extends Room {
 		setInterval(() => {
 			this.gametick()
 		}, 1500);
+
+		this.customerMaxId = 0;
 	}
 
 	onJoin(client: Client, options: any) {
@@ -341,7 +349,9 @@ export class Ascii extends Room {
 					wants[order_item] = 1
 				}
 			}
-			this.state.createCustomer(wants)
+			this.customerMaxId = this.customerMaxId +1;
+
+			this.state.createCustomer(wants, this.customerMaxId)
 		}
 	}
 }

Server/hitbox.ts

@@ -6,7 +6,7 @@ var hitbox = new Map([
 [96,"Zotrine"],[95,"Premium"],[94,"Kolle"],							//get full bottle
 [92,"sink"],[91,"sink"],											//just hitbox as of now
 [55,"Milk"],[53,"Espresso_Beans"],[54,"Crema_Beans"],				//get refill stuff for coffee machine
-[32,"machine coffee"],[33,"machine milk"],							//coffee machine sides differ for refill
+[32,"Coffee"],[33,"Cappucchino"],							//coffee machine sides differ for refill
 [31,"php"],															//php gives hard penalties when served to any customer
 [70,"trash"],														//trashcan allows to empty inventory
 [37,"table"],[93,"table"],[90,"table"],[52,"table"]					//hitboxes with no specific meaning