-
Notifications
You must be signed in to change notification settings - Fork 30
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- add cursor position to game's getProperty
- eval formulas in game.getProperty - refactor GameUtils::get*Property - update gamefiles (rework inventory stash item pick wheybags/freeablo#353 wheybags/freeablo#358)
- Loading branch information
Showing
33 changed files
with
558 additions
and
543 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,42 @@ | ||
| { | ||
| "action": { | ||
| "name": "action.set", | ||
| "id": "update{1}Click", | ||
| "action": [ | ||
| { "name": "item.update", "inventory": "stash", "item": [{2}] }, | ||
| "updateStashItems", | ||
| { | ||
| "name": "if.equal", | ||
| "param1": "%currentLevel.currentPlayer.hasSelectedItem%", | ||
| "param2": true, | ||
| "then": "updateSelectedItem", | ||
| "else": "update{1}Text" | ||
| "action": [ | ||
| { | ||
| "name": "action.set", | ||
| "id": "updateStashClick", | ||
| "action": { | ||
| "name": "loadJson", | ||
| "json": { | ||
| "replaceVars": "value", | ||
| "action": [ | ||
| { "name": "item.update", "inventory": "stash", "item": ["|stashPosX|", "|stashPosY|"] }, | ||
| "updateStashItems", | ||
| { | ||
| "name": "if.equal", | ||
| "param1": "%currentLevel.currentPlayer.hasSelectedItem%", | ||
| "param2": true, | ||
| "then": "updateSelectedItem", | ||
| "else": "updateStash|$.game.var.stashPosX + 1||$.game.var.stashPosY + 1|Text" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| { | ||
| "name": "action.set", | ||
| "id": "btnStashClick", | ||
| "action": [ | ||
| { | ||
| "name": "variable.set", | ||
| "key": "stashPosX", | ||
| "value": "%$.:trunc(game.cursor.x - btnStash.position.x - (currentLevel.currentPlayer.selectedItem.inventorySize.x :nvl 1 - 1 * 14.5) / 29 * 10) * 0.1 :max 0 :min 9%" | ||
| }, | ||
| { | ||
| "name": "variable.set", | ||
| "key": "stashPosY", | ||
| "value": "%$.:trunc(game.cursor.y - btnStash.position.y - (currentLevel.currentPlayer.selectedItem.inventorySize.y :nvl 1 - 1 * 14.5) / 29 * 10) * 0.1 :max 0 :min 3%" | ||
| }, | ||
| "updateStashClick" | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.