Skip to content

Commit

Permalink
As it turns out, there are *three* types of clouds. Gotta catch 'em all.
Browse files Browse the repository at this point in the history
  • Loading branch information
scottschiller committed Apr 6, 2023
1 parent eec50e1 commit 4a561c4
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 19 deletions.
18 changes: 13 additions & 5 deletions css/aa.css
Expand Up @@ -2889,23 +2889,31 @@ body.bnb .sprite.engineer.butthead.building {
}

.cloud1,
.cloud2 {
.cloud2,
.cloud3 {
left: 0px;
top: 0px;
/* clouds hide helicopters. */
z-index: 5;
background-position: 0px 0px;
background-repeat: no-repeat;
background-size: contain;
}

.cloud1 {
/* background: url(../image/cloud-1.png) no-repeat 0px 0px; */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGYAAAAdAgAAAAA34V4dAAAAAnRSTlMAAHaTzTgAAAI6SURBVHgBbc9BaxNBGMbxZ8okogeZkaSSFrRC288xKbOtvW1kU0iD1UJ2anLIsQdPFUoPnhLIhswWoR66uG/o6qWHpCB+CkE86KVRV+gH0ItsWqSCv/f45z08uEYADP9TRlYYFACO6zjXZUBrhez+bXMnPbCa7QFKSqWuPVXaFGONIlcKsd0PGKaYZFC5vtm4kYwCtlple89eXn1pT0kJlAYF8t2iHem8ebqPjJCHnaojO2BuIJn5Ga13UOpcrbn1escYv+wCYIfj4YFyVhrTDc7yTDl8a0M3GzB7kdBRzroCALYmSSXfJkpP1cjas3E6HC2bBrI2F42P6jak93u3v7SqfpvGyeZZFwxArk5JrJ2QzoiOgyIN6ceQOuxy1WxTAbWQKPK0SYnoF3kF7eKOgu5xl/P1NNaKlShrcbcWALA9gdpiWRS2hqNi7Rtlop1+AQBTkLu1QLPV9nBk0vG0JQ0NyAW59DgmUxHFcDP9PS2RtcUykPNbH59T9MnqtfFBO4mbfRPaYw8CuPf5zZPYtmhidiNn0LfBcpxQFV8B5OnFljW7JrFJjPxDM7NvwsnKecCBolOYO63aOqXUiJjcm39XivwPFU8BWutZijfMyab/yCqVb5/wlu1xBQASNw8ntvo9d//C55inpuoa4zoAGICaPe+2cLc5AE8ocrk/EFCYWvQDt76fMy7QatqC7C64AlNSeVpJHw4vOONXnoO8w3GFMQC6AjA8qAgsAQp/MXABCIBzNbN9Gf4AGXLZuRdaZoUAAAAASUVORK5CYII=);
background-image: url(../image/cloud-1.png);
width: 102px;
height: 29px;
}

.cloud2 {
/* background: url(../image/cloud-2.png) no-repeat 0px 0px; */
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAH0AAAAiAgAAAAAdg5F6AAAAAnRSTlMAAHaTzTgAAAKuSURBVHgBdcwxaxxHGIfx/ytmDinVu2ZPQoY0JknhPv2s2TUpZ8W8B3MmDgTNJnsCdW4CCU7hIl0Udhf2au2BRvjArQL5Fko+gV1cIB8gaXKLhLEQ/tUPD94jwOCjDDhVBqawN+k9qsyOPGkAFrcN40M7Tu91RxaASlSRs+ExvMNXJyc9a5ArJ2cmLTTu4oPLq/5YgdsC9hfrl14U40P6x7goATrtXfFt8/jtRW8BZtziDFL1Dtg5/f3CPmqKb56HY+SagBGBxCQiGunhJq4HI0gO562CNbihZr6BsoZw0Mu8slSqYhpMUjcGI1NcbcJLKAIKSQuRXRjolB7GASM7ncdVJYxbVhFUCfjT128x0osYRRwoNUrGjjhNXJlf//e6B0bzVpiYISXoO8mRiohumGTuAFCe6ULBAsWszfDwWEiqOizrpmTNAO07MJOIKWS1dDx9cyZ93S2HTrCHHEDdGqj9zUbkh1j15un3757NlnHofWM+e4St6GCyRYxxE1fD8Cv8VdxahFcGP88J+CQY4CBe/rOOdR1nDtPHcWvVW8qhDfAbA8kijrquq1vOwjjwQYkIRoaVvqi3SX0hvgsGfhEXq859+vfCW2Bkvqw6f7Fahk7CX07tr6qu98lkvY7nY2Ggr/tyv/ODhHD9go2f93UXTFm1vlUASFEIJq1Xc3/GRykwCV/03j3gaaYdRocv03SS/emDy0kZaopZ/Xmb755D2QRbPKlhDl+1Vd+CDRpwIZLzzr8voIDRg3WxW2Wh9bao3I5R4IwZT+M54wZdhb42s8rl+8PqyZMzBUWkdSu4QXRydTmwThQ9++Prdm82t2cAU2ZxSxWz0BByO/spnqeTuHn3VQNAKbw3dRk0JbUPZYbnQ8u4K8kII5dmgFLO4h7GFgFsAUMaH2Nw3/+C2uVrQe2QSQAAAABJRU5ErkJggg==);
background-image: url(../image/cloud-2.png);
width: 116px;
height: 28px;
}

.cloud3 {
background-image: url(../image/cloud-3.png);
width: 125px;
height: 34px;
}
Expand Down
Binary file modified image/cloud-1.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified image/cloud-2.png 100755 → 100644
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added image/cloud-3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 27 additions & 14 deletions script/elements/Cloud.js
@@ -1,13 +1,33 @@
import { rndInt, worldWidth, worldHeight, rng, TYPES } from '../core/global.js';
import { rndInt, worldWidth, worldHeight, rng, TYPES, rngInt } from '../core/global.js';
import { common } from '../core/common.js';
import { zones } from '../core/zones.js';
import { sprites } from '../core/sprites.js';
import { net } from '../core/network.js';
import { game } from '../core/Game.js';

const cloudTypes = [
{
className: 'cloud1',
width: 102,
height: 29
}, {
className: 'cloud2',
width: 116,
height: 28
}, {
className: 'cloud3',
width: 125,
height: 34
}
];

const Cloud = (options = {}) => {

let cloudType, cloudWidth, cloudHeight, css, dom, data, exports;
const cloudData = cloudTypes[rngInt(cloudTypes.length, TYPES.cloud)];

const { className, width, height } = cloudData;

let css, dom, data, exports;
let type = TYPES.cloud;

function animate() {
Expand Down Expand Up @@ -76,14 +96,7 @@ const Cloud = (options = {}) => {

}

cloudType = (rng(1, TYPES.cloud) > 0.5 ? 2 : 1);

cloudWidth = (cloudType === 2 ? 125 : 102);
cloudHeight = (cloudType === 2 ? 34 : 29);

css = common.inheritCSS({
className: `cloud${cloudType}`
});
css = common.inheritCSS({ className });

data = common.inheritData({
type,
Expand All @@ -95,10 +108,10 @@ const Cloud = (options = {}) => {
verticalDirection: 0.33,
verticalDirectionDefault: 0.33,
y: options.y || (96 + parseInt((worldHeight - 96 - 128) * rng(1, type), 10)),
width: cloudWidth,
halfWidth: parseInt(cloudWidth / 2, 10),
height: cloudHeight,
halfHeight: parseInt(cloudHeight / 2, 10),
width,
halfWidth: width / 2,
height,
halfHeight: height / 2,
noEnergyStatus: true
}, options);

Expand Down

0 comments on commit 4a561c4

Please sign in to comment.