Skip to content

Commit

Permalink
food changes
Browse files Browse the repository at this point in the history
  • Loading branch information
SilverSokolova committed Oct 18, 2023
1 parent 974dd41 commit e8a59bb
Show file tree
Hide file tree
Showing 206 changed files with 2,590 additions and 2,384 deletions.
2 changes: 1 addition & 1 deletion _metadata
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"name": "XRC_BETA_STARBOUND",
"steamContentId": "2010607826",
"tags": "Crafting and Building|Miscellaneous|Planets and Environments|Musical Instruments and Songs|NPCs and Creatures|Weapons|Quests|Dungeons|Ships|User Interface|Furniture and Objects|Character Improvements|Food and Farming|In-Game Tools|Mechanics|Vehicles and Mounts|Armor and Clothes",
"version": "0.10c"
"version": "0.10j"
}
179 changes: 113 additions & 66 deletions betabound.macros

Large diffs are not rendered by default.

59 changes: 0 additions & 59 deletions betabound2.macros

This file was deleted.

250 changes: 0 additions & 250 deletions betabound3.macros

This file was deleted.

10 changes: 5 additions & 5 deletions interface/tooltips/sb_food.tooltip
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
},
"foodValueLabel": {
"type": "label",
"position": [18, 168],
"hAnchor": "left",
"position": [36, 168],
"hAnchor": "mid",
"centered": true,
"width": 126
},
"foodAmountLabel": {
"type": "label",
"position": [18, 168],
"hAnchor": "left",
"position": [36, 168],
"hAnchor": "mid",
"centered": true,
"width": 126
},
Expand Down Expand Up @@ -63,7 +63,7 @@
},
"effectLabel": {
"type": "label",
"position": [70, 178],
"position": [67.5, 178],
"wrapWidth": 90,
"fontSize": 6,
"lineSpacing": 1,
Expand Down
5 changes: 2 additions & 3 deletions items/active/starbound/guns/alienlaser.activeitem
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
"tooltipKind": "sb_gun2",
"tooltipFields": {
"damageKindImage": "/projectiles/guns/plasmabullets/fireplasma/icon.png",
"damageKindBImage": "/projectiles/guns/plasmabullets/electricplasma/icon.png",
"damageKindBImage": "/projectiles/guns/plasmabullets/electricplasma/icon.png"
// "damageKindImage" : "/interface/elements/fire.png",
// "damageKindBImage" : "/interface/elements/electric.png",
"subtitle": "Alien Gun"
// "damageKindBImage" : "/interface/elements/electric.png"
},
"itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"],
"category": "pistol",
Expand Down
7 changes: 3 additions & 4 deletions items/active/starbound/guns/corrosivegun.activeitem
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"price": 800,
"tooltipKind": "sb_gun2",
"tooltipFields": {
"damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.png",
"subtitle": "Alien Gun"
"damageKindImage": "/interface/sb_tooltips/sb_corrosiveparticle.png"
},
"itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"],
"category": "pistol",
"itemTags": ["weapon", "ranged", "assaultrifle", "upgradeableWeapon"],
"category": "assaultRifle",
"rarity": "Rare",
"fixedRarity": false,
"animation": "/items/active/starbound/guns/randomgenerated/gun.animation",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,13 @@
"baseOffset": [-0.25, 0.25],
"muzzleOffset": [0, 0.375],
"price": 620,
"category": "pistol",
"category": "machinePistol",
"twoHanded": false,
"level": 1,
"paletteSwaps": "",
"tooltipKind": "sb_gun2",
"description": "A small fully automatic pistol.",
"shortdescription": "Common Machine Pistol",
"tooltipFields": {
"subtitle": "Machine Pistol"
},
"itemTags": ["weapon", "ranged", "pistol", "upgradeableWeapon"],
"scripts": ["/items/active/weapons/ranged/gun.lua"],
"animation": "/items/active/starbound/guns/randomgenerated/gun.animation",
Expand Down
Loading

0 comments on commit e8a59bb

Please sign in to comment.