Skip to content

Commit

Permalink
Minor fixes and changes
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamKyle committed Nov 20, 2023
1 parent 37777d3 commit e07ae6c
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 3 deletions.
14 changes: 14 additions & 0 deletions app/Admin/Import/GuideQuests/Sheets/GuideQuestsSheet.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function collection(Collection $rows) {
protected function returnCleanAffix(array $data) {

$gameMap = GameMap::where('name', $data['required_game_map_id'])->first();
$beOnMap = GameMap::where('name', $data['be_on_game_map'])->first();
$skill = GameSkill::where('name', $data['required_skill'])->first();
$secondarySkill = GameSkill::where('name', $data['required_secondary_skill'])->first();
$passiveSkill = PassiveSkill::where('name', $data['required_passive_skill'])->first();
Expand All @@ -50,6 +51,7 @@ protected function returnCleanAffix(array $data) {
$secondaryItem = Item::where('name', $data['secondary_quest_item_id'])->where('type', 'quest')->first();
$quest = Quest::where('name', $data['required_quest_id'])->first();
$kingdomBuilding = GameBuilding::where('name', $data['required_kingdom_building_id'])->first();
$parentGuideQuest = GuideQuest::where('name', $data['parent_id'])->first();

if (is_null($skill)) {
$data['required_skill_level'] = null;
Expand Down Expand Up @@ -110,6 +112,18 @@ protected function returnCleanAffix(array $data) {
$data['required_kingdom_building_id'] = $kingdomBuilding->id;
}

if (is_null($beOnMap)) {
$data['be_on_game_map'] = null;
} else {
$data['be_on_game_map'] = $beOnMap->id;
}

if (is_null($parentGuideQuest)) {
$data['parent_id'] = null;
} else {
$data['parent_id'] = $parentGuideQuest->id;
}

return $data;
}
}
6 changes: 3 additions & 3 deletions app/Game/Events/Values/GlobalEventForEventTypeValue.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ public static function returnGlobalEventInfoForSeasonalEvents(int $eventType): a

if ($event->isWinterEvent()) {
return [
'max_kills' => 19000,
'reward_every_kills' => 1000,
'next_reward_at' => 1000,
'max_kills' => 190000,
'reward_every_kills' => 10000,
'next_reward_at' => 10000,
'event_type' => EventType::WINTER_EVENT,
'item_specialty_type_reward' => ItemSpecialtyType::CORRUPTED_ICE,
'should_be_unique' => true,
Expand Down
6 changes: 6 additions & 0 deletions resources/js/game/sections/map/map-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ export default class MapSection extends React.Component<MapProps, MapState> {
npc_kingdoms: this.props.map_data.npc_kingdoms,
});
}

if (!isEqual(this.props.map_data.locations, this.state.locations)) {
this.setState({
locations: this.props.map_data.locations,
})
}
}
}

Expand Down

0 comments on commit e07ae6c

Please sign in to comment.