Skip to content

Optimized housing system #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Jhobean wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Optimized housing system #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e50b036
Optimized housing system
Jhobean Apr 13, 2024
771d5ec
Version 2
Jhobean Apr 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
640 changes: 528 additions & 112 deletions housing/house_defs.scp
View file
Open in desktop

Large diffs are not rendered by default.

3,188 changes: 1,831 additions & 1,357 deletions housing/house_dialogs.scp
View file
Open in desktop

Large diffs are not rendered by default.

1,514 changes: 817 additions & 697 deletions housing/house_functions.scp
View file
Open in desktop

Large diffs are not rendered by default.

103 changes: 71 additions & 32 deletions housing/house_speech.scp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ ON=lock this*
return 0
else
src.targetf f_house_item_lock
src.message @,,1 What do you wish to lockdown?
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to lockdown?
src.message @,,1 Укажите, что вы хотите закрепить?
enddo
return 1
endif

Expand All @@ -21,17 +24,36 @@ ON=release this*
return 0
else
src.targetf f_house_item_unlock
src.message @,,1 What do you wish to release?
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to release?
src.message @,,1 Укажите, что вы хотите открепить?
enddo
return 1
endif

// ON=flip this*
// ref1 = <region.uid>
// if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
// return 0
// else
// src.targetf f_house_item_flip
// doswitch <src.f_LangShowNum>
// src.message @,,1 What do you wish to flip?
// src.message @,,1 Укажите, что вы хотите повернуть?
// enddo
// return 1
// endif

ON=secure this*
ref1 = <region.uid>
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <src.isgm>) //<ref1.GetFriendPos <src>> >= 0 ||
return 0
else
src.targetf f_house_item_secure
src.message @,,1 What do you wish to secure?
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to secure?
src.message @,,1 Укажите, что вы хотите охранять?
enddo
return 1
endif

Expand All @@ -40,8 +62,11 @@ ON=move north*
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
return 0
else
src.targetf f_house_moven
src.message @,,1 What do you wish to move?
src.targetf f_house_moveN
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to move?
src.message @,,1 Укажите, что вы хотите подвинуть?
enddo
return 1
endif

Expand All @@ -50,8 +75,11 @@ ON=move south*
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
return 0
else
src.targetf f_house_moves
src.message @,,1 What do you wish to move?
src.targetf f_house_moveS
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to move?
src.message @,,1 Укажите, что вы хотите подвинуть?
enddo
return 1
endif

Expand All @@ -60,8 +88,11 @@ ON=move east*
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
return 0
else
src.targetf f_house_movee
src.message @,,1 What do you wish to move?
src.targetf f_house_moveE
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to move?
src.message @,,1 Укажите, что вы хотите подвинуть?
enddo
return 1
endif

Expand All @@ -70,18 +101,11 @@ ON=move west*
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
return 0
else
src.targetf f_house_movew
src.message @,,1 What do you wish to move?
return 1
endif

ON=release this*
ref1 = <region.uid>
if !(<ref1.isowner <src>> || <ref1.GetCoownerPos <src>> >= 0 || <ref1.GetFriendPos <src>> >= 0 || <src.isgm>)
return 0
else
targetf, f_release
src.message @,,1 What do you wish to release?
src.targetf f_house_moveW
doswitch <src.f_LangShowNum>
src.message @,,1 What do you wish to move?
src.message @,,1 Укажите, что вы хотите подвинуть?
enddo
return 1
endif

Expand All @@ -92,7 +116,10 @@ ON=bank*
return 0
else
src.bankself
src.sysmessage @,,1 You have <bankbalance> gold in your Bank Box.
doswitch <src.f_LangShowNum>
src.sysmessage @,,1 You have <f_math_cat <src.bankbalance>> gold in your Bank Box.
src.sysmessage @,,1 На вашем банковском счету находится <f_math_cat <src.bankbalance>> gp
enddo
return 1
endif
endif
Expand All @@ -103,7 +130,10 @@ ON=eject*
return 0
else
src.targetf f_house_eject
src.message @,,1 Select player to eject
doswitch <src.f_LangShowNum>
src.message @,,1 Select player to eject.
src.message @,,1 Укажите персонажа, которого вы хотите удалить с территории дома.
enddo
return 1
endif

Expand All @@ -113,7 +143,10 @@ ON=Ban Person*
return 0
else
src.targetf f_house_add_list ban
src.message @,,1 Select player to ban
doswitch <src.f_LangShowNum>
src.message @,,1 Select player to ban.
src.message @,,1 Укажите персонажа, которого вы хотите изгнать с территории дома.
enddo
return 1
endif

Expand All @@ -123,12 +156,15 @@ ON=Place trashcan*
return 0
else
if (<ref1.tag0.trashcan>)
sysmessage @32,,1 You already have a trashcan.
doswitch <src.f_LangShowNum>
src.message @<def.fail>,,1 You already have a trashcan.
src.message @<def.fail>,,1 На территории дома уже установлена мусорная корзина.
enddo
else
serv.newitem i_trashcan
new.p=<p>
new.attr=attr_move_never
ref1.tag0.trashcan=<new>
new.p = <src.p>
new.attr = attr_move_never
ref1.tag0.trashcan = <new>
endif
return 1
endif
Expand All @@ -139,10 +175,13 @@ ON=Remove trashcan*
return 0
else
if (<ref1.tag0.trashcan>)
try uid.<ref1.tag0.trashcan>.remove
ref1.tag.trashcan
try uid.<ref1.tag0.trashcan>.remove
ref1.tag.trashcan =
else
sysmessage @32,,1 You have no trashcan to remove.
doswitch <src.f_LangShowNum>
src.message @<def.fail>,,1 You have no trashcan to remove.
src.message @<def.fail>,,1 На территории дома нет мусорной корзины.
enddo
endif
return 1
endif
Expand Down
Loading