nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-10-23 03:13:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'happiyness' into 'ms4/dev'

Browse Source 
Goodbye Happyness, welcome Happiness. Now where's my cup of tea, Elizabeth?

See merge request morningstar/Arcturus-Community!32
This commit is contained in:
brenoepic 2023-01-12 09:23:53 +00:00
commit a224028df3
7 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sqlupdates/3_5_0 to 4_0_0.sql
View File

@ -2,9 +2,14 @@ INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.error.cmd_change
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.succes.cmd_changename.done', 'Successfully toggled the name change for the Habbo %user%.');
INSERT INTO `emulator_texts` (`key`, `value`) VALUES ('commands.succes.cmd_changename.received', 'Hotel staff requests for you to change your name.\n Please click on your Habbo then click on the "Change Your Name" button.');
ALTER TABLE `achievements`
ADD `visible` enum('0','1') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT 'Is the achievement in use and/or obtainable?';
ALTER TABLE `achievements` ADD `visible` enum('0','1') COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '1' COMMENT 'Is the achievement in use and/or obtainable?';
UPDATE pet_commands_data SET required_level=1 WHERE command_id=35;
UPDATE `pet_commands_data` SET `required_level` = '1' WHERE `command_id` = '35';
INSERT IGNORE INTO `emulator_settings` (`key`, `value`) VALUES ('encryption.forced', '0');
UPDATE `emulator_texts` SET `key` = 'generic.pet.happiness', `value` = 'Happiness' WHERE `key` = 'generic.pet.happyness';
ALTER TABLE `pet_commands_data` CHANGE `cost_happyness` `cost_happiness` int(11) NOT NULL DEFAULT '0';
ALTER TABLE `users_pets` CHANGE `happyness` `happiness` int(11) NOT NULL DEFAULT '100';

4
sqlupdates/4_0_0_pets_EN.sql
View File

@ -63,12 +63,12 @@ CREATE TABLE IF NOT EXISTS `pet_commands_data` (
`text` varchar(25) NOT NULL,
`required_level` int(11) NOT NULL,
`reward_xp` int(11) NOT NULL DEFAULT 5,
`cost_happyness` int(11) NOT NULL DEFAULT 0,
`cost_happiness` int(11) NOT NULL DEFAULT 0,
`cost_energy` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`command_id`) USING BTREE
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
INSERT INTO `pet_commands_data` (`command_id`, `text`, `required_level`, `reward_xp`, `cost_happyness`, `cost_energy`) VALUES
INSERT INTO `pet_commands_data` (`command_id`, `text`, `required_level`, `reward_xp`, `cost_happiness`, `cost_energy`) VALUES
(0, 'Free', 1, 5, 0, 0),
(1, 'Sit', 1, 5, 0, 0),
(2, 'Down', 2, 10, 0, 0),

4
sqlupdates/4_0_0_pets_NL.sql
View File

@ -63,12 +63,12 @@ CREATE TABLE IF NOT EXISTS `pet_commands_data` (
`text` varchar(25) NOT NULL,
`required_level` int(11) NOT NULL,
`reward_xp` int(11) NOT NULL DEFAULT 5,
`cost_happyness` int(11) NOT NULL DEFAULT 0,
`cost_happiness` int(11) NOT NULL DEFAULT 0,
`cost_energy` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`command_id`) USING BTREE
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci;
INSERT INTO `pet_commands_data` (`command_id`, `text`, `required_level`, `reward_xp`, `cost_happyness`, `cost_energy`) VALUES
INSERT INTO `pet_commands_data` (`command_id`, `text`, `required_level`, `reward_xp`, `cost_happiness`, `cost_energy`) VALUES
(0, 'Geen', 1, 0, 0, 0),
(1, 'Zit', 1, 10, 0, 0),
(2, 'Lig', 2, 10, 0, 0),

2
src/main/java/com/eu/habbo/habbohotel/commands/PetInfoCommand.java
View File

@ -30,7 +30,7 @@ public class PetInfoCommand extends Command {
Emulator.getTexts().getValue("commands.generic.cmd_pet_info.stats") + "\r\n" +
Emulator.getTexts().getValue("generic.pet.scratches") + ": " + pet.getRespect() + "\r" +
Emulator.getTexts().getValue("generic.pet.energy") + ": " + pet.getEnergy() + "/" + PetManager.maxEnergy(pet.getLevel()) + "\r" +
Emulator.getTexts().getValue("generic.pet.happyness") + ": " + pet.getHappiness() + "\r" +
Emulator.getTexts().getValue("generic.pet.happiness") + ": " + pet.getHappiness() + "\r" +
Emulator.getTexts().getValue("generic.pet.level.thirst") + ": " + pet.levelThirst + "\r" +
Emulator.getTexts().getValue("generic.pet.level.hunger") + ": " + pet.levelHunger + "\r" +
Emulator.getTexts().getValue("generic.pet.current_action") + ": " + (pet.getTask() == null ? Emulator.getTexts().getValue("generic.nothing") : pet.getTask().name()) + "\r" +

6
src/main/java/com/eu/habbo/habbohotel/pets/Pet.java
View File

@ -149,7 +149,7 @@ public class Pet implements ISerialize, Runnable {
}
this.race = set.getInt("race");
this.experience = set.getInt("experience");
this.happiness = set.getInt("happyness");
this.happiness = set.getInt("happiness");
this.energy = set.getInt("energy");
this.respect = set.getInt("respect");
this.created = set.getInt("created");
@ -284,7 +284,7 @@ public class Pet implements ISerialize, Runnable {
if (this.isNeedsUpdate()) {
try (Connection connection = Emulator.getDatabase().getDataSource().getConnection()) {
if (this.id > 0) {
try (PreparedStatement statement = connection.prepareStatement("UPDATE users_pets SET room_id = ?, experience = ?, energy = ?, respect = ?, x = ?, y = ?, z = ?, rot = ?, hunger = ?, thirst = ?, happyness = ?, created = ? WHERE id = ?")) {
try (PreparedStatement statement = connection.prepareStatement("UPDATE users_pets SET room_id = ?, experience = ?, energy = ?, respect = ?, x = ?, y = ?, z = ?, rot = ?, hunger = ?, thirst = ?, happiness = ?, created = ? WHERE id = ?")) {
statement.setInt(1, (this.room == null ? 0 : this.room.getId()));
statement.setInt(2, this.experience);
statement.setInt(3, this.energy);
@ -774,7 +774,7 @@ public class Pet implements ISerialize, Runnable {
}
/**
* Increases the pet's happyness level when it is scratched.
* Increases the pet's happiness level when it is scratched.
*
* @param habbo the habbo who scratched the pet
*/

2
src/main/java/com/eu/habbo/habbohotel/pets/PetCommand.java
View File

@ -32,7 +32,7 @@ public class PetCommand implements Comparable<PetCommand> {
this.level = set.getInt("required_level");
this.xp = set.getInt("reward_xp");
this.energyCost = set.getInt("cost_energy");
this.happinessCost = set.getInt("cost_happyness");
this.happinessCost = set.getInt("cost_happiness");
this.action = action;
}

2
src/main/java/com/eu/habbo/messages/outgoing/rooms/pets/PetInfoMessageComposer.java
View File

@ -40,7 +40,7 @@ public class PetInfoMessageComposer extends MessageComposer {
}
this.response.appendInt(this.pet.getEnergy());
this.response.appendInt(this.pet.getMaxEnergy()); //Max energy
this.response.appendInt(this.pet.getHappiness()); //this.pet.getHappyness()
this.response.appendInt(this.pet.getHappiness());
this.response.appendInt(100);
this.response.appendInt(this.pet.getRespect());
this.response.appendInt(this.pet.getUserId());