Skip to content

Commit 8a90452

Browse files
AmbratolmAmbratolm
authored andcommitted
Fixed item icons (hopefully)πŸ™‚...hlA:)
1 parent a3dd0bf commit 8a90452

File tree

4 files changed

+41
-10
lines changed

4 files changed

+41
-10
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+
APP_DIR="/home/ubuntu/ACT"
26+
REPO_URL="https://github.com/simple-works/ACT.git"
27+
REMOTE="fork"
28+
BRANCH="ft-rework"
29+
30+
if [ ! -d "$APP_DIR" ]; then
31+
echo "Directory $APP_DIR does not exist. Creating and cloning..."
32+
mkdir -p "$APP_DIR"
33+
cd "$APP_DIR"
34+
git clone --depth 1 "$REPO_URL" .
35+
git checkout "$BRANCH"
36+
else
37+
cd "$APP_DIR"
38+
if [ ! -d ".git" ]; then
39+
echo "No git repo found, Re-cloning..."
40+
rm -rf *
41+
git clone --depth 1 "$REPO_URL" .
42+
git checkout "$BRANCH"
43+
else
44+
echo "Fetching and resetting..."
45+
git fetch "$REMOTE" "$BRANCH"
46+
git reset --hard "$REMOTE"/"$BRANCH"
47+
fi
48+
fi
49+
50+
echo "Restarting service..."
2851
sudo systemctl restart act-app.service
2952
sleep 3
3053
sudo systemctl status act-app.service --no-pager

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

Lines changed: 15 additions & 7 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",
@@ -260,12 +268,12 @@ class ItemStack(Model):
260268
id="cookie",
261269
name="Cookie",
262270
description="A delicious cookie that restores a small amount of health and energy.",
263-
emoji="",
271+
emoji="<:cookie:1351081122267660349>",
264272
alt_emoji="πŸͺ",
265-
icon_url="",
273+
icon_url="https://cdn.discordapp.com/attachments/1348859490203734057/1351081403634417695/cookie.png?ex=67d9141c&is=67d7c29c&hm=4ae302921dc66a87b29814141acb8ab666386ac15d9167be43926efc8d5d053d&",
266274
type=ItemType.CONSUMABLE,
267275
health_bonus=1,
268276
energy_bonus=1,
269-
price=20,
277+
price=45,
270278
),
271279
]
10.8 KB
Loading

β€Žz_assets/items/cookie.pngβ€Ž

475 KB
Loading

0 commit comments

Comments
Β (0)