Fixed some calculation / view issues.

This commit is contained in:
stijnb1234 2021-09-02 17:09:29 +02:00
parent 9c871bff8d
commit cb1189c623
2 changed files with 31 additions and 22 deletions

23
dist/js/calculator.js vendored
View file

@ -33,26 +33,35 @@ function toJSON(item, models) {
//Insert models //Insert models
json['overrides'] = []; json['overrides'] = [];
//Insert default model
json['overrides'][0] = {
'predicate': {
'damaged': 0,
'damage': 0
},
'model': 'item/' + item
};
for (let i = 0; i < models.length; i++) { for (let i = 0; i < models.length; i++) {
const model = models[i]; const model = models[i];
const damage = getMappedDamage(i+1, itemDamages[item]); const damage = getMappedDamage(i+1, itemDamages[item]);
json['overrides'][i] = { json['overrides'][i+1] = {
'predicate': { 'predicate': {
'damaged': 0, 'damaged': 0,
'damage': damage, 'damage': damage
'model': 'item/' + model },
} 'model': model
}; };
} }
//Insert damaged model //Insert damaged model
json['overrides'][models.length] = { json['overrides'][models.length+1] = {
'predicate': { 'predicate': {
'damaged': 1, 'damaged': 1,
'damage': 0, 'damage': 0
},
'model': 'item/' + item 'model': 'item/' + item
}
}; };
return JSON.stringify(json, null, 2); return JSON.stringify(json, null, 2);

View file

@ -6,13 +6,12 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.0/css/bootstrap.min.css"
href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.0-beta3/css/bootstrap.min.css" integrity="sha512-F7WyTLiiiPqvu2pGumDR15med0MDkUIo5VTVyyfECR5DZmCnDhti9q5VID02ItWjq6fvDfMaBaDl2J3WdL1uxA=="
integrity="sha512-N415hCJJdJx+1UBfULt+i+ihvOn42V/kOjOpp1UTh4CZ70Hx5bDlKryWaqEKfY/8EYOu/C2MuyaluJryK1Lb5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
crossorigin="anonymous"/> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css"
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ=="
integrity="sha512-iBBXm8fW90+nuLcSKlbmrPcLa0OT92xO1BIsZ+ywDWZCvqsWgccV3gFoRBv0z+8dLJgyAHIhR35VZc2oM/gI1w==" crossorigin="anonymous" referrerpolicy="no-referrer"/>
crossorigin="anonymous"/>
<link rel="stylesheet" href="dist/css/beautify.css"> <link rel="stylesheet" href="dist/css/beautify.css">
</head> </head>
<body> <body>
@ -37,12 +36,12 @@
<div class="mb-3 w-50"> <div class="mb-3 w-50">
<label for="itemcount">The amount of models:</label> <label for="itemcount">The amount of models:</label>
<div class="input-group"> <div class="input-group">
<button type="button" class="btn btn-outline-secondary btn-number" disabled <button type="button" class="btn btn-outline-secondary btn-number" data-type="minus"
data-type="minus" data-field="quant[1]"> data-field="quant[1]">
<span class="fas fa-minus"></span> <span class="fas fa-minus"></span>
</button> </button>
<input type="text" id="itemcount" name="quant[1]" class="form-control input-number" value="1" min="1" <input type="text" id="itemcount" name="quant[1]" class="form-control input-number" value="1"
max="2" readonly> min="1" max="2" readonly>
<button type="button" class="btn btn-outline-secondary btn-number" data-type="plus" <button type="button" class="btn btn-outline-secondary btn-number" data-type="plus"
data-field="quant[1]"> data-field="quant[1]">
<span class="fas fa-plus"></span> <span class="fas fa-plus"></span>
@ -52,7 +51,8 @@
<div id="items"> <div id="items">
<div class="mb-3 w-50"> <div class="mb-3 w-50">
<label for="item1">Model for damage 1:</label> <label for="item1">Model for damage 1:</label>
<input type="text" class="form-control" id="item1" name="item1" placeholder="cars/blue_car" required> <input type="text" class="form-control" id="item1" name="item1" placeholder="cars/blue_car"
required>
</div> </div>
</div> </div>
<button type="submit" class="btn btn-primary">Calculate</button> <button type="submit" class="btn btn-primary">Calculate</button>
@ -67,7 +67,7 @@
</body> </body>
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js" <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"
integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ==" integrity="sha512-894YE6QWD5I59HgZOGReFYm4dnWc1Qt5NtvYSaNcOP+u1T9qYdvdihz0PPSiiqn/+/3e7Jo4EaG7TubfWGUrMQ=="
crossorigin="anonymous"></script> crossorigin="anonymous" referrerpolicy="no-referrer"></script>
<script type="application/javascript" src="dist/js/calculator.js"></script> <script type="application/javascript" src="dist/js/calculator.js"></script>
<script type="application/javascript" src="dist/js/beautify.js"></script> <script type="application/javascript" src="dist/js/beautify.js"></script>
<script> <script>
@ -134,7 +134,7 @@
} }
}); });
form.on("submit", function(e){ form.on("submit", function (e) {
e.preventDefault(); e.preventDefault();
//Get selected item //Get selected item