woofmeow/netfishing
woofmeow/netfishing
1
0
Fork 0
Code Issues 33 Pull requests Projects 1 Releases 24 Packages Wiki Activity Actions

Expand fish catalog and add bait system

Browse source
This commit is contained in:
Alexander Sellite 2026-08-06 01:00:52 -04:00
parent 43f57e56a0
commit 954042fd1d
134 changed files with 3134 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

23
network/network_shop_service.gd
View file

@ -108,11 +108,13 @@ func is_local_purchase_pending() -> bool:
func request_supply(item_id: StringName) -> String:
var owned: int = _bag.get_quantity(item_id) if _bag != null else 0
var quantity: int = FishingShopStockType.get_purchase_quantity(item_id, owned)
return _request_purchase(
item_id,
NetworkShopProtocol.ProductCategory.SUPPLY,
1,
_bag.get_quantity(item_id) if _bag != null else 0
quantity,
owned
)
@ -307,7 +309,7 @@ func _build_authoritative_result(
var rejection: String = ""
if StringName(str(request["shop_id"])) != SHOP_ID:
rejection = "The shop is unavailable."
elif quantity != 1:
elif quantity < 1:
rejection = "Purchase could not be completed."
else:
match category:
@ -322,10 +324,11 @@ func _build_authoritative_result(
or product_id not in (
FishingShopStockType.get_stock_item_ids()
)
or item.category != ItemDataType.Category.CONSUMABLE
or (item.category != ItemDataType.Category.CONSUMABLE and not FishingShopStockType.is_bait_topoff(product_id))
or not item.stackable
or not item.usable
or (not item.usable and not FishingShopStockType.is_bait_topoff(product_id))
or current_state >= item.max_stack
or current_state + quantity > item.max_stack
):
rejection = (
"Your Bag is full."
@ -333,7 +336,11 @@ func _build_authoritative_result(
else "Purchase could not be completed."
)
else:
resulting_state = current_state + 1
if not FishingShopStockType.is_bait_topoff(product_id) and quantity != 1:
rejection = "Purchase could not be completed."
else:
cost *= quantity
resulting_state = current_state + quantity
NetworkShopProtocol.ProductCategory.ROD:
rejection = "This item is not sold here."
NetworkShopProtocol.ProductCategory.REEL_SPEED_UPGRADE:
@ -576,7 +583,7 @@ func _validate_local_result(data: Dictionary) -> String:
var resulting_state: int = int(data["resulting_state"])
if (
category != NetworkShopProtocol.ProductCategory.ART_UPGRADE
and resulting_state != expected_state + 1
and resulting_state != expected_state + int(data["quantity"])
):
return "Purchase could not be completed."
if not _wallet.can_afford(cost):
@ -585,6 +592,8 @@ func _validate_local_result(data: Dictionary) -> String:
NetworkShopProtocol.ProductCategory.SUPPLY:
if _bag.get_quantity(product_id) != expected_state:
return "Purchase could not be completed."
if cost != FishingShopStockType.get_price(product_id) * int(data["quantity"]):
return "Purchase could not be completed."
if not _bag.can_add_item(product_id, data["quantity"]):
return "Your Bag is full."
NetworkShopProtocol.ProductCategory.REEL_SPEED_UPGRADE: