diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json index bac12bb..de4fe4e 100755 --- a/DataCollection/gamedata.json +++ b/DataCollection/gamedata.json @@ -140,10 +140,44 @@ "password_input":"
^PLReply:|^PS14|ANSWER^R1", "last_poet":"^R1^LLast Player Poet:%USERNAME% ^R1", "ranch":{ - "unowned_ranch":"This is an unowned ranch.
It is available for purchase for $%PRICE%
^T6You could purchase this ranch:^B6P^R1", + "unowned_ranch":"This is an unowned ranch.
It is available for purchase for $%PRICE%
", + "you_could_purchase_this":"^T6You could purchase this ranch:^B6P^R1", + "ranch_already_owned":"You already own a ranch, however.", + "unowned_ranch_click":"Unowned Ranch", - "ranch_buy_default_name":"%USERNAME%'s Ranch", - "ranch_buy_cannot_afford":"You cannot afford this property!" + "click_message":"%USERNAME%'s %TITLE%", + + "dorothy_message":"There's no place like home... There's no place like home...", + "ranch_buy_cannot_afford":"You cannot afford this property!", + "ranch_brought":"You paid $%PRICE% and are now the proud owner of this ranch!", + "saved_ranch":"Saved Ranch Description.", + "default_title":"Ranch", + "ranch_description":"^PLRanch Title:|%RANCHTITLE%^LYour Ranch Description:^R1^PB160|%RANCHDESC%^PS11|SAVE DESCRIPTION" + "build":{ + "build_on_this_spot":"You can build one of the following buildings on this spot:", + "build_format":"^T6Build a %BUILDINGNAME% for $%PRICE%^B6L%BUILDINGID%^B6B%BUILDINGID%^R1", + "cannot_afford":"You cannot afford this building!", + "information":"%BUILDINGNAME%: %BUILINGDESCRIPTION%.", + "build_complete":"Additional ranch building has been constructed.", + "building_allready_placed":"You already have a building here:^T6Remove the %BUILDINGNAME%^B6R%BUILDINGID%^R1^L(You will get 35% money back - $%PRICE%)^R1", + "torn_down":"You have torn down a ranch building and were refunded $%PRICE%.", + "building_Info":"This is a %BUILDINGNAME%.
Details: %BUILDINGDESC%", + "barn":"
Owner's horses in barns:%HORSELIST%" + }, + "upgrade":{ + "upgrade_message":"Ranch Upgraded.", + "cannot_afford":"You cannot afford this upgrade!", + "upgrade_meta":"You currently have a %UPGRADENAME%.
Details: %UPGRADEDESC%

You could upgrade to a:^T6%NEXTUPGRADE% for $%COST%^B6U^R1^LYou could also sell your ranch: (75% of total invested)^R1^T6SELL your ranch for $%SELLPRICE%^D60|SELL^R1" + }, + "your_ranch_meta":"%USERANME%'s %TITLE%", + "rest_here":"
You have a building here to rest in. You are now fully rested.
", + "special":{ + "water_well":"
You have a Water Well here. You and all of your horses have just been watered.", + "windmills":"
You have %COUNT% Windmill(s) earning you $%AMOUNT% every 12 game hours.", + "wagon":"
^T6Your Wagon can take you to the nearest station.^D7|STATION^R1^H", + "wagon_used":"Your wagon dropped you off at the nearest station." + }, + "view_desc":"^HYOUR RANCH DESCRIPTION:
%DESCRIPTION%
^T5Edit Your Ranch Description^D27|DESCRIPTION^R1" }, "riddler":{ "riddle_format":"Welcome to an Enigmatic Perplexing Conundrum!
(Answer with the simplest form possible. There is no penalty for wrong answers. DO NOT discuss the riddles in Global Chat)


The following Riddling Riddle Riddles you:
%RIDDLE%^PLAnswer Riddle:|^PS6|SOLVE RIDDLE", @@ -2318,10 +2352,10 @@ "Zulu","Zulu Warrior"], "categorys":[ {"name":"LEASED","message":"^LLEASED - Horses only temporarily cared for, limited use:^R1"}, - {"name":"KEEPER","message":"^LKEEPERS - Horses I would not sell for any price:^R1"}, - {"name":"TRAINING","message":"^LTRAINING - Horses I am actively training and competing with:^R1"}, - {"name":"TRADING","message":"^LTRADING - Horses I am trading or auctioning:^R1"}, - {"name":"RETIRED","message":"^LRETIRED - Horses that are still special to me but not used:^R1"} + {"name":"KEEPER","message":"^LKEEPERS - Horses I would not sell for any price:^R1","message_others":"^LKEEPERS - Horses not for sale for any price^R1"}, + {"name":"TRAINING","message":"^LTRAINING - Horses I am actively training and competing with:^R1","message_others":"TRAINING - Horses actively being trained and competed with:^R1"}, + {"name":"TRADING","message":"^LTRADING - Horses I am trading or auctioning:^R1","message_others":"^LTRADING - Horses for trading or auctioning:^R1"}, + {"name":"RETIRED","message":"^LRETIRED - Horses that are still special to me but not used:^R1","message_others":"^LRETIRED - Horses that are still special to player but not used:^R1"} ], "breeds":[ { @@ -548301,168 +548335,141 @@ } ], "ranch":{ - "ranch_buildings":[ - { - "id": 1, - "type": "UPGRADE", - "cost": 0, - "title": "TeePee Ranch House", - "description": "This simple structure provides great flexibility, but does not allow for much expansion of your ranch.", - "limit": 1 - }, - { - "id": 2, - "type": "UPGRADE", - "cost": 50000, - "title": "Ranch Shack", - "description": "This small shack is just big enough to live in. It provides for 2 out buildings.", - "limit": 2 - }, - { - "id": 3, - "type": "UPGRADE", - "cost": 100000, - "title": "Small Ranch Cabin", - "description": "This small cabin is much more comfortable than a shack, and it provides for 4 out buildings.", - "limit": 4 - }, - { - "id": 4, - "type": "UPGRADE", - "cost": 200000, - "title": "Large Ranch Cabin", - "description": "The additional space of the large cabin makes for a very comfortable lifestyle. It also provides for 6 out buildings.", - "limit": 6 - }, - { - "id": 5, - "type": "UPGRADE", - "cost": 400000, - "title": "Small Ranch House", - "description": "This small house makes life very comfortable. It also provides for 8 out buildings.", - "limit": 8 - }, - { - "id": 6, - "type": "UPGRADE", - "cost": 800000, - "title": "Medium Ranch House", - "description": "This ranch house provides up to 10 out buildings.", - "limit": 10 - }, - { - "id": 7, - "type": "UPGRADE", - "cost": 2000000, - "title": "Large Ranch House", - "description": "This large ranch house provides for 12 out buildings.", - "limit": 12 - }, - { - "id": 8, - "type": "UPGRADE", - "cost": 5000000, - "title": "Huge Ranch Estate", - "description": "This huge home supports up to 14 out buildings.", - "limit": 14 - }, - { - "id": 1, - "type": "BUILDING", - "cost": 50000, - "title": "Horse Stable Barn", - "description": "This nice barn is big enough to allow you to own 4 more horses", - "limit": null - }, - { - "id": 2, - "type": "BUILDING", - "cost": 25000, - "title": "Water Well", - "description": "Having a well automatically waters all of your horses and yourself whenever you are here", - "limit": null - }, - { - "id": 3, - "type": "BUILDING", - "cost": 100000, - "title": "Grain Silo", - "description": "Building a grain silo automatically feeds your horses", - "limit": null - }, - { - "id": 4, - "type": "BUILDING", - "cost": 50000, - "title": "Shed", - "description": "A shed is a great place to store excess stuff. You can carry up to 20 more items in your inventory. (Max 2 sheds.)", - "limit": null - }, - { - "id": 5, - "type": "BUILDING", - "cost": 5000, - "title": "Flower Garden", - "description": "A simple, pretty flower garden. It's just nice to look at", - "limit": null - }, - { - "id": 6, - "type": "BUILDING", - "cost": 100000, - "title": "Training Pen", - "description": "The training pen allows for free horse training once per game day. (Max 1 training pen.)", - "limit": null - }, - { - "id": 7, - "type": "BUILDING", - "cost": 50000, - "title": "Wagon", - "description": "Building a wagon provides you free transport to the nearest wagon station and free use of wagons", - "limit": null - }, - { - "id": 8, - "type": "BUILDING", - "cost": 120000, - "title": "Windmill", - "description": "A windmill automatically makes you $10,000 of money every game day", - "limit": null - }, - { - "id": 9, - "type": "BUILDING", - "cost": 15000, - "title": "Vegetable Garden", - "description": "The garden automatically feeds the owner whenever they visit", - "limit": null - }, - { - "id": 10, - "type": "BUILDING", - "cost": 500000, - "title": "Horse Stable Big Barn", - "description": "This larger barn is big enough to allow you to own 8 more horses", - "limit": null - }, - { - "id": 11, - "type": "BUILDING", - "cost": 5000000, - "title": "Horse Stable Gold Barn", - "description": "This large, fancy barn is big enough to allow you to own 12 more horses", - "limit": null - }, - { - "id": 9, - "type": "UPGRADE", - "cost": 20000000, - "title": "Enormous Ranch Estate", - "description": "This huge home supports up to 16 out buildings.", - "limit": 16 - } - ], + "ranch_buildings":{ + "upgrades":[ + { + "id": 1, + "cost": 0, + "title": "TeePee Ranch House", + "description": "This simple structure provides great flexibility, but does not allow for much expansion of your ranch.", + "limit": 1 + }, + { + "id": 2, + "cost": 50000, + "title": "Ranch Shack", + "description": "This small shack is just big enough to live in. It provides for 2 out buildings.", + "limit": 2 + }, + { + "id": 3, + "cost": 100000, + "title": "Small Ranch Cabin", + "description": "This small cabin is much more comfortable than a shack, and it provides for 4 out buildings.", + "limit": 4 + }, + { + "id": 4, + "cost": 200000, + "title": "Large Ranch Cabin", + "description": "The additional space of the large cabin makes for a very comfortable lifestyle. It also provides for 6 out buildings.", + "limit": 6 + }, + { + "id": 5, + "cost": 400000, + "title": "Small Ranch House", + "description": "This small house makes life very comfortable. It also provides for 8 out buildings.", + "limit": 8 + }, + { + "id": 6, + "cost": 800000, + "title": "Medium Ranch House", + "description": "This ranch house provides up to 10 out buildings.", + "limit": 10 + }, + { + "id": 7, + "cost": 2000000, + "title": "Large Ranch House", + "description": "This large ranch house provides for 12 out buildings.", + "limit": 12 + }, + { + "id": 8, + "cost": 5000000, + "title": "Huge Ranch Estate", + "description": "This huge home supports up to 14 out buildings.", + "limit": 14 + }, + { + "id": 9, + "cost": 20000000, + "title": "Enormous Ranch Estate", + "description": "This huge home supports up to 16 out buildings.", + "limit": 16 + } + ], + "buildings":[ + { + "id": 1, + "cost": 50000, + "title": "Horse Stable Barn", + "description": "This nice barn is big enough to allow you to own 4 more horses", + }, + { + "id": 2, + "cost": 25000, + "title": "Water Well", + "description": "Having a well automatically waters all of your horses and yourself whenever you are here", + }, + { + "id": 3, + "cost": 100000, + "title": "Grain Silo", + "description": "Building a grain silo automatically feeds your horses", + }, + { + "id": 4, + "cost": 50000, + "title": "Shed", + "description": "A shed is a great place to store excess stuff. You can carry up to 20 more items in your inventory. (Max 2 sheds.)", + }, + { + "id": 5, + "cost": 5000, + "title": "Flower Garden", + "description": "A simple, pretty flower garden. It's just nice to look at", + }, + { + "id": 6, + "cost": 100000, + "title": "Training Pen", + "description": "The training pen allows for free horse training once per game day. (Max 1 training pen.)", + }, + { + "id": 7, + "cost": 50000, + "title": "Wagon", + "description": "Building a wagon provides you free transport to the nearest wagon station and free use of wagons", + }, + { + "id": 8, + "cost": 120000, + "title": "Windmill", + "description": "A windmill automatically makes you $10,000 of money every game day", + }, + { + "id": 9, + "cost": 15000, + "title": "Vegetable Garden", + "description": "The garden automatically feeds the owner whenever they visit", + }, + { + "id": 10, + "cost": 500000, + "title": "Horse Stable Big Barn", + "description": "This larger barn is big enough to allow you to own 8 more horses", + }, + { + "id": 11, + "cost": 5000000, + "title": "Horse Stable Gold Barn", + "description": "This large, fancy barn is big enough to allow you to own 12 more horses", + } + ] + } "ranch_locations":[ {"id":37,"x":519,"y":217,"value":500000}, {"id":38,"x":517,"y":218,"value":500000}, diff --git a/Horse Isle Server/HorseIsleServer/Game/Messages.cs b/Horse Isle Server/HorseIsleServer/Game/Messages.cs index 62a26a7..a172009 100755 --- a/Horse Isle Server/HorseIsleServer/Game/Messages.cs +++ b/Horse Isle Server/HorseIsleServer/Game/Messages.cs @@ -605,7 +605,6 @@ namespace HISP.Game { return RiddlerCorrectAnswerFormat.Replace("%REASON%", reason); } - public static string FormatPirateTreasure(int prize) { return PirateTreasureFormat.Replace("%PRIZE%", prize.ToString("N0")); diff --git a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs index 15be0d9..384bdd6 100755 --- a/Horse Isle Server/HorseIsleServer/Server/GameServer.cs +++ b/Horse Isle Server/HorseIsleServer/Server/GameServer.cs @@ -2515,7 +2515,7 @@ namespace HISP.Server { if(loggedInUser.CurrentlyRidingHorse.BasicStats.Experience < 25) { - if(GameServer.RandomNumberGenerator.Next(0,50) == 25 || sender.LoggedinUser.Username.ToLower() == "dream") + if(GameServer.RandomNumberGenerator.Next(0,20) == 14 || sender.LoggedinUser.Username.ToLower() == "dream") { loggedInUser.CurrentlyRidingHorse.BasicStats.Experience++; sender.LoggedinUser.CurrentlyRidingHorse = null; diff --git a/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs b/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs index 4af9cd0..1f631cb 100755 --- a/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs +++ b/Horse Isle Server/HorseIsleServer/Server/PacketBuilder.cs @@ -366,8 +366,6 @@ namespace HISP.Server { direction -= 20; moveTwo = true; - - } int ystart = y - 4;