Skip to content

Commit 70092e8

Browse files
AmbratolmAmbratolm
authored andcommitted
Fixed item icons (hopefully)🙂...hlA:)
1 parent a3dd0bf commit 70092e8

File tree

3 files changed

+48
-17
lines changed

3 files changed

+48
-17
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,32 @@ jobs:
2222
key: ${{ secrets.EC2_SSH_KEY }}
2323
command_timeout: "20m"
2424
script: |
25-
cd /home/ubuntu/ACT/
26-
git fetch fork ft-rework
27-
git reset --hard fork/ft-rework
25+
if [ ! -d "/home/ubuntu/ACT/" ]; then
26+
echo "Directory /home/ubuntu/ACT/ does not exist. Creating and cloning..."
27+
mkdir -p /home/ubuntu/ACT/
28+
cd /home/ubuntu/ACT/
29+
git clone --depth 1 https://github.com/simple-works/ACT.git .
30+
git checkout ft-rework
31+
else
32+
echo "Directory /home/ubuntu/ACT/ exists. Fetching and resetting..."
33+
cd /home/ubuntu/ACT/
34+
if [ ! -d ".git" ]; then
35+
echo "No git repo found, Re-cloning..."
36+
rm -rf *
37+
git clone --depth 1 https://github.com/simple-works/ACT.git .
38+
git checkout ft-rework
39+
else
40+
git fetch origin ft-rework
41+
git reset --hard origin/ft-rework
42+
fi
43+
fi
2844
sudo systemctl restart act-app.service
2945
sleep 3
3046
sudo systemctl status act-app.service --no-pager
47+
# script: |
48+
# cd /home/ubuntu/ACT/
49+
# git fetch fork ft-rework
50+
# git reset --hard fork/ft-rework
51+
# sudo systemctl restart act-app.service
52+
# sleep 3
53+
# sudo systemctl status act-app.service --no-pager

‎.vscode/settings.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"jupyter.notebookFileRoot": "${workspaceFolder}",
33
"files.exclude": {
4-
".github": true,
5-
".gitignore": true,
6-
".mongodb": true,
7-
".python-version": true,
8-
".venv": true,
9-
".vscode": true,
10-
"**/*cache*": true,
11-
"LICENSE": true,
12-
"README.*": true,
13-
"uv.lock": true
4+
".github": false,
5+
".gitignore": false,
6+
".mongodb": false,
7+
".python-version": false,
8+
".venv": false,
9+
".vscode": false,
10+
"**/*cache*": false,
11+
"LICENSE": false,
12+
"README.*": false,
13+
"uv.lock": false
1414
}
1515
}

db/Item.py renamed to db/item.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ class ItemStack(Model):
5353
# * Items
5454
# ----------------------------------------------------------------------------------------------------
5555
ITEMS = [
56-
# Weapons
56+
# ----------------------------------------------------------------------------------------------------
57+
# * Weapon Equippables
58+
# ----------------------------------------------------------------------------------------------------
5759
Item(
5860
id="dagger",
5961
name="Dagger",
@@ -150,7 +152,9 @@ class ItemStack(Model):
150152
speed_bonus=1,
151153
price=35000,
152154
),
153-
# Armor
155+
# ----------------------------------------------------------------------------------------------------
156+
# * Armor Equippables
157+
# ----------------------------------------------------------------------------------------------------
154158
Item(
155159
id="shield",
156160
name="Shield",
@@ -198,7 +202,9 @@ class ItemStack(Model):
198202
speed_bonus=-1,
199203
price=45000,
200204
),
201-
# Footwear
205+
# ----------------------------------------------------------------------------------------------------
206+
# * Footwear Equippables
207+
# ----------------------------------------------------------------------------------------------------
202208
Item(
203209
id="sandals",
204210
name="Sandals",
@@ -233,7 +239,9 @@ class ItemStack(Model):
233239
defense_bonus=1,
234240
price=30000,
235241
),
236-
# Consumables
242+
# ----------------------------------------------------------------------------------------------------
243+
# * Consumables
244+
# ----------------------------------------------------------------------------------------------------
237245
Item(
238246
id="potion",
239247
name="Potion",

0 commit comments

Comments
 (0)