mirror of
				https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-02.git
				synced 2025-11-04 06:06:15 +01:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			18300987a4
			...
			eb54fb1d14
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					eb54fb1d14 | ||
| 
						 | 
					40c550cc4d | 
@@ -327,6 +327,11 @@ public class ClientGameLogic implements ServerInterpreter, GameEventBroker {
 | 
				
			|||||||
                
 | 
					                
 | 
				
			||||||
                board.add(new Hotel(property.getId()));
 | 
					                board.add(new Hotel(property.getId()));
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					                for(int i = 0; i < 4; i++) {
 | 
				
			||||||
 | 
					                    board.remove(board.getHouse(msg.getId(), i+1));
 | 
				
			||||||
 | 
					                }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                board.add(new House( property.getHouses(), property.getId()));
 | 
					                board.add(new House( property.getHouses(), property.getId()));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
        } else {
 | 
					        } else {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -484,9 +484,9 @@ public class ServerGameLogic implements ClientInterpreter {
 | 
				
			|||||||
        // buildHouses(p1, Set.of(1, 3));
 | 
					        // buildHouses(p1, Set.of(1, 3));
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
        // Player 2 builds houses on the Red set
 | 
					        // Player 2 builds houses on the Red set
 | 
				
			||||||
        buildHouses(p2, Set.of(21, 23, 24));
 | 
					        // buildHouses(p2, Set.of(21, 23, 24));
 | 
				
			||||||
        buildHouses(p2, Set.of(23, 24));
 | 
					        // buildHouses(p2, Set.of(23, 24));
 | 
				
			||||||
        buildHouses(p2, Set.of( 24));
 | 
					        // // buildHouses(p2, Set.of( 24));
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
        // Set player balances
 | 
					        // Set player balances
 | 
				
			||||||
        p1.setAccountBalance(12325);
 | 
					        p1.setAccountBalance(12325);
 | 
				
			||||||
@@ -518,6 +518,8 @@ public class ServerGameLogic implements ClientInterpreter {
 | 
				
			|||||||
            field.setOwner(player);
 | 
					            field.setOwner(player);
 | 
				
			||||||
            player.addProperty(propertyId);
 | 
					            player.addProperty(propertyId);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        updateAllPlayers();
 | 
				
			||||||
        LOGGER.log(Level.DEBUG, "Properties assigned to player {0}: {1}", player.getName(), properties);
 | 
					        LOGGER.log(Level.DEBUG, "Properties assigned to player {0}: {1}", player.getName(), properties);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user